[MediaWiki-commits] [Gerrit] [4.4] Sync index frontpage with upstream changes - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Sync index frontpage with upstream changes
..
[4.4] Sync index frontpage with upstream changes
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Sync upstream changes in QuickSearch form and CSS embedding.
Rename hook 'links' to new upstream name 'additional_links'.
Change-Id: I1d5791e5c6f92f2f6beaddbdbe6e18008d588de8
---
M template/en/custom/index.html.tmpl
1 file changed, 52 insertions(+), 17 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/index.html.tmpl
b/template/en/custom/index.html.tmpl
index 22530ac..49542dc 100644
--- a/template/en/custom/index.html.tmpl
+++ b/template/en/custom/index.html.tmpl
@@ -32,9 +32,46 @@
[% PROCESS global/header.html.tmpl
title = Wikimedia $terms.Bugzilla Main Page
header = Main Page
+ style_urls = [ 'skins/contrib/Wikimedia/index.css' ]
%]
-link rel=stylesheet href=skins/contrib/Wikimedia/index.css media=screen
/
+
+script type=text/javascript
+!--
+function onLoadActions() {
+ quicksearchHelpText('quicksearch_main', 'show');
+ if( window.external.AddSearchProvider ){
+YAHOO.util.Dom.removeClass('quicksearch_plugin', 'bz_default_hidden');
+ }
+ document.getElementById('quicksearch_top').focus();
+}
+var quicksearch_message = Enter [% terms.abug %] # or some search terms;
+
+function checkQuicksearch( form ) {
+ if (form.quicksearch.value == '' || form.quicksearch.value ==
quicksearch_message ) {
+alert('Please enter one or more search terms first.');
+return false;
+ }
+ return true;
+}
+
+function quicksearchHelpText(el_id, action){
+ var el = document.getElementById(el_id);
+ if ( action == show) {
+if( el.value == ) {
+ el.value = quicksearch_message
+ YAHOO.util.Dom.addClass(el, quicksearch_help_text);
+}
+ } else {
+if( el.value == quicksearch_message ) {
+ el.value = ;
+ YAHOO.util.Dom.removeClass(el, quicksearch_help_text);
+}
+ }
+}
+YAHOO.util.Event.onDOMReady(onLoadActions);
+//--
+/script
div id=page-index
[% IF user.settings.skin.value=='Wikimedia' %]
@@ -76,7 +113,7 @@
[% IF user.id %]
href=userprefs.cgispanUser Preferences/span/a
[% ELSIF Param('createemailregexp')
- user.authorizer.user_can_create_account
+ user.authorizer.user_can_create_account
%]
href=createaccount.cgispanOpen a New Account/span/a
[% ELSE %]
@@ -90,22 +127,20 @@
hr /
[%# List items of links to more things users can do on this installation.
%]
-[% Hook.process(links) %]
+[% Hook.process('additional_links') %]
- form id=f name=f action=buglist.cgi method=get
-onsubmit=if (this.quicksearch.value == '')
- { alert('Please enter one or more search terms first.');
-return false; } return true;
- div
-pEnter [% terms.abug %] # or some search terms:/p
-input id=quicksearch type=text name=quicksearch
-input id=find type=submit value=Find
-a href=page.cgi?id=quicksearch.html[Help]/a
- /div
- /form
-
- div class=outro[% Hook.process('outro') %]/div
-
+form id=quicksearchForm name=quicksearchForm action=buglist.cgi
method=get
+ onsubmit=return checkQuicksearch(this);
+ div
+input id=quicksearch_main type=text name=quicksearch
+ title=Quick Search
+ onfocus=quicksearchHelpText(this.id, 'hide');
+ onblur=quicksearchHelpText(this.id, 'show');
+
+input id=find type=submit value=Quick Search
+ /div
+/form
+div class=outro[% Hook.process('outro') %]/div
/div
[% PROCESS global/footer.html.tmpl %]
--
To view, visit https://gerrit.wikimedia.org/r/98013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d5791e5c6f92f2f6beaddbdbe6e18008d588de8
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [4.4] Sync index frontpage with upstream changes - change (wikimedia...modifications)
Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98013
Change subject: [4.4] Sync index frontpage with upstream changes
..
[4.4] Sync index frontpage with upstream changes
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Sync upstream changes in QuickSearch form and CSS embedding.
Rename hook 'links' to new upstream name 'additional_links'.
Change-Id: I1d5791e5c6f92f2f6beaddbdbe6e18008d588de8
---
M template/en/custom/index.html.tmpl
1 file changed, 53 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications
refs/changes/13/98013/1
diff --git a/template/en/custom/index.html.tmpl
b/template/en/custom/index.html.tmpl
index 22530ac..3392ba5 100644
--- a/template/en/custom/index.html.tmpl
+++ b/template/en/custom/index.html.tmpl
@@ -32,9 +32,47 @@
[% PROCESS global/header.html.tmpl
title = Wikimedia $terms.Bugzilla Main Page
header = Main Page
+ header_addl_info = version $constants.BUGZILLA_VERSION
+ style_urls = [ 'skins/contrib/Wikimedia/index.css' ]
%]
-link rel=stylesheet href=skins/contrib/Wikimedia/index.css media=screen
/
+
+script type=text/javascript
+!--
+function onLoadActions() {
+ quicksearchHelpText('quicksearch_main', 'show');
+ if( window.external.AddSearchProvider ){
+YAHOO.util.Dom.removeClass('quicksearch_plugin', 'bz_default_hidden');
+ }
+ document.getElementById('quicksearch_top').focus();
+}
+var quicksearch_message = Enter [% terms.abug %] # or some search terms;
+
+function checkQuicksearch( form ) {
+ if (form.quicksearch.value == '' || form.quicksearch.value ==
quicksearch_message ) {
+alert('Please enter one or more search terms first.');
+return false;
+ }
+ return true;
+}
+
+function quicksearchHelpText(el_id, action){
+ var el = document.getElementById(el_id);
+ if ( action == show) {
+if( el.value == ) {
+ el.value = quicksearch_message
+ YAHOO.util.Dom.addClass(el, quicksearch_help_text);
+}
+ } else {
+if( el.value == quicksearch_message ) {
+ el.value = ;
+ YAHOO.util.Dom.removeClass(el, quicksearch_help_text);
+}
+ }
+}
+YAHOO.util.Event.onDOMReady(onLoadActions);
+//--
+/script
div id=page-index
[% IF user.settings.skin.value=='Wikimedia' %]
@@ -76,7 +114,7 @@
[% IF user.id %]
href=userprefs.cgispanUser Preferences/span/a
[% ELSIF Param('createemailregexp')
- user.authorizer.user_can_create_account
+ user.authorizer.user_can_create_account
%]
href=createaccount.cgispanOpen a New Account/span/a
[% ELSE %]
@@ -90,22 +128,20 @@
hr /
[%# List items of links to more things users can do on this installation.
%]
-[% Hook.process(links) %]
+[% Hook.process('additional_links') %]
- form id=f name=f action=buglist.cgi method=get
-onsubmit=if (this.quicksearch.value == '')
- { alert('Please enter one or more search terms first.');
-return false; } return true;
- div
-pEnter [% terms.abug %] # or some search terms:/p
-input id=quicksearch type=text name=quicksearch
-input id=find type=submit value=Find
-a href=page.cgi?id=quicksearch.html[Help]/a
- /div
- /form
-
- div class=outro[% Hook.process('outro') %]/div
-
+form id=quicksearchForm name=quicksearchForm action=buglist.cgi
method=get
+ onsubmit=return checkQuicksearch(this);
+ div
+input id=quicksearch_main type=text name=quicksearch
+ title=Quick Search
+ onfocus=quicksearchHelpText(this.id, 'hide');
+ onblur=quicksearchHelpText(this.id, 'show');
+
+input id=find type=submit value=Quick Search
+ /div
+/form
+div class=outro[% Hook.process('outro') %]/div
/div
[% PROCESS global/footer.html.tmpl %]
--
To view, visit https://gerrit.wikimedia.org/r/98013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d5791e5c6f92f2f6beaddbdbe6e18008d588de8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
