allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject git commit: [#6974] make import doc links be source-specific
Date Wed, 11 Dec 2013 22:18:49 GMT
Updated Branches:
  refs/heads/db/6974 [created] 03ce0981e


[#6974] make import doc links be source-specific


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

Branch: refs/heads/db/6974
Commit: 03ce0981ea7ded96e7da0999822cffb698413fc8
Parents: fcf2e46
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Wed Dec 11 22:18:39 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Wed Dec 11 22:18:39 2013 +0000

----------------------------------------------------------------------
 Allura/development.ini                                     | 4 ++++
 ForgeImporters/forgeimporters/templates/importer_base.html | 4 ++--
 ForgeImporters/forgeimporters/templates/project_base.html  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/03ce0981/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index a217641..b9df222 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -319,6 +319,10 @@ markdown_cache_threshold = .1
 # markdown text longer than max length will not be converted to html
 markdown_render_max_length = 999999999
 
+# If your site has docs about specific importers, you can add them here and
+# they'll appear on the import forms
+#doc.url.importers.Google Code = http://...
+
 [app:task]
 use = main
 override_root = task

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/03ce0981/ForgeImporters/forgeimporters/templates/importer_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/importer_base.html b/ForgeImporters/forgeimporters/templates/importer_base.html
index b22aa3d..18fc312 100644
--- a/ForgeImporters/forgeimporters/templates/importer_base.html
+++ b/ForgeImporters/forgeimporters/templates/importer_base.html
@@ -87,10 +87,10 @@
   <div>
     You'll receive an email when the import is finished.
     Import time varies depending on the amount of data being imported.
-    {% if config['doc.url.importers'] %}
+    {% if config['doc.url.importers.{}'.format(importer.source)] %}
         <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>.
+        please see the <a href="{{ config['doc.url.importers.{}'.format(importer.source)]
}}">{{importer.source}} import documentation</a>.
     {% endif %}
   </div>
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/03ce0981/ForgeImporters/forgeimporters/templates/project_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html
index d34c2d1..d0bac1b 100644
--- a/ForgeImporters/forgeimporters/templates/project_base.html
+++ b/ForgeImporters/forgeimporters/templates/project_base.html
@@ -140,10 +140,10 @@
     <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.
-      {% if config['doc.url.importers'] %}
+      {% if config['doc.url.importers.{}'.format(importer.source) ] %}
           <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>.
+          please see the <a href="{{ config['doc.url.importers.{}'.format(importer.source)
] }}">{{importer.source}} import documentation</a>.
       {% endif %}
     </div>
 


Mime
View raw message