drg_cms 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f15153abc4771ed08a6ffbe80f70b4922b55f05e
-  data.tar.gz: 0eb5f0a39892fac760bf75460821d9bc9deef1e7
+  metadata.gz: 3281dd3aef7554c89150fcf948a4ffdbd253da8d
+  data.tar.gz: dc53e3cd616e1baf33b15d8b60a30251fa4ecc8d
 SHA512:
-  metadata.gz: 2c9080f136311b94f6eae470ff7c0e09712b621875cd616bdf48a1d8563faec4cc9fab67b79bec8b6197032c971f3b0afae1e21c67aa1256686e211df880ace4
-  data.tar.gz: e1bca3a5c70f23342f58e1c6be16be0b2eee186dc223ccdd02efa8161155e3bfcfb8d566b433012213aaed16f03fde738ae602421f7b6f989eb34e38111b488a
+  metadata.gz: e19a6cfa74140520e97be7a23b2e2c3091514f72b7c404c4b1b5af75dffa0f7f1a42fefd6c93998c326456d9730d3d80c74d875c40429d454ee6386494fe72e8
+  data.tar.gz: 489cc0194a151b6f3f13cea9d3841ae3b4b833f19440e9ca8577f6c95128c0463f1d1ddca2e6fbe1d6ab679e7956a6323ef60e31184a57f741ff9636b15d550a

data/README.md

@@ -1,8 +1,12 @@
 # DrgCms
 
-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 is alternative way of programming application for Ruby on Rails. Instead of creating controllers and views for each collection (table) model, DRG CMS introduces single Cmsedit controller which uses DRG Forms to control CRUD database operations. 
+ 
+DRG CMS uses Mongo DB, leading NO-SQL document database, as database back-end with a help of mongoid gem. Mongoid's flexible document model defines all document fields, indexes, dependencies, validations in single model file with no Rails migrations required.
 
-DRG CMS can be used for rapid building of complex, data-entry intensive web sites as well as building your private Intranet applications.
+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 development of complex, data-entry intensive web sites as well as building your private, in-house, Intranet applications.
 
 Project Tracking
 ----------------
@@ -12,7 +16,7 @@ Project Tracking
 Compatibility
 -------------
 
-DRG CMS is tested against Ruby 1.9.3, 2.0, 2.1 and 2.2, MongoDB 2.4 and 2.6
+DRG CMS is tested against Ruby 2.0, 2.1 and 2.2, Rails 4.2, Mongoid 4 and 5, MongoDB 2.4 and 2.6
 
 Documentation
 -------------

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

@@ -477,14 +477,31 @@ element = $(this).find(':first').attr('id');
   });
   
  /*******************************************************************
-  * Fire show document when doubleclicked on result row
+  * Fire action (by default show document) when doubleclicked on result row
   *******************************************************************/
   $('.dc-result tr').on('dblclick', function(e) {
-    e.preventDefault();
-    url = this.getAttribute("data");
-    if (url !== null & url.length > 5) { location.href = url; } // prevent when url not set
+    url = String( this.getAttribute("data-dblclick") );
+// prevent when data-dblclick not set
+    if (url.length > 5) { 
+      e.preventDefault();
+      location.href = url;
+    } 
+  });
+
+ /*******************************************************************
+  * Fire action clicked on result row. 
+  * TODO: Find out how to prevent event when clicked on action icon.
+  *******************************************************************/
+  $('.dc-result tr').on('click', function(e) {
+    url = String( this.getAttribute("data-click") );
+// prevent when data-click not set
+    if (url.length > 5) { 
+      e.preventDefault();
+      location.href = url; 
+    } 
   });
 
+
 });
 
 /*******************************************************************

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

@@ -79,17 +79,14 @@ font-family: helvetica;
 font-size: 12px;
 margin: 0px;
 vertical-align: middle;
+color: #222;
 }
 
 textarea, input, select {
 color: #222;
-padding: 3px;
+padding: 4px;
 border: solid 1px #aaa;
 border-radius: 2px;
-/*background: linear-gradient(#ffd 4%, #fff 100%); */
-/*
-box-shadow: rgba(0,0,0, 0.1) 0px 0px 4px;
-*/
 }
 
 /*
@@ -101,6 +98,11 @@ background: #fff;
 }
 */
 
+select {
+padding: 4px 0px;
+background: #fff;  
+}
+
 hr {
 background-color: #ccc;
 border: none;
@@ -120,10 +122,13 @@ height: 2px;
 td { vertical-align: middle; }
 
 th {
-padding: 5px 1px;
+padding: 4px;
 text-align: left;
-border-bottom:2px solid #ccc;
-background: #fff;
+border-bottom:1px solid #e8e8e8;
+border-right:1px solid #e8e8e8;
+background: #e8e8e8;
+color:#888;
+font-weight: bold;
 }
 
 th a:hover { color: #000;}
@@ -137,7 +142,7 @@ text-decoration: none;
 background: transparent;
 }
 
-a:hover { text-decoration: none; color: #fff; }
+a:hover { text-decoration: none; color: #000; }
 a img { border: none; }
 
 
@@ -157,18 +162,22 @@ width: 24px;
 }
 
 .dc-result {
-  width: 100%;
-  padding: 0px;
-  border-spacing: 0px;
-  border-radius: 1px;  
-  background-color: #f8f8f8;
+width: 100%;
+padding: 0px;
+border-spacing: 0px;
+border-radius: 1px;  
+background-color: #fafafa;
+border-top: 1px solid #e8e8e8;
+border-left: 1px solid #e8e8e8;
 }
 
-.dc-result tr:hover { background-color: #ddd; }
+.dc-result tr:hover { background-color: #eee; }
 
 .dc-result td { 
-padding: 2px 0px;
+padding: 3px 4px;
 line-height: 1.5em; 
+border-right: 1px solid #e8e8e8;
+border-bottom: 1px solid #e8e8e8;
 }
 
 .dc-result i { 
@@ -183,17 +192,24 @@ padding: 0px;
 #data-fields {margin: 5px;}
 
 .dc-link {
-padding: 4px 8px;
+padding: 3px 8px;
 text-align: center;
 border-radius: 5px;
 background-color: #eee;
+background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
+border: 1px solid #ddd;
 }
 
 .dc-link:hover {
   background-color: #888;
+  border: 1px solid #aaa;
+  transition: 0.3s;  
 }
 
-.dc-link:hover a { color: #fff; }
+.dc-link:hover a { 
+  color: #222; 
+  transition: 0.3s;  
+}
 
 .dc-link-ajax {
   text-align: left;
@@ -201,16 +217,23 @@ background-color: #eee;
   padding: 5px 8px;  
   border-radius: 5px;
   color: #888;
-  background-color: #eee;  
+  background-color: #eee;
+  background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
+  border: 1px solid #ddd;
 }
 
 .dc-link-ajax:hover {
-  cursor: pointer;
-  color: #fff;
-  background-color: #888;  
+cursor: pointer;
+/*background-color: #888;  */
+border: 1px solid #aaa;
+transition: 0.3s; 
 }
 
-.dc-link-ajax:hover a { color: #fff; cursor: pointer }
+.dc-link-ajax:hover a { 
+color: #222; 
+cursor: pointer; 
+transition: 0.3s; 
+}
 
 .dc-link-img {
   padding: 3px;
@@ -265,31 +288,37 @@ background-color: #eee;
 .skip-next a:hover { text-decoration: none; color: #c43; }
 
 .dc-animate-button {
-box-shadow: inset 0 0 10px #fff;
 background-color: #888;
+background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat scroll 0% 0% !important;
+/*border: 1px solid #ddd;*/
 }
 
 .dc-link-submit {
   text-align: left;
-  padding: 5px 6px;  
+  padding: 4px 6px;  
   margin-right: 4px;
 
   border-radius: 5px;
-  background-color: #eee;   
+  background-color: #eee;
+  background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
+  border: 1px solid #ddd;
 }
 
 .dc-link-submit .fa {
   color: #888;
 }
 .dc-link-submit:hover .fa {
-  color: #fff;
+  color: #222;
+  transition: 0.3s;
 }
 .dc-link-submit:hover {
   color: #000;
-  background-color: #888;
+  border: 1px solid #aaa;
+  transition: 0.3s;
 }
 .dc-link-submit:hover .dc-submit {
-  color: #fff;
+  color: #222;
+  transition: 0.3s;
 }
 .dc-submit {
   text-decoration: none;
@@ -297,9 +326,10 @@ background-color: #888;
   color: #888;
   font-weight: bold;
   box-shadow: none;
-  background: none;
+/*  background: none;*/
   padding: 0px 2px;
   border-radius: 0px;
+  background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
 } 
 
 .dc-submit:hover { 
@@ -335,16 +365,20 @@ background-color: #888;
   width: 99.9%;
   margin: 0px;
   background-color: #fff;
+/*  
+  
   border-radius: 1px;
   border-top:1px solid #fff;
   border-left:1px solid #fff;
-  border-bottom:1px solid #ccc;
+  border-bottom:1px solid #ccc;*/
 }
 
 .dc-form-table {
   width: 100%;
   border-spacing: 0px;
   padding: 0px;
+  border: 1px solid #ddd;
+  border-top: 0px;
 }
 
 .dc-form-info {
@@ -423,10 +457,11 @@ background-color: #888;
 }
 
 .dc-color-odd {
-  background-color: #f4f4f4;  
+  background-color: #f8f8f8;  
 /*  border-bottom: solid 1px #eee; */
 }
 .dc-color-even {
+  background-color: #f8f8f8;  
 /*  border-bottom: solid 1px #eee;  */
 }
 
@@ -462,7 +497,7 @@ border-bottom: 1px solid #eee;
 }
 
 .dc-odd {
-  background-color: #fff;
+ background-color: #fcfcfc;
 }
 
 .dc-separator {
@@ -502,10 +537,15 @@ background: transparent;
 .cmsedit-table {
 width: 100%;
 background-color: #fff; 
-border-spacing: 0px; 
 border-collapse: collapse;
+border: 4px solid #fff;
 }
 
+.cmsedit-table tr {
+background-color: #fff;
+background: #fff;
+}  
+
 .cmsedit-menu {
 background-color: #fff;
 padding: 4px;
@@ -695,10 +735,11 @@ background-color: #eee;
 }
 
 .iframe_embedded {
-border: 1px solid #6cf;
+padding: 4px;
 background-image: none;
-border-radius: 1px;
-box-shadow: 1px 1px 1px #6cf;
+border-radius: 2px;
+border: 2px solid #669;
+background-color: #fff;
 }
 
 #iframe_edit, #iframe_cms {
@@ -721,7 +762,7 @@ color: #888;
 #dc-action-menu ul {
 list-style:none;
 padding: 0px;
-margin: 5px 2px 4px 0px; 
+margin: 6px 2px 4px 2px; 
 }
 
 .dc-action-menu  {
@@ -739,25 +780,30 @@ max-width: 200px;
 background: #eee;
 border-radius:5px;
 z-index: 1;
-/*background: linear-gradient(#eee 5%, #fff 100%);  */
+
+background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
+border: 1px solid #ddd;
 }
 
 .dc-action-menu li:hover {
-background: #888;
-color: #fff;
+border: 1px solid #aaa;
+color: #222;
+transition: 0.3s;  
 /*background: linear-gradient(#fff 5%, #eee 100%);  */
 }
 
 .dc-action-menu li:hover a {
-color: #fff;
+color: #222;
 }
 
 .dc-action-menu ul {
+margin-top: 1px;
 background:#fff; 
 position:absolute;
 left:-9999px; 
-border: 0px;
-box-shadow: 2px 2px 2px -1px #aaa;
+
+/*box-shadow: 2px 2px 4px #aaa;*/
+
 }
 
 .dc-action-menu ul li {
@@ -765,10 +811,9 @@ display:block;
 float:none;
 padding: 4px 10px;
 border-radius: 0px;
-background: none;
-background-color: #f8f8f8;
 margin-right: 0px;
 white-space:nowrap;
+background: transparent linear-gradient(to bottom, #FFF 0%, #F2F2F2 100%) repeat scroll 0% 0%;
 }
 
 .dc-action-menu ul a {
@@ -786,7 +831,7 @@ color: #888;
 }
 
 .dc-action-menu li:hover ul li a:hover {
-color: #fff;
+color: #222;
 }
 
 /************************** info popup *************************/

data/app/controllers/cmsedit_controller.rb

@@ -206,9 +206,11 @@ def index
         @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
+# pagination
+      unless @form['table'] == 'dc_dummy'
+        per_page = (@form['result_set']['per_page'] || 30).to_i
+        @records = @records.page(params[:page]).per(per_page) if per_page > 0
+      end
     else
       p "Error: result_set:filter: #{@form['result_set']['filter']} not found in controls!"
     end
@@ -314,18 +316,18 @@ end
 def duplicate_embedded(source) #:nodoc:
 # TODO Works for two embedded levels. Dies with third and more levels.
   dest = {}
-  source.each do |attr_name, value|
-    next if attr_name == '_id' # don't duplicate _id
+  source.each do |attribute_name, value|
+    next if attribute_name == '_id' # don't duplicate _id
     if value.class == Array
-      dest[attr_name] = []
+      dest[attribute_name] = []
       value.each do |ar|
-        dest[attr_name] << duplicate_embedded(ar)
+        dest[attribute_name] << duplicate_embedded(ar)
       end
     else      
 # if duplicate string must be added. Useful for unique attributes
-      add_duplicate = params['dup_fields'].to_s.match(attr_name + ',')
-      dest[attr_name] = value
-      dest[attr_name] << ' dup' if add_duplicate
+      add_duplicate = params['dup_fields'].to_s.match(attribute_name + ',')
+      dest[attribute_name] = value
+      dest[attribute_name] << ' dup' if add_duplicate
     end
   end
   dest
@@ -337,19 +339,19 @@ end
 ########################################################################
 def duplicate_document(source)
   dest = {}
-  source.attribute_names.each do |attr_name|
-    next if attr_name == '_id' # don't duplicate _id
-# if duplicate string must be added. Useful for unique attributes
-    add_duplicate = params['dup_fields'].to_s.match(attr_name + ',')
-    dest[attr_name] = source[attr_name]
-    dest[attr_name] << ' dup' if add_duplicate
-  end
-#  
+  source.attribute_names.each do |attribute_name|
+    next if attribute_name == '_id' # don't duplicate _id
+# if duplicate, string must be added. Useful for unique attributes
+    add_duplicate = params['dup_fields'].to_s.match(attribute_name + ',')
+    dest[attribute_name] = source[attribute_name]
+    dest[attribute_name] << ' dup' if add_duplicate
+  end
+# embedded documents
   source.embedded_relations.keys.each do |embedded_name|
     next if source[embedded_name].nil? # it happens
     dest[embedded_name] = []
-    source[embedded_name].each do |ar|
-      dest[embedded_name] << duplicate_embedded(ar)
+    source[embedded_name].each do |embedded|
+      dest[embedded_name] << duplicate_embedded(embedded)
     end
   end
   dest