allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [21/38] git commit: [#4019] ticket:514 fix UI and test
Date Wed, 30 Apr 2014 18:15:53 GMT
[#4019] ticket:514 fix UI and test


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

Branch: refs/heads/master
Commit: 0e65cc4263f740b5b310769e333e7342c3c004ac
Parents: 2c8c3c5
Author: Yaroslav Sokolovsky <yaroslav.sokolovsky@gmail.com>
Authored: Thu Jan 16 16:35:05 2014 +0200
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Wed Apr 30 15:55:12 2014 +0000

----------------------------------------------------------------------
 .../tracker_widgets/ticket_search_results.html  |  1 -
 .../forgetracker/tests/functional/test_root.py  |  6 ++----
 .../widgets/resources/css/ticket-list.css       |  3 ++-
 .../widgets/resources/js/ticket-list.js         | 20 ++++++++++++++------
 4 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0e65cc42/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
index 29df818..309d6bb 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -45,7 +45,6 @@
                 </li>
                 <li class="btns">
                   <input type="button" value="Ok" class="apply-filters">
-                  <a href="#" class="close btn link">Cancel</a>
                 </li>
               {% endif %}
                </ul>

http://git-wip-us.apache.org/repos/asf/allura/blob/0e65cc42/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 3efab34..e2e8622 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -2628,10 +2628,8 @@ class TestCustomUserField(TrackerTestController):
         kw = {'custom_fields._code_review': 'test-admin'}
         self.new_ticket(summary='test custom fields', **kw)
         r = self.app.get('/bugs/')
-        assert r.html.find(
-            'table', 'ticket-list').findAll('th')[7].text == 'Code Review'
-        assert r.html.find(
-            'table', 'ticket-list').tbody.tr.findAll('td')[7].text == 'Test Admin'
+        assert r.html.find('table', 'ticket-list').findAll('th')[7].text[:11] == 'Code Review'
+        assert r.html.find('table', 'ticket-list').tbody.tr.findAll('td')[7].text == 'Test
Admin'
 
 
 class TestHelpTextOptions(TrackerTestController):

http://git-wip-us.apache.org/repos/asf/allura/blob/0e65cc42/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css b/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css
index 3aa4d23..7553ebd 100644
--- a/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css
+++ b/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css
@@ -24,6 +24,7 @@
 }
 .filter-ico {
     font-size: 16px;
+    padding-left: 2px;
 }
 .ticket-filter {
     display: none;
@@ -39,7 +40,7 @@
 }
 .ticket-filter .btns {
     position: absolute;
-    bottom: 0px;
+    bottom: 0;
 }
 .ticket-filter a[data-sort] { cursor: pointer; }
 .ticket-list th[data-filter-toggle] { cursor: pointer; }

http://git-wip-us.apache.org/repos/asf/allura/blob/0e65cc42/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js b/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js
index 838547d..8561203 100644
--- a/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js
+++ b/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js
@@ -18,6 +18,7 @@
 */
 
 (function(){
+
     function ico_active() {
     $('.ticket-filter').each(function() {
           if ($(this).find('select option').attr('selected')) {
@@ -28,7 +29,7 @@
     });
     }
 
-    $( document ).ready(function() {
+    $(document).ready(function() {
         ico_active();
     });
 
@@ -83,7 +84,8 @@
         }
     }).disableSelection();
 
-    $('.ticket-list th[data-filter-toggle]').click(function() {
+    $('.ticket-list th[data-filter-toggle]').click(function(event) {
+      event.stopPropagation();
       var column = $(this).attr('data-filter-toggle');
       var filter_selector = '.ticket-filter[data-column="' + column + '"]';
       var filter = $(this).parents('.ticket-list').find(filter_selector);
@@ -114,10 +116,7 @@
           return 'Filtering by ' + $(this.element[0]).attr('data-label');
         }
     });
-    $('.ticket-filter .close').click(function(e) {
-       e.preventDefault();
-       $('.ticket-filter').hide();
-    });
+
     $('.ticket-filter .apply-filters').click(function() {
       filter = {};
       $('.ticket-filter select').each(function() {
@@ -145,4 +144,13 @@
       }
     }
     select_active_filter();
+
+    $('html').click(function() {
+        $('.ticket-filter').hide()
+    });
+
+    $('.ui-multiselect-menu').click(function(event){
+        event.stopPropagation();
+    });
+
 })();


Mime
View raw message