it-logica-application-backbone 1.0.11 → 1.0.12

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/app/assets/javascripts/backbone_js/ladas_loading.js

@@ -241,6 +241,9 @@ function parse_link_and_load_page(element) {
     if (typeof(element.data("content_id")) != 'undefined') {
         settings['content_id'] = element.data("content_id");
     }
+    if (typeof(element.data("no_tracking")) != 'undefined') {
+        settings['no_tracking'] = element.data("no_tracking");
+    }
     load_page(settings);
 }
 
@@ -253,7 +256,9 @@ function parse_link_and_post(element) {
     if (typeof(element.data("content_id")) != 'undefined') {
         settings['content_id'] = element.data("content_id");
     }
-
+    if (typeof(element.data("no_tracking")) != 'undefined') {
+        settings['no_tracking'] = element.data("no_tracking");
+    }
     load_page(settings);
 }
 

data/app/assets/javascripts/backbone_js/ladas_tinymce.js

@@ -64,6 +64,9 @@ function tinymce_datafile_url(settings, type) {
     if (typeof(settings) != "undefined") {
         if (settings['resource_type'] && settings['resource_id']) {
             var datafile_url = "/datafiles?datafile[owner_type]=" + settings['resource_type'] + "&datafile[owner_id]=" + settings['resource_id'] + "&type=" + type;
+            if (typeof(settings['sub_type']) != "undefined") {
+                datafile_url = datafile_url + "&datafile[sub_type]="+settings['sub_type']
+            }
         }
         else {
             var datafile_url = "";

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

@@ -1,5 +1,7 @@
-<% form_id = "fileupload_#{object.id}" %>
-<% index_url = url_for(:controller => "/datafiles", "datafile[owner_type]" => "#{object.class.name.to_s}", "datafile[owner_id]" => "#{object.id.to_s}") %>
+<% form_id = "fileupload_#{object.id}"
+   form_id += sub_type.to_s unless sub_type.blank?
+%>
+<% index_url = url_for(:controller => "/datafiles", "datafile[owner_type]" => "#{object.class.name.to_s}", "datafile[owner_id]" => "#{object.id.to_s}", "datafile[sub_type]" => sub_type) %>
 <%
    #if is_tree_node?(object)
    #  tree_node = object
@@ -12,6 +14,7 @@
    #  end
    #end
    tree_node = { :resource_type => "#{object.class.name.to_s}", :resource_id => "#{object.id.to_s}"}
+   tree_node[:sub_type] = sub_type unless sub_type.blank?
 %>
 <% if !tree_node.blank? %>
     <script type="text/javascript">
@@ -77,6 +80,7 @@
 
                       <%= text_field_tag "datafile[owner_type]", "#{object.class.name.to_s}" %>
                       <%= text_field_tag "datafile[owner_id]", "#{object.id.to_s}" %>
+                      <%= hidden_field_tag "datafile[sub_type]", sub_type unless sub_type.nil? %>
                       <%= f.file_field :file, :multiple => true %>
                       <%#= f.file_field :file%>
                     </span>

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.0.11"
+  s.version = "1.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-08-06"
+  s.date = "2012-08-22"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/table_settings/table_action.rb

@@ -42,6 +42,7 @@ class TableSettings
       self
     end
 
+    # @param [Symbol|String] - :get|:put|:post|:delete
     def http_method(name)
       @action_hash[:method] = name
       self
@@ -52,7 +53,25 @@ class TableSettings
       self
     end
 
+    def css_class_type(type)
+      css=case type
+            when :show then "btn btn-success"
+            when :edit then "btn btn-warning"
+            when :delete then "btn btn-danger"
+            when :destroy then "btn btn-danger"
+            else "btn"
+          end
+      @action_hash[:class] = css
+      self
+    end
 
+    ##
+    # Position of button
+    # @param [Symbol] pos - :left | :right
+    def position(pos)
+      @action_hash[:position] = pos
+      self
+    end
 
   end
 end

data/lib/table_settings/table_button.rb

@@ -107,6 +107,12 @@ class TableSettings
 
     def method(symbol)
       @hash[:method] = symbol
+      self
+    end
+
+    def confirm(string)
+      @hash[:confirm] = string
+      self
     end
 
     def css_class(name)
@@ -118,7 +124,9 @@ class TableSettings
       css=case type
             when :show then "btn btn-success"
             when :edit then "btn btn-warning"
+            when :delete then "btn btn-danger"
             when :destroy then "btn btn-danger"
+            when :log then "btn btn-inverse"
             else "btn"
           end
       @hash[:class] = css

data/lib/table_settings/table_column.rb

@@ -107,6 +107,11 @@ class TableSettings
 
       self
     end
+
+    def table(name)
+      @column_hash[:table] = name
+      self
+    end
   end
 
 end

data/lib/view_mixins/datafiles_for.rb

@@ -1,7 +1,7 @@
 module ViewMixins
   module DatafilesFor
-    def datafiles_for(object, tiny_mce_selector = ".datafile_tinymce", can_upload = true)
-      render :partial => '/helpers/build_datafiles', :layout => false, :locals => {:object => object, :tiny_mce_selector => tiny_mce_selector, :can_upload => can_upload}
+    def datafiles_for(object, tiny_mce_selector = ".datafile_tinymce", can_upload = true, sub_type = nil)
+      render :partial => '/helpers/build_datafiles', :layout => false, :locals => {:object => object, :tiny_mce_selector => tiny_mce_selector, :can_upload => can_upload, :sub_type => sub_type}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &82712690 !ruby/object:Gem::Requirement
+  requirement: &81774830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82712690
+  version_requirements: *81774830
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &82712420 !ruby/object:Gem::Requirement
+  requirement: &81774550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82712420
+  version_requirements: *81774550
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82712150 !ruby/object:Gem::Requirement
+  requirement: &81774260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *82712150
+  version_requirements: *81774260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82711820 !ruby/object:Gem::Requirement
+  requirement: &81773950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *82711820
+  version_requirements: *81773950
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82711530 !ruby/object:Gem::Requirement
+  requirement: &81773660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *82711530
+  version_requirements: *81773660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &82711220 !ruby/object:Gem::Requirement
+  requirement: &81773350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82711220
+  version_requirements: *81773350
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -571,7 +571,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380196145
+      hash: -1004891789
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: