Scarab commit: svn commit: r10683 - trunk/src/webapp: WEB-INF/templates/layouts WEB-INF/templates/navigations skins
Hussayn Dabbous <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2009-01-16 15:43:57-0800
New Revision: 10683
Modified:
trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
trunk/src/webapp/skins/classic.css
Log:
refer to issue SCB2793
- refactored the breadcrumbs section
- added some css-classes for better skin support
- moved the link to the module-editor into the left navigation bar for the
sake of more place in the breadcrumbs row
- minor clean up of the default.vm velocity page.
Modified: trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&pathrev=10683&r1=10682&r2=10683
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/layouts/Default.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/layouts/Default.vm 2009-01-16 15:43:57-0800
@@ -75,10 +75,20 @@
################################################################
## Top row
################################################################
- <body marginwidth="0" marginheight="0" class="scb_page" #if($hide_bars || $autoresize) onload="initializeAll()" #else onload="initializeTreeview()" #end>
+ <body marginwidth="0"
+ marginheight="0"
+ class="scb_page"
+ #if($hide_bars || $autoresize) onload="initializeAll()" #else onload="initializeTreeview()" #end>
+
+
<div id="datePopupDiv" class="scb_calendar"></div>
+
+ ################################################################
+ ## The banner row
+ ################################################################
+
<div id="scb_banner" #if($hide_bars) ondblclick="hideBanner()" #end>
- <table border="0" cellspacing="0" cellpadding="8" width="100%">
+ <table>
<tr>
<td>
<a href="$link.setPage("Index.vm")"><img src="$staticLink.setPath("/images/logo.gif")" alt="Scarab" width="118" height="23" border="0" /></a>
@@ -105,67 +115,64 @@
## Bread crumb row, only when logged in ??
#########################################################################
#if ($data.User.hasLoggedIn())
- <div id="breadcrumbs" #if($hide_bars) ondblclick="showBanner()" #end>
- <table border="0" cellspacing="0" cellpadding="4" width="100%">
- <tr>
- <td>
- #if ($scarabR.CurrentModule)
- <a href="$link.setPage("SelectModule.vm")">$l10n.Modules</a> >
- $scarabR.CurrentModule.Name
-
- #set ($currentIssueId = $data.parameters.getString('id', ''))
- #if ($currentIssueId != '')
- #set ($currentIssue = $scarabR.getIssue($currentIssueId))
- #if ($currentIssue)
- > <strong>$l10n.Issue $currentIssue.UniqueId:</strong>
- (<strong>$currentIssue.DefaultText</strong>)
- #end
- #end
+ <div id="breadcrumbs" #if($hide_bars) ondblclick="showBanner()" #end>
+ <table border="0" cellspacing="0" cellpadding="4" width="100%">
+ <tr>
+ <td class="location">
+ #if ($scarabR.CurrentModule)
+ $scarabR.CurrentModule.Name
+ #set ($currentIssueId = $data.parameters.getString('id', ''))
+ #if ($currentIssueId != '')
+ #set ($currentIssue = $scarabR.getIssue($currentIssueId))
+ #if ($currentIssue)
+ > <span class="issueId">$l10n.Issue $currentIssue.UniqueId:</span>
+ (<span class="issueText">$currentIssue.DefaultText</span>)
+ #end
+ #end
+ #end
+ </td>
- #else
- <a href="$link.setPage("SelectModule.vm")">$l10n.Modules</a>
- #end
- </td>
-
- <td>
- <div align="right">
- <div>
- #if ($data.User.isUserAnonymous())
- #if ($currentIssueId && ($currentIssueId.length()>0) )
- $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Login").setPathInfo("viewIssueId", $currentIssueId)
- #else
- $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Login")
- #end
- #else
- $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Logout")
- <strong class="username">$!data.User.FirstName $!data.User.LastName
- #set ($roleNames = $!data.User.currentRoleNames)
- #if ($roleNames.size() >0)
- (#foreach ($roleName in $roleNames) $roleName #end)
- #end
- </strong>
- #end
- </div>
- </div>
- </td>
+ <td>
+ <div align="right">
+ <div>
+ #if ($data.User.isUserAnonymous())
+ #if ($currentIssueId && ($currentIssueId.length()>0) )
+ $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Login").setPathInfo("viewIssueId", $currentIssueId)
+ #else
+ $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Login")
+ #end
+ #else
+ <span class="logout">$link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Logout")</span>
+ <span class="username">$!data.User.FirstName $!data.User.LastName
+ #set ($roleNames = $!data.User.currentRoleNames)
+ #set ($roleCounter = 0)
+ #if ($roleNames.size() >0)
+ (#foreach ($roleName in $roleNames)#if ($roleCounter > 0)|#end#set ($roleCounter=$roleCounter+1)$roleName#end)
+ #end
+ </span>
+ #end
+ </div>
+ </div>
+ </td>
- <td width="1">
- <img src="$staticLink.setPath('/images/icon_help_sml.gif')"
- onClick="showDelayedTooltip('scarab.help',0)"
- >
- <div class="scarab-tooltip" id="scarab.help" onclick="hideTooltip()">
- <div class="scarab-toolgroup">
- <div class="label"><strong>$l10n.HowDoI</strong></div>
- <div class="body">
- $renderer.render("navigations", "Help.vm")
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
- #end
+ <td width="1">
+ <img src="$staticLink.setPath('/images/icon_help_sml.gif')"
+ onClick="showDelayedTooltip('scarab.help',0)"
+ >
+ <div class="scarab-tooltip" id="scarab.help" onclick="hideTooltip()">
+ <div class="scarab-toolgroup">
+ <div class="label"><strong>$l10n.HowDoI</strong></div>
+ <div class="body">
+ $renderer.render("navigations", "Help.vm")
+ </div>
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+ #end
#######################################################################
## Main Canvas
@@ -221,7 +228,7 @@
<td>
<div id="navcolumn" style="margin:4px;height:100%">
<div style="text-align:left;white-space:nowrap;height:100%">
- $renderer.render("navigations", $template, "Default.vm")
+ $renderer.render("navigations", $template, "Default.vm")
</div>
## This is temporary: Control whether to place an issue
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=10683&r1=10682&r2=10683
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm 2009-01-16 15:43:57-0800
@@ -45,7 +45,8 @@
<div class="scarab-toolgroup">
<div class="body">
- <strong><a href="$link.setPage($data.User.HomePage)">$l10n.IssueTrackingHome</a></strong>
+ <strong><a href="$link.setPage($data.User.HomePage)">$l10n.IssueTrackingHome</a></strong> |
+ <strong><a href="$link.setPage("SelectModule.vm")">$l10n.Modules ...</a></strong>
</div>
</div>
Modified: trunk/src/webapp/skins/classic.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/skins/classic.css?view=diff&pathrev=10683&r1=10682&r2=10683
==============================================================================
--- trunk/src/webapp/skins/classic.css (original)
+++ trunk/src/webapp/skins/classic.css 2009-01-16 15:43:57-0800
@@ -26,22 +26,22 @@
authentification
banner banner section
- aplication-logo
- application-description
+ aplicationLogo
+ applicationDescription
- application-functions functionbar section (valid for the entire application)
- home-button
- module-button
+ applicationFunctions functionbar section (valid for the entire application)
+ homeButton
+ moduleButton
canvas Here we will find the application pages
- toolbox-canvas
- application-canvas
+ toolboxCanvas
+ applicationCanvas
footer page footer section
- atom-button
- rss-button
- url-button
- footer-description (new, used for additional text in the footer section)
+ atomButton
+ rssButton
+ urlButton
+ footerDescription (new, used for additional text in the footer section)
button generic button
input generic input field
@@ -80,7 +80,7 @@
#scb_banner {
font-size: 1.25em;
- border-top: 1px solid #369;
+ border-top: 1px solid #369;
background-color: #036;
color: #fff;
}
@@ -89,10 +89,46 @@
color: #f90 !important;
}
+#scb_banner table {
+ border-style:none;
+ margin:8px;
+ padding:0px;
+ width:100%;
+}
+
+/* ================================================ */
+/* The breadcrumbs section ======================== */
+/* ================================================ */
+
+#breadcrumbs {
+ border-top: 1px solid #fff;
+ background-color: #ccc;
+ padding: 2px 8px;
+ font-size: x-small;
+ color:#003366;
+}
+
+#breadcrumbs .logout a {
+ text-decoration: none;
+ color:red;
+}
+
+#breadcrumbs .location {
+ font-weight:normal;
+}
+
+#breadcrumbs a,
+#breadcrumbs .issueId,
+#breadcrumbs .issueText,
+#breadcrumbs .logout,
+#breadcrumbs .username{
+ font-weight:bold;
+}
+
+#breadcrumbs .username {
+ font-size: 90%;
+}
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* ==== From here on downwards the refactoring must still take place. ==== */
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* ====================================================== */
@@ -106,7 +142,13 @@
layer-background-color:white;
}
-
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* ==== From here on downwards the refactoring must still take place. ==== */
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+
+
/* ============================================================== */
/* tigris.css */
/* ============================================================== */
@@ -155,7 +197,7 @@
color: #f30 !important;
}
-#leftcol a,#breadcrumbs a {
+#leftcol a {
text-decoration: none;
}
@@ -194,11 +236,6 @@
padding: 4px 4px 4px 0;
}
-#breadcrumbs {
- border-top: 1px solid #fff;
- background-color: #ccc;
- padding: 2px 8px;
-}
}
#main {
@@ -400,7 +437,7 @@
font-size: small;
}
-small,div#footer,div#login,div.tabs th,div.tabs td,input,select,.paginate,.functnbar,.functnbar2,.functnbar3,#breadcrumbs,.courtesylinks,#rightcol div.help,.colbar,.tasknav,body.docs div#toc,#leftcol,.legend,.bars
+small,div#footer,div#login,div.tabs th,div.tabs td,input,select,.paginate,.functnbar,.functnbar2,.functnbar3,.courtesylinks,#rightcol div.help,.colbar,.tasknav,body.docs div#toc,#leftcol,.legend,.bars
{
font-size: xx-small;
voice-family: "\"}\"";
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=1029640