diff options
author | Olivier Thauvin <nanardon@mageia.org> | 2010-10-03 15:36:00 +0000 |
---|---|---|
committer | Olivier Thauvin <nanardon@mageia.org> | 2010-10-03 15:36:00 +0000 |
commit | ddcf19029c7b58b2ea236bd14e6c1456949f0fc0 (patch) | |
tree | 725f066cac991b43163f1e08a5954b6071634f3d /root/html/includes/new | |
parent | 114b46067622cc0c68d007711cf58f74e25411b8 (diff) | |
download | mgamirrors-ddcf19029c7b58b2ea236bd14e6c1456949f0fc0.tar mgamirrors-ddcf19029c7b58b2ea236bd14e6c1456949f0fc0.tar.gz mgamirrors-ddcf19029c7b58b2ea236bd14e6c1456949f0fc0.tar.bz2 mgamirrors-ddcf19029c7b58b2ea236bd14e6c1456949f0fc0.tar.xz mgamirrors-ddcf19029c7b58b2ea236bd14e6c1456949f0fc0.zip |
- use google maps for location, improve messages
Diffstat (limited to 'root/html/includes/new')
-rw-r--r-- | root/html/includes/new/confirm.tt | 8 | ||||
-rw-r--r-- | root/html/includes/new/invalid_mirror.tt | 2 | ||||
-rw-r--r-- | root/html/includes/new/invalid_uri.tt | 2 | ||||
-rw-r--r-- | root/html/includes/new/mirror_exists.tt | 4 | ||||
-rw-r--r-- | root/html/includes/new/new_host.tt | 9 | ||||
-rw-r--r-- | root/html/includes/new/overlap_hosts.tt | 9 | ||||
-rw-r--r-- | root/html/includes/new/url_form.tt | 3 |
7 files changed, 13 insertions, 24 deletions
diff --git a/root/html/includes/new/confirm.tt b/root/html/includes/new/confirm.tt deleted file mode 100644 index e0bb7d4..0000000 --- a/root/html/includes/new/confirm.tt +++ /dev/null @@ -1,8 +0,0 @@ -<div id="foo"> -<p>Really adding [% c.session.new_uri | html %] ?</p> - -[% c.prototype.form_remote_tag({ url => c.uri_for('confirm'), update => 'foo' } ) %] -<input type="hidden" name="confirm" value="1"> -<input type="submit"> -</form> -</div> diff --git a/root/html/includes/new/invalid_mirror.tt b/root/html/includes/new/invalid_mirror.tt index f22d0f3..bef66c8 100644 --- a/root/html/includes/new/invalid_mirror.tt +++ b/root/html/includes/new/invalid_mirror.tt @@ -1 +1 @@ -This url seems to not contain a valid mirror. +<p>This url seems to not point a valid mirror.</p> diff --git a/root/html/includes/new/invalid_uri.tt b/root/html/includes/new/invalid_uri.tt index 87ced3c..4d9390e 100644 --- a/root/html/includes/new/invalid_uri.tt +++ b/root/html/includes/new/invalid_uri.tt @@ -1 +1 @@ -[% uri %] is not a valid url. +<p>[% uri %] is not a valid url.</p> diff --git a/root/html/includes/new/mirror_exists.tt b/root/html/includes/new/mirror_exists.tt index f891993..3345cd2 100644 --- a/root/html/includes/new/mirror_exists.tt +++ b/root/html/includes/new/mirror_exists.tt @@ -1 +1,3 @@ -<p>The url [% uri | html %] has same server and same protocol than [% exists_url.0.url %].</p> +<p>The mirror [% uri.host | html %] is already registered serving the distribution via [% uri.scheme | html %] +at url <a href="[% uri %]">[% uri | html %]</a></p> +<p>The URL [% exists_url.url %] cannot be added.</p> diff --git a/root/html/includes/new/new_host.tt b/root/html/includes/new/new_host.tt deleted file mode 100644 index a4296d2..0000000 --- a/root/html/includes/new/new_host.tt +++ /dev/null @@ -1,9 +0,0 @@ -Enter Info for [% uri.host %] - -<form action="[% c.uri_for() %]" method="POST"> -<input type="hidden" name="url" value="[% uri | html %]"> -<input type="hidden" name="hostinfo" value="1"> - -[% location.name %] / [% location.continent %]<br> - -[% INCLUDE 'host_information.tt' %] diff --git a/root/html/includes/new/overlap_hosts.tt b/root/html/includes/new/overlap_hosts.tt index 3d60603..77b4991 100644 --- a/root/html/includes/new/overlap_hosts.tt +++ b/root/html/includes/new/overlap_hosts.tt @@ -1 +1,8 @@ -This server seems to be the same than [% overlap_hosts.join(', ') | html %]. +<p>According IP address, host [% uri.host %] is the same than already registered +[% overlap_hosts.join(', ') | html %].</p> + +<p>This URL cannot be added.</p> + +[% IF urlmaybe %] +<p>You can try to add the following URL instead:</p> +[% END %] diff --git a/root/html/includes/new/url_form.tt b/root/html/includes/new/url_form.tt index 169fe73..49a7d66 100644 --- a/root/html/includes/new/url_form.tt +++ b/root/html/includes/new/url_form.tt @@ -1,7 +1,4 @@ <form action="[% c.uri_for() %]" method="POST"> -Enter the url to the top level mirror tree, supported protocol are -[% c.model('Mirrors').protocol_list.join(', ') | html %].<br> - <input type="text" name="url" size=40 value="[% c.req.param('url') | html %]"> <input type=submit> </form> |