From c09a9a46b4c20a99a046b8ad67dbae76910e1256 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Thu, 12 Feb 2009 06:29:08 +0000 Subject: Bug 476090: Allow users to log-in from toolbar Patch By Guy Pyrzak r=mkanat, a=mkanat --- js/global.js | 58 ++++++++++++ skins/standard/global.css | 16 ++++ .../en/default/account/auth/login-small.html.tmpl | 105 ++++++++------------- template/en/default/global/common-links.html.tmpl | 34 ++----- template/en/default/global/header.html.tmpl | 2 +- 5 files changed, 122 insertions(+), 93 deletions(-) create mode 100644 js/global.js diff --git a/js/global.js b/js/global.js new file mode 100644 index 000000000..2efa698b6 --- /dev/null +++ b/js/global.js @@ -0,0 +1,58 @@ +/* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Bugzilla Bug Tracking System. +* +* Contributor(s): Guy Pyrzak +* +*/ + +var mini_login_constants; + +function init_mini_login_form( suffix ) { + var mini_login = document.getElementById('Bugzilla_login' + suffix ); + var mini_password = document.getElementById('Bugzilla_password' + suffix ); + // check if the login and password are blank and if they are + // put in the text login and password and make them slightly greyed out + if( mini_login.value == "" && mini_password.value == "" ) { + mini_login.value = mini_login_constants.login; + mini_password.value = mini_login_constants.password; + mini_password.type = "text"; + + YAHOO.util.Dom.addClass(mini_login, "bz_mini_login_help"); + YAHOO.util.Dom.addClass(mini_password, "bz_mini_login_help"); + } +} + +function mini_login_on_focus( el ) { + if( el.name == "Bugzilla_password" ){ + if( el.type != "password" ) { + el.value = ""; + el.type = "password"; + } + } else if ( el.value == mini_login_constants.login ) { + if( el.value == mini_login_constants.login ) { + el.value = ""; + } + } + YAHOO.util.Dom.removeClass(el, "bz_mini_login_help"); +} + +function check_mini_login_fields( suffix ) { + var mini_login = document.getElementById('Bugzilla_login' + suffix ); + var mini_password = document.getElementById('Bugzilla_password' + suffix ); + if(( mini_login.value != "" && mini_password.value != "" ) && + ( mini_login.value != mini_login_constants.login && + mini_password.value != mini_login_constants.password )) { + return true; + } + window.alert( mini_login_constants.warning ); + return false; +} diff --git a/skins/standard/global.css b/skins/standard/global.css index cbdfdef1f..8bfa75f16 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -508,3 +508,19 @@ form#Create .comment { #down_button { background-image: url(global/down.png); } + +.mini_login, .mini_login input, .mini_login button { + font-size: small; +} + +form.mini_login input.bz_password, form.mini_login input.bz_login { + width: 10em; +} + +form .bz_remember, form .bz_restrict { + margin: 0.4em 0; +} + +.bz_mini_login_help { + color: #ccc; +} diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 19aaca11d..56f281b24 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -1,4 +1,4 @@ -[%# The contents of this file are subject to the Mozilla Public +[%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ @@ -23,68 +23,45 @@ [%# Use the current script name. If an empty name is returned, # then we are accessing the home page. %] -[% script_name = cgi.url(Relative => 1) %] -[% IF !script_name %] - [% script_name = "index.cgi" %] +[% target = cgi.url("-relative" => 1, "-query" => 1) %] +[% IF !target %] + [% target = "index.cgi" %] [% END %] -[%# If SSL is in use, use 'sslbase', else use 'urlbase'. %] -[% IF Param("sslbase") != "" && Param("ssl") != "never" %] - [% script_name = Param("sslbase") _ script_name %] -[% ELSE %] - [% script_name = Param("urlbase") _ script_name %] -[% END %] - -
- - - - - - - - - - - [% IF Param('rememberlogin') == 'defaulton' || - Param('rememberlogin') == 'defaultoff' %] - - - - - [% END %] - - [% IF Param('loginnetmask') < 32 %] - - - - - [% END %] - - - - - [%# For now, password change requests only apply to the DB - # verification method #%] - - [% IF user.authorizer.can_change_password %] - - [% END %] - -
- [% Param('emailsuffix') FILTER html %]
- -
  - - -
  - - -
[ Forgot my Password ]
- -
- +[% target = urlbase _ target %] +
  • + +
    • diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index 3fce543d1..6f2c46f46 100644 --- a/template/en/default/global/common-links.html.tmpl +++ b/template/en/default/global/common-links.html.tmpl @@ -20,7 +20,6 @@ #%] [% DEFAULT qs_suffix = "" %] - + [% Hook.process("link-row") %] [% BLOCK link_to_documentation %] [% IF doc_section && Param('docs_urlbase') %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index b687da6af..5f3ed44d8 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -189,6 +189,7 @@ +