Merge branch 'master' into PROT-9-webservice

[proteocache.git] / webapp / view / fragments / mainmenu.jsp

diff --git a/webapp/view/fragments/mainmenu.jsp b/webapp/view/fragments/mainmenu.jsp
index f310fbf..cc17930 100644 (file)
--- a/webapp/view/fragments/mainmenu.jsp
+++ b/webapp/view/fragments/mainmenu.jsp
@@ -10,11 +10,23 @@
                        <li>
                                <a href="<spring:url value="/" htmlEscape="true" />"><span class="glyphicon glyphicon-home"></span> Home</a>
                        </li>
+                       <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-tree-conifer"></span> Proteomes <b class="caret"></b></a>
+                               <ul class="dropdown-menu">
+                                       <li><a href="<spring:url value="/proteomes/load" htmlEscape="true" />">Load Proteome</a></li>
+                                       <li><a href="<spring:url value="/proteomes/view" htmlEscape="true" />">View Proteome</a></li>
+<sec:authorize access="hasRole('ROLE_ADMIN')">
+                                       <li><a href="<spring:url value="/proteomes/launch" htmlEscape="true" />">Launch Predictions</a></li>
+</sec:authorize>
+                               </ul>
+                       </li>
                        <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-search"></span> Search Servlets <b class="caret"></b></a>
                                <ul class="dropdown-menu">
                                        <li><a href="<spring:url value="/sequence/query" htmlEscape="true" />">Protein Sequence</a></li>
-                                       <li><a href="<spring:url value="/job/query" htmlEscape="true" />">Job</a></li>
-                                       <li><a href="<spring:url value="/admin/ip/query" htmlEscape="true" />">IP</a></li>
+                                       <li><a href="<spring:url value="/features/query" htmlEscape="true" />">Protein Secondary Structure Features</a></li>
+<sec:authorize access="hasRole('ROLE_ADMIN')">
+                                       <li><a href="<spring:url value="/job/query" htmlEscape="true" />">Job Query</a></li>
+                                       <li><a href="<spring:url value="/admin/ip/query" htmlEscape="true" />">IP Query</a></li>
+</sec:authorize>
                                </ul>
                        </li>
                        <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-stats"></span> Statistics Servlets<b class="caret"></b></a>
@@ -22,7 +34,9 @@
                                        <li><a href="<spring:url value="/stat/jobs/query" htmlEscape="true" />">Daily Job Statistics</a></li>
                                        <li class="divider"></li>
                                        <li><a href="<spring:url value="/stat/exectime/query" htmlEscape="true" />">Job Time Execution</a></li>
+<sec:authorize access="hasRole('ROLE_ADMIN')">
                                        <li><a href="<spring:url value="/admin/ip/counts/query" htmlEscape="true" />">IPs by Job count</a></li>
+</sec:authorize>
                                        <li><a href="<spring:url value="/sequence/counts/query" htmlEscape="true" />">Proteins by Job count</a></li>
                                </ul>
                        </li>