Changeset 5192

Timestamp:

Nov 23, 2009, 9:27:03 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1439: Switch active project list in the top menu too long

Location:

branches/2.14-stable

Files:

• doc/src/docbook/userdoc/project_permission.xml (modified) (1 diff)
• doc/src/docbook/userdoc/webclient.xml (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/taglib/Body.java (modified) (1 diff)
• www/include/menu.jsp (modified) (4 diffs)

branches/2.14-stable/doc/src/docbook/userdoc/project_permission.xml

@@ -408 +408 @@
                 automatically be inactivated.
               </para>
+              <para>
+                The drop-down menu can display a maximum of 25 projects. If you are a 
+                member of more projects, the last menu entry will take you to the 
+                complete list of projects.
+              </para>
+              <tip>
+                <para>
+                The sort order in the menu is the same as the sort order on the
+                projects list page. If you, for example, want to sort the newest
+                project first, select to sort by the <guilabel>Registered</guilabel> 
+                column in descending order on the list page. The menu will automatically 
+                use the same order.
+                </para>
+              </tip>
             </listitem>
           

branches/2.14-stable/doc/src/docbook/userdoc/webclient.xml

@@ -264 +264 @@
             <para>
             A list of all projects you are a member of. Selecting a project in the
-            list will make that project the active project.
-            </para>
+            list will make that project the active project. The list can display
+            a maximum of 25 projects. If you are a member of more projects, the last
+            menu entry will take you to the complete list of projects.
+            </para>
+            <tip>
+              <para>
+              The sort order in the menu is the same as the sort order on the
+              projects list page. If you, for example, want to sort the newest
+              project first, select to sort by the <guilabel>Registered</guilabel> 
+              column in descending order on the list page. The menu will automatically 
+              use the same order.
+              </para>
+            </tip>
           </listitem>
         </varlistentry>

branches/2.14-stable/src/clients/web/net/sf/basedb/clients/web/taglib/Body.java

@@ -296 +296 @@
         BodyContent menuBody = pageContext.pushBody();
         pageContext.include("/include/menu.jsp?name=recentItems");
+        pageContext.include("/include/menu.jsp?name=projects");
         pageContext.popBody();
         sb.append(menuBody.getString());

branches/2.14-stable/www/include/menu.jsp

@@ -52 +52 @@
   import="net.sf.basedb.core.ItemResultList"
   import="net.sf.basedb.core.query.Orders"
+  import="net.sf.basedb.core.query.Order"
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.clients.web.Base"
@@ -80 +81 @@
 if ("login".equals(name))
 {
+}
+else if ("projects".equals(name) && sc != null && sc.isLoggedIn())
+{
+  // Projects menu
+  final ItemContext projectCC = sc.getCurrentContext(Item.PROJECT);
+  int activeProjectId = sc.getActiveProjectId();
+  final ItemQuery<Project> projectQuery = Project.getQuery();
+  projectQuery.include(Include.MINE, Include.SHARED);
+  Order projectSortOrder = projectCC.getSortOrder();
+  if (projectSortOrder != null) projectQuery.order(projectSortOrder);
+  projectQuery.order(Orders.asc(Hql.property("name")));
+  projectQuery.setCacheResult(true);
+  final DbControl dc = sc.newDbControl();
+  try
+  {
+    %>
+    <m:menu  
+      id="projects"
+      style="display: none"
+      >
+      <m:menuitem
+        title="<i>- no active project -</i>"
+        onclick="<%="Main.openPopup('"+root+"my_base/projects/set_active.jsp?ID="+ID+"', 'ActivateProject', 300, 140)"%>"
+        icon="<%=activeProjectId == 0 ? "checkedmenu.gif" : null%>"
+        enabled="<%=activeProjectId != 0%>"
+        tooltip="<%=activeProjectId == 0 ? "No project is active" : "Disable the currently active project"%>"
+      />
+      <%
+      ItemResultList<Project> projects = projectQuery.list(dc);
+      boolean breakAt20 = projects.size() > 25;
+      int index = 0;
+      for (Project p : projects)
+      {
+        if (index == 20 && breakAt20) break;
+        index++;
+        int projectId = p.getId();
+        boolean active = activeProjectId == projectId;
+        %>
+        <m:menuitem
+          title="<%=HTML.encodeTags(p.getName())%>"
+          style="<%=active ? "color: #000000; font-weight: bold;" : null %>"
+          onclick="<%="Main.openPopup('"+root+"my_base/projects/set_active.jsp?ID="+ID+"&project_id="+p.getId()+"', 'ActivateProject', 300, 140)"%>"
+          icon="<%=active ? "checkedmenu.gif" : null%>"
+          enabled="<%=!active%>"
+          tooltip="<%=active ? "This is the active project" : "Set this project to the active project"%>"
+        />
+        <%
+      }
+      if (breakAt20)
+      {
+        int more = projects.size() - 20;
+        %>
+        <m:menuseparator />
+        <m:menuitem 
+          title="<%=more + " more" %>"
+          onclick="<%="Menu.openUrl('"+root+"my_base/projects/index.jsp?ID="+ID+"')"%>"
+          tooltip="Show more projects"
+        />
+        <%
+      }
+      %>
+    </m:menu>
+    <%
+  }
+  finally
+  {
+    if (dc != null) dc.close();
+  }
 }
 else if ("recentItems".equals(name) && sc != null && sc.isLoggedIn())
@@ -255 +324 @@
 else if ("standard".equals(name))
 {
-  final DbControl dc = sc.newDbControl(); 
-  ItemResultList<Project> projects = null;
+  final DbControl dc = sc.newDbControl();
   StringBuilder fillText = new StringBuilder();
   try
@@ -542 +610 @@
     }
     
-    // Projects menu
-    int activeProjectId = sc.getActiveProjectId();
-    final ItemQuery<Project> projectQuery = Project.getQuery();
-    projectQuery.include(Include.MINE, Include.SHARED);
-    projectQuery.order(Orders.asc(Hql.property("name")));
-    projectQuery.setCacheResult(true);
-    %>
-    <m:menu  
-      id="projects"
-      style="display: none"
-      >
-      <m:menuitem
-        title="<i>- no active project -</i>"
-        onclick="<%="Main.openPopup('"+root+"my_base/projects/set_active.jsp?ID="+ID+"', 'ActivateProject', 300, 140)"%>"
-        icon="<%=activeProjectId == 0 ? "checkedmenu.gif" : null%>"
-        enabled="<%=activeProjectId != 0%>"
-        tooltip="<%=activeProjectId == 0 ? "No project is active" : "Disable the currently active project"%>"
-      />
-      <%
-      projects = projectQuery.list(dc);
-      for (Project p : projects)
-      {
-        int projectId = p.getId();
-        boolean active = activeProjectId == projectId;
-        %>
-        <m:menuitem
-          title="<%=HTML.encodeTags(p.getName())%>"
-          style="<%=active ? "color: #000000; font-weight: bold;" : null %>"
-          onclick="<%="Main.openPopup('"+root+"my_base/projects/set_active.jsp?ID="+ID+"&project_id="+p.getId()+"', 'ActivateProject', 300, 140)"%>"
-          icon="<%=active ? "checkedmenu.gif" : null%>"
-          enabled="<%=!active%>"
-          tooltip="<%=active ? "This is the active project" : "Set this project to the active project"%>"
-        />
-        <%
-      }
-      %>
-    </m:menu>
-    
-    <%
     // Array LIMS - menu
     final boolean hasPlateGeometries = sc.hasPermission(Permission.READ, Item.PLATEGEOMETRY);