You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/12/13 06:08:06 UTC
[20/45] git commit: [#6974] make import doc links be source-specific
[#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/4d300243
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4d300243
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4d300243
Branch: refs/heads/tv/6942
Commit: 4d300243b0d6dadf9ce20b00ef8c79ef332b638e
Parents: 7fbf93c
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Dec 11 22:18:39 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Dec 12 04:01:10 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/4d300243/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/4d300243/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/4d300243/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>