diff options
| -rw-r--r-- | css/global.css | 95 | ||||
| -rw-r--r-- | skins/standard/global.css | 95 | ||||
| -rw-r--r-- | template/en/default/global/banner.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/global/footer.html.tmpl | 19 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 49 | ||||
| -rw-r--r-- | template/en/default/search/search-specific.html.tmpl | 3 |
6 files changed, 221 insertions, 41 deletions
diff --git a/css/global.css b/css/global.css index 7f725603d..7cbda7b0a 100644 --- a/css/global.css +++ b/css/global.css @@ -17,6 +17,8 @@ * * Contributor(s): Byron Jones <bugzilla@glob.com.au> * Christian Reis <kiko@async.com.br> + * Vitaly Harisov <vitaly@rathedg.com> + * Svetlana Harisova <light@rathedg.com> */ /* banner (begin) */ @@ -71,6 +73,99 @@ } /* banner (end) */ +/* footer (begin) */ + #footer + { + float: left; + } + + #footer form + { + background: #FFFFE0; + border: 1px solid #000; + } + + #footer span + { + display: block; + } + + #footer .btn, #footer .txt + { + font-size: 0.8em; + } + + #footer #useful-links + { + padding: 0.3em; + } + + /* hide from MSIE and NN4 */ + [id]#footer #useful-links + { + margin: 0.3em; + display: table; + } + + #footer .group + { + display: table-row; + } + + #footer #link-action, + #footer #link-edit, + #footer #link-saved + { + width: 7.2em; + display: block; + float: left; + + vertical-align: baseline; + + padding: 0.1em 0.2em; + } + + #footer #link-action + { + padding-top: 0.45em; + } + + /* hide from MSIE and NN4 */ + [id]#footer #link-action, + [id]#footer #link-edit, + [id]#footer #link-saved + { + display: table-cell; + float: none; + width: auto; + + padding-top: 0; + } + + #footer .links + { + display: block; + + padding: 0.1em 0.2em; + } + + /* hide from MSIE and NN4 */ + [id]#footer .links + { + display: table-cell; + + padding-top: 0; + + vertical-align: baseline; + } + + /* hide from MSIE and NN4 */ + #footer+* + { + clear: both; + } +/* footer (end) */ + .bz_obsolete { text-decoration: line-through; } .bz_inactive { text-decoration: line-through; } .bz_closed { text-decoration: line-through; } diff --git a/skins/standard/global.css b/skins/standard/global.css index 7f725603d..7cbda7b0a 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -17,6 +17,8 @@ * * Contributor(s): Byron Jones <bugzilla@glob.com.au> * Christian Reis <kiko@async.com.br> + * Vitaly Harisov <vitaly@rathedg.com> + * Svetlana Harisova <light@rathedg.com> */ /* banner (begin) */ @@ -71,6 +73,99 @@ } /* banner (end) */ +/* footer (begin) */ + #footer + { + float: left; + } + + #footer form + { + background: #FFFFE0; + border: 1px solid #000; + } + + #footer span + { + display: block; + } + + #footer .btn, #footer .txt + { + font-size: 0.8em; + } + + #footer #useful-links + { + padding: 0.3em; + } + + /* hide from MSIE and NN4 */ + [id]#footer #useful-links + { + margin: 0.3em; + display: table; + } + + #footer .group + { + display: table-row; + } + + #footer #link-action, + #footer #link-edit, + #footer #link-saved + { + width: 7.2em; + display: block; + float: left; + + vertical-align: baseline; + + padding: 0.1em 0.2em; + } + + #footer #link-action + { + padding-top: 0.45em; + } + + /* hide from MSIE and NN4 */ + [id]#footer #link-action, + [id]#footer #link-edit, + [id]#footer #link-saved + { + display: table-cell; + float: none; + width: auto; + + padding-top: 0; + } + + #footer .links + { + display: block; + + padding: 0.1em 0.2em; + } + + /* hide from MSIE and NN4 */ + [id]#footer .links + { + display: table-cell; + + padding-top: 0; + + vertical-align: baseline; + } + + /* hide from MSIE and NN4 */ + #footer+* + { + clear: both; + } +/* footer (end) */ + .bz_obsolete { text-decoration: line-through; } .bz_inactive { text-decoration: line-through; } .bz_closed { text-decoration: line-through; } diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl index 95a7605b9..42ccce1aa 100644 --- a/template/en/default/global/banner.html.tmpl +++ b/template/en/default/global/banner.html.tmpl @@ -18,6 +18,7 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> # Matthew Tuck <matty@chariot.net.au> + # Vitaly Harisov <vitaly@rathedg.com> #%] [%# Migration note: this file corresponds to the old Param 'bannerhtml' %] diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl index 4bde601d8..fc1016621 100644 --- a/template/en/default/global/footer.html.tmpl +++ b/template/en/default/global/footer.html.tmpl @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <gerv@gerv.net> + # Svetlana Harisova <light@rathedg.com> #%] [%# INTERFACE: @@ -30,13 +31,8 @@ # 'footerhtml' #%] -<table border="0"> - <tr> - <td bgcolor="#000000" valign="top"> - <table border="0" cellpadding="10" cellspacing="0" width="100%" - bgcolor="lightyellow"> - <tr> - <td> +<div id="footer"> + <div class="intro"></div> [%# Migration note: the old param 'blurbhtml' goes here %] @@ -44,11 +40,8 @@ [% PROCESS "global/useful-links.html.tmpl" %] - </td> - </tr> - </table> - </td> - </tr> -</table> + <div class="outro"></div> +</div> + </body> </html> diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index d238a4253..8e208927c 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <gerv@gerv.net> + # Svetlana Harisova <light@rathedg.com> #%] [%# Migration note: this whole file corresponds to the old %commandmenu% @@ -25,18 +26,15 @@ [% PROCESS global/variables.none.tmpl %] <form method="get" action="show_bug.cgi"> - <table width="100%" cellspacing="4"> - <tr> - <td> - Actions: - </td> - - <td valign="middle"> +<div id="useful-links"> + <div class="group"> + <div id="link-action">Actions:</div> + <div class="links"> <a href="enter_bug.cgi">New</a> | <a href="query.cgi">Search</a> | - <input type="submit" value="Find"> [% terms.bug %] # - <input name="id" size="6"> | + <input class="btn" type="submit" value="Find"> [% terms.bug %] # + <input class="txt" name="id" size="6"> | <a href="report.cgi">Reports</a> @@ -62,15 +60,14 @@ [% END %] | <a href="query.cgi?GoAheadAndLogIn=1">Log In</a> [% END %] - </td> - </tr> + </div> + </div> [% IF user.login %] - <tr> - <td> - Edit: - </td> - <td valign="middle"> + <div class="group"> + <div id="link-edit">Edit:</div> + <div class="links"> + <a href="userprefs.cgi">Prefs</a> [% ' | <a href="editparams.cgi">Parameters</a>' IF user.groups.tweakparams %] @@ -84,21 +81,20 @@ IF user.groups.creategroups %] [% ' | <a href="editkeywords.cgi">Keywords</a>' IF user.groups.editkeywords %] - </td> - </tr> + </div> + </div> [% END %] [%# Saved searches %] - <tr> + <div class="group"> + <div id="link-saved"> [% IF user.showmybugslink OR user.queries.size %] - <td> Saved Searches: - </td> [% END %] - - <td valign="middle"> + </div> + <div class="links"> [% IF user.showmybugslink %] [% filtered_username = user.login FILTER url_quote %] <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a> @@ -112,8 +108,7 @@ [% print_pipe = 1 %] [% END %] [% END %] - </td> - </tr> - - </table> + </div> + </div> +</div> </form> diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index 345483320..ca3dae67b 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -101,7 +101,8 @@ for "crash secure SSL flash". <td> <input type="submit" value="Search"> </td> - + </tr> +</table> </form> [% PROCESS global/footer.html.tmpl %] |