it-logica-application-backbone 1.0.44 → 1.0.45

data/VERSION

@@ -1 +1 @@
-1.0.44
+1.0.45

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

@@ -30,21 +30,25 @@ class TableBuilder
     summarize_page = ""
     summarize_page += '<tr class="summarize_page">'
     # todo make sure functions collumn got skipped when placement is different, eg. on the end
+    summarize_page += '<td class="summarize" colspan="2"><span class="label">Celkem na stránce: </span></td>' if TableBuilder.obj.checkboxes?
     summarize_page += '<td class="summarize"></td>' if functions_present
-    summarize_page += '<td class="summarize"></td>' if TableBuilder.obj.checkboxes?
+    col_count = 0
     for col in TableBuilder.obj.columns
       do (col) ->
-        summarize_page += '<td class="summarize">'
-        if col.summarize_page? || col.summarize_page_value?
-          summarize_page_present = true
-          summarize_page += '<div class="summarize_page">'
-          summarize_page += if col.summarize_page_label? then col.summarize_page_label else '<span class="label">Celkem na stránce: </span>'
-          summarize_page += '<span class="value">'
-          summarize_page += if col.summarize_page_value? then col.summarize_page_value else 0
-          summarize_pagel += '</span>'
-          summarize_page += '</div>'
-
-        summarize_page += '</td>'
+        col_count += 1
+        # the sumarize label has 2 colspan, so it has to be without 1 first column if there is no function column
+        unless col_count == 1 && !functions_present
+          summarize_page += '<td class="summarize">'
+          if col.summarize_page? || col.summarize_page_value?
+            summarize_page_present = true
+            summarize_page += '<div class="summarize_page">'
+            summarize_page += if col.summarize_page_label? then col.summarize_page_label else ''
+            summarize_page += '<span class="value">'
+            summarize_page += if col.summarize_page_value? then col.summarize_page_value else 0
+            summarize_pagel += '</span>'
+            summarize_page += '</div>'
+
+          summarize_page += '</td>'
     summarize_page += '</tr>'
 
 
@@ -54,20 +58,27 @@ class TableBuilder
     summarize_all_present = false
     summarize_all = ""
     summarize_all += '<tr class="summarize_all">'
-    summarize_all += '<td class="summarize"></td>' if functions_present
-    summarize_all += '<td class="summarize"></td>' if TableBuilder.obj.checkboxes?
+
+    summarize_all += '<td class="summarize" colspan="2"><span class="label">Celkem: </span></td>' if TableBuilder.obj.checkboxes?
+    #it has colspan 2 so there is no function column
+    #summarize_all += '<td class="summarize"></td>' if functions_present
+
+    col_count = 0
     for col in TableBuilder.obj.columns
       do (col) ->
-        summarize_all += '<td class="summarize">'
-        if col.summarize_all? || col.summarize_all_value?
-          summarize_all_present = true
-          summarize_all += '<div class="summarize_all">'
-          summarize_all += if col.summarize_all_label? then col.summarize_all_label else '<span class="label">Celkem: </span>'
-          summarize_all += '<span class="value">'
-          summarize_all += if col.summarize_all_value? then col.summarize_all_value else 0
-          summarize_all += '</span>'
-          summarize_all += '</div>'
-        summarize_all += '</td>'
+        col_count += 1
+        # the sumarize label has 2 colspan, so it has to without 1 first column if there is no function column
+        unless col_count == 1 && !functions_present
+          summarize_all += '<td class="summarize">'
+          if col.summarize_all? || col.summarize_all_value?
+            summarize_all_present = true
+            summarize_all += '<div class="summarize_all">'
+            summarize_all += if col.summarize_all_label? then col.summarize_all_label else ''
+            summarize_all += '<span class="value">'
+            summarize_all += if col.summarize_all_value? then col.summarize_all_value else 0
+            summarize_all += '</span>'
+            summarize_all += '</div>'
+          summarize_all += '</td>'
     summarize_all += '</tr>'
 
     TableBuilder.html += summarize_all if summarize_all_present

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.44"
+  s.version = "1.0.45"
 
   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.44
+  version: 1.0.45
   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: &69091980 !ruby/object:Gem::Requirement
+  requirement: &77658850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69091980
+  version_requirements: *77658850
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &69091550 !ruby/object:Gem::Requirement
+  requirement: &77658360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69091550
+  version_requirements: *77658360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &69091170 !ruby/object:Gem::Requirement
+  requirement: &77657940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *69091170
+  version_requirements: *77657940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &69090780 !ruby/object:Gem::Requirement
+  requirement: &77657450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *69090780
+  version_requirements: *77657450
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &69090410 !ruby/object:Gem::Requirement
+  requirement: &77656920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *69090410
+  version_requirements: *77656920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &69864040 !ruby/object:Gem::Requirement
+  requirement: &77656390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69864040
+  version_requirements: *77656390
 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: 220523985
+      hash: -211265489
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: