Browse Source

[spark] Fix css class conflict

The class actions is used elsewhere, this renames it to hover-actions.
Johan Ahlen 10 years ago
parent
commit
317c6aa

+ 4 - 4
apps/spark/src/spark/templates/editor_components.mako

@@ -254,8 +254,8 @@ from django.utils.translation import ugettext as _
                 .addClass('card-heading')
                 .html($element.parents('h2').html())
                 .appendTo(_par)
-                .find('.actions')
-                .removeClass('actions');
+                .find('.hover-actions')
+                .removeClass('hover-actions');
               _par.css('height', '100px');
               return _par;
             }
@@ -340,7 +340,7 @@ from django.utils.translation import ugettext as _
         </div>
 
         <span data-bind="editable: name, editableOptions: {enabled: $root.isEditing(), placement: 'right'}"></span>
-        <div class="actions inline pull-right">
+        <div class="hover-actions inline pull-right">
           <a href="javascript:void(0)" class="move-widget"><i class="fa fa-arrows"></i></a>
           <a href="javascript:void(0)" data-bind="click: function(){ codeVisible(! codeVisible()) }"><i class="fa" data-bind="css: {'fa-compress' : codeVisible, 'fa-expand' : ! codeVisible() }"></i></a>
           <a href="javascript:void(0)" data-bind="click: function(){ settingsVisible(! settingsVisible()) }, visible: Object.keys(ko.mapping.toJS(properties)).length > 0"><i class="fa fa-cog"></i></a>
@@ -669,7 +669,7 @@ from django.utils.translation import ugettext as _
     <a data-bind="visible: status() == 'loading'" class="btn btn-primary spark-btn" style="cursor: default;" title="${ _('Creating session') }">
       <i class="fa fa-spinner fa-spin"></i>
     </a>
-    <div class="actions">
+    <div class="hover-actions">
       <a title="${ _('CTRL + ENTER') }" data-bind="click: execute, visible: status() != 'running' && status() != 'loading'" class="run-button btn btn-primary disable-feedback spark-btn pointer" style="color: #FFF;"><i class="fa fa-play"></i></a>
     </div>
     <a title="${ _('Cancel') }" data-bind="click: cancel, visible: status() == 'running'" class="btn btn-danger disable-feedback spark-btn pointer">

+ 12 - 12
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -2001,29 +2001,29 @@ pre {
   white-space: nowrap;
 }
 
-.reveals-actions:hover .actions,
-.reveals-actions-2nd:hover .actions-2nd,
-.reveals-actions-3rd:hover .actions-3rd {
+.reveals-actions:hover .hover-actions,
+.reveals-actions-2nd:hover .hover-actions-2nd,
+.reveals-actions-3rd:hover .hover-actions-3rd {
   opacity: 1;
 }
 
-.actions,
-.actions-2nd,
-.actions-3rd {
+.hover-actions,
+.hover-actions-2nd,
+.hover-actions-3rd {
   display: inline-block;
   opacity: 0;
   transition: opacity 0.2s linear;
 }
 
-.actions > a,
-.actions-2nd > a,
-.actions-3rd > a {
+.hover-actions > a,
+.hover-actions-2nd > a,
+.hover-actions-3rd > a {
   color: #D1D1D1;
   transition: color 0.2s ease;
 }
 
-.actions > a:hover,
-.actions-2nd > a:hover,
-.actions-3rd > a:hover {
+.hover-actions > a:hover,
+.hover-actions-2nd > a:hover,
+.hover-actions-3rd > a:hover {
   color: #338bb8;
 }

+ 4 - 4
desktop/core/src/desktop/templates/ko_components.mako

@@ -120,7 +120,7 @@ from django.utils.translation import ugettext as _
     <div class="reveals-actions" style="position: relative; height: 100%">
       <ul class="nav nav-list" style="float:left; border: none; padding: 0; background-color: #FFF; margin-bottom: 1px; width: 100%;">
         <li class="nav-header">${_('database')}
-          <div class="pull-right actions">
+          <div class="pull-right hover-actions">
             <a href="javascript:void(0)" data-bind="click: reloadAssist"><i class="pointer fa fa-refresh" title="${_('Manually refresh the table list')}"></i></a>
           </div>
         </li>
@@ -130,7 +130,7 @@ from django.utils.translation import ugettext as _
           <div data-bind="visible: Object.keys(assist.firstLevelObjects()).length == 0">${_('The selected database has no tables.')}</div>
         </li>
         <li class="nav-header" style="margin-top:10px;">${_('tables')}
-          <div class="pull-right actions">
+          <div class="pull-right hover-actions">
             <a href="javascript:void(0)" data-bind="click: toggleSearch"><i class="pointer fa fa-search" title="${_('Search')}"></i></a>
           </div>
         </li>
@@ -138,7 +138,7 @@ from django.utils.translation import ugettext as _
           <div data-bind="slideVisible: options.isSearchVisible"><input type="text" placeholder="${ _('Table name...') }" style="width:90%;" data-bind="value: assist.filter, valueUpdate: 'afterkeydown'"/></div>
           <ul class="assist-tables" data-bind="visible: Object.keys(assist.firstLevelObjects()).length > 0, foreach: assist.filteredFirstLevelObjects()">
             <li class="assist-table reveals-actions-2nd" style="position:relative;">
-              <div class="actions-2nd assist-actions">
+              <div class="hover-actions-2nd assist-actions">
                 <a href="javascript:void(0)" data-bind="click: $parent.showTablePreview"><i class="fa fa-list" title="${_('Preview Sample data')}"></i></a>
                 <a href="javascript:void(0)" data-bind="click: function(data, event) { $parent.showStats(data, null, event) }"><i class='fa fa-bar-chart' title="${_('View statistics') }"></i></a>
               </div>
@@ -146,7 +146,7 @@ from django.utils.translation import ugettext as _
               <div data-bind="visible: $parent.assist.firstLevelObjects()[$data].loaded() && $parent.assist.firstLevelObjects()[$data].open()">
                 <ul class="assist-columns" data-bind="visible: $parent.assist.firstLevelObjects()[$data].items().length > 0, foreach: $parent.assist.firstLevelObjects()[$data].items()">
                   <li class="assist-column reveals-actions-3rd">
-                    <div class="actions-3rd assist-actions">
+                    <div class="hover-actions-3rd assist-actions">
                       <a href="javascript:void(0)" class="table-stats" data-bind="click: function(data, event) { $parents[1].showStats($parent, data.name, event) }"><i class='fa fa-bar-chart' title="${_('View statistics') }"></i></a>
                     </div>
                     <a class="assist-column-link" data-bind="attr: {'title': $parents[1].secondLevelTitle($data)}" style="padding-left:10px" href="javascript:void(0)"><span data-bind="html: $parents[1].truncateSecondLevel($data), event: { 'dblclick': function() { huePubSub.publish('assist.dblClickItem', $data.name +', '); } }"></span></a>