it-logica-application-backbone 1.0.45 → 1.0.46

data/VERSION

@@ -1 +1 @@
-1.0.45
+1.0.46

data/app/assets/javascripts/backbone_js/ladas_table_sorting.js.coffee

@@ -45,22 +45,22 @@ class TableSorting
 
     $("#" + form_id + " .sort_button").each (index, element) =>
       $(element).removeClass("btn-success")
-      #$(element).addClass("inactive")  # give all disabled class
-    
+    #$(element).addClass("inactive")  # give all disabled class
+
 
     new_order_by_val = ""
     for element in order_by_array
       if (new_order_by_val != "")
         new_order_by_val += ","
-  
+
       #console.log(element)
       new_order_by_val += element
-  
+
       order_by_button_id = "#" + element.replace(" ", "___").replace(".", "___")
       #console.log(order_by_button_id)
       #$(order_by_button_id).removeClass("inactive")
       $(order_by_button_id).addClass("btn-success")
-      
+
     #console.log(new_order_by_val)
 
     $(order_by_id).val(new_order_by_val)
@@ -78,7 +78,7 @@ class TableSorting
 
     $("#" + form_id + " .sort_button").each (index, element) =>
       $(element).removeClass("btn-success")
-      #$(element).addClass("inactive")  # give all disabled class
+    #$(element).addClass("inactive")  # give all disabled class
 
     element = order_by_value + " " + dir
     order_by_button_id = "#" + element.replace(" ", "___").replace(".", "___")
@@ -91,6 +91,79 @@ class TableSorting
     form_submit_watcher(form_id)
 
 
+  @force_toggled_change_sorting: (form_id, order_by_value, obj) ->
+    order_by_value = order_by_value.toLowerCase()
+
+    parent_th = $(obj)
+    if parent_th.hasClass("sorted")
+      if parent_th.hasClass("sorted_asc")
+        dir = "desc"
+      else
+        dir = "asc"
+    else
+      dir = "asc"
+
+    order_by_id = '#' + form_id + '_order_by'
+
+    $("#" + form_id + " .sorting_th").each (index, element) =>
+      $(element).removeClass("sorted").removeClass("sorted_desc").removeClass("sorted_asc")
+      $(element).removeClass("sorted_desc_hover").removeClass("sorted_asc_hover")
+
+    element = order_by_value + " " + dir
+    order_by_button_class = "." + element.replace(" ", "___").replace(".", "___")
+    #$(order_by_button_id).removeClass("inactive")
+    $(order_by_button_class).addClass("sorted").addClass("sorted_" + dir)
+    ;
+
+    $(order_by_id).val(element)
+
+    #$('#' + form_id).submit()
+    form_submit_watcher(form_id)
+
+
+  @mouse_over_hover_sorting: (form_id, order_by_value, obj) ->
+    order_by_value = order_by_value.toLowerCase()
+
+    parent_th = $(obj)
+    if parent_th.hasClass("sorted")
+      if parent_th.hasClass("sorted_asc")
+        dir = "desc"
+      else
+        dir = "asc"
+    else
+      dir = "asc"
+
+    order_by_id = '#' + form_id + '_order_by'
+
+    $("#" + form_id + " .sorting_th").each (index, element) =>
+      $(element).removeClass("sorted_desc_hover").removeClass("sorted_asc_hover")
+
+    element = order_by_value + " " + dir
+    order_by_button_class = "." + element.replace(" ", "___").replace(".", "___")
+    #$(order_by_button_id).removeClass("inactive")
+    $(order_by_button_class).addClass("sorted_" + dir + "_hover")
+
+
+
+  @mouse_out_hover_sorting: (form_id, order_by_value, obj) ->
+    order_by_value = order_by_value.toLowerCase()
+
+    parent_th = $(obj)
+    if parent_th.hasClass("sorted")
+      if parent_th.hasClass("sorted_asc")
+        dir = "desc"
+      else
+        dir = "asc"
+    else
+      dir = "asc"
+
+    order_by_id = '#' + form_id + '_order_by'
+
+    $("#" + form_id + " .sorting_th").each (index, element) =>
+      $(element).removeClass("sorted_desc_hover").removeClass("sorted_asc_hover")
+
+
+
 
 window.TableSorting = TableSorting
 

data/app/assets/stylesheets/backbone_css/overrides_of_lach_design.css.scss

@@ -45,3 +45,52 @@ li.active > a {
   min-height: 49px;
 }
 
+
+.dataGrid table thead th.sorted_desc_hover {
+  background-image: url('/assets/backbone_images/control_icons/sort_desc_hover.png') !important;
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-color: #F5F3EF;
+}
+
+.dataGrid table thead th.sorted_asc_hover {
+  background-image: url('/assets/backbone_images/control_icons/sort_asc_hover.png') !important;
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-color: #F5F3EF;
+}
+
+.dataGrid table thead th.sorted_asc {
+  background-image: url('/assets/backbone_images/control_icons/sort_asc.png');
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-color: #F1FADF;
+}
+
+.dataGrid table thead th.sorted_desc {
+  background-image: url('/assets/backbone_images/control_icons/sort_desc.png');
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-color: #F1FADF;
+}
+
+.dataGrid table thead th.sorting_th {
+  cursor: pointer;
+}
+
+.dataGrid table th.filtering_th {
+  border: 1px solid #CCC;
+  padding: 4px 12px;
+}
+
+.dataGrid table thead th .inputs.small_padding input.text {
+  padding: 1px;
+}
+
+
+
+
+
+
+
+

data/app/views/helpers/_build_table_wrapper.html.erb

@@ -1,84 +1,26 @@
 <table class="table table-bordered table-condensed table_special">
   <thead>
-  <!--<tr>-->
-  <!--<th colspan="100" class="<%#= settings[:form_id] + '_ajax_pager' %>">-->
-  <!--<%#= render :partial => 'helpers/build_table_pager', :locals => {:settings => settings} %>-->
-  <!--</th>-->
-  <!--</tr>-->
-  <tr>
+  <tr class="filtering_tr">
     <% if !settings[:checkboxes].blank? && settings[:checkboxes] %>
-        <th class="chbox">
-
-          <!--<div class="checkboxes_filtered">-->
-          <!--Filtrováno položek:-->
-          <!--<span id="<%#= settings[:form_id]+ "_active_checkboxes_count" %>">-->
-          <!--<%#= !settings[:params]["checkbox_pool"].blank? ? settings[:params]["checkbox_pool"].split(",").count : 0 %>-->
-          <!--</span>-->
-          <!--<a onclick="CheckboxPool.clear_by_form_id('<%#= settings[:form_id] %>')" class="btn uncheck">Odznačit vše</a>-->
-          <!--</div>-->
-
-          <!--<span title="Počet označených řádků na všech stránkách" id="<%#= settings[:form_id]+ "_active_checkboxes_count" %>">-->
-          <!--<%#= !settings[:params]["checkbox_pool"].blank? ? settings[:params]["checkbox_pool"].split(",").count : 0 %>-->
-          <!--</span>-->
-          <!--<br/>-->
-          <input type="checkbox" title="Označit/odznačit vše na stránce" onclick="CheckboxPool.check_or_uncheck_page(this, '<%= settings[:form_id] %>')" id=""/>
-
-          <!--<div class="checkboxes_menu">-->
-          <!--<a onclick="CheckboxPool.uncheck_page('<%#= settings[:form_id] %>')" class="btn">Odznačit vše</a>-->
-          <!--<a onclick="CheckboxPool.check_page('<%#= settings[:form_id] %>')" class="btn">Označit vše</a>-->
-          <!--</div>-->
-
-
+        <th class="chbox filtering_th">
         </th>
     <% end %>
     <% if !settings[:row].blank? && !settings[:row][:functions].blank? %>
-        <th></th>
+        <th class="filtering_th"></th>
     <% end %>
     <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless  settings[:params][:order_by].blank? %>
     <% settings[:columns].each do |col| %>
-        <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc") %>
-        <% order_desc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___desc") %>
-        <th class="<%= col[:class] %>">
-          <div class="th_label">
-            <strong>
-              <span><%= col[:label].html_safe %></span>
-            </strong>
-          </div>
-
+        <th class="filtering_th">
           <% if settings[:display_method].blank? %>
-              <div class="sortable clearfix">
-                <% if col[:column_method].blank? && col[:row_method].blank? && !col[:name].blank? %>
-                    <a href="#"
-                       onclick="TableSorting.force_change_sorting('<%= settings[:form_id] %>','<%= col[:table] + "." +col[:name] %>', 'asc', this); return false;"
-                       ondblclick="TableSorting.force_change_sorting('<%= settings[:form_id] %>','<%= col[:table] + "." +col[:name] %>', 'asc', this); return false;"
-                       title="Seřadit od nejnižší hodnoty"
-                       class="btn first sort_button <%= (order_by_arr.include?(col[:table] + "." + col[:name] + " asc")) ? "btn-success" : "" %>"
-                       id="<%= order_asc_id %>">
-                      <i class="icon-arrow-up"></i>
-                    </a>
-
-                    <a href="#"
-                       onclick="TableSorting.force_change_sorting('<%= settings[:form_id] %>','<%= col[:table] + "." +col[:name] %>', 'desc', this); return false;"
-                       ondblclick="TableSorting.force_change_sorting('<%= settings[:form_id] %>','<%= col[:table] + "." +col[:name] %>', 'desc', this); return false;"
-                       title="Seřadit od nejvyšší hodnoty"
-                       class="btn sort_button <%= (order_by_arr.include?(col[:table] + "." + col[:name] + " desc")) ? "btn-success" : "" %>"
-                       id="<%= order_desc_id %>">
-                      <i class="icon-arrow-down"></i>
-                    </a>
-                <% end %>
-              </div>
-
-
-
               <% case col[:filter] %>
           <% when :find %>
-                  <div class="inputs clearfix">
+                  <div class="inputs clearfix small_padding">
                     <% saved_param = (!settings[:params].blank? && !settings[:params]['find'].blank? && !settings[:params]['find']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['find']["#{col[:table]}.#{col[:name]}"] : "" %>
                     <%= text_field_tag "find[#{col[:table]}.#{col[:name]}]", saved_param,
                                        {:class => "text first #{settings[:form_id] + '_column_find'}"} %>
                   </div>
               <% when :find_exact %>
-                  <div class="inputs clearfix">
+                  <div class="inputs clearfix small_padding">
                     <% saved_param = (!settings[:params].blank? && !settings[:params]['find_exact'].blank? && !settings[:params]['find_exact']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['find_exact']["#{col[:table]}.#{col[:name]}"] : "" %>
                     <%= text_field_tag "find_exact[#{col[:table]}.#{col[:name]}]", saved_param,
                                        {:class => "text first #{settings[:form_id] + '_column_find_exact'}"} %>
@@ -130,6 +72,54 @@
     <% end %>
   </tr>
 
+  <tr class="sorting_tr">
+    <% if !settings[:checkboxes].blank? && settings[:checkboxes] %>
+        <th class="chbox">
+          <input type="checkbox" title="Označit/odznačit vše na stránce" onclick="CheckboxPool.check_or_uncheck_page(this, '<%= settings[:form_id] %>')" id=""/>
+        </th>
+    <% end %>
+    <% if !settings[:row].blank? && !settings[:row][:functions].blank? %>
+        <th></th>
+    <% end %>
+    <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless  settings[:params][:order_by].blank? %>
+    <% settings[:columns].each do |col| %>
+        <% order_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "") %>
+        <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc") %>
+        <% order_desc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___desc") %>
+
+        <%
+           sorted_class = ""
+           if col[:column_method].blank? && col[:row_method].blank? && !col[:name].blank?
+             sorted_class += "sorting_th "
+
+             sorting_onclick = "TableSorting.force_toggled_change_sorting('#{settings[:form_id]}','#{col[:table] + "." +col[:name]}', this); return false;"
+             sorting_mouseover = "TableSorting.mouse_over_hover_sorting('#{settings[:form_id]}','#{col[:table] + "." +col[:name]}', this); return false;"
+             sorting_mouseout = "TableSorting.mouse_out_hover_sorting('#{settings[:form_id]}','#{col[:table] + "." +col[:name]}', this); return false;"
+
+             if (order_by_arr.include?(col[:table] + "." + col[:name] + " desc"))
+               sorted_class +="sorted sorted_desc"
+             elsif (order_by_arr.include?(col[:table] + "." + col[:name] + " asc"))
+               sorted_class +="sorted sorted_asc"
+             end
+           end
+
+        %>
+
+        <th class="<%= order_asc_id %> <%= order_desc_id %> <%= col[:class] %> <%= sorted_class %>"
+            onmouseover="<%= sorting_mouseover %>"
+            onmouseout="<%= sorting_mouseout %>"
+            onclick="<%= sorting_onclick %>">
+          <div class="th_label">
+            <strong>
+              <span><%= col[:label].html_safe %></span>
+            </strong>
+          </div>
+        </th>
+
+    <% end %>
+  </tr>
+
+
   </thead>
   <tbody id="<%= settings[:form_id] %>_ajax_content">
   <% unless settings[:template].blank? %>
@@ -183,7 +173,7 @@
     //$('#filled_value_' + fid + '_' + rid).multiselect("open");
     $(".ui-multiselect-menu").css("width", "240px");
     $("button.ui-multiselect").css("width", "55px");
-    $("button.ui-multiselect").css("height", "28px");
+    $("button.ui-multiselect").css("height", "22px");
 
     $('.multiselect_class').bind("multiselectcheckall", function (event, ui) {
         form_submit_watcher('<%=settings[:form_id] %>');

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.0.45"
+  s.version = "1.0.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.45
+  version: 1.0.46
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &77658850 !ruby/object:Gem::Requirement
+  requirement: &72533030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77658850
+  version_requirements: *72533030
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77658360 !ruby/object:Gem::Requirement
+  requirement: &72532630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77658360
+  version_requirements: *72532630
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77657940 !ruby/object:Gem::Requirement
+  requirement: &72532240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77657940
+  version_requirements: *72532240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77657450 !ruby/object:Gem::Requirement
+  requirement: &72531840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *77657450
+  version_requirements: *72531840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77656920 !ruby/object:Gem::Requirement
+  requirement: &72531470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77656920
+  version_requirements: *72531470
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77656390 !ruby/object:Gem::Requirement
+  requirement: &72118340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77656390
+  version_requirements: *72118340
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -591,7 +591,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -211265489
+      hash: 93727633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: