1.1 --- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag Sat Jan 15 18:14:15 2011 +0100
1.2 +++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/stranka.tag Wed Jan 26 03:23:32 2011 +0100
1.3 @@ -15,6 +15,10 @@
1.4 doctype-root-element="html"
1.5 omit-xml-declaration="false"/>
1.6
1.7 + <c:set var="prihlasenyUzivatel" scope="request" value="${pageContext.request.userPrincipal.name}"/>
1.8 + <!-- zc = základní cesta = contextPath s lomítkem na konci -->
1.9 + <c:set var="zc" scope="application" value="${pageContext.request.contextPath}/"/>
1.10 +
1.11 <html xmlns="http://www.w3.org/1999/xhtml">
1.12 <head>
1.13 <c:choose>
1.14 @@ -25,15 +29,15 @@
1.15 <title>${fn:escapeXml(titulek)} – <fmt:message key="nazev"/></title>
1.16 </c:otherwise>
1.17 </c:choose>
1.18 - <link href="styl.css" type="text/css" rel="StyleSheet"/>
1.19 - <link href="js/colorbox/colorbox.css" type="text/css" rel="StyleSheet"/>
1.20 - <script type="text/javascript" src="js/jquery.js"></script>
1.21 - <script type="text/javascript" src="js/jquery.bxSlider.js"></script>
1.22 - <script type="text/javascript" src="js/colorbox/jquery.colorbox-min.js"></script>
1.23 - <script type="text/javascript" src="js/hlasovani.js"></script>
1.24 - <script type="text/javascript" src="js/komentare.js"></script>
1.25 - <script type="text/javascript" src="js/fotkyPodniku.js"></script>
1.26 - <link rel="alternate" type="application/atom+xml" title="podniky" href="atom/" />
1.27 + <link href="${zc}styl.css" type="text/css" rel="StyleSheet"/>
1.28 + <link href="${zc}js/colorbox/colorbox.css" type="text/css" rel="StyleSheet"/>
1.29 + <script type="text/javascript" src="${zc}js/jquery.js"></script>
1.30 + <script type="text/javascript" src="${zc}js/jquery.bxSlider.js"></script>
1.31 + <script type="text/javascript" src="${zc}js/colorbox/jquery.colorbox-min.js"></script>
1.32 + <script type="text/javascript" src="${zc}js/hlasovani.js"></script>
1.33 + <script type="text/javascript" src="${zc}js/komentare.js"></script>
1.34 + <script type="text/javascript" src="${zc}js/fotkyPodniku.js"></script>
1.35 + <link rel="alternate" type="application/atom+xml" title="podniky" href="${zc}atom/" />
1.36 <fmt:message key="meta.popis" var="metaPopis"/>
1.37 <fmt:message key="meta.klicova-slova" var="metaKlicovaSlova"/>
1.38 <fmt:message key="meta.autor" var="metaAutor"/>
1.39 @@ -47,24 +51,24 @@
1.40 <div class="body">
1.41
1.42 <div id="horniPruh">
1.43 - <h1><a href="?"><fmt:message key="nazev"/></a></h1>
1.44 + <h1><a href="${zc}"><fmt:message key="nazev"/></a></h1>
1.45 </div>
1.46
1.47 <ul id="nabidka">
1.48 - <li><a href="?"><fmt:message key="uvod"/></a></li>
1.49 + <li><a href="${zc}"><fmt:message key="uvod"/></a></li>
1.50 <!-- TODO: použít Jabberot, dočasně vypnuté
1.51 <li><a href="?akce=chat"><fmt:message key="chat.nadpis"/></a></li>
1.52 -->
1.53
1.54 <c:choose>
1.55 <c:when test="${prihlasenyUzivatel == null}">
1.56 - <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
1.57 - <li><a href="?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
1.58 + <li><a href="${zc}?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
1.59 + <li><a href="${zc}?akce=registrovatUzivatele"><fmt:message key="registrovatSe"/></a></li>
1.60 </c:when>
1.61 <c:otherwise>
1.62 - <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
1.63 + <li><a href="${zc}?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
1.64 <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
1.65 - <li><a href="?akce=prihlaseni&amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
1.66 + <li><a href="${zc}?akce=prihlaseni&amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
1.67 </c:otherwise>
1.68 </c:choose>
1.69
1.70 @@ -82,8 +86,8 @@
1.71 <div id="paticka">
1.72 <p>
1.73 <fmt:message key="licence"/>&#160;
1.74 - <a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
1.75 - <a href="nekurak.net-src.zip.SHA-512">.</a>
1.76 + <a href="${zc}nekurak.net-src.zip">nekurak.net-src.zip</a>
1.77 + <a href="${zc}nekurak.net-src.zip.SHA-512">.</a>
1.78 </p>
1.79 </div>
1.80