incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [2/2] git commit: [#6759] Replace extra_notes in importers with configurable docs link
Date Wed, 16 Oct 2013 22:18:05 GMT
[#6759] Replace extra_notes in importers with configurable docs link

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/d3a2b22f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d3a2b22f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d3a2b22f

Branch: refs/heads/cj/6759
Commit: d3a2b22f0a4fd72e81cadf82051bcc33898abd4d
Parents: 41c3145
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Wed Oct 16 22:16:39 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Wed Oct 16 22:17:54 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/base.py                  |  1 -
 ForgeImporters/forgeimporters/github/wiki.py           |  4 ----
 ForgeImporters/forgeimporters/google/code.py           |  6 +-----
 .../forgeimporters/google/templates/project.html       |  6 ------
 ForgeImporters/forgeimporters/google/tracker.py        |  2 +-
 .../forgeimporters/templates/importer_base.html        |  6 +++++-
 .../forgeimporters/templates/project_base.html         | 13 +++++--------
 7 files changed, 12 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 0a28ea6..bd2592b 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -335,7 +335,6 @@ class ToolImporter(object):
     target_app = None  # app or list of apps
     source = None  # string description of source, must match project importer
     controller = None
-    extra_notes = ''
 
     @staticmethod
     def by_name(name):

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/github/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py
index d24b27f..6c48a2c 100644
--- a/ForgeImporters/forgeimporters/github/wiki.py
+++ b/ForgeImporters/forgeimporters/github/wiki.py
@@ -112,10 +112,6 @@ class GitHubWikiImporter(ToolImporter):
     source = 'GitHub'
     tool_label = 'Wiki'
     tool_description = 'Import your wiki from GitHub'
-    extra_notes = '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.'
     tool_option = {"import_history": "Import history"}
 
     mediawiki_exts = ['.wiki', '.mediawiki']

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/google/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/code.py b/ForgeImporters/forgeimporters/google/code.py
index ff97447..bcb379e 100644
--- a/ForgeImporters/forgeimporters/google/code.py
+++ b/ForgeImporters/forgeimporters/google/code.py
@@ -150,11 +150,7 @@ class GoogleRepoImporter(ToolImporter):
     source = 'Google Code'
     controller = GoogleRepoImportController
     tool_label = 'Source Code'
-    tool_description = 'Import your SVN, Git, or Hg repo from Google Code'
-    extra_notes = 'Only the first (default) source repository is imported. '\
-                  'It is recommended that you add a README file to your '\
-                  'repository, if one is not already present, as it will be '\
-                  'displayed by default when browsing your repository.'
+    tool_description = 'Import your primary SVN, Git, or Hg repo from Google Code'
 
     def import_tool(self, project, user, project_name=None, mount_point=None,
             mount_label=None, **kw):

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/google/templates/project.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/templates/project.html b/ForgeImporters/forgeimporters/google/templates/project.html
index 7617622..a00c0dd 100644
--- a/ForgeImporters/forgeimporters/google/templates/project.html
+++ b/ForgeImporters/forgeimporters/google/templates/project.html
@@ -66,9 +66,3 @@
         </div>
     </div>
 {% endblock %}
-
-{% block extra_notes %}
-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. {{ super() }}
-{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/google/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tracker.py b/ForgeImporters/forgeimporters/google/tracker.py
index 29bde5f..59b50bc 100644
--- a/ForgeImporters/forgeimporters/google/tracker.py
+++ b/ForgeImporters/forgeimporters/google/tracker.py
@@ -92,7 +92,7 @@ class GoogleCodeTrackerImporter(ToolImporter):
     target_app = ForgeTrackerApp
     controller = GoogleCodeTrackerImportController
     tool_label = 'Issues'
-    extra_notes = 'Private tickets are not imported.'
+    tool_description = 'Import your public tickets from Google Code'
 
     field_types = defaultdict(lambda: 'string',
             milestone='milestone',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/templates/importer_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/importer_base.html b/ForgeImporters/forgeimporters/templates/importer_base.html
index 9943a7c..16cbae2 100644
--- a/ForgeImporters/forgeimporters/templates/importer_base.html
+++ b/ForgeImporters/forgeimporters/templates/importer_base.html
@@ -87,7 +87,11 @@
   <div>
     You'll receive an email when the import is finished.
     Import time varies depending on the amount of data being imported.
-    {{ importer.extra_notes }}
+    {% if config['doc.url.importers'] %}
+        <br/><br/>
+        For more information on what will be imported and post-import configuration,
+        please see the <a href="{{ config['doc.url.importers'] }}">import documentation</a>.
+    {% endif %}
   </div>
 
   <input type="submit" value="Import"/>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d3a2b22f/ForgeImporters/forgeimporters/templates/project_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html
index 3908415..d7863eb 100644
--- a/ForgeImporters/forgeimporters/templates/project_base.html
+++ b/ForgeImporters/forgeimporters/templates/project_base.html
@@ -140,14 +140,11 @@
     <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.
-      <br/><br/>
-      {% block extra_notes %}
-        {% for name, tool_importer in importer.tool_importers.iteritems() %}
-          {% if tool_importer.extra_notes %}
-            {{tool_importer.extra_notes}}
-          {% endif %}
-        {% endfor %}
-      {% endblock %}
+      {% if config['doc.url.importers'] %}
+          <br/><br/>
+          For more information on what will be imported and post-import configuration,
+          please see the <a href="{{ config['doc.url.importers'] }}">import documentation</a>.
+      {% endif %}
     </div>
 
     <input type="submit" value="Import"/>


Mime
View raw message