[Treebase-guts] SF.net SVN: treebase:[525] trunk/treebase-web/src/main

[<yo...@us...>]

Revision: 525
          http://treebase.svn.sourceforge.net/treebase/?rev=525&view=rev
Author:   youjun
Date:     2010-03-04 16:48:06 +0000 (Thu, 04 Mar 2010)

Log Message:
-----------
make the menus collapsible

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp
    trunk/treebase-web/src/main/webapp/common/adminMenu.jsp
    trunk/treebase-web/src/main/webapp/common/searchMenuRight.jsp
    trunk/treebase-web/src/main/webapp/common/searchSummaryMenuRight.jsp
    trunk/treebase-web/src/main/webapp/common/submissionMenu.jsp

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java	2010-03-03 22:53:35 UTC (rev 524)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java	2010-03-04 16:48:06 UTC (rev 525)
@@ -77,7 +77,6 @@
 	public static final String ALGORITHM_TYPES = "algorithmtypes";
 	public static final String ALGORITHM_LIKELIHOOD = Algorithm.LikelihoodAlgorithm;
 	public static final String ALGORITHM_PARSIMONY = Algorithm.ParsimonyAlgorithm;
-	//public static final String ALGORITHM_DISTANCE = Algorithm.DistanceAlgorithm;
 	public static final String ALGORITHM_OTHER = Algorithm.OtherAlgorithm;
 	public static final String ALGORITHM_Bayesian =Algorithm.BayesianAlgorithm;	
 	public static final String ALGORITHM_Evolution =Algorithm.EvolutionAlgorithm;

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp	2010-03-03 22:53:35 UTC (rev 524)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp	2010-03-04 16:48:06 UTC (rev 525)
@@ -35,7 +35,7 @@
 	<img class="iconButton" alt="link" src="<fmt:message key="icons.weblink"/>" />
 	Reviewer access URL: right-click and copy me
 </a>
-<div><string>You can copy and send this URL to you journal editor to provide reviewers with limited, read-only access to your data, even if your submission has not yet been approved and the data are not yet public.</sstrong></div>
+<div><strong>You can copy and send this URL to you journal editor to provide reviewers with limited, read-only access to your data, even if your submission has not yet been approved and the data are not yet public.</strong></div>
 <br/>
 <c:if test="${not empty citationsummary.study}">
 	<c:if test="${not empty citationsummary.study.name}">

Modified: trunk/treebase-web/src/main/webapp/common/adminMenu.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/common/adminMenu.jsp	2010-03-03 22:53:35 UTC (rev 524)
+++ trunk/treebase-web/src/main/webapp/common/adminMenu.jsp	2010-03-04 16:48:06 UTC (rev 525)
@@ -4,6 +4,7 @@
 <div id="mainMenu">
 <div id="gutter">
 <div id="menu">
+<a onclick="switchMenu('menuDiv');" style="cursor: pointer;">[X]</a>
 <menu:useMenuDisplayer name="ListMenu" permissions="rolesAdapter">
     <menu:displayMenu name="StudyManagementMenu"/>
     <menu:displayMenu name="UserManagementMenu"/>
@@ -14,4 +15,14 @@
 </div>
 <script type="text/javascript">
     initializeMenus();
+    
+    function switchMenu(obj) {
+        var el = document.getElementById(obj);
+        if ( el.style.display != "none" ) {
+            el.style.display = 'none';
+        }
+        else {
+            el.style.display = '';
+        }
+    }
 </script>

Modified: trunk/treebase-web/src/main/webapp/common/searchMenuRight.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/common/searchMenuRight.jsp	2010-03-03 22:53:35 UTC (rev 524)
+++ trunk/treebase-web/src/main/webapp/common/searchMenuRight.jsp	2010-03-04 16:48:06 UTC (rev 525)
@@ -4,6 +4,7 @@
 <div id="mainMenu">
 <div id="gutter">
 <div id="menu">
+<a onclick="switchMenu('menuDiv');" style="cursor: pointer;">[X]</a>
 <menu:useMenuDisplayer name="ListMenu" permissions="rolesAdapter" >
     <menu:displayMenu name="Searches" />
  </menu:useMenuDisplayer>
@@ -13,8 +14,19 @@
 </div>
 <script type="text/javascript">
     initializeMenus();
+
     var menu = document.getElementById("menuDiv");
     if (menu != null) {
         openMenu("menuDiv");
     }
+
+    function switchMenu(obj) {
+        var el = document.getElementById(obj);
+        if ( el.style.display != "none" ) {
+            el.style.display = 'none';
+        }
+        else {
+            el.style.display = '';
+        }
+    }
 </script>

Modified: trunk/treebase-web/src/main/webapp/common/searchSummaryMenuRight.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/common/searchSummaryMenuRight.jsp	2010-03-03 22:53:35 UTC (rev 524)
+++ trunk/treebase-web/src/main/webapp/common/searchSummaryMenuRight.jsp	2010-03-04 16:48:06 UTC (rev 525)
@@ -4,6 +4,7 @@
 <div id="mainMenu">
 <div id="gutter">
 <div id="menu">
+<a onclick="switchMenu('menuDiv');" style="cursor: pointer;">[X]</a>
 <menu:useMenuDisplayer name="ListMenu" permissions="rolesAdapter">
     <menu:displayMenu name="SubmissionInfo"/>
     <menu:displayMenu name="Citation"/>
@@ -21,4 +22,14 @@
 </div>
 <script type="text/javascript">
     initializeMenus();
+
+    function switchMenu(obj) {
+        var el = document.getElementById(obj);
+        if ( el.style.display != "none" ) {
+            el.style.display = 'none';
+        }
+        else {
+            el.style.display = '';
+        }
+    }
 </script>

Modified: trunk/treebase-web/src/main/webapp/common/submissionMenu.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/common/submissionMenu.jsp	2010-03-03 22:53:35 UTC (rev 524)
+++ trunk/treebase-web/src/main/webapp/common/submissionMenu.jsp	2010-03-04 16:48:06 UTC (rev 525)
@@ -4,6 +4,7 @@
 <div id="mainMenu">
 <div id="gutter">
 <div id="menu">
+<a onclick="switchMenu('menuDiv');" style="cursor: pointer;">[X]</a>
 <menu:useMenuDisplayer name="ListMenu" permissions="rolesAdapter">
 	<menu:displayMenu name="SubmissionHome"/>
 	<menu:displayMenu name="SubmissionNotes"/>
@@ -22,5 +23,18 @@
 </div>
 </div>
 </div>
+<script type="text/javascript">
+    initializeMenus();
+
+    function switchMenu(obj) {
+        var el = document.getElementById(obj);
+        if ( el.style.display != "none" ) {
+            el.style.display = 'none';
+        }
+        else {
+            el.style.display = '';
+        }
+    }
+</script>
 <script type="text/javascript" src="/treebase-web/scripts/prototype/prototype-1.6.0.3.js"></script>
 <script type="text/javascript" src="/treebase-web/scripts/user/submissionSummary.js"></script>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.