You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/06/09 16:33:34 UTC

[1/3] allura git commit: [#6057] ticket:792 Allow ConfigOption to specify extra attrs for html input tag

Repository: allura
Updated Branches:
  refs/heads/ib/6057 ed3eac3dc -> 1cb2df179


[#6057] ticket:792 Allow ConfigOption to specify extra attrs for html input tag

and use it to pass type='url' to ForgeLink's url options


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

Branch: refs/heads/ib/6057
Commit: a186ea5bb5602a914e5b02b0f16b7bfae521ad21
Parents: ed3eac3
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jun 9 13:41:25 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Jun 9 13:46:50 2015 +0000

----------------------------------------------------------------------
 Allura/allura/app.py                                      | 8 +++++++-
 Allura/allura/templates/app_admin_options.html            | 4 ++--
 Allura/allura/templates/app_admin_options_on_install.html | 4 ++--
 Allura/allura/tests/test_app.py                           | 5 +++++
 ForgeLink/forgelink/link_main.py                          | 3 ++-
 5 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/a186ea5b/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 58aa49d..2683e36 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -36,6 +36,7 @@ from formencode import validators as fev
 
 from ming.orm import session
 from ming.utils import LazyProperty
+import ew.jinja2_ew as ew
 
 from allura.lib import helpers as h
 from allura.lib.security import has_access, require_access
@@ -56,13 +57,14 @@ class ConfigOption(object):
 
     """
 
-    def __init__(self, name, ming_type, default, label=None, validator=None):
+    def __init__(self, name, ming_type, default, label=None, validator=None, extra_attrs=None):
         """Create a new ConfigOption.
 
         """
         self.name, self.ming_type, self._default, self.label = (
             name, ming_type, default, label or name)
         self.validator = validator
+        self.extra_attrs = extra_attrs
 
     @property
     def default(self):
@@ -78,6 +80,10 @@ class ConfigOption(object):
             return self.validator.to_python(value)
         return value
 
+    def render_attrs(self):
+        """Return extra_attrs formatted in a way that allows inserting into html tag"""
+        return ew._Jinja2Widget().j2_attrs(self.extra_attrs or {})
+
 
 class SitemapEntry(object):
 

http://git-wip-us.apache.org/repos/asf/allura/blob/a186ea5b/Allura/allura/templates/app_admin_options.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_options.html b/Allura/allura/templates/app_admin_options.html
index 8924823..bf013c4 100644
--- a/Allura/allura/templates/app_admin_options.html
+++ b/Allura/allura/templates/app_admin_options.html
@@ -26,9 +26,9 @@
            {{app.config.options.get(o.name, o.default)}}
       {% else%}
         {% if o.ming_type.__name__ == 'bool' %}
-            <input id="{{o.name}}" name="{{o.name}}" type="checkbox"{{ ' checked="checked"' if app.config.options.get(o.name, o.default)}}>
+            <input {{o.render_attrs()}} id="{{o.name}}" name="{{o.name}}" type="checkbox"{{ ' checked="checked"' if app.config.options.get(o.name, o.default)}}>
         {% else %}
-            <input id="{{o.name}}" name="{{o.name}}" value="{{app.config.options.get(o.name, o.default)}}">
+            <input {{o.render_attrs()}} id="{{o.name}}" name="{{o.name}}" value="{{app.config.options.get(o.name, o.default)}}">
         {% endif %}
       {% endif %}
     </div>

http://git-wip-us.apache.org/repos/asf/allura/blob/a186ea5b/Allura/allura/templates/app_admin_options_on_install.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_options_on_install.html b/Allura/allura/templates/app_admin_options_on_install.html
index bc0d8ea..218dd61 100644
--- a/Allura/allura/templates/app_admin_options_on_install.html
+++ b/Allura/allura/templates/app_admin_options_on_install.html
@@ -20,9 +20,9 @@
   <label class="grid-13" for="{{o.name}}">{{o.label|capitalize}}</label>
   <div class="grid-13">
     {% if o.ming_type.__name__ == 'bool' %}
-      <input id="{{o.name}}" name="{{o.name}}" type="checkbox"{{ ' checked="checked"' if o.default}}>
+      <input {{o.render_attrs()}}id="{{o.name}}" name="{{o.name}}" type="checkbox"{{ ' checked="checked"' if o.default}}>
     {% else %}
-      <input id="{{o.name}}" name="{{o.name}}" value="{{o.default or ''}}">
+      <input {{o.render_attrs()}} id="{{o.name}}" name="{{o.name}}" value="{{o.default or ''}}">
     {% endif %}
   </div>
 {% endfor %}

http://git-wip-us.apache.org/repos/asf/allura/blob/a186ea5b/Allura/allura/tests/test_app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_app.py b/Allura/allura/tests/test_app.py
index 2642a95..230b5f9 100644
--- a/Allura/allura/tests/test_app.py
+++ b/Allura/allura/tests/test_app.py
@@ -54,6 +54,11 @@ def test_config_options():
     assert options[1].default == 'MyTestValue'
 
 
+def test_config_options_render_attrs():
+    opt = app.ConfigOption('test1', str, None, extra_attrs={'type': 'url'})
+    assert_equal(opt.render_attrs(), 'type="url"')
+
+
 def test_config_option_without_validator():
     opt = app.ConfigOption('test1', str, None)
     assert_equal(opt.validate(None), None)

http://git-wip-us.apache.org/repos/asf/allura/blob/a186ea5b/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index b50c22e..ec32974 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -51,7 +51,8 @@ class ForgeLinkApp(Application):
     config_options = Application.config_options + [
         ConfigOption(
             'url', str, None,
-            validator=fev.URL(not_empty=True, add_http=True)),
+            validator=fev.URL(not_empty=True, add_http=True),
+            extra_attrs={'type': 'url'}),
     ]
     config_on_install = ['url']
     searchable = True


[3/3] allura git commit: [#6057] ticket:792 Get rid of help text for mount points

Posted by je...@apache.org.
[#6057] ticket:792 Get rid of help text for mount points


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

Branch: refs/heads/ib/6057
Commit: 1cb2df179626070042577641e736480a7f3c5fa7
Parents: 3091707
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jun 9 14:10:51 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Jun 9 14:10:51 2015 +0000

----------------------------------------------------------------------
 .../ext/admin/templates/project_tools.html      | 21 +-------------------
 Allura/allura/public/nf/js/project_tools.js     |  9 ---------
 2 files changed, 1 insertion(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/1cb2df17/Allura/allura/ext/admin/templates/project_tools.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_tools.html b/Allura/allura/ext/admin/templates/project_tools.html
index 057af51..38705ed 100644
--- a/Allura/allura/ext/admin/templates/project_tools.html
+++ b/Allura/allura/ext/admin/templates/project_tools.html
@@ -31,7 +31,7 @@
   <div class="nested-grid-container">
     {% for tool in installable_tools %}
       <span class="tcenter grid-4 installable_tool">
-        <a class="install_trig" data-tool="{{ tool['name'] }}" data-relaxed-mount-points="{{ 'true' if tool.app.relaxed_mount_points else 'false' }}">
+        <a class="install_trig" data-tool="{{ tool['name'] }}">
           <span class="tool_title">{{ tool['app'].tool_label }}{{' (%s)' % tool.app.status if tool.app.status != 'production' else ''}}</span><br />
           <img src="{{ g.theme.app_icon_url(tool['name'], 32) or 'unk.png' }}" alt="">
         </a>
@@ -55,25 +55,6 @@
         <input id="id_url_input" type="text" name="new.mount_point" title="The url for this tool relative to {{ full_url }} " class="new_mount_point">
        <p><span id="full-url-preview" data-url="{{full_url}}"></span></p>
     </div>
-    <div class="grid-13">
-      <small>
-        * The mount point is the name of the tool as it will appear in a URL.
-        <span class="mount-point-name-rules tool">
-          A valid mount point for this tool must begin with a letter, contain only lowercase letters,
-          numbers, and dashes, and be from 1-63 characters in length.
-        </span>
-        <span class="mount-point-name-rules tool-relaxed">
-          A valid mount point for this tool must begin with a letter or number, contain only
-          letters, numbers, dashes, underscores, periods, and plus signs, and be
-          from 1-63 characters in length.
-        </span>
-        <span class="mount-point-name-rules subproject">
-          A valid subproject mount point must begin with a letter, contain only lowercase letters,
-          numbers, and dashes, and be from 3-15 characters in length.
-        </span>
-      </small>
-    </div>
-    <div class="grid-13">&nbsp;</div>
     <div id="install_options">{# js inserts form fields here #}</div>
     <div class="grid-13">&nbsp;</div>
     <hr>

http://git-wip-us.apache.org/repos/asf/allura/blob/1cb2df17/Allura/allura/public/nf/js/project_tools.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/project_tools.js b/Allura/allura/public/nf/js/project_tools.js
index b7c4e0c..a690937 100644
--- a/Allura/allura/public/nf/js/project_tools.js
+++ b/Allura/allura/public/nf/js/project_tools.js
@@ -33,8 +33,6 @@
     install_popup.append(install_form.show());
     $('a.install_trig').click(function () {
         var datatool = $(this).data('tool');
-        var relaxed_mount_points = $(this).data('relaxed-mount-points');
-        install_form.find('.mount-point-name-rules').hide();
         if (datatool) {
             var tool = defaults[datatool];
             install_options.html('Loading options...');
@@ -45,18 +43,11 @@
             new_ep_name.val(datatool);
             new_mount_point.val(tool.default_mount);
             new_mount_label.val(tool.default_label);
-            if (relaxed_mount_points) {
-              install_form.find('.mount-point-name-rules.tool-relaxed').show();
-            }
-            else {
-              install_form.find('.mount-point-name-rules.tool').show();
-            }
         } else {
             install_tool_label.html("Subproject");
             new_ep_name.val('');
             new_mount_point.val('');
             new_mount_label.val('');
-            install_form.find('.mount-point-name-rules.subproject').show();
         }
     });
     // Edit popup


[2/3] allura git commit: [#6057] ticket:792 Allow ConfigOption to specify help text

Posted by je...@apache.org.
[#6057] ticket:792 Allow ConfigOption to specify help text


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

Branch: refs/heads/ib/6057
Commit: 309170743832348b901c367a78919c79ec73ed64
Parents: a186ea5
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jun 9 14:01:56 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Jun 9 14:01:56 2015 +0000

----------------------------------------------------------------------
 Allura/allura/app.py                                      | 9 +++++----
 Allura/allura/templates/app_admin_options.html            | 3 +++
 Allura/allura/templates/app_admin_options_on_install.html | 5 ++++-
 ForgeLink/forgelink/link_main.py                          | 2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/30917074/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 2683e36..62b82fe 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -57,12 +57,13 @@ class ConfigOption(object):
 
     """
 
-    def __init__(self, name, ming_type, default, label=None, validator=None, extra_attrs=None):
-        """Create a new ConfigOption.
-
-        """
+    def __init__(self, name, ming_type, default,
+                 label=None, help_text=None, validator=None,
+                 extra_attrs=None):
+        """Create a new ConfigOption."""
         self.name, self.ming_type, self._default, self.label = (
             name, ming_type, default, label or name)
+        self.help_text = help_text
         self.validator = validator
         self.extra_attrs = extra_attrs
 

http://git-wip-us.apache.org/repos/asf/allura/blob/30917074/Allura/allura/templates/app_admin_options.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_options.html b/Allura/allura/templates/app_admin_options.html
index bf013c4..d818a56 100644
--- a/Allura/allura/templates/app_admin_options.html
+++ b/Allura/allura/templates/app_admin_options.html
@@ -30,6 +30,9 @@
         {% else %}
             <input {{o.render_attrs()}} id="{{o.name}}" name="{{o.name}}" value="{{app.config.options.get(o.name, o.default)}}">
         {% endif %}
+        {% if o.help_text %}
+          <div class="grid-9"><small>{{o.help_text}}</small></div>
+        {% endif %}
       {% endif %}
     </div>
   {% else %}

http://git-wip-us.apache.org/repos/asf/allura/blob/30917074/Allura/allura/templates/app_admin_options_on_install.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_options_on_install.html b/Allura/allura/templates/app_admin_options_on_install.html
index 218dd61..16b62b6 100644
--- a/Allura/allura/templates/app_admin_options_on_install.html
+++ b/Allura/allura/templates/app_admin_options_on_install.html
@@ -17,7 +17,7 @@
        under the License.
 -#}
 {% for o in options %}
-  <label class="grid-13" for="{{o.name}}">{{o.label|capitalize}}</label>
+  <label class="grid-13" for="{{o.name}}">{{o.label}}</label>
   <div class="grid-13">
     {% if o.ming_type.__name__ == 'bool' %}
       <input {{o.render_attrs()}}id="{{o.name}}" name="{{o.name}}" type="checkbox"{{ ' checked="checked"' if o.default}}>
@@ -25,4 +25,7 @@
       <input {{o.render_attrs()}} id="{{o.name}}" name="{{o.name}}" value="{{o.default or ''}}">
     {% endif %}
   </div>
+  {% if o.help_text %}
+    <div class="grid-13"><small>{{o.help_text}}</small></div>
+  {% endif %}
 {% endfor %}

http://git-wip-us.apache.org/repos/asf/allura/blob/30917074/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index ec32974..735816d 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -51,6 +51,8 @@ class ForgeLinkApp(Application):
     config_options = Application.config_options + [
         ConfigOption(
             'url', str, None,
+            label='External Url',
+            help_text='URL to which you wish to link',
             validator=fev.URL(not_empty=True, add_http=True),
             extra_attrs={'type': 'url'}),
     ]