Scarab commit: svn commit: r11285 - branches/scarab_11079_legacy_with_ant_maven1/src/webapp: WEB-INF/templates/macros skins skins/images

Author: dabbous
Date: 2012-06-10 14:07:24-0700
New Revision: 11285

Added:
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_first.png   (contents, props changed)
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_last.gif   (contents, props changed)
Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_left.gif
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_right.gif
   branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css

Log:
modernise issue navigation bar

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=11285&r1=11284&r2=11285
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	2012-06-10 14:07:24-0700
@@ -737,14 +737,18 @@
    <p class="paginate">
   #set ($prevIssue=$scarabR.PrevIssue)
   #if($prevIssue)
+   #set ($prevLink = $link.setPathInfo("id", "$prevIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", 1))
+   <a href="$prevLink" class="first_issue">&nbsp;</a>
    #set ($prevLink = $link.setPathInfo("id", "$prevIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.PrevIssuePosInList))
-   <a href="$prevLink">$l10n.PaginatePrevious</a> |
+   <a href="$prevLink" class="prev_issue">&nbsp;</a>
   #end
-  $scarabR.IssuePosInList of $scarabR.CurrentSearchResultsSize
+  <span class="current_issue">$scarabR.IssuePosInList</span><span class="issue_counter">of $scarabR.CurrentSearchResultsSize</span>
   #set ($nextIssue=$scarabR.NextIssue)
   #if ($nextIssue)
    #set ($nextLink = $link.setPathInfo("id", "$nextIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.NextIssuePosInList))
-    | <a href="$nextLink">$l10n.PaginateNext</a>
+    <a href="$nextLink" class="next_issue">&nbsp;</a>
+   #set ($nextLink = $link.setPathInfo("id", "$nextIssue").setPage($scarabR.getCurrentTemplate()).addPathInfo("posInList", $scarabR.CurrentSearchResultsSize))
+    <a href="$nextLink" class="last_issue">&nbsp;</a> 
   #end
   </p>
  #end

Added: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_first.png
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_first.png?view=markup&pathrev=11285
==============================================================================
Binary file. No diff available.

Added: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_last.gif
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_last.gif?view=markup&pathrev=11285
==============================================================================
Binary file. No diff available.

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_left.gif
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_left.gif?view=diff&pathrev=11285&r1=11284&r2=11285
==============================================================================
Binary files. No diff available.

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_right.gif
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/images/icon_right.gif?view=diff&pathrev=11285&r1=11284&r2=11285
==============================================================================
Binary files. No diff available.

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css?view=diff&pathrev=11285&r1=11284&r2=11285
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/webapp/skins/modern.css	2012-06-10 14:07:24-0700
@@ -329,6 +329,46 @@
 	margin-left:15px;
 }
 
+a.next_issue, a.prev_issue, a.first_issue, a.last_issue, .current_issue {
+ text-decoration:none;
+ background-repeat: no-repeat;
+ background-position:center; 
+ display:inline-block;
+ vertical-align:middle;
+ 
+ border-color: #B08080 #B08080 #D0B0B0 #D0B0B0;
+ border-radius: 5px;
+ border-style:solid;
+ border-width:2px;
+ padding:2px 8px;
+}
+    
+a.next_issue {
+ background-image: url(images/icon_right.gif);
+}
+a.prev_issue {
+ background-image: url(images/icon_left.gif);
+}
+a.first_issue {
+ background-image: url(images/icon_first.gif);
+}
+a.last_issue {
+ background-image: url(images/icon_last.gif);
+}
+
+.issue_counter {
+ text-decoration:none;
+ background-repeat: no-repeat;
+ display:inline-block;
+ vertical-align:middle; 
+ padding:2px 8px;
+}
+
+.current_issue {
+ border-width:1px;
+ padding:2px 12px;
+}
+
 /* ============================================================== */
 /* Issue comments                                                 */
 /* ============================================================== */

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