allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [22/38] git commit: [#4019] ticket:514 clean templates and js
Date Wed, 30 Apr 2014 18:15:54 GMT
[#4019] ticket:514 clean templates and js


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

Branch: refs/heads/master
Commit: 9188f667e22103487dee962f4b4e67146adf8d61
Parents: 0e65cc4
Author: Yaroslav Sokolovsky <yaroslav.sokolovsky@gmail.com>
Authored: Fri Jan 17 14:15:35 2014 +0200
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Wed Apr 30 15:55:12 2014 +0000

----------------------------------------------------------------------
 .../templates/tracker_widgets/ticket_search_results.html     | 8 ++++----
 .../forgetracker/widgets/resources/css/ticket-list.css       | 7 +++++++
 .../forgetracker/widgets/resources/js/ticket-list.js         | 1 -
 3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/9188f667/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 309d6bb..b7552cd 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -17,7 +17,7 @@
        under the License.
 -#}
 {% from 'allura:templates/jinja_master/lib.html' import abbr_date with context %}
-<div id="ticket_search_results_holder" style="clear:both">
+<div id="ticket_search_results_holder">
   {% if solr_error %}<p>{{solr_error}}</p>{% endif %}
   {{widget.fields['page_size'].display(page=page, count=count, limit=limit)}}
   {% if count %}
@@ -31,7 +31,7 @@
               {% else %}
                 {{col['label']}}<span class="filter-ico">&#x25BE;</span>
               {% endif %}
-              <ul class="ticket-filter" data-column="{{col['name']}}" style="display:
none; position: absolute;">
+              <ul class="ticket-filter" data-column="{{col['name']}}">
               <li><a data-sort-asc="{{col['sort_name']}}" title="{{col['label']}}">Sort
A -> Z</a></li>
               <li><a data-sort-desc="{{col['sort_name']}}" title="{{col['label']}}">Sort
Z -> A</a></li>
               {% if col['name'] in widget.filters.keys() %}
@@ -50,7 +50,7 @@
                </ul>
             </th>
           {% endfor %}
-          <th style="width:15px">
+          <th id="select_col_menu">
             <a href="#" id="col_menu" title="Select Columns"><b data-icon="{{g.icons['admin'].char}}"
class="ico {{g.icons['admin'].css}}"></b></a>
           </th>
         </tr>
@@ -97,7 +97,7 @@
         {% endfor %}
       </tbody>
     </table>
-    <form action="." id="col_list_form" style="display:none">
+    <form action="." id="col_list_form">
       <input type="hidden" name="limit" value="{{limit}}">
       <input type="hidden" name="page" value="{{page}}">
       {% if sort %}

http://git-wip-us.apache.org/repos/asf/allura/blob/9188f667/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 7553ebd..c971be6 100644
--- a/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css
+++ b/ForgeTracker/forgetracker/widgets/resources/css/ticket-list.css
@@ -22,12 +22,19 @@
     padding: 0;
     list-style-type: none;
 }
+#select_col_menu {
+    width: 15px;
+}
+#col_list_form {
+    display: none;
+}
 .filter-ico {
     font-size: 16px;
     padding-left: 2px;
 }
 .ticket-filter {
     display: none;
+    position: absolute;
     background: #E5E5E5;
     margin: 6px 0;
     padding: 0;

http://git-wip-us.apache.org/repos/asf/allura/blob/9188f667/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 8561203..4383373 100644
--- a/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js
+++ b/ForgeTracker/forgetracker/widgets/resources/js/ticket-list.js
@@ -102,7 +102,6 @@
       }
 
       var visible = filter.is(':visible');
-      $(this).find('select').multiselect("close");
       filter.hide();
 
       if (!visible) {


Mime
View raw message