summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-07-14 15:07:59 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-07-14 15:07:59 -0600
commitd10acd3ebf889fc50054b4da9c1962bad79533e1 (patch)
tree38970704a658d9ed31585c5518007d48ade6bac6 /templates
parent9b6561a2c1a99023a5cad68a1763a07c4aecae8d (diff)
parent7f7598cf43e6b630ac21bc9a435773773213ea60 (diff)
Merge branch 'archweb-generic2'
Conflicts: Makefile templates/public/index.html
Diffstat (limited to 'templates')
-rw-r--r--templates/feeds/news_title.html1
-rw-r--r--templates/feeds/packages_description.html1
-rw-r--r--templates/mirrors/mirror_details.html4
-rw-r--r--templates/public/index.html2
4 files changed, 6 insertions, 2 deletions
diff --git a/templates/feeds/news_title.html b/templates/feeds/news_title.html
deleted file mode 100644
index 7899fce3..00000000
--- a/templates/feeds/news_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.title }} \ No newline at end of file
diff --git a/templates/feeds/packages_description.html b/templates/feeds/packages_description.html
deleted file mode 100644
index cfc42616..00000000
--- a/templates/feeds/packages_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.pkgdesc }} \ No newline at end of file
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index f2202e38..a06b81c1 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -49,6 +49,10 @@
<td>{% if mirror.admin_email %}<a href="mailto:{{ mirror.admin_email }}">{{ mirror.admin_email }}</a>{% else %}None{% endif %}</td>
</tr>
<tr>
+ <th>Alternate Email:</th>
+ <td>{% if mirror.alternate_email %}<a href="mailto:{{ mirror.alternate_email }}">{{ mirror.alternate_email }}</a>{% else %}None{% endif %}</td>
+ </tr>
+ <tr>
<th>Notes:</th>
<td>{{ mirror.notes|linebreaks }}</td>
</tr>
diff --git a/templates/public/index.html b/templates/public/index.html
index 02d0cb14..a5be4058 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -166,6 +166,8 @@
title="View the available package groups">Package Groups</a></li>
<li><a href="/todo/"
title="Hacker Todo Lists">Todo Lists</a></li>
+ <li><a href="{% url 'releng-release-list' %}"
+ title="Release Engineering ISO listing">ISO Release List</a></li>
<li><a href="{% url 'visualize-index' %}"
title="View visualizations">Visualizations</a></li>
</ul>