Scarab commit: svn commit: r10753 - trunk/src: conf/classes webapp/WEB-INF/templates/navigations webapp/skins

Hussayn Dabbous <[email protected]>
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]> 
Author: dabbous
Date: 2009-06-05 17:03:07-0700
New Revision: 10753

Modified:
   trunk/src/conf/classes/ScarabBundle_de.properties
   trunk/src/conf/classes/ScarabBundle_en.properties
   trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
   trunk/src/webapp/skins/classic.css

Log:
SCB2955: enhanced the left navigation bar by reorganising the toolboxes

Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev753&r1752&r2753
=============================================================================--- trunk/src/conf/classes/ScarabBundle_de.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties	2009-06-05 17:03:07-0700
@@ -356,7 +356,7 @@
 ViewIssue=Ticket anzeigen
 EnterNewIssue=Neues Ticket
 EnterNewIssueType=Neuer "{0}"-Eintrag
-NewIssueType={0} (neu)
+NewIssueType={0}
 EnterNewBriefInstructions=Klicken Sie auf den Ticket Typen, für den Sie ein neues Ticket erfassen wollen.
 DefaultText=Standard-Text-Attribute werden verwendet, wenn mehr Informationen als die Ticketnummer benötigt werden, um das Ticket zu identifizieren. Dies wird zum Beispiel in den E-Mail-Benachtrichtigungen verwendet, die nach der Ticket-Eingabe versendet werden.
 StaticIssueInfo=Statische Informationen

Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&pathrev753&r1752&r2753
=============================================================================--- trunk/src/conf/classes/ScarabBundle_en.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties	2009-06-05 17:03:07-0700
@@ -408,7 +408,7 @@
 ViewIssue=View issue
 EnterNewIssue=Enter new issue
 EnterNewIssueType=Enter new {0}
-NewIssueType=new {0}
+NewIssueType={0}
 EnterNewBriefInstructions=Click the issue type name to enter a new issue from scratch or select a template.
 DefaultText�fault text attribute is used when more distinguishing information than the issue ID is needed. It is used in emails after an issue is entered, for example.
 StaticIssueInfo=Issue info

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&pathrev753&r1752&r2753
=============================================================================--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	2009-06-05 17:03:07-0700
@@ -64,7 +64,7 @@
 <div class="scarab-toolgroup">

   <div class="label">
-    <strong><a href="$link.setPage("home,EnterNew.vm").addPathInfo("eventSubmit_doStart", "foo").setAction("ReportIssue")">$l10n.IssueTypes</a></strong>
+    <strong><a href="$link.setPage("home,EnterNew.vm").addPathInfo("eventSubmit_doStart", "foo").setAction("ReportIssue")">$l10n.EnterNewIssue ...</a></strong>
   </div>

   <div class="body">
@@ -93,25 +93,75 @@
 <div class="scarab-toolgroup">

   <div class="label">
-    <strong>$l10n.Tools</strong>
+    <strong>$l10n.Queries</strong>
   </div>

   <div class="body">

     #if (!$module.isGlobalModule())
-      #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__SEARCH, $module))
-      <div>$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("$l10n.EditPrivateQueries")</div>
-      <div>$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("$l10n.EditPublicQueries")</div>
-      #end
-      #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__ENTER, $module))
-      <div>$link.setPage("TemplateList.vm").setLabel("$l10n.EditTemplates")</div>
-      #end
-      <div>$link.setPage("reports,ReportList.vm").setLabel("$l10n.Reports")</div>
+     #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__SEARCH, $module))
+
+       <div style="font-weight:bold;">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("$l10n.EditPrivateQueries ...")</div>
+
+       #set ($queries = $scarabR.UserAllQueries)
+       #set ($counter = 0 )
+       #foreach ($query in $queries)
+         #set ($canEdit   = $query.canEdit($user))
+         #if ($canEdit)
+          #set ($counter = $counter + 1 )
+          #if ($counter > 7 )
+            <div class="sublist">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("...")</div>
+            #break
+          #else
+            <div class="sublist"><a href="$scarabR.getExecuteLink($link.setPage("IssueList.vm").toString(), $query)">$query.Name</a></div>
+          #end
+         #end
+       #end
+
+       <div style="font-weight:bold;">$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("$l10n.EditPublicQueries ...")</div>
+
+       #set ($queries = $scarabR.GlobalQueries)
+       #set ($counter = 0 )
+       #foreach ($query in $queries)
+         #set ($canEdit   = $query.canEdit($user))
+         #if ($canEdit)
+          #set ($counter = $counter + 1 )
+          #if ($counter > 7 )
+            <div class="sublist">$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("...")</div>
+            #break
+          #else
+            <div class="sublist"><a href="$scarabR.getExecuteLink($link.setPage("IssueList.vm").toString(), $query)">$query.Name</a></div>
+          #end
+         #end
+       #end
+
+     #end
+
+    #end
+
+  </div>
+</div>
+
+
+## ====================================================================
+## Show shortcuts to tools (queries, reports, ...)
+## ====================================================================
+
+<div class="scarab-toolgroup">
+  <div class="label">
+    <strong>$l10n.Tools</strong>
+  </div>
+
+  <div class="body">
+    #if (!$module.isGlobalModule())
+     #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__ENTER, $module))
+       <div>$link.setPage("TemplateList.vm").setLabel("$l10n.EditTemplates")</div>
+     #end
+     <div>$link.setPage("reports,ReportList.vm").setLabel("$l10n.Reports")</div>
     #end
     #if (!$data.User.isUserAnonymous())
       <div>$link.setPage("notifications,NotificationList.vm").setLabel("$l10n.NotificationList")</div>
     #end
-
   </div>
 </div>

\ No newline at end of file

Modified: trunk/src/webapp/skins/classic.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/classic.css?view=diff&pathrev753&r1752&r2753
=============================================================================--- trunk/src/webapp/skins/classic.css	(original)
+++ trunk/src/webapp/skins/classic.css	2009-06-05 17:03:07-0700
@@ -190,10 +190,18 @@
 	background-position: .5em .5em;
 }

+div div.sublist {
+	margin-left:10px;
+	background-image: none;
+}
+
+
+
 #searchbox .body div,#navcolumn .body .heading {
 	background-image: none;
 }

+
 a:link .selfref,a:visited .selfref {
 	color: #555 !important;
 	text-decoration: none;

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2359872
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.