allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [3/3] allura git commit: [#6057] ticket:792 Get rid of help text for mount points
Date Tue, 09 Jun 2015 14:33:36 GMT
[#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 <jetmind2@gmail.com>
Authored: Tue Jun 9 14:10:51 2015 +0000
Committer: Igor Bondarenko <jetmind2@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


Mime
View raw message