drg_cms 0.4.61 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa3b5330e24fcd8592073f29df197ff39e42370
-  data.tar.gz: ede668ee2e25017ffdf57383945e80439a3db73c
+  metadata.gz: cd0544d2cf8584b8b6081d9303dc5eafed7c61f2
+  data.tar.gz: 03ff0ee749f6ec797edd6b185fc7775fe56df7e6
 SHA512:
-  metadata.gz: 776ae4624332a4d86e5368120d8ea14a480eec5dbed77437138cc122c464e4ca0a30d1b2c6c00934c002d11f265ea6cf041f25044c105ee63a57d5abacdb62b4
-  data.tar.gz: 47f49d630d9846eba09ade84b3d28ecbe2a3ed83bf0f3785163e41b1ce9586e4b8e07fec8c422b2eeca030a1723a311f0374e28465395eefddde1c87a43cef49
+  metadata.gz: 37f38a5123df485097ea0838d1d8c44fe22ead095961b6d5ee6f8f5d0f0a41ab42c6bc9227cd620231a77a454b1c895b71ff38df0a8cb204b4d252b81e5ae358
+  data.tar.gz: 4d4a60ea1524ed9feecfe25f1c1fc86dee7c8a43c077ad9846de6143355a763351c2f6ca156b6c8551725166867f66bfb3e03af8a42305b916878f8b5314c738

data/README.md

@@ -1,8 +1,8 @@
 # DrgCms
 
-DRG CMS is content management system build on strong foundations of Ruby on Rails and Mongo DB. It uses single (cmsedit) controller for data entry and specialy crafted forms system for defining data entry fields. It has user friendly role based access system built-in and is highly extendable with help of Ruby on Rails plugin system.
+DRG CMS is content management system build on strong foundations of Ruby on Rails and Mongo DB. It uses single (cmsedit) controller together with specialy crafted forms system for data entry. It has built-in user friendly role based access system and it can be easly extended with help of Ruby on Rails plugin system.
 
-DRG CMS can be used for rapid building of complex, data-entry intensive web sites or building your private Intranet sites.
+DRG CMS can be used for rapid building of complex, data-entry intensive web sites as well as building your private Intranet applications.
 
 Project Tracking
 ----------------
@@ -12,7 +12,7 @@ Project Tracking
 Compatibility
 -------------
 
-DRG CMS is tested against Ruby 1.9.3, 2.0, 2.1 and 2.2, MongoDB 2.4, 2.6
+DRG CMS is tested against Ruby 1.9.3, 2.0, 2.1 and 2.2, MongoDB 2.4 and 2.6
 
 Documentation
 -------------
@@ -47,4 +47,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Credits
 -------
 
-Damjan Rems: damjan dot rems at gmail dot com
+Damjan Rems: damjan dot rems at gmail dot com

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

@@ -80,7 +80,7 @@ $(function() {
  *  
  *  #div_divname : will replace divname with value
  *  #div+_divname : will append value to divname
- *  #+div_divname : will prepend value to divname
+ *  #+div_divname : will prepend value to divname 
  *  .div_classname : will replace all accurencess of classname with value
  *  .+div_classname : will prepend value to all accurencess of classname
  *  .div+_classname : will append value to all accurencess of classname
@@ -419,8 +419,7 @@ element = $(this).find(':first').attr('id');
   * Popup or hide document information 
   *******************************************************************/
   $('#dc-document-info').on('click',function(e) { 
-//  $('.fa').on('click',function(e) { 
-    popup = $(e.target).next();
+    popup = $('#dc-document-info-popup');
     popup.toggleClass('div-hidden'); 
     if (!popup.hasClass('div-hidden')) {
       var o = {
@@ -434,13 +433,7 @@ element = $(this).find(':first').attr('id');
   * Just hide document information on click.
   *******************************************************************/
   $('#dc-document-info-popup').on('click',function(e) {
-// click on container (id)
-    if (e.target.id == 'dc-document-info-popup') {
-      $(e.target).toggleClass('div-hidden');
-// click on text or picture. Hence hide parent      
-    } else {
-      $(e.target).parent().toggleClass('div-hidden');
-    }  
+    $('#dc-document-info-popup').toggleClass('div-hidden'); 
   });    
 
 /*******************************************************************
@@ -452,11 +445,13 @@ element = $(this).find(':first').attr('id');
   });
 
 /*******************************************************************
- * Force reload of parent page if this div appears
+ * Force reload of parent page if this div appears. 
+ * 
+ * Just an Idea. Not needed yet.
  *******************************************************************/
   $('#div-reload').load( function() {
-//    alert('div-reload 1');
-    location.href = location.href;
+    alert('div-reload 1');
+//    location.href = location.href;
   });
   
   $('#div-reload-parent').on('DOMNodeInserted DOMNodeRemoved', function() {
@@ -471,7 +466,8 @@ element = $(this).find(':first').attr('id');
   *******************************************************************/
   $('.dc-result tr').on('dblclick', function(e) {
     e.preventDefault();
-    location.href = this.getAttribute("data");
+    url = this.getAttribute("data");
+    if (url !== null) { location.href = url; }
   });
 
 });

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

@@ -134,52 +134,39 @@ padding: 0px;
 .dc-link {
 padding: 4px 8px;
 text-align: center;
-/*  border: 1px solid #eee;*/
 border-radius: 5px;
 background-color: #eee;
-/*  background: linear-gradient(#eee 5%, #fff 100%); */
 }
 
 .dc-link:hover {
-/*  background: linear-gradient(#fff 5%, #eee 100%); */
   background-color: #888;
 }
 
-.dc-link:hover a {
-  color: #fff;
-}
+.dc-link:hover a { color: #fff; }
 
 .dc-link-ajax {
   text-align: left;
   font-weight: bold;
-/*  border:1px solid #eee; */
   padding: 5px 8px;  
   border-radius: 5px;
   color: #888;
   background-color: #eee;  
-/*  
-  background: linear-gradient(#eee 5%, #fff 100%); */
 }
 
 .dc-link-ajax:hover {
-/*  background: linear-gradient(#fff 5%, #eee 100%);  */
-  cursor: pointer;
   color: #fff;
   background-color: #888;  
 }
 
+.dc-link-ajax:hover a { color: #fff; }
+
 .dc-link-img {
   padding: 3px;
   text-align: center;
   margin: 0px;
-/*  
-  border:1px solid #eee;
-  border-radius: 2px;
-  background: linear-gradient(#eee 5%, #fff 100%);   */
 }
 
 .dc-link-img:hover {
-/*  background: linear-gradient(#fff 5%, #eee 100%); */
   background-color: #eee; 
 }
 
@@ -195,6 +182,20 @@ background-color: #eee;
   border:1px solid #eee;
 }
 
+.dc-inline-link {
+  cursor: pointer;
+  color: #222;
+  padding: 4px;
+  background: #fff;
+  border: 2px solid #222;
+  border-radius: 5px;
+}
+
+.dc-inline-link:hover {
+  color: #c43;
+  border: 2px solid #c43;
+}
+
 .skip-next {
   text-align: center;
   border:1px solid #888;
@@ -489,7 +490,7 @@ height: 26px;
 
 .ui-autocomplete-table {
 padding: 3px;
-border: solid 1px #888;
+border: solid 1px #aaa;
 border-radius: 2px;
 background: #fff;
 /*
@@ -524,6 +525,7 @@ position:absolute;
 background-color: #eee;
 border: 1px solid #ddd;
 border-radius: 4px;
+z-index: 100;
 }
 
 .drgcms_popmenu_class a:hover {

data/app/controllers/cmsedit_controller.rb

@@ -77,7 +77,7 @@
 ########################################################################
 class CmseditController < DcApplicationController
 before_action :check_authorization, :except => [:login]
-before_filter :reload_patches if Rails.env.development?
+before_filter :dc_reload_patches if Rails.env.development?
   
 layout 'cms'
 
@@ -127,7 +127,7 @@ def user_filter_options(model) #:nodoc:
   field = '_id' if field == 'id' # must be
   value = /#{value}/ if oper == 'like' # do regex if operation is like
 # when field type is ObjectId transform value    
-  if model.fields[field].type == BSON::ObjectId
+  if model.fields[field] and model.fields[field].type == BSON::ObjectId
     value = BSON::ObjectId.from_string(value) rescue nil
     flash[:error] = t('drgcms.not_id') if value.nil?
   end
@@ -166,7 +166,7 @@ def check_filter_options() #:nodoc:
     field = '_id' if field == 'id' # must be
     value = /#{value}/ if oper == 'like' # do regex if operation is like
 # when field type is ObjectId transform value    
-    if model.fields[field].type == BSON::ObjectId
+    if model.fields[field] and model.fields[field].type == BSON::ObjectId
       value = BSON::ObjectId.from_string(value) rescue nil
       flash[:error] = t('drgcms.not_id') if value.nil?
     end
@@ -202,7 +202,10 @@ def index
     if respond_to?(@form['result_set']['filter'])
       @records = send @form['result_set']['filter']
 # something iz wrong. flash[] should have explanation.
-      return render(action:  :index) if @records.class == FalseClass
+      if @records.class == FalseClass
+        @records = []
+        return render(action:  :index)
+      end
 # pagination      
       per_page = (@form['result_set']['per_page'] || 30).to_i
       @records = @records.page(params[:page]).per(per_page) if per_page > 0
@@ -762,13 +765,4 @@ def save_data
   saved
 end
   
-########################################################################
-# Reload patches in development.
-########################################################################
-def reload_patches
-  DrgCms.paths(:patches).each do |patches| 
-    Dir["#{patches}/**/*.rb"].each { |path| require_dependency path }
-  end
-end
-
 end

data/app/controllers/dc_application_controller.rb

@@ -439,6 +439,42 @@ def dc_render_ajax(opts)
   render inline: result.to_json, formats: 'js'
 end
 
+######################################################################
+# Small helper for rendering ajax return code from controller. When ajax call is
+# made from DRG CMS form return may be quite complicated. All ajax return combinations 
+# can be found in drg_cms.js file. 
+# 
+# [Parameters:]
+# [Hash opts] Different options
+# 
+# [Return:]
+# String. Formatted to be used on ajax return.
+# 
+# [Example:]
+#    html_code = '<span>Some text</span>'
+#    dc_render_ajax(div: 'mydiv', prepand: html_code) # Will prepand code to mydiv div
+#    dc_render_ajax(class: 'myclass', append: html_code) # Will append code to all objects with myclass class
+#    dc_render_ajax(operation: 'window', value: "/pdf_file.pdf") # will open pdf file in new window.
+# 
+######################################################################
+def dc_render_ajax(opts)
+  result = {}
+  if opts[:div] or opts[:class]
+    selector = opts[:div] ? '#' : '.' # for div . for class
+    key = case
+      when opts[:prepend] then "#{selector}+div"
+      when opts[:append]  then "#{selector}div+"
+    else "#{selector}div"
+    end
+    key << "_#{opts[:div]}#{opts[:class]}"
+  else
+    p 'Error: dc_render_ajax. Operation is not set!' if opts[:operation].nil?
+    key = "#{opts[:operation]}_"
+  end
+  result[key] = opts[:value] || opts[:url] || ''
+  render inline: result.to_json, formats: 'js'
+end
+
 ########################################################################
 # Find document by parameters. This is how cmsedit finds document based
 # on url parameters.
@@ -467,5 +503,17 @@ def dc_find_document(table, id, ids)
   doc
 end
 
+########################################################################
+# Reload patches in development. Since patching files are not automatically loaded in
+# development environment thiws litle method automatically reloads all patch files
+# found in DrgCms.paths(:patches) path array.
+########################################################################
+def dc_reload_patches
+  DrgCms.paths(:patches).each do |patches| 
+    Dir["#{patches}/**/*.rb"].each { |path| require_dependency path }
+  end
+end
+
+
 
 end

data/app/controllers/dc_common_controller.rb

@@ -239,7 +239,7 @@ def paste_clipboard
       end
     }
   end
-  dc_render_ajax(operation: :div, div: 'result', value: result )
+  dc_render_ajax(div: 'result', value: result )
 end
 
 protected

data/app/forms/all_options.yml

@@ -10,7 +10,6 @@ permissions:
 
 index:
   filter: name, id as text_field
-  
   actions: standard
   
   actions:
@@ -82,7 +81,12 @@ result_set:
 form:
   edit_title: description
   height: 600
+  title:
+    edit: Title for edit
+    show: Title for show
+
   actions: standard
+  actions: none
 
   actions: 
     5: 

data/app/forms/dc_category.yml

@@ -40,7 +40,6 @@ form:
         size: 100
     2:
       name: ctype
-      text: Vrsta kategorije
       type: select
 
     3:
@@ -50,7 +49,6 @@ form:
         size: 5
     4:
       name: parent
-      text: Nadrejena kategorija
       type: select
       eval: DcCategory.values_for_parent
       html:

data/app/forms/dc_design.yml

@@ -15,9 +15,9 @@ result_set:
       dup_fields: name,description
 
     3: delete
-    4: 
-      type: edit_embedded
-      table: dc_part
+#    4: 
+#      type: edit_embedded
+#      table: dc_part
 
   columns:
     1:  

data/app/helpers/cmsedit_helper.rb

@@ -48,11 +48,9 @@ def dc_actions_for_index()
 # start div with hidden spinner image 
   html = <<EOT
 <div id="dc-action-menu">
-  <span id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}"</span>
+  <span id="dc-spinner" class="div-hidden">#{fa_icon('spinner lg spin')}</span>
   <ul class="dc-action-menu">
 EOT
-#    #{fa_icon('spinner lg spin', id: 'dc-spinner', class: 'div-hidden')}
-
 #
    actions.each do |k,v|
     session[:form_processing] = "index:actions: #{k}=#{v}"
@@ -99,7 +97,8 @@ EOT
 #      link_to(caption.html_safe, '#', yhtml )
       dc_link_to('drgcms.filter','filter', '#', yhtml )
     when action == 'new' then # new
-      dc_link_to(t('drgcms.new'),'plus', url, yhtml )
+      caption = yaml['caption'] || 'drgcms.new'
+      dc_link_to(caption,'plus', url, yhtml )
     when action == 'menu' then  # menu
       caption = t(v['caption'], v['caption'])
       caption + eval(v['eval'])      
@@ -218,41 +217,6 @@ def dc_table_title_for_result(result=nil)
   dc_table_title(title, result)
 end
 
-############################################################################
-# Similar to rails submit_tag, but also takes care of link icon, translation, ...
-############################################################################
-def dc_submit_tag(caption, icon, parms, rest={})
-  parms['class'] ||= 'dc-submit'
-  if icon
-    icon_image = if icon.match(/\./)
-      image_tag(icon, class: 'dc-animate')
-    else
-      fa_icon(icon)
-    end
-  end
-  html = icon_image || ''
-  html << submit_tag(t(caption, caption), parms)
-end
-############################################################################
-# Similar to rails link_to, but also takes care of link icon, translation, ...
-############################################################################
-def dc_link_to(caption, icon, parms, rest={})
-  rest['class'] =  rest['class'].to_s + ' dc-animate'
-  if icon
-    icon_image = if icon.match(/\./)
-      image_tag(icon, class: 'dc-link-img dc-animate')
-    else
-      fa_icon(icon)
-    end
-  end
-#  
-  if caption
-    caption = t(caption, caption)
-    icon_image << ' ' if icon_image
-  end
-  link_to("#{icon_image}#{caption}".html_safe, parms, rest)  
-end
-
 ############################################################################
 # Creates code for link or ajax action type. Subroutine of dc_actions_for_result.
 ############################################################################
@@ -336,6 +300,7 @@ def dc_actions_for_result(record)
       parms['id']     = record.id
 # duplicate string will be added to these fields.
       parms['dup_fields'] = yaml['dup_fields'] 
+      parms['action'] = 'create'
       dc_link_to( nil, 'copy lg', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post )
     when yaml['type'] == 'delete' then
       parms['action'] = 'destroy'
@@ -485,8 +450,10 @@ def dc_actions_for_form()
   actions = std_actions if actions.nil?
 # readonly 
   actions = {' 1' => 'back'} if @form['readonly']
-  
-  if actions['standard']
+# Actions are strictly forbidden 
+  if @form['form']['actions'] and dc_dont?(@form['form']['actions'])
+    actions = []
+  elsif actions['standard']
     actions.merge!(std_actions)
     actions['standard'] = nil
   end
@@ -763,8 +730,9 @@ def dc_document_statistics
   return '' if @record.new_record? or dc_dont?(@form['form']['info'])
   html =  "<div id='dc-document-info'>#{t('drgcms.doc_info')}</div>"
 #  html =  "<div id='dc-document-info'>#{fa_icon 'info-circle 2x'}</div>"
-  html << "<div id='dc-document-info-popup' class='div-hidden'><table>"
+  html =  '<div id="dc-document-info">' + fa_icon('info-circle lg') + '</div>'
 #
+  html << "<div id='dc-document-info-popup' class='div-hidden'><table>"
   u = _get_user_for('created_by')
   html << "<tr><td>#{t('drgcms.created_by', 'Created by')}: </td><td><b>#{u}</td></tr>" if u
   u = _get_user_for('updated_by')