move hosting mode to urls page; finally rename goddamn "admin" to "roles"

2 files changed, 29 insertions, 19 deletions

diff --git a/templates/pkg_edit.pt b/templates/pkg_edit.pt
index e1f16a8..fb10954 100644
--- a/templates/pkg_edit.pt
+++ b/templates/pkg_edit.pt
@@ -5,6 +5,8 @@
       metal:use-macro="standard_template/macros/page">
 <metal:fill fill-slot="body">
 
+<p tal:replace="structure app/release_nav" />
+
 <p>
   Each package may have a release for each version of the
   package that is released. You may use this form to hide releases
@@ -86,25 +88,6 @@ uncheck the button below</p>
   <br/>
 </form>
 
-<p>Hosting Mode</p>
-<form tal:attributes="action app/url_path" method="POST" enctype="multipart/form-data">
-    <input type="hidden" name=":action" value="pkg_edit" />
-    <input type="hidden" name="name" tal:attributes="value data/name" />
-
-    <input tal:condition="python: data['hosting_mode'] != 'pypi-explicit'" type="radio" name="hosting_mode" id="pypi-explicit" value="pypi-explicit" />
-    <input tal:condition="python: data['hosting_mode'] == 'pypi-explicit'" type="radio" name="hosting_mode" id="pypi-explicit" value="pypi-explicit" checked="checked" />
-    <label for="pypi-explicit">Do not extract URLs from description field</label>
-
-    <input tal:condition="python: data['hosting_mode'] != 'pypi-scrape'" type="radio" name="hosting_mode" id="pypi-scrape" value="pypi-scrape" />
-    <input tal:condition="python: data['hosting_mode'] == 'pypi-scrape'" type="radio" name="hosting_mode" id="pypi-scrape" value="pypi-scrape" checked="checked" />
-    <label for="pypi-scrape">Automatically extract URLs from description field</label>
-
-    <input tal:condition="python: data['hosting_mode'] != 'pypi-scrape-crawl'" type="radio" name="hosting_mode" id="pypi-scrape-crawl" value="pypi-scrape-crawl" />
-    <input tal:condition="python: data['hosting_mode'] == 'pypi-scrape-crawl'" type="radio" name="hosting_mode" id="pypi-scrape-crawl" value="pypi-scrape-crawl" checked="checked" />
-    <label for="pypi-scrape-crawl">Scrape Homepage and Download URL (Slow!)</label>
-
-    <input type="submit" name="submit_hosting_mode" value="Change" />
-</form>
 
 <p>You can now host documentation at
 <a tal:attributes="href string:http://pythonhosted.org/${data/name}"
diff --git a/templates/urls.pt b/templates/urls.pt
index 0ea88d5..03869c0 100644
--- a/templates/urls.pt
+++ b/templates/urls.pt
@@ -7,6 +7,33 @@
 
 <p tal:replace="structure app/release_nav" />
 
+<p><b>Hosting Mode</b></p>
+<form tal:attributes="action app/url_path" method="POST" enctype="multipart/form-data">
+    <input type="hidden" name=":action" value="pkg_edit" />
+    <input type="hidden" name="name" tal:attributes="value data/name" />
+
+    <input tal:condition="python: data['hosting_mode'] != 'pypi-explicit'"
+        type="radio" name="hosting_mode" id="pypi-explicit" value="pypi-explicit" />
+    <input tal:condition="python: data['hosting_mode'] == 'pypi-explicit'"
+        type="radio" name="hosting_mode" id="pypi-explicit" value="pypi-explicit" checked="checked" />
+    <label for="pypi-explicit">Do not extract URLs from description field</label>
+<br>
+    <input tal:condition="python: data['hosting_mode'] != 'pypi-scrape'"
+        type="radio" name="hosting_mode" id="pypi-scrape" value="pypi-scrape" />
+    <input tal:condition="python: data['hosting_mode'] == 'pypi-scrape'"
+        type="radio" name="hosting_mode" id="pypi-scrape" value="pypi-scrape" checked="checked" />
+    <label for="pypi-scrape">Automatically extract URLs from description field</label>
+<br>
+    <input tal:condition="python: data['hosting_mode'] != 'pypi-scrape-crawl'"
+        type="radio" name="hosting_mode" id="pypi-scrape-crawl" value="pypi-scrape-crawl" />
+    <input tal:condition="python: data['hosting_mode'] == 'pypi-scrape-crawl'"
+        type="radio" name="hosting_mode" id="pypi-scrape-crawl" value="pypi-scrape-crawl" checked="checked" />
+    <label for="pypi-scrape-crawl">Scrape Homepage and Download URL (Slow!)</label>
+<br>
+    <input type="submit" name="submit_hosting_mode" value="Change" />
+</form>
+
+<p><b>Registered File URLs</b></p>
 <form tal:attributes="action app/url_path" method="POST" enctype="multipart/form-data">
     <input type="hidden" name="name" tal:attributes="value data/name" />
     <input type="hidden" name="version" tal:attributes="value data/version" />