incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [1/2] git commit: [#7075] ticket:530 s/dragable/draggable and merge nested if
Date Wed, 12 Feb 2014 18:29:37 GMT
Updated Branches:
  refs/heads/master 9702f5c7d -> 367ae8dda


[#7075] ticket:530 s/dragable/draggable and merge nested if


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

Branch: refs/heads/master
Commit: 367ae8dda8258848197c1d904d7a5c2b04cac1e0
Parents: 984c22e
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Fri Feb 7 15:39:57 2014 +0200
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Feb 12 18:29:13 2014 +0000

----------------------------------------------------------------------
 Allura/allura/ext/admin/admin_main.py                    | 2 +-
 Allura/allura/lib/widgets/project_list.py                | 2 +-
 Allura/allura/templates/widgets/project_screenshots.html | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/367ae8dd/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 4b75a13..8c10e3d 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -65,7 +65,7 @@ class W:
     group_settings = aw.GroupSettings()
     new_group_settings = aw.NewGroupSettings()
     screenshot_admin = aw.ScreenshotAdmin()
-    screenshot_list = ProjectScreenshots(dragable=True)
+    screenshot_list = ProjectScreenshots(draggable=True)
     metadata_admin = aw.MetadataAdmin()
     audit = aw.AuditLog()
     page_list = ffw.PageList()

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/367ae8dd/Allura/allura/lib/widgets/project_list.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/project_list.py b/Allura/allura/lib/widgets/project_list.py
index ba560e6..f14fba9 100644
--- a/Allura/allura/lib/widgets/project_list.py
+++ b/Allura/allura/lib/widgets/project_list.py
@@ -166,7 +166,7 @@ class ProjectScreenshots(ew_core.Widget):
         ew_core.Widget.defaults,
         project=None,
         edit=False,
-        dragable=False)
+        draggable=False)
 
     def resources(self):
         yield ew.JSLink('js/screenshots.js')

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/367ae8dd/Allura/allura/templates/widgets/project_screenshots.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/project_screenshots.html b/Allura/allura/templates/widgets/project_screenshots.html
index 53731a2..94107c5 100644
--- a/Allura/allura/templates/widgets/project_screenshots.html
+++ b/Allura/allura/templates/widgets/project_screenshots.html
@@ -18,12 +18,10 @@
 -#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 {% set screenshots = project.get_screenshots() %}
-{% if dragable %}
-  {% if screenshots.__len__() > 1 %}
+{% if draggable and screenshots.__len__() > 1 %}
   <p>Drag screenshots to sort.</p>
-  {% endif %}
 {% endif %}
-<div class="{% if dragable %}sortable{% endif %}">
+<div class="{% if draggable %}sortable{% endif %}">
   {% for ss in screenshots %}
   <div data-ss-id="{{ ss._id }}" class="screenshot">
     <div class="image">


Mime
View raw message