litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move FreeMarker templates, controllers, setup, and library upgrades into trunk. Not used to generate any pages or templates yet (except a couple of hidden pages that are only available through the url).

Browse source
This commit is contained in:
rjy7 2010-05-11 20:37:50 +00:00
parent 3a78b7ae23
commit e3e38c87c6
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
themes/vivo-basic/css/screen.css
View file

@ -101,11 +101,16 @@ ul#otherMenu li {
margin-left: 4px; margin-left: 4px;
} }
ul#otherMenu li.border { ul#otherMenu li {
padding-right: 4px; padding-right: 4px;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
} }
ul#otherMenu li.last {
padding-right: 0;
border-right: none;
}
/************************ /************************
Navigation and Search Navigation and Search

12
themes/vivo-basic/jsp/identity.jsp
View file

@ -106,11 +106,11 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
<c:param name="home" value="${currentPortal}" /> <c:param name="home" value="${currentPortal}" />
</c:url> </c:url>
<li class="border"> <li>
Logged in as <strong><%= loginName %></strong> (<a href="${logoutHref}">Log out</a>) Logged in as <strong><%= loginName %></strong> (<a href="${logoutHref}">Log out</a>)
</li> </li>
<li class="border"><a href="${siteAdminHref}" >Site Admin</a></li> <li><a href="${siteAdminHref}" >Site Admin</a></li>
<%-- A user is not logged in --%> <%-- A user is not logged in --%>
<% } else { %> <% } else { %>
@ -120,7 +120,7 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
<c:param name="login" value="block"/> <c:param name="login" value="block"/>
</c:url> </c:url>
<li class="border"><a title="log in to manage this site" href="${loginHref}">Log in</a></li> <li><a title="log in to manage this site" href="${loginHref}">Log in</a></li>
<% } %> <% } %>
<c:url var="aboutHref" value="<%= Controllers.ABOUT %>"> <c:url var="aboutHref" value="<%= Controllers.ABOUT %>">
@ -129,11 +129,11 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
<c:set var="aboutHref"> <c:set var="aboutHref">
<c:out value="${aboutHref}" escapeXml="true"/> <c:out value="${aboutHref}" escapeXml="true"/>
</c:set> </c:set>
<li<c:if test="${contactMailSetup}"> class="border"</c:if>><a href="${aboutHref}" title="more about this web site">About</a></li> <li<c:if test="${!contactMailSetup}"> class="last"</c:if>><a href="${aboutHref}" title="more about this web site">About</a></li>
<c:if test="${contactMailSetup}" > <c:if test="${contactMailSetup}" >
<li><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li> <li class="last"><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li>
</c:if> </c:if>
</ul> </ul>

4
themes/vivo-basic/jsp/menu.jsp
View file

@ -45,8 +45,8 @@
String uri = (String)request.getAttribute("javax.servlet.forward.request_uri"); String uri = (String)request.getAttribute("javax.servlet.forward.request_uri");
if(uri != null){ if(uri != null){
request.setAttribute("indexClass", uri.indexOf("browsecontroller") > 0 ? "class=\"activeTab\"" : ""); request.setAttribute("indexClass", uri.endsWith("browsecontroller") ? "class=\"activeTab\"" : "");
if ( uri.indexOf("about") > 0) { if ( uri.indexOf("about") > 0) {
request.setAttribute("aboutClass","class=\"activeTab\""); request.setAttribute("aboutClass","class=\"activeTab\"");
} }