From d8f23ea46b2244fb5c2ae610637deed14db13704 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Thu, 12 Feb 2009 00:46:34 +0000 Subject: Bug 475063: Make the logged-out index.cgi simpler Patch By Guy Pyrzak r=mkanat, a=mkanat --- skins/standard/index.css | 138 +++++++++++++------ skins/standard/index/bug.gif | Bin 0 -> 4638 bytes skins/standard/index/login.gif | Bin 0 -> 3214 bytes skins/standard/index/seach.gif | Bin 0 -> 3265 bytes template/en/default/attachment/create.html.tmpl | 2 +- template/en/default/attachment/created.html.tmpl | 3 +- template/en/default/attachment/edit.html.tmpl | 1 - template/en/default/attachment/updated.html.tmpl | 3 +- template/en/default/bug/create/create.html.tmpl | 3 +- template/en/default/bug/create/created.html.tmpl | 3 +- template/en/default/bug/process/header.html.tmpl | 3 +- template/en/default/bug/show.html.tmpl | 3 +- template/en/default/global/header.html.tmpl | 14 +- template/en/default/index.html.tmpl | 168 ++++++++++++++--------- template/en/default/list/list.html.tmpl | 3 +- testserver.pl | 8 +- 16 files changed, 222 insertions(+), 130 deletions(-) create mode 100644 skins/standard/index/bug.gif create mode 100644 skins/standard/index/login.gif create mode 100644 skins/standard/index/seach.gif diff --git a/skins/standard/index.css b/skins/standard/index.css index 2b021f349..61837f491 100644 --- a/skins/standard/index.css +++ b/skins/standard/index.css @@ -11,6 +11,7 @@ * The Original Code is the Bugzilla Bug Tracking System. * * Contributor(s): Vitaly Harisov + * Guy Pyrzak */ /* index page (begin) */ @@ -20,66 +21,125 @@ padding: 0.2em 0.2em 0.15em 0.2em; } - #page-index ul, #page-index li, - #page-index p, #page-index form p + /* Hide from NN4 */ + + #new_release { - margin: 0; - padding: 0; + border: 2px solid red; + padding: 0.5em 1em; + margin: 1em; + font-weight: bold; } - #page-index ul + #new_release .notice { - padding-bottom: 1em; + font-size: 80%; + font-weight: normal; } - #page-index li + #welcome-admin a { - list-style: none; + font-weight: bold; } - - #page-index p + + div.bz_common_actions { - padding-bottom: 0.5em; + height: 190px; + width: 195px; + background-color: blue; + float: left; + margin: 0 3ex; + text-align: center; + margin-bottom: 3em; } - - /* Hide from NN4 */ - div#page-index .intro + div.bz_common_actions span { - width: 250px; - height: 200px; - - margin-top: 2.3em; - margin-right: 2.3em; - float: right; - background: transparent no-repeat url(index/front.png); + position: relative; + top: 95%; + font-weight: bold; } - - #page-index #report + + div.bz_common_actions, + div.bz_common_actions a, + div.bz_common_actions a div, + div.bz_common_actions a:visited, + div.bz_common_actions a:hover { + text-decoration: none; + } + + a.bz_common_actions { + text-decoration: none; + } + + #quicksearchForm { - padding-bottom: 1em; + clear: both; + text-align: center; + margin-bottom: 2em; } - - #page-index #sidebar + + #quicksearchForm #quicksearch { - padding-top: 1em; + width: 25em; } - - #new_release + + #quicksearchForm { - border: 2px solid red; - padding: 0.5em 1em; - margin: 1em; + margin: 0; + padding: 0; + } + + #page-index table{ + border-collapse: collapse; + } + + #welcome + { + font-size: x-large; font-weight: bold; + text-align: center; + margin: 0 0 0.8em 0; + padding: 0; } - - #new_release .notice + + #enter_bug { - font-size: 80%; - font-weight: normal; + background: url(index/bug.gif) no-repeat; } - - #welcome-admin a + + #query { - font-weight: bold; + background: url(index/search.gif) no-repeat; + } + + #account + { + background: url(index/account.gif) no-repeat; + } + + ul.additional_links + { + list-style: none; + margin: 0; + padding: 0; + } + + ul#quicksearch_links{ + margin-bottom: 1em; + } + + ul.additional_links li + { + display: inline; + } + + ul.additional_links li.bz_default_hidden + { + display: none; + } + + input.quicksearch_help_text + { + color: #ccc; } /* index page (end) */ diff --git a/skins/standard/index/bug.gif b/skins/standard/index/bug.gif new file mode 100644 index 000000000..55ac1888c Binary files /dev/null and b/skins/standard/index/bug.gif differ diff --git a/skins/standard/index/login.gif b/skins/standard/index/login.gif new file mode 100644 index 000000000..cdc75c8d4 Binary files /dev/null and b/skins/standard/index/login.gif differ diff --git a/skins/standard/index/seach.gif b/skins/standard/index/seach.gif new file mode 100644 index 000000000..5276c1540 Binary files /dev/null and b/skins/standard/index/seach.gif differ diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 3c099bee7..10648159b 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -35,7 +35,7 @@ subheader = subheader onload="setContentTypeDisabledState(document.entryform);" style_urls = [ 'skins/standard/create_attachment.css' ] - javascript_urls = [ "js/yui/yahoo-dom-event.js", "js/attachment.js" ] + javascript_urls = [ "js/attachment.js" ] doc_section = "attachments.html" %] diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl index faf1b87c0..22d5c1220 100644 --- a/template/en/default/attachment/created.html.tmpl +++ b/template/en/default/attachment/created.html.tmpl @@ -39,8 +39,7 @@ [% PROCESS global/header.html.tmpl title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id" bodyclasses = bodyclasses - javascript_urls = [ "js/util.js", "js/field.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ] + javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ] doc_section = "bug_page.html" %] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 10c615323..f461e9e91 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -35,7 +35,6 @@ title = title header = header subheader = subheader - javascript_urls = [ "js/yui/yahoo-dom-event.js" ] doc_section = "attachments.html" %] diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl index bc22b4666..e0a92bc8a 100644 --- a/template/en/default/attachment/updated.html.tmpl +++ b/template/en/default/attachment/updated.html.tmpl @@ -43,8 +43,7 @@ subheader = filtered_desc header_addl_info = "Last modified: $filtered_timestamp" bodyclasses = bodyclasses - javascript_urls = [ "js/util.js", "js/field.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ] + javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ] doc_section = "bug_page.html" %] diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 7b6180781..2cee5c91d 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -32,8 +32,7 @@ title = title style_urls = [ 'skins/standard/create_attachment.css', 'skins/standard/yui/calendar.css' ] - javascript_urls = [ "js/attachment.js", "js/util.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js", + javascript_urls = [ "js/attachment.js", "js/util.js", "js/yui/calendar.js", "js/field.js", "js/yui/cookie.js", "js/TUI.js" ] %] diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl index 7ec59b126..0a03a4d71 100644 --- a/template/en/default/bug/create/created.html.tmpl +++ b/template/en/default/bug/create/created.html.tmpl @@ -39,8 +39,7 @@ title = "$terms.Bug $id Submitted – $filtered_desc" header = "$terms.Bug $id Submitted" subheader = filtered_desc - javascript_urls = [ "js/util.js", "js/field.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ] + javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ] diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl index 4aecfc1b8..3ca8e10e8 100644 --- a/template/en/default/bug/process/header.html.tmpl +++ b/template/en/default/bug/process/header.html.tmpl @@ -42,8 +42,7 @@ [% END %] [% PROCESS global/header.html.tmpl - javascript_urls = [ "js/util.js", "js/field.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ] + javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ] doc_section = "bug_page.html" %] diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl index cf6127413..b92acb134 100644 --- a/template/en/default/bug/show.html.tmpl +++ b/template/en/default/bug/show.html.tmpl @@ -44,8 +44,7 @@ subheader = filtered_desc header_addl_info = "Last modified: $filtered_timestamp" bodyclasses = bodyclasses - javascript_urls = [ "js/util.js", "js/field.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ] + javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ] doc_section = "bug_page.html" %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 82a75e6a3..b687da6af 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -188,8 +188,14 @@ type="text/css"> + @@ -101,57 +124,76 @@ function addSidebar() {
- -

Welcome to [% terms.Bugzilla %]. To see what's new in this version - of [% terms.Bugzilla %], see the - release notes! - You may also want to read the - - [%- terms.Bugzilla %] User's Guide to find out more about - [%+ terms.Bugzilla %] and how to use it.

- -

Most common actions:

- - [% PROCESS "account/auth/login-small.html.tmpl" %] - - -
-
-

Enter [% terms.abug %] # or some search terms:

- - - [Help] -
-
- + + + + +
+

Welcome to [% terms.Bugzilla %]

+ +
+ File a Bug +
+ + + +
+ Search +
+ + + +
+ + [% IF user.id %] + User Preferences + [% ELSIF Param('createemailregexp') && user.authorizer.user_can_create_account %] + Open a new Account + [% ELSE %] + Log In + [% END%] +
+ +
+ + +
+
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index a75f1340c..e0676b2b7 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -46,8 +46,7 @@ title = title style = style atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" - javascript_urls = [ "js/util.js", "js/field.js", - "js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ] + javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] style_urls = [ "skins/standard/buglist.css", "skins/standard/yui/calendar.css" ] doc_section = "query.html#list" %] diff --git a/testserver.pl b/testserver.pl index d3cab1dc5..f7949948f 100755 --- a/testserver.pl +++ b/testserver.pl @@ -86,14 +86,14 @@ to validate webservergroup.\n"; } -# Try to fetch a static file (front.png) +# Try to fetch a static file (padlock.png) $ARGV[0] =~ s/\/$//; -my $url = $ARGV[0] . "/skins/standard/index/front.png"; +my $url = $ARGV[0] . "/images/padlock.png"; if (fetch($url)) { - print "TEST-OK Got front picture.\n"; + print "TEST-OK Got padlock picture.\n"; } else { print -"TEST-FAILED Fetch of skins/standard/index/front.png failed +"TEST-FAILED Fetch of images/padlock.png failed Your web server could not fetch $url. Check your web server configuration and try again.\n"; exit(1); -- cgit v1.2.3-24-g4f1b