From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Sat, 20 Oct 2018 05:10:28 +0000 (-0400)
Subject: Bug 1497077 followup - Convert links to absolute path
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=366560691d0358d9603e4c1c9e37f9282af8a79e;p=thirdparty%2Fbugzilla.git

Bug 1497077 followup - Convert links to absolute path
---

diff --git a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
index 42f37583f..e824eb17a 100644
--- a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
@@ -17,7 +17,7 @@
   the <a href="[% basepath FILTER none %]page.cgi?id=triage_request.html">triage request form</a>.
 </p>
 
-[% editbugs = "enter_bug.cgi?assigned_to=nobody%40mozilla.org&bug_file_loc=http%3A%2F%2F&bug_ignored=0&bug_severity=normal&bug_status=NEW&cf_fx_iteration=---&cf_fx_points=---&component=Editbugs%20Requests&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-4=X&flag_type-607=X&flag_type-791=X&flag_type-800=X&flag_type-803=X&flag_type-916=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Unspecified&priority=--&product=bugzilla.mozilla.org&rep_platform=Unspecified&target_milestone=---&version=Production" %]
+[% editbugs = basepath _ "enter_bug.cgi?assigned_to=nobody%40mozilla.org&bug_file_loc=http%3A%2F%2F&bug_ignored=0&bug_severity=normal&bug_status=NEW&cf_fx_iteration=---&cf_fx_points=---&component=Editbugs%20Requests&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-4=X&flag_type-607=X&flag_type-791=X&flag_type-800=X&flag_type-803=X&flag_type-916=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Unspecified&priority=--&product=bugzilla.mozilla.org&rep_platform=Unspecified&target_milestone=---&version=Production" %]
 
 <p>
   If you want <kbd>editbugs</kbd>, open a
diff --git a/extensions/Voting/template/en/default/pages/voting.html.tmpl b/extensions/Voting/template/en/default/pages/voting.html.tmpl
index 5165d32c8..d4e8a64fa 100644
--- a/extensions/Voting/template/en/default/pages/voting.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting.html.tmpl
@@ -64,6 +64,7 @@ a few [% terms.bugs %] indicating your strong support for them.
 on [% terms.bugs %] you vote for.</p>
 
 <p>You may review your votes at any time by clicking on the "<a href=
-"page.cgi?id=voting/user.html">My Votes</a>" link in the page footer.</p>
+"[% basepath FILTER none %]page.cgi?id=voting/user.html">My Votes</a>" link in
+the page footer.</p>
 
 [% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 27c17aa4e..4f2bc3d1e 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -201,7 +201,7 @@
     <div id="mfa-enable-totp" style="display:none">
 
       <div id="mfa-totp-throbber">
-        Generating new QR code.. <img src="../../images/throbber.gif" width="16" height="11">
+        Generating new QR code.. <img src="[% basepath FILTER none %]images/throbber.gif" width="16" height="11">
       </div>
 
       <div id="mfa-totp-issued" style="display:none">
diff --git a/template/en/default/admin/classifications/footer.html.tmpl b/template/en/default/admin/classifications/footer.html.tmpl
index 647430ecf..c230fa930 100644
--- a/template/en/default/admin/classifications/footer.html.tmpl
+++ b/template/en/default/admin/classifications/footer.html.tmpl
@@ -20,5 +20,5 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-<p>Back to the <a href="./">main [% terms.bugs %] page</a>
+<p>Back to the <a href="[% basepath FILTER none %]">main [% terms.bugs %] page</a>
 or <a href="[% basepath FILTER none %]editclassifications.cgi"> edit</a> more classifications.</p>
diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl
index f05a4dc01..09e3fdb02 100644
--- a/template/en/default/admin/groups/create.html.tmpl
+++ b/template/en/default/admin/groups/create.html.tmpl
@@ -116,7 +116,7 @@ products. Unchecking the "Insert new group into all existing
 products" option will prevent this and make the group become
 visible only when its controls have been added to a product.</p>
 
-<p>Back to the <a href="./">main [% terms.bugs %] page</a>
+<p>Back to the <a href="[% basepath FILTER none %]">main [% terms.bugs %] page</a>
 
 or to the <a href="[% basepath FILTER none %]editgroups.cgi">group list</a>.
 
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index e916d705e..6d629a3fe 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -317,7 +317,7 @@
        [% INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.product,
             override_legal_values = bug.choices.product
-            desc_url = 'describecomponents.cgi', value = bug.product
+            desc_url = basepath _ 'describecomponents.cgi', value = bug.product
             editable = bug.check_can_change_field('product', 0, 1) %]
     </tr>
 
@@ -340,7 +340,7 @@
       [% INCLUDE bug/field.html.tmpl
           bug = bug, field = bug_fields.component, value = bug.component
           override_legal_values = bug.choices.component
-          desc_url = "describecomponents.cgi?product=$bug.product"
+          desc_url = basepath _ "describecomponents.cgi?product=$bug.product"
           editable = bug.check_can_change_field('component', 0, 1)
       %]
     </tr>
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 6308098b5..7cf6e963f 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -55,7 +55,7 @@
       if(!document.location.href.match(/show_bug\.cgi/)) {
         history.replaceState( null,
                              "[% unfiltered_title FILTER js %]",
-                             "show_bug.cgi?id=[% bug.bug_id FILTER js %]" );
+                             "[% basepath FILTER js %]show_bug.cgi?id=[% bug.bug_id FILTER js %]" );
         document.title = "[% unfiltered_title FILTER js %]";
       }
       if (document.location.href.match(/show_bug\.cgi\?.*list_id=/)) {
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index a219a0274..d74ef6f66 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -216,7 +216,7 @@
 
     [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %]
     <link rel="search" type="application/opensearchdescription+xml"
-                       title="[% terms.BugzillaTitle %]" href="./search_plugin.cgi">
+                       title="[% terms.BugzillaTitle %]" href="[% basepath FILTER none %]search_plugin.cgi">
     [% IF allow_mobile && is_mobile_browser %]
       <meta name="viewport" content="width=device-width, initial-scale=1">
     [% END %]
@@ -284,7 +284,7 @@
 
 <header id="header" role="banner">
   <div class="inner">
-    <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1>
+    <h1 id="header-title" class="title"><a href="[% basepath FILTER none %]" title="Go to home page">[% terms.Bugzilla %]</a></h1>
     <form role="search" id="header-search" class="quicksearch" action="[% basepath FILTER none %]buglist.cgi" data-no-csrf>
       <section class="searchbox-outer dropdown" role="combobox" aria-expanded="false" aria-haspopup="listbox"
                aria-owns="header-search-dropdown">
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 3053e2f73..250e3a640 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -49,7 +49,7 @@
   title = title
   generate_api_token = dotweak
   style = style
-  atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom"
+  atomlink = basepath _ "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom"
   javascript_urls = [ "js/util.js", "js/field.js" ]
   style_urls = [ "skins/standard/buglist.css" ]
   doc_section = "query.html#list"
diff --git a/template/en/default/mfa/duo/verify.html.tmpl b/template/en/default/mfa/duo/verify.html.tmpl
index f3f49657a..309404da1 100644
--- a/template/en/default/mfa/duo/verify.html.tmpl
+++ b/template/en/default/mfa/duo/verify.html.tmpl
@@ -37,7 +37,7 @@ $(function() {
 [% css = BLOCK %]
 
   #duo_container {
-    background: #fff url(../../images/throbber.gif) 10px 10px no-repeat;
+    background: #fff url([% basepath FILTER none %]images/throbber.gif) 10px 10px no-repeat;
     width: 620px;
     height: 330px;
     border: 1px solid #000;