incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [06/36] git commit: [#6534] ticket:416 Fix checkbox labels
Date Fri, 27 Sep 2013 16:43:11 GMT
[#6534] ticket:416 Fix checkbox labels


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

Branch: refs/heads/db/6534
Commit: 86b2ec734cf05a2f0a883c00efa03962a05f066d
Parents: 72fd220
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Sep 10 17:04:48 2013 +0300
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Sep 27 16:31:48 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/github/wiki.py             |  2 +-
 .../forgeimporters/templates/project_base.html           | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/86b2ec73/ForgeImporters/forgeimporters/github/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py
index b652744..b9d9688 100644
--- a/ForgeImporters/forgeimporters/github/wiki.py
+++ b/ForgeImporters/forgeimporters/github/wiki.py
@@ -45,7 +45,7 @@ class GitHubWikiImporter(ToolImporter):
     source = 'GitHub'
     tool_label = 'Wiki'
     tool_description = 'Import your wiki from GitHub'
-    tool_option = {"history_github_wiki": "Import wiki revision history"}
+    tool_option = {"history_github_wiki": "Import history"}
     # List of supported formats https://github.com/gollum/gollum/wiki#page-files
     supported_formats = [
             'asciidoc',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/86b2ec73/ForgeImporters/forgeimporters/templates/project_base.html
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html
index 4a12b1f..1417a6d 100644
--- a/ForgeImporters/forgeimporters/templates/project_base.html
+++ b/ForgeImporters/forgeimporters/templates/project_base.html
@@ -125,12 +125,13 @@
             <label>
                 <input name="tools" value="{{name}}" type="checkbox"{% if not c.form_errors
or name in c.form_values['tools'] %} checked="checked"{% endif %}/>
                 {{tool_importer.tool_label}}
-                {%for option_name, option_label in tool_importer.tool_option.iteritems()%}
-                    </br>
-                    <input name="tool_option" value="{{option_name}}" type="checkbox"{%
if not c.form_errors or name in c.form_values['tool_option'] %} checked="checked"{% endif
%}/>
-                    {{option_label}}
-                {%endfor%}
             </label>
+            {% for option_name, option_label in tool_importer.tool_option.iteritems() %}
+              <label>
+                <input name="tool_option" value="{{option_name}}" type="checkbox"{% if
not c.form_errors or name in c.form_values['tool_option'] %} checked="checked"{% endif %}/>
+                {{option_label}}
+              </label>
+            {% endfor %}
             {{tool_importer.tool_description}}
         </div>
         {% endfor %}


Mime
View raw message