Adding in Akeybl changes to template, fixed two regressions:

1. 'betabeta' dir when passing in a beta suffix 2. malformed urls on desktop/mobile switcher
mozilla · Mar 16, 2012 · 16a2fad · 16a2fad
1 parent f5eb254
commit 16a2fad
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 39 deletions.
diff --git a/relnotes.sqlite b/relnotes.sqlite
diff --git a/run.py b/run.py
@@ -34,25 +34,28 @@ def cache_channels(aurora_suffix, beta_suffix, esr_suffix):
         if ('desktop-url' not in channel_info[channel] or
             'mobile-url' not in channel_info[channel]) :
             relname = 'releasenotes'
+            version_text = '%s.0' % version
+
+            if sub_version != 0:
+                version_text += '.%s' % sub_version
 
-	    version_text = '%s.0' % version
-
-	    if sub_version != 0:
-	        version_text += '.%s' % sub_version
-
-	    if channel == 'Aurora':
-                version_text = version_text + aurora_suffix
-                relname = 'auroranotes'
-        elif channel == 'Beta':
-            version_text = version_text + beta_suffix
-        elif channel == 'ESR':
-            version_text = version_text + esr_suffix
+            if channel == 'Aurora':
+                    version_text = version_text + aurora_suffix
+                    relname = 'auroranotes'
+            elif channel == 'Beta':
+                version_text = version_text + beta_suffix
+            elif channel == 'ESR':
+                version_text = version_text + esr_suffix
 
-        if product == 'Firefox':
-            channel_info[channel]['desktop-url'] = 'en-US/firefox/%s/%s' % (version_text, relname)
-        else:
-            channel_info[channel]['mobile-url'] = 'en-US/mobile/%s/%s' % (version_text, relname)
-
+            if product == 'Firefox ESR':
+                channel_info[channel]['desktop-url'] = 'en-US/firefox/%s/%s' % (version_text, relname)
+            else:
+                channel_info[channel]['mobile-url'] = 'en-US/mobile/%s/%s' % (version_text, relname)
+
+            if product == 'Firefox':
+                channel_info[channel]['desktop-url'] = 'en-US/firefox/%s/%s' % (version_text, relname)
+            else:
+                channel_info[channel]['mobile-url'] = 'en-US/mobile/%s/%s' % (version_text, relname)
 
 def publish_channel(product_name, channel_name, out_base, aurora_suffix, beta_suffix, esr_suffix):
     c.execute('SELECT id, product_text FROM Products WHERE product_name=? LIMIT 1', (product_name,))
@@ -128,7 +131,7 @@ def publish_channel(product_name, channel_name, out_base, aurora_suffix, beta_su
         relname = 'auroranotes'
     elif channel == 'Beta':
         version_text = version_text + beta_suffix
-        real_version_text = version_text + 'beta'
+        real_version_text = version_text
     elif channel == 'ESR':
         version_text = version_text + esr_suffix
         real_version_text = version_text

diff --git a/templates/Aurora.html b/templates/Aurora.html
@@ -127,8 +127,8 @@ <h3>Try Firefox Aurora</h3>
             </a>
           </li>
           {% if not is_mobile %}
-          <li id="try3"><a href="https://support.mozilla.com/en-US/kb/Installing%20Firefox">Install »</a></li>
-          <li id="try4"><a href="https://addons.mozilla.org/en-US/firefox/">Customize »</a></li>
+          <li id="try3"><a href="https://support.mozilla.org/kb/Installing%20Firefox">Install »</a></li>
+          <li id="try4"><a href="https://addons.mozilla.org/firefox/">Customize »</a></li>
           {% endif %}
         </ol>
     </section>
@@ -143,7 +143,7 @@ <h3>Want to get involved?</h3>
     <section id="problems">
         <h3>Having Problems?</h3>
         <ol>
-          <li><a href="http://support.mozilla.com/">Search for answers on the Firefox Support page »</a></li>
+          <li><a href="http://support.mozilla.org/">Search for answers on the Firefox Support page »</a></li>
           <li><a href="#knownissues">Look at the known issues list and see if we already know about the problem »</a></li>
           <li><a href="https://bugzilla.mozilla.org/enter_bug.cgi">If you can’t find reference to your issue, please consider filing a technical bug report »</a></li>
         </ol>

diff --git a/templates/Beta.html b/templates/Beta.html
@@ -133,13 +133,13 @@ <h3>Try Firefox Beta</h3>
             </a>
           </li>
           <li id="try2">
-            <a href="/mobile/beta/">
+            <a href="/{% if is_mobile %}mobile{% else %}firefox{% endif %}/beta/">
               Download »
             </a>
           </li>
           {% if not is_mobile %}
-          <li id="try3"><a href="https://support.mozilla.com/en-US/kb/Installing%20Firefox">Install »</a></li>
-          <li id="try4"><a href="https://addons.mozilla.org/en-US/firefox/">Customize »</a></li>
+          <li id="try3"><a href="https://support.mozilla.org/kb/Installing%20Firefox">Install »</a></li>
+          <li id="try4"><a href="https://addons.mozilla.org/firefox/">Customize »</a></li>
           {% endif %}
         </ol>
     </section>
@@ -154,7 +154,7 @@ <h3>Want to get involved?</h3>
     <section id="problems">
         <h3>Having Problems?</h3>
         <ol>
-          <li><a href="http://support.mozilla.com/">Search for answers on the Firefox Support page »</a></li>
+          <li><a href="http://support.mozilla.org/">Search for answers on the Firefox Support page »</a></li>
           <li><a href="#knownissues">Look at the known issues list and see if we already know about the problem »</a></li>
           <li><a href="https://bugzilla.mozilla.org/enter_bug.cgi">If you can’t find reference to your issue, please consider filing a technical bug report »</a></li>
         </ol>

diff --git a/templates/ESR.html b/templates/ESR.html
@@ -1,6 +1,6 @@
 <?php
     $page_title = 'Firefox ESR Notes - Desktop';
-    $body_id    = 'esr-relnotes';
+    $body_id    = 'firefox-notes';
 $fonts = <<<FONTS
     <style>
     @font-face {
@@ -24,15 +24,13 @@
 
 <div id="main-feature">
     <h2>
-        <img src="<?=$config['static_prefix']?>/img/covehead/firefox-esr/notes/title.png" alt="Firefox ESR" />
+        <img src="<?=$config['static_prefix']?>/img/covehead/firefox/notes/title.png" alt="Firefox ESR" />
         Notes <small>(First offered to Firefox ESR users on {{ release_date }})</small>
     </h2>
     {% if release_text %}{{ release_text }}{% endif %}
     {% if product_text %}{{ product_text }}{% endif %}
 
-    If interested, please see the
-    <a href="/en-US/firefox/{{ version_text }}/esrnotes/buglist.html">complete list of changes</a>
-    in this release.
+    If interested, please see the <a href="https://bugzilla.mozilla.org/buglist.cgi?type0-1-0=anywordssubstr;field0-1-0=cf_status_esr10;field0-0-0=cf_tracking_esr10;query_format=advanced;value0-1-0=fixed%20verified;type0-0-0=equals;value0-0-0=11%2B">complete list of changes</a> in this release.
 </div>
 
 <div id="main-content">
@@ -64,7 +62,7 @@ <h5>
         </div>
     </section>
 
-    <section id="knownissues">
+<!--    <section id="knownissues">
         <h3>Known Issues</h3>
         <div class="section-contents">
             <ul>
@@ -91,7 +89,7 @@ <h5>{{ item[1] }} (see <a href="https://bugzilla.mozilla.org/show_bug.cgi?id={{
               {% endfor %}
             </ul>
         </div>
-    </section>
+	</section> -->
 
 </div><!-- end #main-content div -->
 
@@ -108,16 +106,16 @@ <h3>Want to get involved?</h3>
     <section id="problems">
         <h3>Having Problems?</h3>
         <ol>
-          <li><a href="http://support.mozilla.com/">Search for answers on the Firefox Support page »</a></li>
-          <li><a href="#knownissues">Look at the known issues list and see if we already know about the problem »</a></li>
+          <li><a href="http://support.mozilla.org/">Search for answers on the Firefox Support page »</a></li>
+	  <!--<li><a href="#knownissues">Look at the known issues list and see if we already know about the problem »</a></li>-->
           <li><a href="https://bugzilla.mozilla.org/enter_bug.cgi">If you can’t find reference to your issue, please consider filing a technical bug report »</a></li>
         </ol>
     </section>
 
 
     <section id="other">
         <h3>Other Resources</h3>
-      <p><a href="http://www.mozilla.org/en-US/firefox/organizations/">Information for Organizations »</a></p>
+      <p><a href="http://www.mozilla.org/firefox/organizations/">Information for Organizations »</a></p>
       <p><a href="https://blog.mozilla.com/futurereleases/">Future of Firefox Blog »</a></p>
     </section>
 

diff --git a/templates/Release.html b/templates/Release.html
@@ -137,13 +137,13 @@ <h3>Try Firefox</h3>
             </a>
           </li>
           <li id="try2">
-            <a href="/mobile/">
+            <a href="/{% if is_mobile %}mobile{% else %}firefox{% endif %}/">
               Download »
             </a>
           </li>
           {% if not is_mobile %}
-          <li id="try3"><a href="https://support.mozilla.com/en-US/kb/Installing%20Firefox">Install »</a></li>
-          <li id="try4"><a href="https://addons.mozilla.org/en-US/firefox/">Customize »</a></li>
+          <li id="try3"><a href="https://support.mozilla.org/kb/Installing%20Firefox">Install »</a></li>
+          <li id="try4"><a href="https://addons.mozilla.org/firefox/">Customize »</a></li>
           {% endif %}
         </ol>
     </section>
@@ -158,7 +158,7 @@ <h3>Want to get involved?</h3>
     <section id="problems">
         <h3>Having Problems?</h3>
         <ol>
-          <li><a href="http://support.mozilla.com/">Search for answers on the Firefox Support page »</a></li>
+          <li><a href="http://support.mozilla.org/">Search for answers on the Firefox Support page »</a></li>
           <li><a href="#knownissues">Look at the known issues list and see if we already know about the problem »</a></li>
           <li><a href="https://bugzilla.mozilla.org/enter_bug.cgi">If you can’t find reference to your issue, please consider filing a technical bug report »</a></li>
         </ol>