Scarab commit: svn commit: r10841 - trunk/src/webapp: WEB-INF/templates/navigations skins

Author: dabbous
Date: 2009-07-29 02:42:33-0700
New Revision: 10841

Modified:
   trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
   trunk/src/webapp/skins/custom.css

Log:
Minor (no issue) When current page displays a public or private query, render the corresponding link in the navigation bar in style boldface

Modified: trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm?view=diff&pathrev=10841&r1=10840&r2=10841
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	2009-07-29 02:42:33-0700
@@ -39,6 +39,12 @@
   #end
 #end
 
+#macro ( activeQuery $queryId $currentQueryId )
+  #if ( $queryId && $queryId == $currentQueryId )
+    id="activeQueryLabel" class="activeQuery"
+  #end
+#end
+
 ## ====================================================================
 ## Shortcut to user home-page
 ## ====================================================================
@@ -104,7 +110,7 @@
 
     #if (!$module.isGlobalModule())
       #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__SEARCH, $module))
-
+        #set ($currentQueryId = $data.Parameters.go) 
         <div style="font-weight:bold;">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("$l10n.EditPrivateQueries ...")</div>
        
         #set ($queries = $scarabR.UserAllQueries)
@@ -112,10 +118,10 @@
         #foreach ($query in $queries)
           #set ($counter = $counter + 1 )
           #if ($counter > 7 )
-            <div class="sublist">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("...")</div>
+            <div class="sublist" >$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("...")</div>
             #break
           #else
-            <div class="sublist"><a href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$query.Name</a></div>
+            <div class="sublist"><a #activeQuery($query.QueryId $currentQueryId) href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$query.Name</a></div>
           #end
         #end
        
@@ -129,7 +135,7 @@
             <div class="sublist">$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("...")</div>
             #break
           #else
-            <div class="sublist"><a href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$query.Name</a></div>
+            <div class="sublist"><a #activeQuery($query.QueryId $currentQueryId) href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$query.Name</a></div>
           #end
         #end 
       #end 

Modified: trunk/src/webapp/skins/custom.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/custom.css?view=diff&pathrev=10841&r1=10840&r2=10841
==============================================================================
--- trunk/src/webapp/skins/custom.css	(original)
+++ trunk/src/webapp/skins/custom.css	2009-07-29 02:42:33-0700
@@ -137,20 +137,21 @@
 .a_attention5 td {background: #fa686b;}
 .b_attention5 td {background: #fc8689;}
 
-
 // experimental stuff will be removed later.
 
 .wiedervorlagedatum {
 	color:red;
 }
 
+
+	
 a.link_button, a.link_button:visited, a.link_button:active {
 	background-color:#e9f1f9;
     border-left: 1px solid #abc4db;
     border-top: 1px solid #abc4db;
     border-right: 1px solid #000000;
     border-bottom: 1px solid #000000;
-    border-style: outset; 
+    border-style: outset;
     border-width:2px;
     text-decoration: none;
     padding-left:5px;
@@ -160,5 +161,7 @@
     color:black;
     font-weight:bold;
     font-size:0.8em;
-    
-}
\ No newline at end of file
+}
+#navcolumn a.activeQuery, #navcolumn a.activeQuery:visited, #navcolumn a.activeQuery:active {
+    font-weight:bold;
+}

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2376539