it-logica-application-backbone 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

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

@@ -302,16 +302,19 @@ class EditableTableBuilder
     EditableTableBuilder.html += ' data-tr_class="' + settings.tr_class + '"' if  settings.tr_class?
     EditableTableBuilder.html += ' data-td_class="' + settings.td_class + '"' if  settings.td_class? && settings.td_class.length > 0
 
-    if it_is_link
+    # todo ladas asi prohodit i v table builder, pokud se zada js_code onclick, mel bz mit prioritu
+    if settings.js_code?
+      # a javascrip code can be passed, it will be put as onclick javascript of the button
+      EditableTableBuilder.html += ' onclick="' + settings.js_code
+      EditableTableBuilder.html += '"'
+    
+    else if it_is_link
       if (settings.confirm)
         EditableTableBuilder.html += ' onclick="if (confirm(\'' + settings.confirm + '\')){ load_page(' + stringified_settings + ',this); }; return false;"'
       else
         EditableTableBuilder.html += ' onclick="load_page(' + stringified_settings + ',this); return false;"'
 
-    else if settings.js_code?
-      # a javascrip code can be passed, it will be put as onclick javascript of the button
-      EditableTableBuilder.html += ' onclick="' + settings.js_code
-      EditableTableBuilder.html += '"'
+    
 
     EditableTableBuilder.html += '>' + sliced_text
 

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

@@ -38,8 +38,24 @@ class EditableTableModalDialog
     )
 
 
+  @show_in_dialog: (cell_element) ->
+    cell_id = $(cell_element).data("cell-identifier")
+    
+    url = $(cell_element).attr("href")
+    
+    # load the content of modal
+    load_page({
+    "content_id": "modal_cell_editing",
+    'symlink_remote': true,
+    'url': url,
+    "no_tracking": true
 
+    })
+    
 
+    # asynchronosly put content of modal when it is prepared and show it
+    $(document).bind('page_loader.loaded', EditableTableModalDialog.display)
+    
   @show: (cell_element, edit_cell_path) ->
     cell_id = $(cell_element).data("cell-identifier")
 

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

@@ -100,4 +100,10 @@ span.previous_page.disabled, span.next_page.disabled {
 .dataGrid .non-breakable-collumn {
   width: 100%;
   white-space: nowrap;
-}
+}
+
+
+.dataGrid .table_filter_active {
+    background-color: #5bff23 !important;
+}
+

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

@@ -0,0 +1,13 @@
+<script type="text/javascript">
+    $.datepicker.setDefaults($.datepicker.regional[ "cs" ]);
+    $('<%= selector %>').datetimepicker({
+        dateFormat:"yy-mm-dd",
+        timeFormat:'hh:mm z',
+        //showTimezone: true,
+        timezone: "+0100",
+        separator:' ',
+        changeYear:true,
+        yearRange:'<%= Date.today.year - 100 %>:<%= Date.today.year + 30 %>',
+        changeMonth:true
+    });
+</script>

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-11-05"
+  s.date = "2012-11-06"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [
@@ -490,6 +490,7 @@ Gem::Specification.new do |s|
     "app/views/helpers/_build_ajax_callback_code.html.erb",
     "app/views/helpers/_build_breadcrumb.html.erb",
     "app/views/helpers/_build_datafiles.html.erb",
+    "app/views/helpers/_build_datetime_picker_js_code.html.erb",
     "app/views/helpers/_build_table.html.erb",
     "app/views/helpers/_build_table_data.html.erb",
     "app/views/helpers/_build_table_filter.html.erb",

data/lib/model_mixins/table_builder_class_methods.rb

@@ -574,35 +574,32 @@ module ModelMixins
       end
 
       # if model has cell colors
+      
       if (object_class.new.respond_to?(:editable_table_cell_colors))
-        if defined? EditableTableCellColor
-          cell_colors = EditableTableCellColor.where(:owner_type => object_class.to_s, :owner_id => all_items_row_ids).all
-          cell_colors_for_settings = {}
-          cell_colors.each do |c|
-            cell_colors_for_settings[c.owner_id] ||= {}
-            cell_colors_for_settings[c.owner_id][c.cell_name] ||= {}
-            cell_colors_for_settings[c.owner_id][c.cell_name]["color"] = c.color
-            cell_colors_for_settings[c.owner_id][c.cell_name]["background_color"] = c.background_color
-          end
-          unless cell_colors_for_settings.blank?
-            settings.merge!({:cell_colors => cell_colors_for_settings})
-          end
+        cell_colors = EditableTableCellColor.where(:owner_type => object_class.to_s, :owner_id => all_items_row_ids).all
+        cell_colors_for_settings = {}
+        cell_colors.each do |c|
+          cell_colors_for_settings[c.owner_id] ||= {}
+          cell_colors_for_settings[c.owner_id][c.cell_name] ||= {}
+          cell_colors_for_settings[c.owner_id][c.cell_name]["color"] = c.color
+          cell_colors_for_settings[c.owner_id][c.cell_name]["background_color"] = c.background_color
+        end
+        unless cell_colors_for_settings.blank?
+          settings.merge!({:cell_colors => cell_colors_for_settings})
         end
       end
 
       # if model has row colors
       if (object_class.new.respond_to?(:editable_table_row_colors))
-        if defined? EditableTableRowColor
-          row_colors = EditableTableRowColor.where(:owner_type => object_class.to_s, :owner_id => all_items_row_ids)
-          row_colors_for_settings = {}
-          row_colors.each do |c|
-            row_colors_for_settings[c.owner_id] ||= {}
-            row_colors_for_settings[c.owner_id]["color"] = c.color
-            row_colors_for_settings[c.owner_id]["background_color"] = c.background_color
-          end
-          unless row_colors_for_settings.blank?
-            settings.merge!({:row_colors => row_colors_for_settings})
-          end
+        row_colors = EditableTableRowColor.where(:owner_type => object_class.to_s, :owner_id => all_items_row_ids)
+        row_colors_for_settings = {}
+        row_colors.each do |c|
+          row_colors_for_settings[c.owner_id] ||= {}
+          row_colors_for_settings[c.owner_id]["color"] = c.color
+          row_colors_for_settings[c.owner_id]["background_color"] = c.background_color
+        end
+        unless row_colors_for_settings.blank?
+          settings.merge!({:row_colors => row_colors_for_settings})
         end
       end
     end

data/lib/table_settings/table_action.rb

@@ -58,6 +58,11 @@ class TableSettings
       self
     end
 
+    def onclick(text)
+      @action_hash[:js_code] = text
+      self
+    end
+
     def css_class_type(type)
       css=case type
             when :show then "btn btn-success"

data/lib/view_mixins/form.rb

@@ -45,5 +45,9 @@ module ViewMixins
       render :partial => '/helpers/build_ajax_callback_code', :layout => false, :locals => {:caller_id => caller_id}
     end
 
+    #todo ladas connect regional to locale and timezone to browser timezone
+    def build_datetime_picker_js_code(selector, regional=nil,timezone=nil)
+      render :partial => '/helpers/build_datetime_picker_js_code', :layout => false, :locals => {:selector => selector, :regional => regional, :timezone => timezone }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &78015210 !ruby/object:Gem::Requirement
+  requirement: &80333600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78015210
+  version_requirements: *80333600
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &78014850 !ruby/object:Gem::Requirement
+  requirement: &80333310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78014850
+  version_requirements: *80333310
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78014570 !ruby/object:Gem::Requirement
+  requirement: &80333040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *78014570
+  version_requirements: *80333040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78014310 !ruby/object:Gem::Requirement
+  requirement: &80332740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *78014310
+  version_requirements: *80332740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78013990 !ruby/object:Gem::Requirement
+  requirement: &80332300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *78013990
+  version_requirements: *80332300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77914110 !ruby/object:Gem::Requirement
+  requirement: &80383890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77914110
+  version_requirements: *80383890
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -558,6 +558,7 @@ files:
 - app/views/helpers/_build_ajax_callback_code.html.erb
 - app/views/helpers/_build_breadcrumb.html.erb
 - app/views/helpers/_build_datafiles.html.erb
+- app/views/helpers/_build_datetime_picker_js_code.html.erb
 - app/views/helpers/_build_table.html.erb
 - app/views/helpers/_build_table_data.html.erb
 - app/views/helpers/_build_table_filter.html.erb
@@ -614,7 +615,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 125939601
+      hash: -283425805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: