[#1788]: Fixed dragging on IE7; imported latest recline.js from repo.

ckan · Mar 27, 2012 · 4a15b94 · 4a15b94
1 parent d368bbb
commit 4a15b94
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -241,20 +241,16 @@ img.gravatar {
   margin: 0; 
   padding: 0; 
 }
-.drag-drop-list .drag-bars {
-  font-size: 12px;
-  color: #ccc;
-  display: inline-block;
-  text-align: center;
-  vertical-align: middle;
-  padding-left: 18px;
-  padding-right: 12px;
-  cursor: move;
-}
 .drag-drop-list li {
   margin-bottom: 3px;
   cursor: move;
 }
+.drag-drop-list li.drag-bars {
+  padding-left: 35px;
+  background-image: url('/images/dragbars.png');
+  background-repeat: no-repeat;
+  background-position: top left;
+}
 
 ul.no-break li {
   white-space: nowrap;
@@ -1060,7 +1056,7 @@ body.package.read h3 {
 .search-result .result-url a { 
     color: #888;
 }
-.search-result .result-url:hover,
+.search-result .result-lrl:hover,
 .search-result .result-url:hover a { 
     color: #333;
 }
@@ -1307,14 +1303,14 @@ fieldset#resources > .instructions {
   color: #B22;
 }
 .resource-list li:hover {
-  background: #f7f7f7;
+  background-color: #f7f7f7;
 }
 .resource-list a:hover {
   text-decoration: none;
 }
 .resource-list li.active {
   border-color: #888;
-  background: #f9f9f9;
+  background-color: #f9f9f9;
   margin-right: 0;
 }
 
@@ -1327,7 +1323,6 @@ fieldset#resources > .instructions {
 .resource-list li.active.hasErrors {
   border-right: 0;
 }
-.resource-list li.hasErrors .drag-bars,
 .resource-list li.hasErrors a {
   color: #c00;
 }
@@ -1370,9 +1365,6 @@ body.editresources .error-explanation {
 .resource-list-edit li a {
   padding-left: 0;
 }
-.resource-list-edit li:hover .drag-bars {
-  color: #999;
-}
 
 button.resource-edit-delete {
   margin-top: 10px;

diff --git a/ckan/public/scripts/templates.js b/ckan/public/scripts/templates.js
@@ -51,9 +51,8 @@ CKAN.Templates.resourceUpload = ' \
 
 
 CKAN.Templates.resourceEntry = ' \
-  <li class="ui-state-default resource-edit"> \
+  <li class="ui-state-default resource-edit drag-bars"> \
     <a class="resource-open-my-panel" href="#">\
-      <div class="drag-bars">|||</div> \
       <img class="js-resource-icon inline-icon resource-icon" src="${resource_icon}" /> \
       <span class="js-resource-edit-name">${resource.name}</span>\
     </a>\

diff --git a/ckan/public/scripts/vendor/recline/recline.js b/ckan/public/scripts/vendor/recline/recline.js
@@ -872,7 +872,7 @@ my.DataGrid = Backbone.View.extend({
             <th class="column-header {{#hidden}}hidden{{/hidden}}" data-field="{{id}}"> \
               <div class="btn-group column-header-menu"> \
                 <a class="btn dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i><span class="caret"></span></a> \
-                <ul class="dropdown-menu data-table-menu"> \
+                <ul class="dropdown-menu data-table-menu pull-right"> \
                   <li class="write-op"><a data-action="bulkEdit" href="JavaScript:void(0);">Transform...</a></li> \
                   <li class="write-op"><a data-action="deleteColumn" href="JavaScript:void(0);">Delete this column</a></li> \
                   <li><a data-action="sortAsc" href="JavaScript:void(0);">Sort ascending</a></li> \