summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2011-11-30 20:53:50 +0100
committerDave Lawrence <dlawrence@mozilla.com>2011-11-30 20:53:50 +0100
commit5639b2edc8c0d7af299d7b938005d13fe3d64990 (patch)
treeb2028b32e327a616f69176c958430abb6aefcfc9 /template
parent41eee15be2640ae0435e2ab51f2d9718819341cc (diff)
parentf22bf7ffb8217525a17ec3e1414fa642047f8584 (diff)
downloadbugzilla-5639b2edc8c0d7af299d7b938005d13fe3d64990.tar.gz
bugzilla-5639b2edc8c0d7af299d7b938005d13fe3d64990.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template')
-rw-r--r--template/en/default/index.html.tmpl40
-rw-r--r--template/en/default/search/boolean-charts.html.tmpl6
2 files changed, 29 insertions, 17 deletions
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 98648e25e..5b9237aa1 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -125,22 +125,30 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
<td>
<h1 id="welcome"> Welcome to [% terms.Bugzilla %]</h1>
<div class="intro">[% Hook.process('intro') %]</div>
- <a id="enter_bug" class="bz_common_actions"
- href="enter_bug.cgi"><span>File [% terms.aBug %]</span></a>
-
- <a id="query" class="bz_common_actions"
- href="query.cgi"><span>Search</span></a>
-
- <a id="account" class="bz_common_actions"
- [% IF user.id %]
- href="userprefs.cgi"><span>User Preferences</span></a>
- [% ELSIF Param('createemailregexp')
- && user.authorizer.user_can_create_account
- %]
- href="createaccount.cgi"><span>Open a New Account</span></a>
- [% ELSE %]
- href="?GoAheadAndLogIn=1"><span>Log In</span></a>
- [% END %]
+
+ <div class="bz_common_actions">
+ <ul>
+ <li>
+ <a id="enter_bug" href="enter_bug.cgi"><span>File
+ [%= terms.aBug %]</span></a>
+ </li>
+ <li>
+ <a id="query" href="query.cgi"><span>Search</span></a>
+ </li>
+ <li>
+ <a id="account"
+ [% IF user.id %]
+ href="userprefs.cgi"><span>User Preferences</span></a>
+ [% ELSIF Param('createemailregexp')
+ && user.authorizer.user_can_create_account
+ %]
+ href="createaccount.cgi"><span>Open a New Account</span></a>
+ [% ELSE %]
+ href="?GoAheadAndLogIn=1"><span>Log In</span></a>
+ [% END %]
+ </li>
+ </ul>
+ </div>
<form id="quicksearchForm" name="quicksearchForm" action="buglist.cgi"
onsubmit="return checkQuicksearch(this);">
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index b5ff90908..878589cea 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -74,7 +74,11 @@
TUI_alternates['custom_search_advanced'] = "Show Advanced Features";
TUI_hide_default('custom_search_advanced');
</script>
- <script type="text/javascript" src="js/custom-search.js"></script>
+ <script type="text/javascript" src="[% 'js/custom-search.js' FILTER mtime %]"></script>
+ <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER mtime %]"></script>
+ <script type="text/javascript">
+ redirect_html4_browsers();
+ </script>
</div>