it-logica-application-backbone 1.0.35 → 1.0.36

data/VERSION

@@ -1 +1 @@
-1.0.35
+1.0.36

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

@@ -19,13 +19,13 @@ class JstreeMethods
     element.show("fast")
     element.parent("li").removeClass("jstree-closed")
     element.parent("li").addClass("jstree-open")
-    element.parent("li").children("button").html("-")
+    element.parent("li").children("button").html('<i class="icon-minus-sign"></i>')
 
   @hide: (element) ->
     element.hide("fast")
     element.parent("li").removeClass("jstree-open")
     element.parent("li").addClass("jstree-closed")
-    element.parent("li").children("button").html("+")
+    element.parent("li").children("button").html('<i class="icon-plus-sign"></i>')
 
 
 window.JstreeMethods = JstreeMethods

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

@@ -0,0 +1,47 @@
+#intranet_left_menu  button.left_menu_plus_button {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  z-index: 20;
+  display: inline;
+  margin: 0px;
+
+
+}
+
+#intranet_left_menu  li.hasSubmenu {
+  position: relative
+}
+
+
+li.active > a {
+  background-color: #9C8866 !important;
+  border-color: #9CCB3B !important;
+  color: white !important;
+}
+
+
+.dataGrid table {
+  margin: 0;
+}
+
+
+.icon-shopping-card {
+  background-position: -359px -118px;
+  width: 15px;
+  height: 15px;
+}
+
+.full-width {
+  width: 100%;
+}
+
+.summarize_all .value, .summarize_page .value {
+  display: block;
+}
+
+
+.tabs {
+  min-height: 49px;
+}
+

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

@@ -1,33 +1,48 @@
-<%= yield :above_table_form %>
-
 <%= render :partial => "/helpers/build_table_text_description", :locals => {:settings => settings} %>
-<% if settings[:display_method].blank? %>
-    <% if settings[:checkboxes] %>
-        <script type="text/javascript">
-            function submit_in_new_window(form_id) {
-                var form_original = $("#" + form_id);
-                var form = form_original.clone(true, true);
-                form.attr("data-remote", "false");
-                form.attr("target", "_blank");
-
-                //Create an input type dynamically.
-                var element = document.createElement("input");
-
-                //Assign different attributes to the element.
-                element.setAttribute("type", "hidden");
-                element.setAttribute("value", "print_by_checkboxes");
-                element.setAttribute("name", "___display_method___");
-
-
-                //Append the element in form
-                form.append(element);
-                form.submit();
-            }
-
-        </script>
-        <a href="#" class="btn" onclick="submit_in_new_window('<%= settings[:form_id] %>'); return false;">Tisk</a>
+
+<div class="tabs">
+  <%= yield :table_form_tabs %>
+
+  <div class="info">
+
+
+
+    <span>Vybraných řádků: <strong>
+      <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>
+    </strong>
+    </span>
+
+    <% if settings[:display_method].blank? %>
+        <% if settings[:checkboxes] %>
+            <script type="text/javascript">
+                function submit_in_new_window(form_id) {
+                    var form_original = $("#" + form_id);
+                    var form = form_original.clone(true, true);
+                    form.attr("data-remote", "false");
+                    form.attr("target", "_blank");
+
+                    //Create an input type dynamically.
+                    var element = document.createElement("input");
+
+                    //Assign different attributes to the element.
+                    element.setAttribute("type", "hidden");
+                    element.setAttribute("value", "print_by_checkboxes");
+                    element.setAttribute("name", "___display_method___");
+
+
+                    //Append the element in form
+                    form.append(element);
+                    form.submit();
+                }
+
+            </script>
+            <a href="#" class="btn" onclick="submit_in_new_window('<%= settings[:form_id] %>'); return false;"><i class="icon-print"></i>&nbsp; Tisknout výběr</a>
+        <% end %>
     <% end %>
-<% end %>
+  </div>
+</div>
 
 <%= form_tag settings[:filter_path], :html => {:'data-type' => 'html'}, :method => 'POST', :class => 'well dataGrid', :remote => true, :id => settings[:form_id] do |f| %>
     <% if settings[:display_method].blank? %>

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

@@ -8,11 +8,16 @@
 
   <% if settings[:data_paginate].total_pages > 1 %>
       <div id="<%= settings[:form_id] %>_pagination" class="paging <%= settings[:form_id] %>_pager">
-        <input type="text" class="own_page" value="<%= settings[:params].blank? ? 1 : settings[:params]["page"] %>"
-               onkeypress="paginate_by_enter('<%= settings[:form_id] %>', this, event);">
-        <button class="btn" onclick='$("#" + "<%= settings[:form_id] %>" + "_page").val($(this).prev("input").val()); $("#" + "<%= settings[:form_id] %>").submit(); return false;'>Přejít</button>
-        <%= will_paginate settings[:data_paginate], {:container => false, :inner_window => 1, :outer_window => 1} %>
-        <%= page_entries_info settings[:data_paginate] %>
+        <div class="goToPage">
+          <input type="text" class="own_page" value="<%= settings[:params].blank? ? 1 : settings[:params]["page"] %>"
+                 placeholder="Strana"
+                 onkeypress="paginate_by_enter('<%= settings[:form_id] %>', this, event);">
+          <button class="btn" onclick='$("#" + "<%= settings[:form_id] %>" + "_page").val($(this).prev("input").val()); $("#" + "<%= settings[:form_id] %>").submit(); return false;'>Přejít</button>
+        </div>
+        <div class="pages">
+          <%= will_paginate settings[:data_paginate], {:container => false, :inner_window => 1, :outer_window => 1} %>
+          <%= page_entries_info settings[:data_paginate] %>
+        </div>
       </div>
 
   <% end %>

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

@@ -17,10 +17,10 @@
           <!--<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/>
+          <!--<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">-->

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.35"
+  s.version = "1.0.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
@@ -448,6 +448,7 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/backbone_css/jquery_datetime_picker.css.scss",
     "app/assets/stylesheets/backbone_css/jquery_ui.css.scss",
     "app/assets/stylesheets/backbone_css/left_menu.css.scss",
+    "app/assets/stylesheets/backbone_css/overrides_of_lach_design.css.scss",
     "app/assets/stylesheets/backbone_css/tables.css.scss",
     "app/assets/stylesheets/backbone_css/themes/default-rtl/d.gif",
     "app/assets/stylesheets/backbone_css/themes/default-rtl/d.png",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.36
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &78220560 !ruby/object:Gem::Requirement
+  requirement: &79745460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78220560
+  version_requirements: *79745460
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &78220280 !ruby/object:Gem::Requirement
+  requirement: &79744890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78220280
+  version_requirements: *79744890
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78219840 !ruby/object:Gem::Requirement
+  requirement: &79744420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *78219840
+  version_requirements: *79744420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78219290 !ruby/object:Gem::Requirement
+  requirement: &79744090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *78219290
+  version_requirements: *79744090
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78218780 !ruby/object:Gem::Requirement
+  requirement: &79743750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *78218780
+  version_requirements: *79743750
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &78218490 !ruby/object:Gem::Requirement
+  requirement: &79743460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78218490
+  version_requirements: *79743460
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -516,6 +516,7 @@ files:
 - app/assets/stylesheets/backbone_css/jquery_datetime_picker.css.scss
 - app/assets/stylesheets/backbone_css/jquery_ui.css.scss
 - app/assets/stylesheets/backbone_css/left_menu.css.scss
+- app/assets/stylesheets/backbone_css/overrides_of_lach_design.css.scss
 - app/assets/stylesheets/backbone_css/tables.css.scss
 - app/assets/stylesheets/backbone_css/themes/default-rtl/d.gif
 - app/assets/stylesheets/backbone_css/themes/default-rtl/d.png
@@ -577,7 +578,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -475089809
+      hash: -586799923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: