[Rt-commit] r3950 - in rt/branches/3.5-TESTING: . html/Elements
html/NoAuth/css/3.5-default html/NoAuth/images
trs at bestpractical.com
trs at bestpractical.com
Tue Oct 11 20:38:56 EDT 2005
Author: trs
Date: Tue Oct 11 20:38:54 2005
New Revision: 3950
Added:
rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/logo.css
Modified:
rt/branches/3.5-TESTING/ (props changed)
rt/branches/3.5-TESTING/html/Elements/Header
rt/branches/3.5-TESTING/html/Elements/Login
rt/branches/3.5-TESTING/html/Elements/Logo
rt/branches/3.5-TESTING/html/Elements/Menu
rt/branches/3.5-TESTING/html/Elements/PageLayout
rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/forms.css
rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/header.css
rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/main.css
rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/nav.css
rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/quickbar.css
rt/branches/3.5-TESTING/html/NoAuth/images/bplogo.gif
Log:
r6571 at wintermute: tom | 2005-10-11 20:28:25 -0400
Reorganized the whole page header to squash some bugs and make it function
better. Lots of CSS cleanups and the stacked menus should generally behave
now. There is a very minor, cosmetic spacing issue in IE, but I'll address
that later. I also moved the logo div out of the quickbar and on its own.
Modified: rt/branches/3.5-TESTING/html/Elements/Header
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Header (original)
+++ rt/branches/3.5-TESTING/html/Elements/Header Tue Oct 11 20:38:54 2005
@@ -75,6 +75,8 @@
<body<% $id && qq[ id="comp-$id"] |n %>>
% if ($ShowBar) {
+<& /Elements/Logo &>
+
<div id="quickbar">
<div id="quick-personal">
<span class="hide"><a href="#skipnav"><&|/l&>Skip Menu</&></a> | </span>
Modified: rt/branches/3.5-TESTING/html/Elements/Login
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Login (original)
+++ rt/branches/3.5-TESTING/html/Elements/Login Tue Oct 11 20:38:54 2005
@@ -67,8 +67,6 @@
<& /Elements/Callback, %ARGS, _CallbackName => 'Header' &>
<& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
-<& /Elements/Logo &>
-
%# End of div#quickbar from /Elements/Header
</div>
Modified: rt/branches/3.5-TESTING/html/Elements/Logo
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Logo (original)
+++ rt/branches/3.5-TESTING/html/Elements/Logo Tue Oct 11 20:38:54 2005
@@ -44,7 +44,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<div id="logo">
- <a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="<%loc("Best Practical Solutions, LLC corporate logo")%>" width="216" height="50"></a>
+ <a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="<%loc("Best Practical Solutions, LLC corporate logo")%>" width="177" height="33"></a>
% if ($show_name) {
<div class="rtname"><% loc("RT for [_1]", $RT::rtname) %></div>
% }
Modified: rt/branches/3.5-TESTING/html/Elements/Menu
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Menu (original)
+++ rt/branches/3.5-TESTING/html/Elements/Menu Tue Oct 11 20:38:54 2005
@@ -44,7 +44,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<ul<% !$level ? ' id="system-menu"' : ''|n %><% $menu_class ? qq[ class="$menu_class"] : ''|n %>>
-<div>
+<div<% $menu_class ? qq[ class="$menu_class"] : ''|n %>><div class="wrapper">
% my $sep = 0;
% my $postsep = 0;
% my $accesskey = 1;
@@ -101,7 +101,7 @@
%
% $postsep = $sep;
% }
-</div>
+</div></div>
</ul>
<%INIT>
Modified: rt/branches/3.5-TESTING/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/PageLayout (original)
+++ rt/branches/3.5-TESTING/html/Elements/PageLayout Tue Oct 11 20:38:54 2005
@@ -51,8 +51,6 @@
% }
</div>
-<& /Elements/Logo &>
-
%# End of div#quickbar from /Elements/Header
</div>
@@ -60,11 +58,7 @@
<& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>
</div>
-<div id="header"
-% if ($RT::WebDefaultStylesheet eq '3.5-default') {
- style="padding-top: <% 1.5 * $menu_depth %>em; _padding-top: <% 0.55 * $menu_depth %>em;"
-% }
- >
+<div id="header">
<h1><%$title%></h1>
% my $sep = 0;
Modified: rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/forms.css
==============================================================================
--- rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/forms.css (original)
+++ rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/forms.css Tue Oct 11 20:38:54 2005
@@ -133,23 +133,3 @@
z-index: 200;
}
-#quickbar #topactions form {
- display: inline;
- margin-left: 1em;
-}
-
-#quickbar #topactions form .button {
- padding: 0 2px 0 2px;
- font-size: 1em;
- margin: 0;
-}
-
-#quickbar #topactions form .field {
- border: 1px solid #069;
- padding: 1px;
- font-size: 0.9em;
-}
-
-#quickbar #topactions form input.field {
- padding: 3px;
-}
Modified: rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/header.css
==============================================================================
--- rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/header.css (original)
+++ rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/header.css Tue Oct 11 20:38:54 2005
@@ -1,52 +1,7 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-
#header {
clear: both;
margin: 0 0.75em 0 0.75em;
+ padding-top: 1em;
}
#header h1 {
@@ -82,7 +37,7 @@
%#
%# The expression() function takes Javascript, and basically what it's doing here
%# is checking to see if the width of the menu would be greater than 65% of the body
-%# width. If it is, great, leave it alone to automatically resize. If it's not, set
+%# width. If it is, great, leave it alone to automatically resize. If it is not, set
%# it to 65% of the body width. This amounts to emulating the min-width rule that
%# compliant browsers understand above.
* html #header ul#page-menu {
Added: rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/logo.css
==============================================================================
--- (empty file)
+++ rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/logo.css Tue Oct 11 20:38:54 2005
@@ -0,0 +1,13 @@
+#logo {
+ float: left;
+ clear: left;
+
+ margin: 0.5em 0 0.5em 10px;
+}
+
+#logo img { border: none; }
+#logo div.rtname {
+ text-align: center;
+ font-weight: bold;
+}
+
Modified: rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/main.css
==============================================================================
--- rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/main.css (original)
+++ rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/main.css Tue Oct 11 20:38:54 2005
@@ -46,6 +46,7 @@
@import "misc.css";
@import "login.css";
+ at import "logo.css";
@import "quickbar.css";
@import "body.css";
@import "approvals.css";
Modified: rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/nav.css
==============================================================================
--- rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/nav.css (original)
+++ rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/nav.css Tue Oct 11 20:38:54 2005
@@ -1,83 +1,40 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-
#nav {
- margin-top: 0.5em;
-}
-
-#nav #system-menu {
+ clear: both;
font-size: 1.1em;
- min-width: 47em;
- width: 70%;
}
#nav ul {
- font-weight: bold;
- font-size: 1em;
+ float: left;
+ clear: left;
+
color: #eee;
- list-style: none;
+ font-weight: bold;
+
margin: 0;
padding: 0;
- float: left;
- position: relative;
+
+ list-style: none;
}
#nav li ul {
- position: absolute;
- left: 0;
- top: 2.21em;
- font-size: 1em;
+ margin-top: 0.75em;
}
-%# Hide from IE... it can't handle relative positioning with both a
-%# left and right set
-html>body #nav li ul {
- right: 2em;
+#nav li {
+ display: inline;
+ margin-bottom: 1em;
+ padding: 0.2em 0 0.4em 0;
+}
+
+#nav li.first { padding-left: 1em; }
+
+#nav ul div div.wrapper {
+ text-align: left;
+ padding: 0.2em 1em 0.4em 0;
}
+/****/
+
#nav :link,
#nav :visited
{
@@ -113,29 +70,16 @@
background: transparent url(<%$RT::WebImagesURL%>/css/light-arrow.png) no-repeat bottom center;
}
-#nav li {
- display: inline;
- margin-bottom: 1em;
- padding: 0.2em 0 0.4em 0;
-}
-
-#nav li.first { padding-left: 1em; }
-
-#nav div { display: inline; }
-#nav ul div {
- display: block;
- text-align: left;
- padding: 0.2em 1em 0.4em 0;
-}
-
+/*
#nav ul { background: #069 url(<%$RT::WebImagesURL%>/css/ctr.gif) no-repeat top right; }
#nav ul div { background: transparent url(<%$RT::WebImagesURL%>/css/cbr.gif) no-repeat bottom right; }
#nav ul.odd { background: #08c url(<%$RT::WebImagesURL%>/css/ctr.gif) no-repeat top right; }
#nav ul.odd div { background: transparent url(<%$RT::WebImagesURL%>/css/cbr.gif) no-repeat bottom right; }
-
-/*
-#nav ul { background: #069 url(<%$RT::WebImagesURL%>/css/ct.gif) no-repeat top left; }
-#nav ul .first { background: transparent url(<%$RT::WebImagesURL%>/css/cb.gif) no-repeat bottom left; }
-#nav ul.odd { background: #08c url(<%$RT::WebImagesURL%>/css/ct-light.gif) no-repeat top left; }
-#nav ul.odd .first { background: transparent url(<%$RT::WebImagesURL%>/css/cb-light.gif) no-repeat bottom left; }
*/
+
+
+#nav ul div.wrapper { background: transparent url(<%$RT::WebImagesURL%>/css/ctr.gif) no-repeat top right; }
+#nav ul div { background: #069 url(<%$RT::WebImagesURL%>/css/cbr.gif) no-repeat bottom right; }
+#nav ul.odd div.wrapper { background: transparent url(<%$RT::WebImagesURL%>/css/ctr.gif) no-repeat top right; }
+#nav ul div.odd { background: #08c url(<%$RT::WebImagesURL%>/css/cbr.gif) no-repeat bottom right; }
+
Modified: rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/quickbar.css
==============================================================================
--- rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/quickbar.css (original)
+++ rt/branches/3.5-TESTING/html/NoAuth/css/3.5-default/quickbar.css Tue Oct 11 20:38:54 2005
@@ -1,14 +1,3 @@
-#logo {
- float: right;
- clear: right;
-}
-
-#logo img { border: none; }
-#logo div.rtname {
- text-align: center;
- font-weight: bold;
-}
-
#quickbar #quick-personal {
display: inline;
color: #888;
@@ -34,6 +23,30 @@
}
#quickbar #topactions {
+ float: right;
+ clear: right;
+
font-size: 0.9em;
- padding: 0.5em 0 0 1em;
+ padding: 1em;
+}
+
+#quickbar #topactions form {
+ display: inline;
+ margin-left: 1em;
+}
+
+#quickbar #topactions form .button {
+ padding: 0 2px 0 2px;
+ font-size: 1em;
+ margin: 0;
+}
+
+#quickbar #topactions form .field {
+ border: 1px solid #069;
+ padding: 1px;
+ font-size: 0.9em;
+}
+
+#quickbar #topactions form input.field {
+ padding: 3px;
}
Modified: rt/branches/3.5-TESTING/html/NoAuth/images/bplogo.gif
==============================================================================
Binary files. No diff available.
More information about the Rt-commit
mailing list