allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/7] allura git commit: [#7884] ticket:799 Add icon for drag & drop
Date Mon, 29 Jun 2015 18:07:55 GMT
[#7884] ticket:799 Add icon for drag & drop


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

Branch: refs/heads/master
Commit: d91dd1d361b4fc004a593beb2ff2c8168048e392
Parents: 3bbf0f6
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Fri Jun 12 10:12:58 2015 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Mon Jun 29 18:04:51 2015 +0000

----------------------------------------------------------------------
 .../templates/admin_widgets/features_field.html    | 17 ++++++-----------
 Allura/allura/ext/admin/widgets.py                 |  5 ++++-
 2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/d91dd1d3/Allura/allura/ext/admin/templates/admin_widgets/features_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/features_field.html b/Allura/allura/ext/admin/templates/admin_widgets/features_field.html
index c5ef066..5d70528 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/features_field.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/features_field.html
@@ -18,15 +18,10 @@
 -#}
 
 <div class="{{css_class}}">
-  {% for f in widget.fields %}
-    {% set ctx=widget.context_for(f) %}
-    <div data-name="{{f.name}}">
-      {% if f.show_label %}
-        <div class="grid-4"><label>{{f.label}}:</label></div>
-        <div class="grid-14">{{f.display(**ctx)}}</div>
-      {% else %}
-        <div>{{f.display(**ctx)}}</div>
-      {% endif %}
-    </div>
-  {% endfor %}
+  {% set f = widget.fields[0] %}
+  {% set ctx = widget.context_for(f) %}
+  <div data-name="{{f.name}}">
+    <span class="ui-icon ui-icon-arrowthick-2-n-s" style="display:inline-block;"></span>
+    {{f.display(**ctx)}}
+  </div>
 </div>

http://git-wip-us.apache.org/repos/asf/allura/blob/d91dd1d3/Allura/allura/ext/admin/widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/widgets.py b/Allura/allura/ext/admin/widgets.py
index 4ea1fcd..572db5d 100644
--- a/Allura/allura/ext/admin/widgets.py
+++ b/Allura/allura/ext/admin/widgets.py
@@ -157,7 +157,10 @@ class ScreenshotAdmin(ff.ForgeForm):
 
 class FeaturesField(ew.CompoundField):
     template = 'jinja:allura.ext.admin:templates/admin_widgets/features_field.html'
-    fields = [ew.TextField(name='feature', show_label=False)]
+    fields = [ew.TextField(name='feature', attrs={'style': 'width:89%'})]
+
+    def resources(self):
+        yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.8.4.custom.css')
 
 
 class MetadataAdmin(ff.AdminForm):


Mime
View raw message