drg_cms 0.5.52 → 0.5.52.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a614de80487c062c05877045536c7cb2c5eec76c
-  data.tar.gz: ad4b065e2b97c8c16f1a5024bb7d23b745553071
+  metadata.gz: ac624231414ec0d8f5dfcb2f87623189fa9558d3
+  data.tar.gz: 4da97b7be20ae7ba6641127a8fa9e1de2f03d84d
 SHA512:
-  metadata.gz: 97e1cef3db8fd9b1afdf629aa7c24b273522064ed9368c7016f7a6525ca067048fdc2781b4ac403bc86ecf1514591dba01ce9f2460f9ac0bb3837701e256e400
-  data.tar.gz: b5131f8e268aa68f7450e8f50379cce65e3b4938dc95d71bf4ac06febe44fad27f603822b4fab9e4323426a2312ba66afd2a64a95c7df12fc4a3ebb5111f7315
+  metadata.gz: 075acb47b95998834a156fa11543c0ed7a9f4dc4292257c144c99e932fac779552a3b8063daf9649797a064f000d6ca001c08362d7bde740c3c316fc96c916fe
+  data.tar.gz: ef960025a10da97bd10cd942793567d313c1cdbcfe30c50fa02479c70cd058c52f4401dd4e5e60fb0a62b01634cbbfe1587f21b25b35904cc96cb1a894171301

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -170,20 +170,6 @@ function dc_reload_window() {
   location.reload(); 
 }
 
-/*******************************************************************
- * I would like to resize window to display whole tab. This will
- * be a job for someone with better javascrip knowledge.
- *******************************************************************/
-function dc_resize_to_tab() {
-  dom = $('iframe');
-  if (dom.contentWindow.document.body.offsetHeight > 10) {
-    alert(dom.style.height);
-    dom.style.height = (dom.contentWindow.document.body.offsetHeight + 30) + 'px'; 
-// scroll to top
-//    $('#' + iframe_name).dc_scroll_view();
-  }
-};
-
 /*******************************************************************
  * Will scroll to position on the screen. This is replacement for 
  * location.hash, which doesn't work in Chrome.
@@ -193,7 +179,7 @@ function dc_resize_to_tab() {
 $.fn.dc_scroll_view = function () { 
   return this.each(function () {
     $('html, body').animate({
-      scrollTop: $(this).offset().top - 20
+      scrollTop: $(this).offset().top - 100
     }, 500);
   });
 };
@@ -243,26 +229,29 @@ $(document).ready( function() {
   * Tab clicked on form. Hide old and show selected div.
   *******************************************************************/
   $('.dc-form-li').on('click', function(e) { 
-/* find li with dc-form-li-selected class and remove it. This will deselect tab */ 
-    var old_id = null;
+// find li with dc-form-li-selected class. This is our old tab
+    var old_tab_id = null;
     $(e.target).parents('ul').find('li').each( function() {
-/*      console.debug( $(this) );  */
       if ($(this).hasClass('dc-form-li-selected')) {
-/* ignore if tab is already selected */        
+// when not already selected toggle dc-form-li-selected class and save old tab
         if ($(this) !== $(e.target)) {
           $(this).toggleClass('dc-form-li-selected');
           $(e.target).toggleClass('dc-form-li-selected');
-          old_id = this.getAttribute("data-div");
+          old_tab_id = this.getAttribute("data-div");
         }
         return false;
       }
         
-    }); /* show selected data div */    
-    if (old_id !== null) {
-      $('#data_' + old_id).toggleClass('div-hidden');
+    }); // show selected data div 
+    if (old_tab_id !== null) {
+      $('#data_' + old_tab_id).toggleClass('div-hidden');
       $('#data_' + e.target.getAttribute("data-div")).toggleClass('div-hidden');
+// resize parent iframe if its size is less then selected div size      
+      var div_height = document.getElementById('data_' + e.target.getAttribute("data-div")).clientHeight + 120;
+//      if (window.frameElement.clientHeight < div_height) {
+        window.frameElement.style.height = div_height.toString() + 'px';
+//      }
     }
-//    dc_resize_to_tab();
   });  
 
 /*******************************************************************

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -89,9 +89,10 @@ color: #222;
 
 textarea, input, select {
 color: #222;
-padding: 5px 3px;
-border: solid 1px #bbb;
+padding: 6px 4px;
+border: solid 2px #ddd;
 border-radius: 2px;
+font: 14px Arial;
 }
 
 input.file {
@@ -99,8 +100,10 @@ border: none;
 }
 
 select {
-padding: 4px 0px;
+padding: 5px 0px;
 background: #fff;  
+border: solid 2px #ddd;
+border-radius: 2px;
 }
 
 hr {
@@ -124,9 +127,9 @@ td { vertical-align: middle; }
 th {
 padding: 4px;
 text-align: left;
-border-bottom:1px solid #e8e8e8;
-border-right:1px solid #e8e8e8;
-background: #e8e8e8;
+border-bottom:2px solid #ddd;
+border-right:2px solid #ddd;
+background: #ddd;
 color:#888;
 font-weight: bold;
 }
@@ -138,7 +141,7 @@ img { vertical-align:bottom; }
 .dc-link a:link, .dc-link a:active, .dc-link a:visited, 
 .dc-animate a:link, .dc-animate a:active, .dc-animate a:visited, 
 .dc-result a:link, .dc-result a:active, .dc-result a:visited { 
-color: #888;
+color: #666;
 font-weight: bold;
 text-decoration: none; 
 background: transparent;
@@ -147,10 +150,10 @@ background: transparent;
 .dc-link a:hover, .dc-animate a:hover, .dc-result a:hover  { 
 background: #f8f8f8;
 transition: 0.3s;
-color: #555;
+color: #000;
 }
 
-a.dc-animate:hover { color: #555; background: transparent;}
+a.dc-animate:hover { color: #000; background: transparent;}
 
 .dc-link a img { border: none; }
 
@@ -176,17 +179,17 @@ padding: 0px;
 border-spacing: 0px;
 border-radius: 1px;  
 background-color: #fafafa;
-border-top: 1px solid #e8e8e8;
-border-left: 1px solid #e8e8e8;
+border-top: 2px solid #ddd;
+border-left: 2px solid #ddd;
 }
 
-.dc-result tr:hover { background-color: #eee; }
+.dc-result tr:hover { background-color: #ddd; }
 
 .dc-result td { 
-padding: 3px 4px;
+padding: 4px;
 line-height: 1.5em; 
-border-right: 1px solid #e8e8e8;
-border-bottom: 1px solid #e8e8e8;
+border-right: 2px solid #ddd;
+border-bottom: 2px solid #ddd;
 }
 
 .dc-result i { 
@@ -216,7 +219,7 @@ border: 1px solid #ddd;
 }
 
 .dc-link:hover a { 
-  color: #555; 
+  color: #000; 
   transition: 0.3s;  
 }
 
@@ -225,7 +228,7 @@ border: 1px solid #ddd;
   font-weight: bold;
   padding: 5px 8px;  
   border-radius: 5px;
-  color: #888;
+  color: #666;
   background-color: #eee;
   background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
   border: 1px solid #ddd;
@@ -239,7 +242,7 @@ transition: 0.3s;
 }
 
 .dc-link-ajax:hover a { 
-color: #222; 
+color: #000; 
 cursor: pointer; 
 transition: 0.3s; 
 }
@@ -320,10 +323,10 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
 }
 
 .dc-link-submit .fa {
-  color: #888;
+  color: #666;
 }
 .dc-link-submit:hover .fa {
-  color: #555;
+  color: #000;
   transition: 0.3s;
 }
 .dc-link-submit:hover {
@@ -332,13 +335,13 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
   transition: 0.3s;
 }
 .dc-link-submit:hover .dc-submit {
-  color: #555;
+  color: #000;
   transition: 0.3s;
 }
 .dc-submit {
   text-decoration: none;
   border: 0px;
-  color: #888;
+  color: #666;
   font-weight: bold;
   box-shadow: none;
 /*  background: none;*/
@@ -351,7 +354,7 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
   cursor: pointer;
   text-decoration: none;
   color: #fff;
-  background-color: #888; 
+  background-color: #000; 
 }
 
 /* Pagination */
@@ -368,7 +371,7 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
 }
 
 #result .pagination span:hover > a {
-  color: #555;
+  color: #000;
 }
 
 #result .pagination .current {
@@ -405,7 +408,7 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
   width: 100%;
   padding: 0px;
   padding-top: 4px;
-  border: 1px solid #eee;
+  border: 1px solid #ddd;
   border-radius: 2px; 
   background-color: #fcfcfc;
 }
@@ -475,7 +478,7 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
 
 .dc-form-field {
   text-align: left;
-  padding: 2px 2px;
+  padding: 3px 2px;
 /*  
   background-color: #f4f4f4;
   border-bottom: 1px solid #eee;
@@ -484,11 +487,12 @@ background: transparent linear-gradient(to bottom, #eee 0%, #eee 100%) repeat sc
 
 .dc-readonly {
   font-weight: normal;
-  padding: 5px 3px;
-  border: 1px solid #ccc;
+  padding: 6px 3px;
+  border: 2px solid #ddd;
   background-color: #eee;
   border-radius: 2px;
-  color: #444;
+  color: #222;
+  font-size: 14px;
 }
 
 .dc-color-odd {
@@ -522,7 +526,7 @@ border-bottom: 1px solid #eee;
   text-align: center;
   font-weight: bold;
 
-  padding:2px 15px;
+  padding:3px 15px;
   border-radius: 4px 4px 0px 0px;
   background: #eee;
   margin-right: 2px;
@@ -532,6 +536,7 @@ border-bottom: 1px solid #eee;
   cursor: pointer;
   color: #fff;
   background: #888;
+  padding:4px 15px 3px 15px;
 }
 
 .dc-odd {
@@ -540,7 +545,7 @@ border-bottom: 1px solid #eee;
 
 .dc-separator {
 padding: 0px;
-border-top: 2px solid #ccc;
+border-top: 2px solid #ddd;
 }
 
 #cmsedit-div {
@@ -663,9 +668,9 @@ display: none;
 /****** jquery ui-autocomplete widget ***************/
 .ui-autocomplete-input {
   font-style: italic;
-  padding: 4px;
+  padding: 6px;
   border-radius: 2px;
-  border: solid 1px #396;
+  border: solid 2px #9c9;
 /*  background: linear-gradient(#8d8 0%, #ffe 15%, #fff 80%); */
 }
 
@@ -685,8 +690,17 @@ border: 1px solid #ddd;
 color: #000;
 }
 
-.dc-red { color: red;}
-.dc-green { color: #396;}
+.ui-autocomplete-border {
+  border-radius: 2px;
+  border: solid 2px #ddd;
+  padding: 8px;
+  background-color: #fff;
+}
+
+.dc-red { color: #d99;}
+.dc-red:hover { color: #e66;}
+.dc-green { color: #9c9;}
+.dc-green:hover { color: #6a6;}
 
 .aui-corner-all {
 background-color: lightyellow;
@@ -784,7 +798,7 @@ overflow-x:hidden;
 #dc-action-menu {
 padding: 2px 0px 2px 0px;
 font-weight: bold;
-color: #888;
+color: #666;
 display: flex;
 }
 
@@ -815,7 +829,7 @@ border: 1px solid #ddd;
 
 .dc-action-menu li:hover {
 border: 1px solid #ccc;
-color: #555;
+color: #000;
 transition: 0.3s;  
 }
 
@@ -926,5 +940,5 @@ padding: 5px;
   max-width: 50%;
   background-color: #fff;
   padding: 10px;
-  border: 1px solid #ccc;
+  border: 2px solid #ddd;
 }

data/app/controllers/design_element_settings_control.rb

@@ -119,6 +119,7 @@ def dc_before_save()
             v['readonly'] # fields with readonly option don't return value and would be wiped
 # return value from form field definition
     value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
+    value = value.map {|e| e.to_s} if value.class == Array
 # set to nil if blank
     value = nil if value.blank?
     data['settings'] ||= {}

data/app/forms/dc_page.yml

@@ -137,24 +137,24 @@ form:
         html:
           include_blank: true      
 
+      70:
+        name: css
+        type: text_area
+        size: 100x20
+
     3content:
       10:
         name: body
         type: html_field
-        options: 'height: 500'
-
-      20:
-        name: css
-        type: text_area
-        size: 100x20
-        
+        options: 'height: 1000'
+       
     4parts:
       10:
         name: dc_parts
         type: embedded
         formname: dc_part
         html:
-          height: 1000
+          height: 600
           
     5iframe:
       10:

data/app/forms/dc_part.yml

@@ -82,7 +82,7 @@ form:
       10:
         name: body
         type: html_field
-        options: 'height: 600'
+        options: 'height: 800'
 
     3advanced:
       10:

data/app/forms/dc_piece.yml

@@ -100,6 +100,6 @@ form:
       10:
         name: body
         type: html_field
-        options: 'height: 600'
+        options: 'height: 800'
 
    

data/app/helpers/dc_application_helper.rb

@@ -1049,7 +1049,7 @@ def dc_user_can_view(ctrl, policy_id)
   end
 # permission defined by default policy
   default_policy = Mongoid::QueryCache.cache { policies.find_by(is_default: true) }
-  return false, 'Default accsess policy not found for the site!' unless default_policy
+  return false, 'Default access policy not found for the site!' unless default_policy
 #  
   permissions = {}
   default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }

data/app/models/dc_menu.rb

@@ -117,13 +117,11 @@ end
 def self.choices4_menu_as_tree(site_id=nil)
   qry = where(active: true)
 # 
-  ar = [nil]
   if site_id.class == BSON::ObjectId
-    ar << site_id
+    qry.in( dc_site_id: [nil, site_id] )
   elsif site_id.respond_to?(:id)
-    ar << site_id.id
+    qry.in( dc_site_id: [nil, site_id.id] )
   end
-  qry = qry.in(dc_site_id: ar)
 #
   result = []
   qry.each do |menu|

data/app/models/drgcms_form_fields.rb

@@ -483,8 +483,9 @@ def render
 # put field to enter search data on form
   @yaml['html'] ||= {}
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
+  @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
   _name = '_' + @yaml['name']
-  @html << '<table class="ui-autocomplete-table"><td>'
+  @html << '<table class="ui-autocomplete-table"><td><div class="ui-autocomplete-border">'
   @html << @parent.link_to(@parent.fa_icon('plus-square lg', class: 'dc-animate dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
 
   record = record_text_for(@yaml['name'])    
@@ -506,18 +507,18 @@ def render
         link  = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#',
                 onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
-        "<div id=\"#{rec.id}\" style=\"padding:2px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
+        "<div id=\"#{rec.id}\" style=\"padding:4px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
       else
         '** error **'
       end
     end
   end
-  @html << "</div></td></table>"
+  @html << "</div></div></td></table>"
 # Create text for div to be added when new category is selected  
   link    = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#', 
             onclick: "$('#rec_id').hide(); var v = $('##{record}_#{@yaml['name']}_rec_id'); v.val(\"-\" + v.val());return false;")
   field   = @parent.hidden_field(record, "#{@yaml['name']}_rec_id", value: 'rec_id')
-  one_div = "<div id=\"rec_id\" style=\"padding:2px;\">#{link} rec_search<br>#{field}</div>"
+  one_div = "<div id=\"rec_id\" style=\"padding:4px;\">#{link} rec_search<br>#{field}</div>"
     
 # JS stuff    
   @js << <<EOJS
@@ -542,6 +543,7 @@ $(document).ready(function() {
       div = div.replace('rec_search', ui.item.value)
       $("##{record}#{@yaml['name']}").append(div);
       $("##{record}_#{_name}").val('');
+      $("##{record}_#{_name}").focus();
     },
     minLength: 2
   });
@@ -1193,7 +1195,7 @@ def render
   ret_name = "#{ret_name}.#{method}" if method
   @yaml['html'] ||= {}
   @yaml['html']['value'] = value_displayed
-  @yaml['html']['placeholder'] ||= t('drgcms.two_chars') || nil
+  @yaml['html']['placeholder'] ||= t('drgcms.search_placeholder') || nil
 #    
   _name = '_' + @yaml['name']
   record = record_text_for(@yaml['name'])  
@@ -1416,31 +1418,14 @@ class TreeSelect < Select
 def make_tree(parent)
   return '' unless @choices[parent.to_s]
   @html << '<ul>'
-  choices = if @choices[parent.to_s].first.last != 0
-    @choices[parent.to_s].sort_by {|e| e[3] } # sort by order if first is not 0
+  choices = if @choices[parent.to_s].first[3] != 0
+    @choices[parent.to_s].sort_by {|e| e[3].to_i } # sort by order if first is not 0
 #    @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
   else  
     @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
   end
   choices.each do |choice|
-    jstree = %Q[{"selected" : #{choice[4] ? 'true' : 'false'} }]
-# data-jstree must be singe quoted
-    @html << %Q[<li data-id="#{choice[1]}" data-jstree='#{jstree}'>#{choice.first}\n]
-# call recursively for children     
-    make_tree(choice[1]) if @choices[ choice[1].to_s ]
-    @html << "</li>"
-  end
-  @html << '</ul>'  
-end
-
-###########################################################################
-# Prepare choices for tree data rendering.
-###########################################################################
-def _make_tree(parent)
-  @html << '<ul>'
-  choices = @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
-  choices.each do |choice|
-    jstree = %Q[{"selected" : #{choice[4] ? 'true' : 'false'} }]
+    jstree = %Q[{"selected" : #{choice.last ? 'true' : 'false'} }]
 # data-jstree must be singe quoted
     @html << %Q[<li data-id="#{choice[1]}" data-jstree='#{jstree}'>#{choice.first}\n]
 # call recursively for children     
@@ -1472,13 +1457,15 @@ def render
   @choices.keys.each do |key|
     0.upto( @choices[key].size - 1 ) do |i|
       choice = @choices[key][i]
-      choice[4] = true if current_values[ choice[1].to_s ]
+      choice[choice.size - 1] = true if current_values[ choice[1].to_s ]
     end
   end
   make_tree(nil)
   @html << '</ul></div>'
 # add hidden communication field  
   @html << @parent.hidden_field(record, @yaml['name'], value: current.join(','))
+# save multiple indicator for data processing on return
+  @html << @parent.hidden_field(record, "#{@yaml['name']}_multiple", value: 1) if @yaml['multiple']
 # javascript to update hidden record field when tree looses focus
   @js =<<EOJS
 $(function(){
@@ -1508,7 +1495,15 @@ end
 # Return value. Return nil if input field is empty
 ###########################################################################
 def self.get_data(params, name)
-  params['record'][name].blank? ? nil : params['record'][name].split(',')
+  return nil if params['record'][name].blank?
+#
+  result = params['record'][name].split(',')
+  result.delete_if {|e| e.blank? }
+  return nil if result.size == 0
+# convert to BSON objects if is BSON object ID
+  result = result.map{ |e| BSON::ObjectId.from_string(e) } if BSON::ObjectId.legal?(result.first)
+# return only first element if multiple values select was not alowed
+  params['record']["#{name}_multiple"] == '1' ? result : result.first  
 end
 
 end

data/config/locales/drgcms_en.yml

@@ -54,6 +54,7 @@ en:
     not_id: Value entered is not ID!
     cms_main: CMS main tables
     cms_advanced: CMS advanced
+    search_placeholder: Start typing to search
 
     edit: Edit
     show: Prikaz

data/config/locales/drgcms_sl.yml

@@ -53,7 +53,8 @@ sl:
     updated_by_other: Dokument je spremenil drug uporabnik. Prosimo ponovite vpis podatkov.
     not_id: Vsebina polja ni ključ ID! 
     cms_main: CMS tabele
-    cms_advanced: CMS napredne opcije    
+    cms_advanced: CMS napredne opcije   
+    search_placeholder: Vpišite pojem za iskanje
 
     edit: Urejanje
     show: Prikaz

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.52"
+  VERSION = "0.5.52.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52
+  version: 0.5.52.2
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails