Author: jorgeuriarte
Date: 2006-09-06 09:54:36-0700
New Revision: 10279
Added:
trunk/src/webapp/images/closing-separator.gif
- copied unchanged from r10278, /branches/release/b21/src/webapp/images/closing-separator.gif
trunk/src/webapp/images/closing-slider.gif
- copied unchanged from r10278, /branches/release/b21/src/webapp/images/closing-slider.gif
trunk/src/webapp/images/opening-separator.gif
- copied unchanged from r10278, /branches/release/b21/src/webapp/images/opening-separator.gif
trunk/src/webapp/images/opening-slider.gif
- copied unchanged from r10278, /branches/release/b21/src/webapp/images/opening-slider.gif
Modified:
trunk/ (props changed)
trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm
Log:
Merged revisions 10277-10278 via svnmerge from
http://scarab.tigris.org/svn/scarab/branches/release/b21
........
r10277 | dabbous | 2006-09-05 09:11:56 +0200 (Tue, 05 Sep 2006) | 3 lines
Adding a slider to the left navigation bar so that it becomes
obvious how to hide/show the left bar. improvements are welcome.
solves SCB1933
........
r10278 | jorgeuriarte | 2006-09-06 18:14:38 +0200 (Wed, 06 Sep 2006) | 6 lines
Improvements to SCB1933 (r10277):
- Fixed alignment for menu; now it's again aligned to left.
- Slide-bar icons are now in a fixed height from the top, so they are more predecible no matter
if the screen is short or large.
- Slide-bars now respond with a simple click.
........
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&rev=10279&p1=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&p2=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&r1=10278&r2=10279
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/layouts/Default.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/layouts/Default.vm 2006-09-06 09:54:36-0700
@@ -63,11 +63,17 @@
}
function hideScarableftNav() {
document.getElementById('leftcol').style.display="none"
+ #if ($scarabR.CurrentModule)
+ document.getElementById('closing-slider').style.display="none"
+ #end
document.getElementById('showleftcol').style.display=""
setCookieScarableftNav("ScarableftNav","0")
}
function showScarableftNav() {
document.getElementById('leftcol').style.display=""
+ #if ($scarabR.CurrentModule)
+ document.getElementById('closing-slider').style.display=""
+ #end
document.getElementById('showleftcol').style.display="none"
setCookieScarableftNav("ScarableftNav","1")
}
@@ -363,11 +369,12 @@
## Main Canvas
#######################################################################
- <table border="0" width=100%" cellspacing="0" cellpadding="4" id="main">
-
- <colgroup>
- <col width="1" >
- </colgroup>
+ <table width=100%"
+ height="100%"
+ style="height:100%;"
+ cellspacing="0"
+ cellpadding="0"
+ id="main">
<tr valign="top">
@@ -375,43 +382,76 @@
######
## The clickable left column
######
- <td width="1"
+ <td height="100%"
+ #if ($scarabR.CurrentModule)
+ background="$staticLink.setPath("/images/opening-separator.gif")"
+ #end
+ style="height:100%;background-image:url($staticLink.setPath("/images/opening-separator.gif"));"
id="showleftcol"
- style="width:1px"
- #if($hide_bars) ondblclick="showScarableftNav()" #end>
+ #if($hide_bars) onclick="showScarableftNav()" #end>
+ <table height="100%"
+ style="height:100%;"
+ border="0"
+ cellpadding="0"
+ cellspacing="0">
+ <tr>
+ <td>
+ <img style="margin-left:0px; margin-top:50px;" src="$staticLink.setPath("/images/opening-slider.gif")" border="0"/>
+ </td>
+ </tr>
+ </table>
</td>
######
## The navigation column
######
- <td width="1" id="leftcol" #if($hide_bars) ondblclick="hideScarableftNav()" #end>
- <div id="navcolumn">
-
- <div style="white-space:nowrap;">
- $renderer.render("navigations", $template, "Default.vm")
- </div>
+ <td width="1"
+ id="leftcol"
+ style="height:100%;" >
+ <table height="100%"
+ border="0"
+ cellspacing="0"
+ cellpadding="0"
+ style="height:100%;">
+ <tr>
+ <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")
+ </div>
- ## This is temporary: Control whether to place an issue
- ## navigation box into the left navigation column of the
- ## screen. If the left navigation bar survives the ongoing
- ## layout transition, we should think about a more general
- ## approach.[HD]
- #if ($currentIssue)
- #viewIssueTab()
+ ## This is temporary: Control whether to place an issue
+ ## navigation box into the left navigation column of the
+ ## screen. If the left navigation bar survives the ongoing
+ ## layout transition, we should think about a more general
+ ## approach.[HD]
+ #if ($currentIssue)
+ #viewIssueTab()
- #if ($tab.equals("all"))
- <div style="white-space:nowrap;">
- $renderer.render("navigations", "Issue.vm")
- </div>
- #end
- #end
- ## End of issue navigation bar calculations
-
- </div>
+ #if ($tab.equals("all"))
+ <div style="white-space:nowrap;height:100%">
+ $renderer.render("navigations", "Issue.vm")
+ </div>
+ #end
+ #end
+ ## End of issue navigation bar calculations
+ </div>
+ </td>
+ </tr>
+ </table>
</td>
-
- <td width="100%" >
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
+
+ #if ($scarabR.CurrentModule)
+ <td style="height:100%;background-repeat:repeat-y;background-image:url($staticLink.setPath("/images/closing-separator.gif"));"
+ #if($hide_bars) onclick="hideScarableftNav()" #end
+ id="closing-slider"
+ >
+ <img style="margin-left:0px; margin-top:50px;" src="$staticLink.setPath("/images/closing-slider.gif")" border="0"/>
+ </td>
+ #end
+
+ <td width="100%">
+ <table width="100%" cellspacing="0" cellpadding="0">
<tr>
######
Modified: trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm?view=diff&rev=10279&p1=trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm&p2=trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm&r1=10278&r2=10279
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/SearchNav.vm 2006-09-06 09:54:36-0700
@@ -5,7 +5,7 @@
#if ($user.hasLoggedIn() && $module)
<div id="topmodule" nowrap="nowrap">
- <table border="0" cellspacing="0" cellpadding="3">
+ <table cellspacing="0" cellpadding="3">
<tr>
<td nowrap="nowrap" id="issueid">
<form action="$link.setPage("IssueList.vm").setAction("Search")" method="get">
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.