drg_cms 0.4.54 → 0.4.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b763f10c4908f259ef1caac04ba0a9d3cb7259
-  data.tar.gz: 1bdca5ace9741bb16c17c817cf81ca18953105ba
+  metadata.gz: 3d10b53c63a0f5d18e7c4ee0abf0d7d78c5245d9
+  data.tar.gz: b6f551fc08937f420940e728f011436b506e4cce
 SHA512:
-  metadata.gz: 1d9a8383bb7328b1c0fc21c9d7939919ba9d716ecdfede5ebadb68bb65f1fa77ccd94060daf0159cc8e57438bd42a6934035486dec24a45305f27aee12afbe00
-  data.tar.gz: 95ef2a4c9a674932ac80a8dc2dc79b2adeed17d4209c60587fbb95122e9d86b8889d8a9bdb9e0ff3553ce2c96d326b7aa784aaec1b8c83d42b2d7cf7e9427dac
+  metadata.gz: 8496a3fa343e395014a47881da429780d9d9c4a407719229685404594af2fdedabc86a59640897324387b58c42d697f97f71aad1c992fa3bd1c7871abfd99b11
+  data.tar.gz: d47a2697eff35587bd695d958233eca2b7df5592a9677b88042ed8411ff161209b8182bd0b1304f0edb8e7bafd309cccae3cf367178ed2e9525556e50d6a39ab

data/README.md

@@ -1,17 +1,18 @@
 # DrgCms
 
-DRG CMS is cms build on strong foundations of Ruby on Rails and Mongo DB.
+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 can be used for rapid building of complex, data-entry intensive web sites or building your private Intranet sites.
 
 Project Tracking
 ----------------
 
 * [DrgCms Website and Documentation](http://www.drgcms.org)
-* [DrgCms Testing website](http://test.drgcms.org)
 
 Compatibility
 -------------
 
-DRG CMS is tested against MRI 1.9.3, 2.0.0, 2.1.0.
+DRG CMS is tested against MRI 1.9.3 and 2.x, MongoDB 2.4, 2.6
 
 Documentation
 -------------

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

@@ -372,8 +372,8 @@ $(document).ready( function() {
   });  
   
 /**********************************************************************
- *
- *
+ * When filter_field (field name) is selected on filter subform this routine finds 
+ * and displays apropriate span with input field.
  **********************************************************************/
   $('#_filter_field').bind('change', function() {
     if (this.value.length > 0) { 
@@ -384,7 +384,7 @@ element = $(this).find(':first').attr('id');
  sometimes it is the second element         
         if (element == nil) { element = $(this).find(':first').next().attr('id');}
  */   
-        if ($(this).attr('id') == name) {
+        if ($(this).attr('id') === name) {
           if ( $(this).hasClass('div-hidden') ) { $(this).toggleClass('div-hidden'); }
         } else {
           if ( !$(this).hasClass('div-hidden') ) { $(this).toggleClass('div-hidden'); }
@@ -404,7 +404,7 @@ element = $(this).find(':first').attr('id');
  *******************************************************************/
   $('.dc-submit').bind('click', function() {
     $.each(this.attributes, function() {
-      if (this.name.substring(0,5) == 'data-') { 
+      if (this.name.substring(0,5) === 'data-') { 
         $('<input>').attr({
           type: 'hidden',
           name: 'data[' + this.name.substring(5) + ']',

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

@@ -31,19 +31,25 @@ vertical-align: middle;
 }
 
 textarea, input, select {
-/*font-family: helvetica;
-font-size: 13px;  */
+color: #222;
 padding: 4px;
 border: solid 1px #888;
-box-shadow: rgba(0,0,0, 0.1) 0px 0px 4px;
 border-radius: 2px;
+/*
 background: linear-gradient(#ffd 4%, #fff 100%); 
-color: #222;
+box-shadow: rgba(0,0,0, 0.1) 0px 0px 4px;
+*/
 }
 
 input { padding: 6px;}
-
-select#record_select { padding: 1px;}
+/*
+select#record_select { 
+padding: 1px;
+max-width: 300px;
+height: 26px;
+background: #fff;
+}
+*/
 
 hr {
 background-color: #ccc;
@@ -64,15 +70,24 @@ height: 2px;
 th {
   padding: 5px 1px;
   text-align: left;
-  border-top:1px solid #ccc;
-  border-bottom:1px solid #ccc;
-  background: linear-gradient(#eee 5%, #fff 100%); 
+  border-bottom:2px solid #ccc;
+  background: #fff;
+/*  border-top:1px solid #ccc;
+  background: linear-gradient(#eee 5%, #fff 100%); */
 }
 
+th a:hover { color: #000;}
+
 img { vertical-align:bottom; }
 
-a:link, a:active, a:visited { color: #c43; text-decoration: none; background: transparent;}
-a:hover { text-decoration: none; color: #000; }
+a:link, a:active, a:visited { 
+color: #888;
+font-weight: bold;
+text-decoration: none; 
+background: transparent;
+}
+
+a:hover { text-decoration: none; color: #fff; }
 a img { border: none; }
 
 
@@ -96,56 +111,68 @@ width: 24px;
   padding: 0px;
   border-spacing: 0px;
   border-radius: 1px;  
+/*
   border-right: 0px;
   border-left: 1px solid #fff;
   border-top: 1px solid #fff;
-  background-color: #f8f8f8;
   border-bottom:1px solid #ccc;
+*/
+  background-color: #f8f8f8;
 }
 
+.dc-result td { padding: 2px 0px; }
 .dc-menu {
   border-spacing: 3px;
   padding: 0px;
 }
 
 .dc-link {
-  padding: 4px 8px;
+  padding: 6px 16px;
   text-align: center;
-  border:1px solid #eee;
-  border-radius: 2px;
-  background: linear-gradient(#eee 5%, #fff 100%); 
+/*  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: linear-gradient(#fff 5%, #eee 100%); */
+  background-color: #888;
+}
+
+.dc-link:hover a {
+  color: #fff;
 }
 
 .dc-link-ajax {
   text-align: left;
-  border:1px solid #eee;
-  padding: 4px 8px;  
-  border-radius: 2px;
-  color: #c43;
-  background: linear-gradient(#eee 5%, #fff 100%); 
+  font-weight: bold;
+/*  border:1px solid #eee; */
+  padding: 6px 16px;  
+  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%); 
-  color: black;
+/*  background: linear-gradient(#fff 5%, #eee 100%);  */
+  color: fff;
   cursor: pointer;
 }
 
 .dc-link-img {
-  padding: 2px;
+  padding: 3px;
   text-align: center;
-  border:1px solid #eee;
+/*  border:1px solid #eee;*/
   margin: 0px;
-  border-radius: 2px;
-  background: linear-gradient(#eee 5%, #fff 100%);   
+/*  border-radius: 2px;*/
+/*  background: linear-gradient(#eee 5%, #fff 100%);   */
 }
 
 .dc-link-img:hover {
-  background: linear-gradient(#fff 5%, #eee 100%); 
+/*  background: linear-gradient(#fff 5%, #eee 100%); */
+  background-color: #eee; 
 }
 
 .dc-link-selected {
@@ -176,43 +203,50 @@ width: 24px;
 .skip-next a:hover { text-decoration: none; color: #c43; }
 
 .dc-animate-button {
-  background: #ccc;
-  box-shadow: inset 0 0 20px #ccc;
+  background: #eee;
+  box-shadow: inset 0 0 10px #fff;
 }
 
 .dc-link-submit {
   text-align: left;
-  border:1px solid #eee;
+/*  border:1px solid #eee; */
   padding: 0px;
   margin: 0px;
 
-  border-radius: 2px;
-  background: linear-gradient(#eee 5%, #fff 100%); 
+  border-radius: 5px;
+  background-color: #eee;   
+/*  background: linear-gradient(#eee 5%, #fff 100%); */
 }
 
 .dc-link-submit:hover {
-  background: linear-gradient(#fff 5%, #eee 100%); 
+  color: #000;
+  background-color: #888;
+/*  background: linear-gradient(#fff 5%, #eee 100%); */
+}
+.dc-link-submit:hover .dc-submit {
+  color: #fff;
 }
-
 .dc-submit {
   text-decoration: none;
   border: 0px;
-  color: #c43;
+  color: #888;
+  font-weight: bold;
   box-shadow: none;
   background: none;
 /*  background-color: none;   */
-  padding: 0px 4px;
+  padding: 0px 10px;
   border-radius: 0px;
 } 
 
 .dc-submit:hover { 
+  cursor: pointer;
   text-decoration: none;
-  color: #000;
-  border-bottom: 1px dotted #000;
-  padding-top: 1px;
-
+  color: #fff;
+/*  border-bottom: 1px solid #888;
+  padding-top: 1px;*/
+  background-color: #888; 
 }
-
+/*
 .dc-img-link {
   border: 0px;
   padding-top: 1px
@@ -222,6 +256,7 @@ width: 24px;
   text-decoration: none;
   background-color: #c43;
 }
+*/
 
 .dc-title {
   font-weight: bold;
@@ -282,7 +317,7 @@ width: 24px;
   border: #a94442 2px solid;
 }
 
-/** VRZI VEN OB PRILIKI *******************/
+/** VRZI VEN OB PRILIKI *******************
 .dc-form-label-odd {
   color: #555;
   text-align: right;
@@ -317,7 +352,7 @@ width: 24px;
   background-color: #f4f4f4;
   border-bottom: 1px solid #eee;
 }
-/************** *******************/
+************** *******************/
 
 .dc-form-label {
   color: #555;
@@ -370,6 +405,8 @@ width: 24px;
   margin-bottom: 3px;
   padding-right: 2px;
   padding-left: 2px;
+  padding-bottom: 2px;
+  border-bottom: 1px solid #eee;
 }
 
 .dc-spinner {
@@ -382,28 +419,35 @@ width: 24px;
   color: #888;
   text-decoration: none;
   text-align: center;
+  font-weight: bold;
+
+/*
   border-bottom: none;
   border-top: 1px solid #ccc;
   border-left: 1px solid #ccc;
   border-right: 1px solid #fff;
-  padding:4px 8px 4px 8px;
+*/
+  padding:3px 15px;
   border-radius: 4px 4px 0px 0px;
   background: #eee;
   margin-right: 4px;
-  background: linear-gradient(#eee 2%, #fff 100%);  
+/*  background: linear-gradient(#eee 2%, #fff 100%);  */
 }
 
 .dc-form-li:hover, .dc-form-li-selected {
-  color: #222;
-  background: #f8f8f8;
+  cursor: pointer;
+  color: #fff;
+  background: #888;
+/*  
   box-shadow: 4px 0px 2px -2px #aaa ;
   box-shadow: 0px -2px 2px #ccc;
-  
+/*  
   border-top: 1px solid #fff;
   border-left: 1px solid #fff;
   border-right: 1px solid #ddd;
   border-bottom: none;
-  background: linear-gradient(#fff 2%, #f4f4f4 100%);  
+*/
+  /*background: linear-gradient(#fff 2%, #f4f4f4 100%);  */
 }
 
 .dc-odd {
@@ -430,6 +474,12 @@ width: 24px;
   margin-bottom: 10px;
 }
 
+.cmsedit-menu select#record_select { 
+padding: 0px;
+max-width: 300px;
+height: 26px;
+}
+
 #result {
   background-color: #eee;
 }
@@ -503,15 +553,18 @@ padding: 0px;
 }
 
 #drgcms_filter {
+padding: 4px 0px; 
+margin: 0px;
+
+/*
 display: none; 
+
 border:1px solid #ccc;
-padding: 4px; 
-margin: 0px;
- 
 border-top: 1px solid #fff;
 border-left: 1px solid #fff;
 border-radius: 1px;
 background-color: #eee;
+*/
 }
 
 .iframe_embedded {
@@ -533,6 +586,8 @@ overflow-x:hidden;
 /******************* action-menu *********************/
 #dc-action-menu {
 padding: 2px 0px 2px 0px;
+font-weight: bold;
+color: #888;
 }
 
 #dc-action-menu ul {
@@ -543,32 +598,30 @@ margin: 5px 2px 4px 0px;
 
 .dc-action-menu  {
 list-style:none;
-font-size: 12px;
-}
-
-.dc-action-menu a {
-color: #c43;
+/*font-size: 12px;*/
 }
 
 .dc-action-menu li {
 display:inline; 
 position:relative;
 list-style:none;
-padding: 4px 10px;
-border-radius: 2px;
-border: 1px solid #eee;
+padding: 6px 15px;
 margin-right: 2px;
-background: linear-gradient(#eee 5%, #fff 100%);  
 max-width: 200px;
+background: #eee;
+border-radius:5px;
+/* border: 1px solid #eee; 
+background: linear-gradient(#eee 5%, #fff 100%);  */
 }
 
 .dc-action-menu li:hover {
-color: #000;
-background: linear-gradient(#fff 5%, #eee 100%);  
+background: #888;
+color: #fff;
+/*background: linear-gradient(#fff 5%, #eee 100%);  */
 }
 
 .dc-action-menu li:hover a {
-color: #c43;
+color: #fff;
 }
 
 .dc-action-menu ul {
@@ -602,11 +655,11 @@ background-color: #fff;
 }
 
 .dc-action-menu li:hover ul li a { 
-color: #c43;
+color: #888;
 }
 
 .dc-action-menu li:hover ul li a:hover {
-color: black;
+color: #fff;
 }
 
 /************************** info popup *************************/

data/app/controllers/cmsedit_controller.rb

@@ -77,6 +77,7 @@
 ########################################################################
 class CmseditController < DcApplicationController
 before_action :check_authorization, :except => [:show, :login]
+layout 'cms'
 
 ########################################################################
 # Will check and set sorting options for current result set. Subroutine of index method.
@@ -463,7 +464,7 @@ end
 =end
 
 ########################################################################
-# Merges two forms when current form extends other form. Subroutine of read_yaml.
+# Merges two forms when current form extends other form. Subroutine of read_drg_cms_form.
 # With a little help of https://www.ruby-forum.com/topic/142809 
 ########################################################################
 def forms_merge(hash1, hash2) 
@@ -482,7 +483,7 @@ end
 ########################################################################
 # Read drgcms form into yaml object. Subroutine of check_authorization.
 ########################################################################
-def read_yaml
+def read_drg_cms_form
   table_name = decamelize_type(params[:table].strip)
   @tables = table_name.split(';').inject([]) { |r,v| r << [v.classify.constantize, v] }
 # split ids passed when embedded document
@@ -498,7 +499,6 @@ def read_yaml
   end
 # add readonly key to form if readonly parameter is passed in url
   @form['readonly'] = 1 if params['readonly'] and %w(1 yes true).include?(params['readonly'].to_s.downcase.strip)
-#  p '2',@form
 # !!!!!! Always use strings for key names since @parms['table'] != @parms[:table]
   @parms = { 'table' => table_name, 'ids' => ids, 'formname' => formname,
              'return_to' => params['return_to'], 'edit_only' => params['edit_only'] }
@@ -510,25 +510,26 @@ end
 ############################################################################
 def check_authorization
   params[:table] ||= params[:formname]
-# Extend class with methods defined in drgcms_controls module. May include embedded forms therefor ; => _ 
-  controls_string = params[:table].gsub(';','_') + '_control'
-  controls = ("DrgcmsControls::#{controls_string.classify}".constantize rescue nil)
-  extend controls if controls 
 # Just show menu
   return show if params[:action] == 'show'
 # request shouldn't pass
-  if session[:user_roles].nil? or params[:table].to_s.strip.downcase.size < 3
+  if session[:user_roles].nil? or params[:table].to_s.strip.downcase.size < 3 or 
+     !dc_user_can(DcPermission::CAN_VIEW)
     return render(action: 'error', locals: { error: t('drgcms.not_authorized')} )
   end
 
-# If user has permission to view table (collection) load form
-  if dc_user_can(DcPermission::CAN_VIEW)
-    read_yaml
+  read_drg_cms_form
 # Permissions can be also defined on form
-    return if @form['permissions'].nil? or @form['permissions']['can_view'].nil?
-    return if dc_user_has_role(@form['permissions']['can_view'])
-  end
-  render(action: 'error', locals: {error: t('drgcms.not_authorized')} )
+#TODO So far only can_view is used. Think about if using other permissions has sense
+  if @form['permissions'].nil? or @form['permissions']['can_view'].nil? or
+    dc_user_has_role(@form['permissions']['can_view'])
+# Extend class with methods defined in drgcms_controls module. May include embedded forms therefor ; => _ 
+    controls_string = (@form['controls'] ? @form['controls'] : params[:table].gsub(';','_')) + '_control'
+    controls = "DrgcmsControls::#{controls_string.classify}".constantize rescue nil
+    extend controls if controls 
+  else
+    render(action: 'error', locals: { error: t('drgcms.not_authorized')} )
+  end  
 end
 
 ########################################################################