Index: portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java
===================================================================
--- portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java	(revision 31566)
+++ portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java	(working copy)
@@ -23,6 +23,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -352,6 +356,13 @@
 			// Get the list of sites in the right order,
 			// My WorkSpace will be the first in the list
 			List<Site> mySites = siteHelper.getAllSites(req, session, true);
+			
+			
+			List<Site> allSites = new ArrayList<Site>();
+			allSites.addAll(mySites);
+			
+			
+			
 			if (!loggedIn)
 			{
 				prefTabs = ServerConfigurationService.getInt(
@@ -422,6 +433,122 @@
 					mySites.add(currentSelectedSite);
 				}
 			}
+			
+			
+
+			
+			//get Sections
+			Map<String, List> termsToSites = new HashMap<String, List>();
+			Map<String, List> tabsMoreTerms = new HashMap<String, List>();
+			for (int i=0; i < allSites.size(); i++){
+				Site site = allSites.get(i);
+				ResourceProperties siteProperties = site.getProperties();
+				
+				String type = site.getType();
+				String term = null;
+				
+				if("course".equals(type)) {
+					term = siteProperties.getProperty("term");
+				} else
+				if ("project".equals(type)) {
+					term = "PROJECTS";
+				} else
+				if ("portfolio".equals(type)) {
+					term = "PORTFOLIOS";
+				} else
+				if ("admin".equals(type)) {
+					term = "ADMINISTRATION";
+				} else {
+					term = "OTHER";
+				}
+				
+				List<Site> currentList = new ArrayList();
+				if(termsToSites.containsKey(term)){
+					currentList = termsToSites.get(term);
+					termsToSites.remove(term);
+				} 
+				currentList.add(site);
+				termsToSites.put(term, currentList);
+			}
+			
+			class TitleSorter implements Comparator<Map> {
+
+				public int compare(Map first, Map second) {
+					
+					if(first == null && second == null) return 0;
+					
+					String firstTitle = (String)first.get("siteTitle");
+					String secondTitle = (String)second.get("siteTitle");
+					
+					if(firstTitle != null)
+						return firstTitle.compareToIgnoreCase(secondTitle);
+					
+					return 0;
+					
+				}
+
+			
+				
+			}
+			
+			Comparator<Map> titleSorter = new TitleSorter();
+			
+			
+			//now loop through each section and convert the Lists to maps
+			for (String key : termsToSites.keySet()){
+				List<Site> currentList = termsToSites.get(key);
+				List<Map> temp = portal.convertSitesToMaps(req, currentList, prefix, siteId,
+						myWorkspaceSiteId,
+						/* includeSummary */false, /* expandSite */false,
+						/* resetTools */"true".equals(ServerConfigurationService
+								.getString(Portal.CONFIG_AUTO_RESET)),
+						/* doPages */true, /* toolContextPath */null, loggedIn);
+				
+				
+				Collections.sort(temp, titleSorter);
+				
+				tabsMoreTerms.put(key, temp);
+				
+			}
+				
+			String[] termOrder = ServerConfigurationService.getStrings("portal.term.order");
+			List<String> tabsMoreSortedTermList = new ArrayList<String>();
+			
+			//Order term column headers according to order specified in portal.term.order
+			//Filter out terms for which user is not a member of any sites
+			
+			
+			
+			if(termOrder != null) {
+				for(int i=0; i < termOrder.length; i++) {
+					
+					if(tabsMoreTerms.containsKey(termOrder[i])) {
+						
+						tabsMoreSortedTermList.add(termOrder[i]);
+						
+					}
+					
+					
+				}
+			}
+			
+			Iterator i = tabsMoreTerms.keySet().iterator();
+			while(i.hasNext()) {
+				String term = (String) i.next();
+				if(!tabsMoreSortedTermList.contains(term)) {
+					tabsMoreSortedTermList.add(term);
+			
+				}
+			}
+			
+		
+			
+			rcontext.put("tabsMoreTerms", tabsMoreTerms);
+			rcontext.put("tabsMoreSortedTermList", tabsMoreSortedTermList);
+			
+			
+				
+		
 
 			String cssClass = (siteType != null) ? "siteNavWrap " + siteType
 					: "siteNavWrap";

--- portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm	(revision 31566)
+++ portal/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm	(working copy)
@@ -24,6 +24,7 @@
 #else 
     <title>${pageTitle}</title>
      <script type="text/javascript" language="JavaScript" src="${pageScriptPath}headscripts.js"></script>
+     <script type="text/javascript" language="JavaScript" src="${pageScriptPath}jquery-1.1.2.js"></script>
 #end
 <script type="text/javascript" language="JavaScript" src="/portal/scripts/portalscripts.js"></script>
 
@@ -285,6 +286,9 @@
 				</li>
 #end
 #end
+#if ($tabsMoreSitesShow)
+				<li><a href="#" onclick="$('div#selectNav').slideToggle()" title="${rloader.sit_more}">${rloader.sit_more}</a></li>
+#end
 				<li style="display:none;border-width:0" class="fixTabsIE">
 					<a href="javascript:void(0);">#x20;</a>
 				</li>
@@ -289,18 +293,8 @@
 					<a href="javascript:void(0);">#x20;</a>
 				</li>
 			</ul>
-		</div>
-#if ($tabsMoreSitesShow)
-		<div id="selectNav">
-			<span class="skip">${rloader.sit_selectmessage}</span>
-			<select onchange="if (this.options[this.selectedIndex].value != '') { parent.location = this.options[this.selectedIndex].value; } else { this.selectedIndex = 0; }">
-				<option value="" selected="selected">${rloader.sit_more}</option>
-#foreach( $site in $tabsMoreSites )
-				<option title="${site.siteTitle}" value="${site.siteUrl}">${site.siteTitle}</option> 
-#end	
-			</select>
-		</div>
-#end
+		</div> <!-- /linkNav -->
+
 #if ($tabsAddLogout)
 		<div class="galleryLogin">
 			<a href="$tabsLogoutUrl">${rloader.sit_log}</a>
@@ -305,7 +299,7 @@
 		<div class="galleryLogin">
 			<a href="$tabsLogoutUrl">${rloader.sit_log}</a>
 		</div>
-	</div>
+	</div> <!-- /siteNav -->
 
 #else
 	</div>
@@ -312,7 +306,37 @@
 	<div class="divColor" id="tabBottom">
 	</div>
 #end	
-</div>
+
+
+
+	<div id="selectNav" style="display:none">
+		<div>
+			<span class="skip">${rloader.sit_selectmessage}</span>
+
+			#foreach( $termKey in $tabsMoreSortedTermList)
+			<div class="termContainer">
+			<h4>$termKey</h4>
+			<ul id="siteLinkList2">
+#foreach( $site in $tabsMoreTerms.get($termKey))
+#if (${site.isMyWorkspace})
+				<li><a href="${site.siteUrl}" title="${rloader.sit_mywor}">
+					<span>${rloader.sit_mywor}</span>
+				</a></li>
+#else
+				<li><a href="${site.siteUrl}" title="${site.siteTitle}">
+					<span>${site.siteTitle}</span>
+				</a></li>
+#end
+#end
+			</ul>
+			</div> <!-- /termContainer -->
+#end
+	
+		</div> <!-- /  -->
+	
+	</div> <!-- /selectNav -->
+
+</div> <!-- /tabsCssClass -->
 #foreach ( $site in $tabsSites)
   #if (${site.isCurrentSite})
     #if ( $site.isChild )