Browse files

various template changes

  • Loading branch information...
1 parent a137a58 commit ee2a4fec925ff7131eda94bb9f55e8f5e0da92d1 @lsblakk lsblakk committed Sep 13, 2012
Showing with 10 additions and 10 deletions.
  1. BIN relnotes.sqlite
  2. +5 −5 run.py
  3. +3 −3 templates/Beta.html
  4. +1 −1 templates/ESR.html
  5. +1 −1 templates/Release.html
View
BIN relnotes.sqlite
Binary file not shown.
View
10 run.py
@@ -38,15 +38,15 @@ def cache_channels(aurora_suffix, beta_suffix, esr_suffix):
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 product == 'Firefox ESR':
channel_info[channel]['desktop-url'] = 'en-US/firefox/%s/%s' % (version_text, relname)
else:
@@ -180,8 +180,8 @@ def publish_channel(product_name, channel_name, out_base, aurora_suffix, beta_su
parser.set_defaults(
output_dir=None,
channels=DEFAULT_CHANNELS,
- aurora_suffix=None,
- beta_suffix='',
+ aurora_suffix='a2',
+ beta_suffix='beta',
esr_suffix='',
)
parser.add_argument("-o", "--output-dir", dest="output_dir",
@@ -221,4 +221,4 @@ def publish_channel(product_name, channel_name, out_base, aurora_suffix, beta_su
publish_channel(product, channel,
options.output_dir, options.aurora_suffix,
options.beta_suffix, options.esr_suffix)
-
+
View
6 templates/Beta.html
@@ -34,12 +34,12 @@
{% if not is_mobile %}
<span>Desktop</span>
{% else %}
- <a href="/{{ versions[version]['desktop-url'] }}">Desktop</a>
+ <a href="/firefox/{{ version_text }}/releasenotes/">Desktop</a>
{% endif %}
</li>
<li>
{% if not is_mobile %}
- <a href="/{{ versions[version]['mobile-url'] }}">Mobile</a>
+ <a href="/mobile/{{ version_text }}/releasenotes/">Mobile</a>
{% else %}
<span>Mobile</span>
{% endif %}
@@ -48,7 +48,7 @@
</div>
<h2>
<img src="<?=$config['static_prefix']?>/img/covehead/firefox/beta/notes/title.png" alt="Firefox Beta" height="156" width="482" />
- Notes <small>(First offered to Beta channel users on {{ release_date }})</small>
+ {% if not is_mobile %}Desktop{% else %}Mobile{% endif %} Notes <small>(First offered to Beta channel users on {{ release_date }})</small>
</h2>
{% if release_text %}{{ release_text }}{% endif %}
{% if product_text %}{{ product_text }}{% endif %}
View
2 templates/ESR.html
@@ -30,7 +30,7 @@
{% if release_text %}{{ release_text }}{% endif %}
{% if product_text %}{{ product_text }}{% endif %}
- 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.
+ 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={{ version }}%2B">complete list of changes</a> in this release.
</div>
<div id="main-content">
View
2 templates/Release.html
@@ -54,7 +54,7 @@
{% if product_text %}{{ product_text }}{% endif %}
If interested, please see the
- <a href="EDIT THIS LINK TO BE A BUGZILLA LINK">complete list of changes</a>
+ <a href="/{{ versions[version]['desktop-url'] }}/buglist.html">complete list of changes</a>
in this release.
</div>

0 comments on commit ee2a4fe

Please sign in to comment.