incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [2/3] git commit: [#6344] ticket:379 Fix messages on import page
Date Wed, 26 Jun 2013 21:52:19 GMT
[#6344] ticket:379 Fix messages on import page


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/34ab86ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/34ab86ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/34ab86ff

Branch: refs/heads/master
Commit: 34ab86ff0f14000ddaaa38c1603a51564ff3acaf
Parents: 3e5360c
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Jun 25 09:25:23 2013 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Jun 26 21:51:39 2013 +0000

----------------------------------------------------------------------
 ForgeSVN/forgesvn/templates/svn/import.html | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/34ab86ff/ForgeSVN/forgesvn/templates/svn/import.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/import.html b/ForgeSVN/forgesvn/templates/svn/import.html
index 313cb18..2a43d89 100644
--- a/ForgeSVN/forgesvn/templates/svn/import.html
+++ b/ForgeSVN/forgesvn/templates/svn/import.html
@@ -29,25 +29,15 @@
 {% block header %}{{c.app.config.options.mount_label}}{% endblock %}
 
 {% block content %}
-{%if c.is_empty%}
-    <div class="message error" style="width:90%">
-        <h1 class="header">Warning</h1>
-        <p class="content">Importing a repository will <strong>overwrite any
and all data</strong>
-            in your existing repository.</p>
-    </div>
-    <br style="clear:both"/>
-    <p><strong>Be careful! Importing will overwrite current repository contents.</strong></p>
+{% if c.is_empty %}
     <p>We expect a URL to a publicly accessible repository (no password).<br />
     (Examples: http://repository.url/svn/name, https://repository.url/svn/name or svn://repository.url/svn/name)</p>
     <p>Notification email will be sent when import complete.</p>
-    <p>If you really, <strong>really</strong> want to do this, enter the
URL of the source repository below:</p>
+    <p>Enter the URL of the source repository below:</p>
     {{ c.form.display(action='do_import') }}
-{% else%}
-    <div class="message error" style="width:90%">
-        <h1 class="header">Warning</h1>
-        <p class="content">You cannot import into a repository that already has commits
in it.
-            Please delete this SVN tool if you really want to delete this whole repository.
-            Then install a new SVN tool and you will be able to import into it.</p>
-    </div>
-{%endif%}
+{% else %}
+  <p>You cannot import into a repository that already has commits in it.
+     Please delete this SVN tool if you really want to delete this whole repository.
+     Then install a new SVN tool and you will be able to import into it.</p>
+{% endif %}
 {% endblock %}


Mime
View raw message