drg_cms 0.4.58 → 0.4.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc3356e32683c0e69159f4fafba4c1dc66da07a
-  data.tar.gz: 83ea7cd35a8299b96dce61012ddcc0ae51bee30a
+  metadata.gz: dfa3b5330e24fcd8592073f29df197ff39e42370
+  data.tar.gz: ede668ee2e25017ffdf57383945e80439a3db73c
 SHA512:
-  metadata.gz: f3c88278551f008520d1c2f9429daec4f21d21ad5fba72460d372c63ae5d0250af1b8cd4c73ed89568a6a2d04970581769f728bf56a921483353c0b68145a54e
-  data.tar.gz: bb768228a9387447a7fa0ee6342105ab2664c5a1c6d405e051e1f48ba9cf9ec22fd8bed180d37d74e141df8b95cf115478eb1e0f961f417b132c87080a631b66
+  metadata.gz: 776ae4624332a4d86e5368120d8ea14a480eec5dbed77437138cc122c464e4ca0a30d1b2c6c00934c002d11f265ea6cf041f25044c105ee63a57d5abacdb62b4
+  data.tar.gz: 47f49d630d9846eba09ade84b3d28ecbe2a3ed83bf0f3785163e41b1ce9586e4b8e07fec8c422b2eeca030a1723a311f0374e28465395eefddde1c87a43cef49

data/README.md

@@ -12,7 +12,7 @@ Project Tracking
 Compatibility
 -------------
 
-DRG CMS is tested against MRI 1.9.3 and 2.x, MongoDB 2.4, 2.6
+DRG CMS is tested against Ruby 1.9.3, 2.0, 2.1 and 2.2, MongoDB 2.4, 2.6
 
 Documentation
 -------------

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

@@ -188,14 +188,14 @@ $(document).ready( function() {
  /*******************************************************************
   * Popup or close CMS edit menu on icon click
   *******************************************************************/
-  $('.drgcms_popmenu').bind('click',function(e) { 
+  $('.drgcms_popmenu').on('click',function(e) { 
     $(e.target).parents('dl:first').find('ul').toggleClass('div-hidden'); 
   });
 
   /*******************************************************************
   * Popup CMS edit menu option clicked
   *******************************************************************/
-  $('.drgcms_popmenu_item').bind('click',function(e) {
+  $('.drgcms_popmenu_item').on('click',function(e) {
     url = e.target.getAttribute("data-url");
     $('#iframe_cms').attr('src', url);
 //    $('#iframe_cms').width(1000).height(1000);
@@ -217,7 +217,7 @@ $(document).ready( function() {
  /*******************************************************************
   * Tab clicked on form. Hide old and show selected div.
   *******************************************************************/
-  $('.dc-form-li').bind('click', function(e) { 
+  $('.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;
     $(e.target).parents('ul').find('li').each( function() {
@@ -269,7 +269,7 @@ $(document).ready( function() {
 /*******************************************************************
  * Process Ajax call on cmsedit form actions
  *******************************************************************/
-  $('.dc-link-ajax').bind('click', function(e) {
+  $('.dc-link-ajax').on('click', function(e) {
     var target = e.target;
 //    if (e.target.src !== undefined) {
 //      target = e.target.parent(); // picture
@@ -334,7 +334,7 @@ $(document).ready( function() {
  /*******************************************************************
   * App menu option clicked
   *******************************************************************/
-  $('.app-menu-item a').bind('click', function(e) { 
+  $('.app-menu-item a').on('click', function(e) { 
 /* parent of a is li */
     $(e.target).parents('li').each( function() {
 /* for all li's in ul, deselect */
@@ -351,11 +351,11 @@ $(document).ready( function() {
 /*******************************************************************
  * Display spinner on link with spinner, submit link
  *******************************************************************/
-  $('.dc-link-spinner').bind('click', function(e) {
+  $('.dc-link-spinner').on('click', function(e) {
     $('#dc-spinner').toggleClass('div-hidden');
   });  
   
-  $('.dc-link-submit').bind('click', function(e) {
+  $('.dc-link-submit').on('click', function(e) {
     $('#dc-spinner').toggleClass('div-hidden');
   });  
 
@@ -364,7 +364,7 @@ $(document).ready( function() {
   * into required table. This is helper scenario, when user is selecting
   * data from with text_autocomplete and data doesn't exist in belongs_to table.
   *******************************************************************/
-  $('.in-edit-add').bind('click', function(e) { 
+  $('.in-edit-add').on('click', function(e) { 
     url = '/cmsedit/new?table=' + this.getAttribute("data-table");
 /* I know. It doesn't work as expected. But it will do for now. */
     w = window.open(url, '', 'chrome=yes,width=800,height=600,resizable,scrollbars=yes,status=1,centerscreen=yes,modal=yes');
@@ -375,7 +375,7 @@ $(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() {
+  $('#_filter_field').on('change', function() {
     if (this.value.length > 0) { 
       name = 'filter_' + this.value;
       $(this).parents('form').find('span').each( function() {
@@ -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'); }
@@ -402,9 +402,9 @@ element = $(this).find(':first').attr('id');
  * to the form. We can now attach  any kind of data to submit button and data 
  * will be passed as data[] parameters to controller. 
  *******************************************************************/
-  $('.dc-submit').bind('click', function() {
+  $('.dc-submit').on('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) + ']',
@@ -418,7 +418,8 @@ element = $(this).find(':first').attr('id');
  /*******************************************************************
   * Popup or hide document information 
   *******************************************************************/
-  $('#dc-document-info').bind('click',function(e) { 
+  $('#dc-document-info').on('click',function(e) { 
+//  $('.fa').on('click',function(e) { 
     popup = $(e.target).next();
     popup.toggleClass('div-hidden'); 
     if (!popup.hasClass('div-hidden')) {
@@ -432,7 +433,7 @@ element = $(this).find(':first').attr('id');
  /*******************************************************************
   * Just hide document information on click.
   *******************************************************************/
-  $('#dc-document-info-popup').bind('click',function(e) {
+  $('#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');
@@ -443,11 +444,11 @@ element = $(this).find(':first').attr('id');
   });    
 
 /*******************************************************************
- * Force reload of parent page if this div appears
+ * Experimental. Force reload of parent page if this div appears. 
  *******************************************************************/
   $('#div-reload-parent').load( function() {
 //    alert('div-reload-parent 1');
-    parent.location.href=parent.location.href
+    parent.location.href = parent.location.href;
   });
 
 /*******************************************************************
@@ -455,15 +456,23 @@ element = $(this).find(':first').attr('id');
  *******************************************************************/
   $('#div-reload').load( function() {
 //    alert('div-reload 1');
-    location.href=location.href
+    location.href = location.href;
   });
   
-  $('#div-reload-parent').bind('DOMNodeInserted DOMNodeRemoved', function() {
+  $('#div-reload-parent').on('DOMNodeInserted DOMNodeRemoved', function() {
     alert('div-reload-parent 2');
   });  
-  $('#div-reload').bind('DOMNodeInserted DOMNodeRemoved', function() {
+  $('#div-reload').on('DOMNodeInserted DOMNodeRemoved', function() {
     alert('div-reload 2');
-  });  
+  });
+  
+ /*******************************************************************
+  * Fire show document when doubleclicked on result row
+  *******************************************************************/
+  $('.dc-result tr').on('dblclick', function(e) {
+    e.preventDefault();
+    location.href = this.getAttribute("data");
+  });
 
 });
 

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

@@ -32,16 +32,15 @@ vertical-align: middle;
 
 textarea, input, select {
 color: #222;
-padding: 4px;
-border: solid 1px #888;
+padding: 3px;
+border: solid 1px #aaa;
 border-radius: 2px;
+/*background: linear-gradient(#ffd 4%, #fff 100%); */
 /*
-background: linear-gradient(#ffd 4%, #fff 100%); 
 box-shadow: rgba(0,0,0, 0.1) 0px 0px 4px;
 */
 }
 
-input { padding: 6px;}
 /*
 select#record_select { 
 padding: 1px;
@@ -111,27 +110,33 @@ width: 24px;
   padding: 0px;
   border-spacing: 0px;
   border-radius: 1px;  
-/*
-  border-right: 0px;
-  border-left: 1px solid #fff;
-  border-top: 1px solid #fff;
-  border-bottom:1px solid #ccc;
-*/
   background-color: #f8f8f8;
 }
 
-.dc-result td { padding: 2px 0px; }
+.dc-result tr:hover { background-color: #ddd; }
+
+.dc-result td { 
+padding: 2px 0px;
+line-height: 1.5em; 
+}
+
+.dc-result i { 
+padding: 2px;
+}
+
 .dc-menu {
-  border-spacing: 3px;
-  padding: 0px;
+border-spacing: 4px;
+padding: 0px;
 }
 
+#data-fields {margin: 5px;}
+
 .dc-link {
-  padding: 6px 16px;
-  text-align: center;
+padding: 4px 8px;
+text-align: center;
 /*  border: 1px solid #eee;*/
-  border-radius: 5px;
-  background-color: #eee;
+border-radius: 5px;
+background-color: #eee;
 /*  background: linear-gradient(#eee 5%, #fff 100%); */
 }
 
@@ -148,26 +153,29 @@ width: 24px;
   text-align: left;
   font-weight: bold;
 /*  border:1px solid #eee; */
-  padding: 6px 16px;  
+  padding: 5px 8px;  
   border-radius: 5px;
   color: #888;
   background-color: #eee;  
-/*  background: linear-gradient(#eee 5%, #fff 100%); */
+/*  
+  background: linear-gradient(#eee 5%, #fff 100%); */
 }
 
 .dc-link-ajax:hover {
 /*  background: linear-gradient(#fff 5%, #eee 100%);  */
-  color: fff;
   cursor: pointer;
+  color: #fff;
+  background-color: #888;  
 }
 
 .dc-link-img {
   padding: 3px;
   text-align: center;
-/*  border:1px solid #eee;*/
   margin: 0px;
-/*  border-radius: 2px;*/
-/*  background: linear-gradient(#eee 5%, #fff 100%);   */
+/*  
+  border:1px solid #eee;
+  border-radius: 2px;
+  background: linear-gradient(#eee 5%, #fff 100%);   */
 }
 
 .dc-link-img:hover {
@@ -203,16 +211,16 @@ width: 24px;
 .skip-next a:hover { text-decoration: none; color: #c43; }
 
 .dc-animate-button {
-  background: #eee;
-  box-shadow: inset 0 0 10px #fff;
+box-shadow: inset 0 0 10px #fff;
+background-color: #888;
 }
 
 .dc-link-submit {
   text-align: left;
-  padding: 6px 6px;  
+  padding: 5px 6px;  
 /*  border:1px solid #eee; 
   padding: 0px;*/
-  margin: 0px;
+  margin-right: 4px;
 
   border-radius: 5px;
   background-color: #eee;   
@@ -232,10 +240,11 @@ width: 24px;
   border: 0px;
   color: #888;
   font-weight: bold;
+  font-size: 12px;
   box-shadow: none;
   background: none;
 /*  background-color: none;   */
-  padding: 0px 10px;
+  padding: 0px 2px;
   border-radius: 0px;
 } 
 
@@ -293,6 +302,7 @@ width: 24px;
   color: darkgreen;  
   border: 1px solid #b2dba1;  
   border-radius: 2px;
+  margin: 4px;
 }
 
 .dc-form-warning {
@@ -302,6 +312,7 @@ width: 24px;
   color: #c84;  
   border: 1px solid #f5e79e;  
   border-radius: 2px;
+  margin: 4px;
 }
 
 .dc-form-error {
@@ -312,62 +323,28 @@ width: 24px;
   color: #a94442;
   border: 1px solid #dca7a7;
   border-radius: 2px;
+  margin: 4px;
 }
 
 .field_with_errors {
   border: #a94442 2px solid;
 }
 
-/** VRZI VEN OB PRILIKI *******************
-.dc-form-label-odd {
-  color: #555;
-  text-align: right;
-  background-color: #f4f4f4;
-  vertical-align: middle;
-  font-weight: bold;
-  padding: 8px 2px;
-  width:  150px;
-  border-bottom: 1px solid #eee;
-}
-.dc-form-label-even {
-  color: #555;  
-  text-align: right;
-  background-color: #f4f4f4;
-  vertical-align: middle;
-  font-weight: bold;
-  padding: 8px 2px;
-  width:  150px;
-  border-bottom: 1px solid #eee;
-}
-
-.dc-form-field-odd {
-  text-align: left;
-  padding: 8px 2px;
-  background-color: #f4f4f4;
-  border-bottom: 1px solid #eee;
-}
-
-.dc-form-field-even {
-  text-align: left;
-  padding: 8px 2px;
-  background-color: #f4f4f4;
-  border-bottom: 1px solid #eee;
-}
-************** *******************/
-
 .dc-form-label {
   color: #555;
   text-align: right;
-  background-color: #f4f4f4;
   vertical-align: middle;
   font-weight: bold;
-  padding: 8px 2px;
+  padding: 10px 2px;
   width:  150px;
+/*
+  background-color: #f4f4f4;
   border-bottom: 1px solid #eee;
+*/
 }
 
 .dc-form-label label {
-  padding-left: 5px;
+  padding: 0px 0px 2px 1px;
 }
 
 .dc-align-left {
@@ -379,26 +356,32 @@ width: 24px;
 
 .dc-form-field {
   text-align: left;
-  padding: 8px 2px;
+  padding: 2px 2px;
+/*  
   background-color: #f4f4f4;
   border-bottom: 1px solid #eee;
+*/
 }
+.dc-readonly { font-weight: normal }
+
 .dc-readonly {
   margin-left: 2px;
   margin-top: 2px;
-  padding: 3px;
-  border: solid 1px #aaa;
-  border-right: solid 1px #fff;
-  border-bottom: 0px;
+  padding: 2px;
+/*  
+  border: solid 1px #e8e8e8; 
   border-radius: 2px;
-  background: linear-gradient(#eee 1%,  #fff 90%); 
+  background: linear-gradient(#eee 1%,  #fff 90%);  
+  background-color: #eee; */
 }
 
 .dc-color-odd {
-  background-color: #f4f4f4;
+/*  background-color: #f4f4f4;  
+  border-bottom: solid 1px #eee; */
 }
 .dc-color-even {
-  background-color: #f4f4f4;
+  background-color: #f4f4f4; 
+/*  border-bottom: solid 1px #eee;  */
 }
 
 .dc-form-ul {
@@ -431,7 +414,7 @@ width: 24px;
   padding:3px 15px;
   border-radius: 4px 4px 0px 0px;
   background: #eee;
-  margin-right: 4px;
+  margin-right: 2px;
 /*  background: linear-gradient(#eee 2%, #fff 100%);  */
 }
 
@@ -463,7 +446,7 @@ width: 24px;
 
 .cmsedit-table {
   width: 100%;
-  background-color: #f8f8f8; 
+  background-color: #fff; 
   border-spacing: 0px; 
   border-collapse: collapse;
 }
@@ -474,6 +457,9 @@ width: 24px;
   border-bottom: 3px solid #666;
   margin-bottom: 10px;
 }
+.cmsedit-menu a {
+  margin-right: 5px;
+}
 
 .cmsedit-menu select#record_select { 
 padding: 0px;
@@ -497,17 +483,22 @@ height: 26px;
   font-style: italic;
   padding: 4px;
   border-radius: 2px;
-  background: linear-gradient(#8d8 0%, #ffe 15%, #fff 80%); 
+  border: solid 1px #396;
+/*  background: linear-gradient(#8d8 0%, #ffe 15%, #fff 80%); */
 }
 
 .ui-autocomplete-table {
 padding: 3px;
-border: solid 1px #fff;
+border: solid 1px #888;
 border-radius: 2px;
+background: #fff;
+/*
 box-shadow: rgba(0,0,0, 0.1) 0px 0px 4px;
-background: linear-gradient(#8d8 40%, #fff 90%); 
+background: linear-gradient(#8d8 40%, #fff 90%); */
 color: #222;  
 }
+.dc-red { color: red;}
+.dc-green { color: #396;}
 
 .aui-corner-all {
 background-color: lightyellow;
@@ -570,6 +561,7 @@ background-color: #eee;
 
 .iframe_embedded {
 border: 1px solid #6cf;
+background-image: none;
 border-radius: 1px;
 box-shadow: 1px 1px 1px #6cf;
 }
@@ -606,13 +598,13 @@ list-style:none;
 display:inline; 
 position:relative;
 list-style:none;
-padding: 6px 15px;
-margin-right: 2px;
+padding: 5px 8px;
+margin-right: 4px;
 max-width: 200px;
 background: #eee;
 border-radius:5px;
-/* border: 1px solid #eee; 
-background: linear-gradient(#eee 5%, #fff 100%);  */
+z-index: 1;
+/*background: linear-gradient(#eee 5%, #fff 100%);  */
 }
 
 .dc-action-menu li:hover {
@@ -636,7 +628,6 @@ box-shadow: 2px 2px 2px -1px #aaa;
 .dc-action-menu ul li {
 display:block; 
 float:none;
-border-top: 1px solid #fff;
 padding: 4px 10px;
 border-radius: 0px;
 background: none;