incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [12/50] git commit: [#6740] Show additional notes on the project import pages
Date Mon, 21 Oct 2013 21:04:46 GMT
[#6740] Show additional notes on the project import pages

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


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

Branch: refs/heads/cj/6686
Commit: 2b34aaaab2956a6e026d5437f3e8f0b6b4967ad2
Parents: 59dc137
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Mon Oct 14 17:56:25 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Mon Oct 14 17:56:25 2013 +0000

----------------------------------------------------------------------
 .../forgeimporters/github/templates/project.html         | 10 +++++++++-
 .../forgeimporters/google/templates/project.html         | 11 ++++++++++-
 .../forgeimporters/templates/project_base.html           |  3 ++-
 3 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2b34aaaa/ForgeImporters/forgeimporters/github/templates/project.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/templates/project.html b/ForgeImporters/forgeimporters/github/templates/project.html
index d0f59f6..c726b10 100644
--- a/ForgeImporters/forgeimporters/github/templates/project.html
+++ b/ForgeImporters/forgeimporters/github/templates/project.html
@@ -40,7 +40,7 @@
     </div>
 
     <div class="grid-6" style="clear:left">
-        <label>URL Name</label>
+        <label>{{config.site_name}} URL Name</label>
     </div>
     <div class="grid-10">
         <input id="project_shortname" name="project_shortname" value="{{c.form_values['project_shortname']}}"/>
@@ -52,3 +52,11 @@
         </div>
     </div>
 {% endblock %}
+
+{% block extra_notes %}
+<br/>
+<br/>
+The wiki importer does not support all formats; currently, only Markdown
+and MediaWiki are supported.  Additionally, links to internal files or
+images (those in the wiki repository) are not supported.
+{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2b34aaaa/ForgeImporters/forgeimporters/google/templates/project.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/templates/project.html b/ForgeImporters/forgeimporters/google/templates/project.html
index a2887e7..271e965 100644
--- a/ForgeImporters/forgeimporters/google/templates/project.html
+++ b/ForgeImporters/forgeimporters/google/templates/project.html
@@ -30,7 +30,7 @@
     </div>
 
     <div class="grid-6" style="clear:left">
-        <label>URL Name</label>
+        <label>{{config.site_name}} URL Name</label>
     </div>
     <div class="grid-10">
         <input id="project_shortname" name="project_shortname" value="{{c.form_values['project_shortname']}}"/>
@@ -42,3 +42,12 @@
         </div>
     </div>
 {% endblock %}
+
+{% block extra_notes %}
+<br/>
+<br/>
+Not all project data can be imported at this time.  The full description
+on the Project Home cannot be automatically converted, due to size limit
+differences.  Only the first (default) source repository is imported,
+and private tickets are not imported.
+{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2b34aaaa/ForgeImporters/forgeimporters/templates/project_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html
index d849601..6a797d2 100644
--- a/ForgeImporters/forgeimporters/templates/project_base.html
+++ b/ForgeImporters/forgeimporters/templates/project_base.html
@@ -101,7 +101,7 @@
       </div>
 
       <div class="grid-6" style="clear:left">
-          <label>URL Name</label>
+          <label>{{config.site_name}} URL Name</label>
       </div>
       <div class="grid-10">
           <input id="project_shortname" name="project_shortname" value="{{c.form_values['project_shortname']}}"/>
@@ -140,6 +140,7 @@
     <div style="margin:5px">
       You'll receive an email after each tool import finishes.
       Import time varies depending on the amount of data being imported.
+      {% block extra_notes %}{% endblock %}
     </div>
 
     <input type="submit" value="Import"/>


Mime
View raw message