[Rt-commit] r17727 - in rt/3.8/branches/html-css-cleanup/share/html: NoAuth NoAuth/css/web2 Search Search/Elements Ticket/Elements
elacour at bestpractical.com
elacour at bestpractical.com
Tue Jan 13 04:36:56 EST 2009
Author: elacour
Date: Tue Jan 13 04:36:56 2009
New Revision: 17727
Modified:
rt/3.8/branches/html-css-cleanup/share/html/Elements/Footer
rt/3.8/branches/html-css-cleanup/share/html/Elements/Header
rt/3.8/branches/html-css-cleanup/share/html/Elements/Login
rt/3.8/branches/html-css-cleanup/share/html/Elements/Menu
rt/3.8/branches/html-css-cleanup/share/html/Elements/PageLayout
rt/3.8/branches/html-css-cleanup/share/html/Elements/Refresh
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/Logout.html
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/layout.css
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie.css
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie6.css
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/nav.css
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket-search.css
rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket.css
rt/3.8/branches/html-css-cleanup/share/html/Search/Elements/ResultViews
rt/3.8/branches/html-css-cleanup/share/html/Search/Results.html
rt/3.8/branches/html-css-cleanup/share/html/Ticket/Elements/Tabs
Log:
Rewrite current web2 layout without absolute positionning (closes: #12437, #10079).
Some comments:
- tools in search results was not using $actions, but wrote ul/li itself with
bad positionning, it now uses $actions in Ticket/Elements/Tab
- remove of the three "empty" <div> used between <ul> and <li> in #nav, which
is not allowed and cause problems with konqueror 4 (closes: #12770)
- there was some curious ordering in html between page-navigation, nav, header
and quickbar, the html layout is now like the visual one: a top "quickbar", a
left "nav", a right "page" (new div, which contains topactions, then
page-navigation, then body) and a footer
- add a min-width of 76em to body to avoid #page going under #nav on screen < 1024x768
- the title (mostly ticket subject) in topactions is no longer truncated and
wrap if needed
Modified: rt/3.8/branches/html-css-cleanup/share/html/Elements/Footer
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Elements/Footer (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Elements/Footer Tue Jan 13 04:36:56 2009
@@ -47,7 +47,10 @@
%# END BPS TAGGED BLOCK }}}
%# End of div#body from /Elements/PageLayout
</div>
+%# End of div#page from /Elements/PageLayout
+</div>
% $m->callback( %ARGS );
+<div style="clear: both;"></div>
<div id="footer">
% if ($m->{'rt_base_time'}) {
<p id="time">
Modified: rt/3.8/branches/html-css-cleanup/share/html/Elements/Header
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Elements/Header (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Elements/Header Tue Jan 13 04:36:56 2009
@@ -50,6 +50,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title><%$Title%></title>
@@ -83,9 +84,9 @@
<body<% $id && qq[ id="comp-$id"] |n %>>
% if ($ShowBar) {
-<& /Elements/Logo, %ARGS &>
<div id="quickbar">
+<& /Elements/Logo, %ARGS &>
<div id="quick-personal">
<span class="hide"><a href="#skipnav"><&|/l&>Skip Menu</&></a> | </span>
% if ($session{'CurrentUser'}->Name) {
Modified: rt/3.8/branches/html-css-cleanup/share/html/Elements/Login
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Elements/Login (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Elements/Login Tue Jan 13 04:36:56 2009
@@ -70,6 +70,7 @@
<& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
+<div style="clear: both;"></div>
%# End of div#quickbar from /Elements/Header
</div>
Modified: rt/3.8/branches/html-css-cleanup/share/html/Elements/Menu
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Elements/Menu (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Elements/Menu Tue Jan 13 04:36:56 2009
@@ -46,7 +46,6 @@
%#
%# END BPS TAGGED BLOCK }}}
<ul<% !$level ? ' id="system-menu"' : ''|n %><% $menu_class ? qq[ class="$menu_class"] : ''|n %>>
-<div<% $menu_class ? qq[ class="$menu_class"] : ''|n %>><div class="wrapper">
<%perl>
my $sep = 0;
my $postsep = 0;
@@ -117,7 +116,6 @@
%
% $postsep = $sep;
% }
-</div></div>
</ul>
<%INIT>
Modified: rt/3.8/branches/html-css-cleanup/share/html/Elements/PageLayout
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Elements/PageLayout (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Elements/PageLayout Tue Jan 13 04:36:56 2009
@@ -45,12 +45,8 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<div id="topactions">
-% foreach my $action (reverse sort keys %{$topactions}) {
-<span class="topaction" id="topaction-<%$action%>"><% $topactions->{"$action"}->{'html'} |n %></span>
-% }
-</div>
+<div style="clear: both;"></div>
%# End of div#quickbar from /Elements/Header
</div>
@@ -60,8 +56,18 @@
</div>
% }
+%# Right page
+<div id="page">
+
<div id="header">
<h1><% $title %></h1>
+<div id="topactions">
+% foreach my $action (reverse sort keys %{$topactions}) {
+<div class="topaction" id="topaction-<%$action%>"><% $topactions->{"$action"}->{'html'} |n %></div>
+% }
+</div>
+<div style="clear: both;"></div>
+</div>
<div id="page-navigation">
% my $sep = 0;
% my $postsep = 0;
@@ -69,7 +75,6 @@
% my $class = { };
%
<ul id="page-menu" <% (($actions && %$actions) || ($subactions && %$subactions)) && q[ class="actions-present"] | n %>>
- <div><div><div>
<%perl>
if ($page_tabs) {
my @tabs = ( sort grep { $_ !~ /^(?:current_toptab|this)$/ } keys %{$page_tabs});
@@ -108,9 +113,13 @@
% } else {
% }
- </div></div></div>
</ul>
+</div>
+<div id="body">
+% $m->callback( %ARGS, CallbackName => 'BeforeBody' );
+% $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
+
% if (($actions && %$actions) || ($subactions && %$subactions)) {
<ul id="actions-menu">
<div><div><div>
@@ -153,11 +162,6 @@
</div></div></div>
</ul>
% }
-</div>
-</div>
-<div id="body">
-% $m->callback( %ARGS, CallbackName => 'BeforeBody' );
-% $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
<%INIT>
if ( defined $current_toptab ) {
Modified: rt/3.8/branches/html-css-cleanup/share/html/Elements/Refresh
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Elements/Refresh (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Elements/Refresh Tue Jan 13 04:36:56 2009
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<select name="<%$Name%>">
+<select name="<%$Name%>" id="<%$Name%>">
<option value="-1"
%unless ($Default) {
selected="selected"
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/Logout.html
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/Logout.html (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/Logout.html Tue Jan 13 04:36:56 2009
@@ -46,6 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => loc('Logout'), Refresh => "1;URL=$URL" &>
+<div style="clear: both;"></div>
</div>
<div id="body" class="login-body">
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/layout.css
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/layout.css (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/layout.css Tue Jan 13 04:36:56 2009
@@ -56,73 +56,69 @@
background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/images/background-gradient.png) top left repeat-x ;
font-family: arial, helvetica, sans-serif;
+ /* below this total width, it's impossible to display RT left page will not
+ fit and go under nav, FIXME : doesn't works for IE 6 :( */
+ min-width: 76em;
+}
+
+div#page {
+ float: left;
+ width: 87.9%;
}
div#body {
- position: relative;
padding: 1em;
padding-top: 1.8em;
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
- margin-left: 10.5em;
- margin-top: 5.2em;
+ margin-top: 1em;
+ margin-left: 1em;
margin-right: 1em;
- margin-bottom: 0em;
+ /* cross browser min-height */
min-height: 10%;
+ height: auto !important;
+ height: 10%;
+ /* end */
background: #fff;
border-top: 2px solid #ccc;
border-left: 2px solid #ccc;
- z-index:1;
+}
+div#header {
+ margin-left: 1em;
+ margin-right: 1em;
}
#topactions {
- position: absolute;
background: transparent;
- top: 3.8em;
- right: 1em;
- width: auto;
- min-width: 42em;
font-size: 0.9em;
- z-index: 99;
-}
-
-#topactions form * {
- vertical-align: top;
+ float: right;
+ width: 60%;
+ margin-top: 1.1em;
+ text-align: right;
}
#topactions button, #topactions select, #topactions input{
- padding-top: 0em;
- padding-bottom: 0em;
- width: 8em;
+ padding: 0em;
+ margin: 0em;
}
-#topactions form {
- display: block;
-
+#topactions div {
+ display: inline;
}
#topactions #CreateTicketInQueue {
- text-align: right;
-
-}
-#topactions #simple-search {
- float: right;
+ display: inline;
}
-#topactions #simple-search input.button {
- width: 5em;
+#topactions #simple-search {
+ display: inline;
}
-#topactions #simple-search .field{
- margin-left: 1em;
- }
div#footer {
- position: absolute;
- right: 0;
- text-align: right;
+ text-align: right;
font-size: 0.9em;
margin-top: 2em;
background: #fff;
@@ -133,6 +129,8 @@
+ float: right;
+ width: 40%;
border-top: 2px solid #aaa;
border-left: 2px solid #aaa;
@@ -146,7 +144,7 @@
}
div#footer #time {
-display: none ;
+ display: none ;
}
div#footer #bpscredits {
@@ -159,23 +157,18 @@
/* logo stuff */
div#logo {
+ float: left;
}
div#logo a {
display: none;
- position: absolute;
- left: 0;
- bottom: 0;
}
div#logo a img {
border: 0;
}
div#logo .rtname {
- position: absolute;
font-weight: bold;
- top: 1em;
- left: 1em;
}
@@ -189,30 +182,28 @@
div#quickbar {
background: #eaeaea;
- padding-top: 1em;
+ padding-top: 0.5em;
padding-left: 1em;
+ padding-right: 1em;
padding-bottom: 0.5em;
- height: 1em;
border-bottom: 1px solid #ccc;
}
div#quick-personal {
- position: absolute;
- right: 1em;
- top: 1em;
+ float: right;
+ width: 50%;
+ text-align: right;
}
div#header h1 {
- position: absolute;
- left: 7.25em;
- right: 20em;
+ float: left;
overflow: hidden;
- height: 1em;
font-size: 1.4em;
margin-top: 0.4em;
- padding: 0.25em;
+ padding: 0.25em 0.25em 0em 0em;
color: #fff;
+ width: 39%;
}
/* in multi-column layouts, make sure we have an internal gutter */
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie.css
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie.css (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie.css Tue Jan 13 04:36:56 2009
@@ -45,76 +45,6 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-div#body {
- left: 0.25em;
- height: 100%;
- top: 1em;
-
-}
-
-
-#footer {
- padding: 1em;
-}
-
-
-div#header h1 {
- position: absolute;
- left: 7.25em;
- overflow: hidden;
- height: 1em;
- font-size: 1.4em;
- margin-top: 0.4em;
- right: 23.5em;
- padding: 0.25em;
-}
-
-
-#topactions {
- top: 4.1em;
- width: auto;
-}
-.topaction form * {
- vertical-align: top;
-}
-
-.topaction form button, .topaction form input {
- height: 2em;
-}
-
-.topaction form input.field {
- height: 1.6em;
-}
-
-.topaction .select-queue {
- margin-top: 0.2em;
-}
-
-div#page-navigation ul#actions-menu {
- margin-top: -2.9em;
- margin-right: -0.2em;
- border-top: 1px solid #ccc;
- border-right: none;
-}
-
-
-div#page-navigation {
- position: absolute;
- top: 6.2em;
- height: 1.8em;
- background: #fff;
- border-top: 2px solid #ccc;
-}
-
-
-
-div#page-navigation ul#page-menu {
- margin-top: -2.5em;
- margin-left: 4em;
- background: none;
- border: none;
-}
-
div#quickbar { height: 1.2em;
@@ -132,22 +62,6 @@
left: 60%;
}
-div#nav li.first {
- margin-top: 0.75em;
- border-top: none;
-}
-div#nav ul ul li.first {
- border-top: 1px solid #cccccc;
- margin-top: 0.25em;
-}
-
-div#nav li.last {
- border-bottom: none;
- padding-bottom: 0;
- margin-bottom: 0;
-}
-
-
.ticket-transaction .type a { font-weight: normal; text-decoration: none; color: #fff; }
@@ -231,4 +145,4 @@
#comp-Search-Build #pick-criteria td.operator {
width: 7.5em;
-}
\ No newline at end of file
+}
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie6.css
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie6.css (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/msie6.css Tue Jan 13 04:36:56 2009
@@ -49,10 +49,6 @@
margin-top: 0;
}
-div#page-navigation ul#page-menu {
- margin-top: -3.2em;
-}
-
.titlebox-title .widget {
top: -1em;
left: 0.5em;
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/nav.css
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/nav.css (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/nav.css Tue Jan 13 04:36:56 2009
@@ -46,20 +46,24 @@
%#
%# END BPS TAGGED BLOCK }}}
div#nav {
- position: absolute;
- left: 0;
font-size: 0.9em;
- top: 3.2em;
- width: 10.5em;
+ width: 12%;
background: #fff;
-moz-border-radius-bottomright: 0.5em;
-webkit-border-bottom-right-radius: 0.5em;
- border-left: 1px solid #999;
-border-top: 1px solid #999;
+ border-left: 1px solid #999;
+ border-top: 1px solid #999;
-moz-border-radius-topright: 0.5em;
-webkit-border-top-right-radius: 0.5em;
- z-index: 99;
+
+ /* cross browser min-height */
+ min-height: 5%;
+ height: auto !important;
+ height: 5%;
+ /* end */
+ float: left;
+ margin-top: 1em;
}
@@ -133,46 +137,32 @@
}
div#page-navigation {
- background: white;
- position: relative;
- width:100%;
- z-index: 10;
-
+ margin-right: 0;
+ margin-left: 0;
}
div#page-navigation ul {
-
+ margin: 0;
+ padding: 0;
}
div#page-navigation ul#page-menu {
- display: block;
- position: absolute;
- left: 8em;
font-size: 0.9em;
- top: 2.3em;
min-height: 1em;
background-color: white;
- right: 0em;
padding-top:0.3em;
padding-bottom:0.5em;
+ padding-left: 1em;
border-top: 1px solid #aaa;
}
-/* ie hack */
-* html div#page-navigation ul#page-menu {
- left: 6.5em;
- top: 3.2em;
- padding-left: 2em;
-}
-
-div#page-navigation ul#actions-menu {
- position: absolute;
- right: 1em;
- top: 5.2em;
- margin-top: 0em;
+div#body ul#actions-menu {
+ float: right;
+ margin-top: -1.9em;
+ margin-right: -1em;
padding: 0.25em;
padding-left: 0.5em;
padding-right: 0.5em;
@@ -191,6 +181,12 @@
+div#body ul#actions-menu li{
+ display: inline;
+
+}
+
+
div#page-navigation ul li{
display: inline;
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket-search.css
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket-search.css (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket-search.css Tue Jan 13 04:36:56 2009
@@ -197,3 +197,8 @@
float: left;
}
+/* Force some widget to fit at max parent box */
+#HomeRefreshInterval, #SavedSearchLoad, #SavedSearchOwner {
+ width: 100%;
+}
+
Modified: rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket.css
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket.css (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/NoAuth/css/web2/ticket.css Tue Jan 13 04:36:56 2009
@@ -48,6 +48,7 @@
div#ticket-history div.ticket-transaction {
border-top: 1px solid #ccc;
padding-bottom: 0.25em;
+ position: relative;
}
@@ -65,9 +66,13 @@
}
+.ticket-transaction div.metadata {
+ position: relative;
+}
.ticket-transaction div.metadata span.actions {
position: absolute;
- right: 2.3em;
+ right: 0;
+ top: 0;
padding: 0em;
background: #ccc;
text-align: right;
Modified: rt/3.8/branches/html-css-cleanup/share/html/Search/Elements/ResultViews
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Search/Elements/ResultViews (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Search/Elements/ResultViews Tue Jan 13 04:36:56 2009
@@ -56,14 +56,6 @@
$ShortQueryString => undef
</%args>
-<ul class="search-result-views">
-<li><a href="<%RT->Config->Get('WebPath')%>/Search/Results.tsv<%$QueryString%>"><&|/l&>Spreadsheet</&></a></li>
-<li><a href="<%$RSSFeedURL%>"><&|/l&>RSS</&></a></li>
-<li><a href="<%RT->Config->Get('WebURL')%>/NoAuth/iCal/<% $ical_path %>"><% loc('iCal') %></a></li>
-<li><a href="<%RT->Config->Get('WebPath')%>/Tools/Offline.html<%$ShortQueryString%>"><&|/l&>Editable text</&></a></li>
-% # Now let callbacks add their extra tools
-% $m->callback( %ARGS, CallbackName => 'AfterTools' );
-</ul>
<form method="get" action="<%RT->Config->Get('WebPath')%>/Search/Chart.html">
% my %hiddens = (Query => $Query, Format => $Format, Rows => $Rows, OrderBy => $OrderBy, Order => $Order);
% foreach my $key (keys(%hiddens)) {
Modified: rt/3.8/branches/html-css-cleanup/share/html/Search/Results.html
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Search/Results.html (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Search/Results.html Tue Jan 13 04:36:56 2009
@@ -53,6 +53,9 @@
Title => $title,
Format => $Format,
Query => $Query,
+ QueryString => $QueryString,
+ RSSFeedURL => $RSSFeedURL,
+ ShortQueryString => $ShortQueryString,
Rows => $Rows,
OrderBy => $OrderBy,
Order => $Order,
Modified: rt/3.8/branches/html-css-cleanup/share/html/Ticket/Elements/Tabs
==============================================================================
--- rt/3.8/branches/html-css-cleanup/share/html/Ticket/Elements/Tabs (original)
+++ rt/3.8/branches/html-css-cleanup/share/html/Ticket/Elements/Tabs Tue Jan 13 04:36:56 2009
@@ -308,6 +308,34 @@
}
+# Tools for result view
+if ( $QueryString && ! $Ticket ) {
+my $ical_path = join '/', map $m->interp->apply_escapes($_, 'u'),
+ $session{'CurrentUser'}->UserObj->Name,
+ $session{'CurrentUser'}->UserObj->GenerateAuthString( $Query ),
+ $Query;
+
+ $actions->{'A'} = {
+ title => loc('Spreadsheet'),
+ path => "Search/Results.tsv".$QueryString,
+ };
+ $actions->{'B'} = {
+ title => loc('RSS'),
+ path => $RSSFeedURL,
+ };
+ $actions->{'C'} = {
+ title => loc('iCal'),
+ path => "NoAuth/iCal/".$ical_path,
+ };
+ $actions->{'D'} = {
+ title => loc('Editable text'),
+ path => "Tools/Offline.html".$ShortQueryString,
+ };
+ # Now let callbacks add their extra tools
+ $m->callback( Query => $Query, QueryString => $QueryString, ShortQueryString => $ShortQueryString, actions=> $actions, tabs => $tabs, %ARGS, CallbackName => 'AfterResultTools' );
+
+}
+
foreach my $searchtab ( keys %{$searchtabs} ) {
( $searchtab =~ /^_/ )
? $tabs->{ "s" . $searchtab } = $searchtabs->{$searchtab}
@@ -324,4 +352,8 @@
$current_subtab => ''
$Title => undef
$RowsPerPage => undef
+$Query => undef
+$RSSFeedURL => undef
+$ShortQueryString => undef
+$QueryString => undef
</%ARGS>
More information about the Rt-commit
mailing list