Scarab commit: svn commit: r10809 - trunk/src/webapp: WEB-INF/templates/screens skins skins/images
Hussayn Dabbous <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2009-07-19 06:09:10-0700
New Revision: 10809
Added:
trunk/src/webapp/skins/images/customize.gif (contents, props changed)
Modified:
trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
trunk/src/webapp/skins/classic.css
Log:
no issue: added some layout modifications to save space
- icons for list customizing and paging
- some reorganization of list layout
Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&pathrev=10809&r1=10808&r2=10809
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm 2009-07-19 06:09:10-0700
@@ -53,25 +53,35 @@
#queryFunctionBar("")
-<h3>
-$page.Title
-<small>$l10n.format("IssueListCount", $totalCount)</small></h3>
+<h3 style="height:18px;">
-<div class="colbar">
-$format.getNow($scarabR.DateFormat)
-</div>
+ <span style="float:left;">
+ #if ($scarabR.Query.Name) $scarabR.Query.Name #else $page.Title #end
+ <small>$l10n.format("IssueListCount", $totalCount)</small>
+
+ ## PAGINATION NAVIGATION LINKS
+ #if ($paginated)
+ <span style="margin-left:15px;margin-right:5px;">#paginateIssueList($resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)</span>
+ #end
-<div class="colbar">
-<small>
-#if ($scarabR.ValidIssueListAttributes.isEmpty())
- #set ($noAttrs = true)
- <p><em>$l10n.NoCommonAttributesInList</em></p>
-#else
- #set ($noAttrs = false)
- $link.setPage('ConfigureIssueList.vm').setLabel($l10n.AddRemoreAttributesFromView).setPathInfo('searchType', $searchType)
-#end
-</small>
-</div>
+ <small>
+ #if ($scarabR.ValidIssueListAttributes.isEmpty())
+ #set ($noAttrs = true)
+ <p><em>$l10n.NoCommonAttributesInList</em></p>
+ #else
+ #set ($noAttrs = false)
+ #set ($configureLink = $link.setPage('ConfigureIssueList.vm').setPathInfo('searchType', $searchType))
+ <a class="configure_list" href="$configureLink" title="$l10n.AddRemoreAttributesFromView"></a>
+ #end
+ </small>
+
+ </span>
+
+ <span style="float:right;">
+ <small style="text-align:right;display:inline-block">$format.getNow($l10n.ShortDateTimePattern)</small>
+ </span>
+
+</h3>
#set ($sortColumn = $data.Parameters.getString('sortColumn'))
#set ($sortInternal=$data.Parameters.getString('sortInternal'))
@@ -87,11 +97,6 @@
<input type="hidden" name="sortPolarity" value="$sortPolarity" />
#end
-## PAGINATION NAVIGATION LINKS
-#if ($paginated)
- #paginateIssueList($resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)
-#end
-
#macro (prepIssueListPageLink)
#set ($dummy = $link.setPage('IssueList.vm').setPathInfo('resultsPerPage', $resultsPerPage).setPathInfo('pageNum', $pageNum))
#end
@@ -101,8 +106,8 @@
<table width="100%" border="1" cellspacing="2" cellpadding="3">
<tr> <!-- HEADER -->
- <th width="70">$l10n.Select</th>
- <th>
+ <th> </th>
+ <th style="white-space:nowrap;">
## Issue ID column
#prepIssueListPageLink()
#if ((!$sortColumn || $sortColumn == 'null') && !$sortInternal)
@@ -183,22 +188,18 @@
</table>
## END of RESULTS TABLE!
-<div class="axial">
- <table cellpadding="3" cellspacing="2" border="0">
- <tr>
- <th>$l10n.MaxPerPage</th>
- <td>
- #resultsPerPageRadioSelect($resultsPerPage true)
- <input type="submit" name="eventSubmit_doRefreshresultsperpage"
- value="$l10n.Refresh" />
- <input type="hidden" name="oldResultsPerPage" value="$resultsPerPage" />
- </td>
- </tr>
- </table>
+<div class="axial" style="margin-left:2px;margin-right:2px;background-color:#abc4db;white-space:nowrap;">
+ <span style="margin-left:15px;margin-right:10px;">
+ #if ($paginated)
+ #paginateIssueList($resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)
+ #end
+ </span>
+ <span style="margin-left:15px;margin-right:5px;">$l10n.MaxPerPage</span>
+ #resultsPerPageRadioSelect($resultsPerPage true)
+ <input type="submit" name="eventSubmit_doRefreshresultsperpage"
+ value="$l10n.Refresh" />
+ <input type="hidden" name="oldResultsPerPage" value="$resultsPerPage" />
</div>
-#if ($paginated)
- #paginateIssueList($resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)
-#end
#end
Modified: trunk/src/webapp/skins/classic.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/classic.css?view=diff&pathrev=10809&r1=10808&r2=10809
==============================================================================
--- trunk/src/webapp/skins/classic.css (original)
+++ trunk/src/webapp/skins/classic.css 2009-07-19 06:09:10-0700
@@ -130,7 +130,6 @@
}
-
/* ====================================================== */
/* Style for a java script calendar */
/* NOTE: The calendar visibility MUST be set to invisible */
@@ -260,6 +259,35 @@
vertical-align:middle;
}
+a.configure_list {
+ margin-left:10px;
+ background-image: url(images/customize.gif);
+ background-repeat: no-repeat;
+ width:16px;
+ height:16px;
+ display:inline-block;
+ vertical-align:middle;
+}
+
+a.next_element {
+ background-image: url(images/icon_right.gif);
+ background-repeat: no-repeat;
+ width:10px;
+ height:13px;
+ display:inline-block;
+ vertical-align:middle;
+}
+
+a.previous_element {
+ background-image: url(images/icon_left.gif);
+ background-repeat: no-repeat;
+ width:10px;
+ height:13px;
+ display:inline-block;
+ vertical-align:middle;
+}
+
+
/* ============================================================== */
/* Issue editor */
/* ============================================================== */
Added: trunk/src/webapp/skins/images/customize.gif
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/images/customize.gif?view=markup&pathrev=10809
==============================================================================
Binary file. No diff available.
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2372428