drg_cms 0.5.8.2 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bff00bdc426d2a63b7206a17daf68c34e30f5c7
-  data.tar.gz: 1f9cb263ff44cdd17051d4579d0229848991804f
+  metadata.gz: 7b502e1b45d6003b1da74942284939b4e930bb7c
+  data.tar.gz: 845ee2831d322d102bbba5c81728e0022dae83ca
 SHA512:
-  metadata.gz: 8dc173b2078147bf66b4e173227999cc72d330b853d70bf4ae66d4195b59a45a54cc7606baa2db0aa2eeac3b9862ac11f4806028d687536e8e1ea94ff7d7c641
-  data.tar.gz: 4d0f3ebd3069c6f49b560a3224255619ac8875d3190664eadffc67c67c8644aa7d91c999db697e3f00ccf80b7c5f5ef042abb13384cdf93c419de68beee5813d
+  metadata.gz: 0fa721bb626e09db7b61c6bff893ad3e020e97a1947dcb5b3c1b6e8f217af1c3851dc8dd4267c2bc37db8061cc37d51de6ed19c586c8376862aee959ad4462aa
+  data.tar.gz: cb6ece0fb52a4c83b30af7724d7e86e2c2c420ecbbe6446ebdfe1116ec3bbd988dc6b5391d091cb74d047a3d71fad958469a823b1c2c0b92d209fc065043a3c9

data/History.log

@@ -0,0 +1,48 @@
+
+New features for DRG CMS version 0.5.9
+
+    Main CMS menu was becoming to large and was divided into two menus.
+    Result set browse filter data entry redesigned. Values can now be entered directly on actions area. Value of entered fied is also retained beetwen calls. 
+    New DcInternals model introduced. It will be used for accessing internal variables.
+    DRG Forms has new option columns. Option defines number of columns per tab or fields. Field option also got colspan option indicating over how many columns field spans.
+    DRG Forms field size can now also be defined on same level as field type. Before it was defined in html sublevel.
+    
+Bugs resolved for DRG CMS version 0.5.9
+
+    Improved readonly display of select and text_autocomplete DRG Forms fields.
+    Text_autocomplete field is set to nil when content of field is deleted.
+
+--
+
+New features for DRG CMS version 0.5.8
+
+    Browsing array of hashes is now possible with DRG Forms
+    Simple browsing of all defined models and field definitions added to CMS System menu
+    new result_set options table_style, table_class, tr_style, tr_class, td_style, td_class. Welcome colors to result_set browser
+    result_set has been renewed for more modern design. Header elements have now sorting icons
+    dblclick and click actions can now be defined on result set and can fire any action when clicked or double clicked on result set row.
+
+Bugs resolved for DRG CMS version 0.5.8
+
+    associated menu can now be selected on dc_page form also for non dc_simple_menu menus
+
+--
+
+New features for DRG CMS version 0.5.7
+
+    single site document. All data for the site can be saved to single dc_site document and processed by dc_single_sitedoc_request
+    site parts can now also be saved and collected from dc_site document
+    CMS menu done right
+    Page title is now set from dc_page_renderer default method
+
+Bugs resolved for DRG CMS version 0.5.7
+
+    Corrected bug when multitext_autocomplete field was not displaying right values when displayed readonly
+
+    dc_choices4 now checks if model has active field defined and returns only choices of documents that have active field value set to true
+
+    Design and page edit icons are now displayed only when design or page documents are available
+
+    return_to from drgcms_control was not properly handled
+
+    Mouse cursor now changes to pointer when moved over ajax link

data/README.md

@@ -4,10 +4,10 @@ DRG CMS is alternative way of programming application for Ruby on Rails. Instead
  
 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.
 
-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.
 
+DRG CMS has built-in user friendly role based access system and it can be easly extended with help of Ruby on Rails plugin system.
+
 Project Tracking
 ----------------
 
@@ -16,7 +16,7 @@ Project Tracking
 Compatibility
 -------------
 
-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
+DRG CMS is tested against Ruby 2.0, 2.1 and 2.2, Rails 4.2, Mongoid 4 and 5, MongoDB 2.4, 2.6, 3.0
 
 Documentation
 -------------
@@ -24,8 +24,8 @@ Documentation
 Please see the DRG CMS website for up-to-date documentation:
 [www.drgcms.org](http://www.drgcms.org)
 
-License
--------
+License (MIT LICENCE)
+---------------------
 
 Copyright (c) 2012-2015 Damjan Rems
 

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

@@ -516,7 +516,7 @@ element = $(this).find(':first').attr('id');
   * This will fire cmsedit index action and pass value enterred into 
   * filter field and thus refresh browsed result set.
   *******************************************************************/
-  $('#record_filter_field').keydown( function(e) {
+  $('#_record__filter_field').keydown( function(e) {
     if (e.which == '13' || e.which == '9') {
       url = $(this).parents('span').attr("data-url");
       url = url + "&filter_value=" + this.value;
@@ -530,7 +530,7 @@ element = $(this).find(':first').attr('id');
   * work on all field types.
   *******************************************************************/
   $('.record_filter_field_icon').on('click', function(e) {
-    field = $('#record_filter_field');
+    field = $('#_record__filter_field');
     url = $(this).parents('span').attr("data-url");
     url = url + "&filter_value=" + field.val();
     location.href = url;
@@ -540,7 +540,10 @@ element = $(this).find(':first').attr('id');
   * Click on show filter form
   *******************************************************************/
   $('#open_drgcms_filter').on('click', function(e) {
-    $('#drgcms_filter').modal().open();   
+    $('#drgcms_filter').bPopup({
+      speed: 650,
+      transition: 'slideDown'
+    });      
   });
   
  /*******************************************************************
@@ -549,11 +552,15 @@ element = $(this).find(':first').attr('id');
   $('.drgcms_popup_submit').on('click', function(e) {
     //e.preventDefault();  
     url = $(this).attr( 'data-url' );
-    field = $('select#_filter_field').val();
+    field = $('select#_filter_field1').val();
     oper  = $('select#_filter_oper').val();
     location.href = url + '&filter_field=' + field + '&filter_oper=' + oper
-//    $('#drgcms_filter').modal().close();
-  });
+// Still opening in new window
+//    iframe = parent.document.getElementsByTagName("iframe")[0].getAttribute("id");
+//    loc = url + '&filter_field=' + field + '&filter_oper=' + oper
+//    $('#'+iframe).attr('src', loc);
+//    parent.document.getElementById(iframe).src = loc   
+   });
   
 });
 

data/app/assets/javascripts/drg_cms/jquery.bpopup.min.js

@@ -0,0 +1,7 @@
+/*================================================================================
+ * @name: bPopup - if you can't get it up, use bPopup
+ * @author: (c)Bjoern Klinggaard (twitter@bklinggaard)
+ * @demo: http://dinbror.dk/bpopup
+ * @version: 0.11.0.min
+ ================================================================================*/
+ (function(c){c.fn.bPopup=function(A,E){function L(){a.contentContainer=c(a.contentContainer||b);switch(a.content){case "iframe":var d=c('<iframe class="b-iframe" '+a.iframeAttr+"></iframe>");d.appendTo(a.contentContainer);t=b.outerHeight(!0);u=b.outerWidth(!0);B();d.attr("src",a.loadUrl);l(a.loadCallback);break;case "image":B();c("<img />").load(function(){l(a.loadCallback);F(c(this))}).attr("src",a.loadUrl).hide().appendTo(a.contentContainer);break;default:B(),c('<div class="b-ajax-wrapper"></div>').load(a.loadUrl,a.loadData,function(d,b,e){l(a.loadCallback,b);F(c(this))}).hide().appendTo(a.contentContainer)}}function B(){a.modal&&c('<div class="b-modal '+e+'"></div>').css({backgroundColor:a.modalColor,position:"fixed",top:0,right:0,bottom:0,left:0,opacity:0,zIndex:a.zIndex+v}).appendTo(a.appendTo).fadeTo(a.speed,a.opacity);C();b.data("bPopup",a).data("id",e).css({left:"slideIn"==a.transition||"slideBack"==a.transition?"slideBack"==a.transition?f.scrollLeft()+w:-1*(x+u):m(!(!a.follow[0]&&n||g)),position:a.positionStyle||"absolute",top:"slideDown"==a.transition||"slideUp"==a.transition?"slideUp"==a.transition?f.scrollTop()+y:z+-1*t:p(!(!a.follow[1]&&q||g)),"z-index":a.zIndex+v+1}).each(function(){a.appending&&c(this).appendTo(a.appendTo)});G(!0)}function r(){a.modal&&c(".b-modal."+b.data("id")).fadeTo(a.speed,0,function(){c(this).remove()});a.scrollBar||c("html").css("overflow","auto");c(".b-modal."+e).unbind("click");f.unbind("keydown."+e);k.unbind("."+e).data("bPopup",0<k.data("bPopup")-1?k.data("bPopup")-1:null);b.undelegate(".bClose, ."+a.closeClass,"click."+e,r).data("bPopup",null);clearTimeout(H);G();return!1}function I(d){y=k.height();w=k.width();h=D();if(h.x||h.y)clearTimeout(J),J=setTimeout(function(){C();d=d||a.followSpeed;var e={};h.x&&(e.left=a.follow[0]?m(!0):"auto");h.y&&(e.top=a.follow[1]?p(!0):"auto");b.dequeue().each(function(){g?c(this).css({left:x,top:z}):c(this).animate(e,d,a.followEasing)})},50)}function F(d){var c=d.width(),e=d.height(),f={};a.contentContainer.css({height:e,width:c});e>=b.height()&&(f.height=b.height());c>=b.width()&&(f.width=b.width());t=b.outerHeight(!0);u=b.outerWidth(!0);C();a.contentContainer.css({height:"auto",width:"auto"});f.left=m(!(!a.follow[0]&&n||g));f.top=p(!(!a.follow[1]&&q||g));b.animate(f,250,function(){d.show();h=D()})}function M(){k.data("bPopup",v);b.delegate(".bClose, ."+a.closeClass,"click."+e,r);a.modalClose&&c(".b-modal."+e).css("cursor","pointer").bind("click",r);N||!a.follow[0]&&!a.follow[1]||k.bind("scroll."+e,function(){if(h.x||h.y){var d={};h.x&&(d.left=a.follow[0]?m(!g):"auto");h.y&&(d.top=a.follow[1]?p(!g):"auto");b.dequeue().animate(d,a.followSpeed,a.followEasing)}}).bind("resize."+e,function(){I()});a.escClose&&f.bind("keydown."+e,function(a){27==a.which&&r()})}function G(d){function c(e){b.css({display:"block",opacity:1}).animate(e,a.speed,a.easing,function(){K(d)})}switch(d?a.transition:a.transitionClose||a.transition){case "slideIn":c({left:d?m(!(!a.follow[0]&&n||g)):f.scrollLeft()-(u||b.outerWidth(!0))-200});break;case "slideBack":c({left:d?m(!(!a.follow[0]&&n||g)):f.scrollLeft()+w+200});break;case "slideDown":c({top:d?p(!(!a.follow[1]&&q||g)):f.scrollTop()-(t||b.outerHeight(!0))-200});break;case "slideUp":c({top:d?p(!(!a.follow[1]&&q||g)):f.scrollTop()+y+200});break;default:b.stop().fadeTo(a.speed,d?1:0,function(){K(d)})}}function K(d){d?(M(),l(E),a.autoClose&&(H=setTimeout(r,a.autoClose))):(b.hide(),l(a.onClose),a.loadUrl&&(a.contentContainer.empty(),b.css({height:"auto",width:"auto"})))}function m(a){return a?x+f.scrollLeft():x}function p(a){return a?z+f.scrollTop():z}function l(a,e){c.isFunction(a)&&a.call(b,e)}function C(){z=q?a.position[1]:Math.max(0,(y-b.outerHeight(!0))/2-a.amsl);x=n?a.position[0]:(w-b.outerWidth(!0))/2;h=D()}function D(){return{x:w>b.outerWidth(!0),y:y>b.outerHeight(!0)}}c.isFunction(A)&&(E=A,A=null);var a=c.extend({},c.fn.bPopup.defaults,A);a.scrollBar||c("html").css("overflow","hidden");var b=this,f=c(document),k=c(window),y=k.height(),w=k.width(),N=/OS 6(_\d)+/i.test(navigator.userAgent),v=0,e,h,q,n,g,z,x,t,u,J,H;b.close=function(){r()};b.reposition=function(a){I(a)};return b.each(function(){c(this).data("bPopup")||(l(a.onOpen),v=(k.data("bPopup")||0)+1,e="__b-popup"+v+"__",q="auto"!==a.position[1],n="auto"!==a.position[0],g="fixed"===a.positionStyle,t=b.outerHeight(!0),u=b.outerWidth(!0),a.loadUrl?L():B())})};c.fn.bPopup.defaults={amsl:50,appending:!0,appendTo:"body",autoClose:!1,closeClass:"b-close",content:"ajax",contentContainer:!1,easing:"swing",escClose:!0,follow:[!0,!0],followEasing:"swing",followSpeed:500,iframeAttr:'scrolling="no" frameborder="0"',loadCallback:!1,loadData:!1,loadUrl:!1,modal:!0,modalClose:!0,modalColor:"#000",onClose:!1,onOpen:!1,opacity:.7,position:["auto","auto"],positionStyle:"absolute",scrollBar:!0,speed:250,transition:"fadeIn",transitionClose:!1,zIndex:9997}})(jQuery);

data/app/assets/javascripts/drg_cms_cms.js

@@ -26,6 +26,7 @@
 //= #require drg_cms/elfinder/js/elfinder.min.js
 //= #require drg_cms/elfinder/js/proxy/elFinderSupportVer1.js
 
-//= require drg_cms/jquery.the-modal.js
+//= #require drg_cms/jquery.the-modal.js
+//= require drg_cms/jquery.bpopup.min.js
 
 

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

@@ -415,16 +415,20 @@ background: transparent linear-gradient(to bottom, #ddd 0%, #FFF 100%) repeat sc
   font-weight: bold;
   padding: 10px 2px;
   width:  150px;
-/*
-  background-color: #f4f4f4;
-  border-bottom: 1px solid #eee;
-*/
 }
 
 .dc-form-label label {
   padding: 0px 0px 2px 1px;
 }
 
+.dc-form-label-top {
+  color: #555;
+  text-align: right;
+  vertical-align: middle;
+  font-weight: bold;
+  padding: 3px 5px;
+}
+
 .dc-align-left {
   text-align: left;
 }
@@ -880,13 +884,14 @@ border-radius: 2px;
 
 /************************** info popup *************************/
 #drgcms_filter {
-    z-index:100;
-    position:fixed;
-    top: 50px;
-    left: 200px;
-    width: 500px;
-    background: #fff;
-    display: none;
-    padding: 20px;
-    border: 2px solid #222;    
+z-index:100;
+background: #fff;
+display: none;
+padding: 4px;
+border: 2px solid #222;    
 }
+#drgcms_filter h1 {
+background-color: #ccc;
+font-size: 2em; 
+padding: 5px;
+}

data/app/assets/stylesheets/drg_cms_cms.css

@@ -16,7 +16,7 @@
  *= #require ../javascripts/drg_cms/elfinder/css/elfinder.min.css
  *= #require ../javascripts/drg_cms/elfinder/css/theme.css
  *= require font-awesome
- *= require drg_cms/the-modal.css
+ *= #require drg_cms/the-modal.css
 */
 
 /* Required for link buttons to look alike */

data/app/controllers/cmsedit_controller.rb

@@ -263,6 +263,15 @@ end
 ########################################################################
 def show
   find_record
+  if (m = callback_method('before_show') )
+    ret = call_callback_method(m)
+# Don't do anything if return is false
+    if ret.class == FalseClass
+      @form['readonly'] = nil # must be
+      return index 
+    end
+  end  
+
   render action: 'edit', layout: 'cms'
 end
 
@@ -645,23 +654,6 @@ def update_standards(record = @record)
   end
 end
 
-########################################################################
-# Since tabs have been introduced on form it is a little more complicated
-# to get all edit fields on form. This method does it. Subroutine of save_data.
-########################################################################
-def fields_on_form() #:nodoc:
-  fields = []
-  if @form['form']['fields']
-# second element of array is hash. Get only hash element
-    @form['form']['fields'].each {|field| fields << field[1]}
-  else
-    @form['form']['tabs'].keys.each do |key|
-      @form['form']['tabs'][key].each {|field| fields << field[1]}
-    end  
-  end
-  fields
-end
-
 ########################################################################
 # Save document changes to journal table. Saves all parameters to retrieve record if needed.
 # 
@@ -748,6 +740,23 @@ def process_return_to(return_to)
   render text: js_tag(script)
 end
 
+########################################################################
+# Since tabs have been introduced on form it is a little more complicated
+# to get all edit fields on form. This method does it. Subroutine of save_data.
+########################################################################
+def fields_on_form() #:nodoc:
+  fields = []
+  if @form['form']['fields']
+# read only field elements (key is Fixnum)
+    @form['form']['fields'].each {|key,options| fields << options if key.class == Fixnum }
+  else
+    @form['form']['tabs'].keys.each do |tab|
+      @form['form']['tabs'][tab].each {|key,options| fields << options if key.class == Fixnum }
+    end  
+  end
+  fields
+end
+
 ########################################################################
 # Save edited data. Take care that only fields defined on form are affected. 
 # It also saves journal data and calls before_save and after_save callbacks.
@@ -757,6 +766,7 @@ def save_data
   return true unless fields.size > 0
 #
   fields.each do |v|
+    next if v['type'].nil?
     next if v['type'].match('embedded') # don't wipe embedded fields
     next if params[:edit_only] and params[:edit_only] != v['name'] # otherwise other fields would be wiped
     next unless @record.respond_to?(v['name']) # there can be temporary fields on the form

data/app/controllers/dc_application_controller.rb

@@ -45,6 +45,8 @@ end
   
 ####################################################################
 # Return true if CMS is in edit mode
+# 
+# @return [Boolean] True if user CMS edit mode is selected
 ####################################################################
 def dc_edit_mode?
   session[:edit_mode] > 1
@@ -54,8 +56,7 @@ end
 # Checks if user has required role.
 # 
 # @param [DcPolicyRole] role can be passed as DcPolicyRole object or 
-# @param [String] role as role name. If passed as name, dc_policy_roles  
-# is searched for appropriate role.
+# @param [String] role as role name. If passed as name, dc_policy_roles is searched for appropriate role.
 # 
 # @return [Boolean] True if user has required role added to his profile.
 # 
@@ -112,14 +113,12 @@ end
 ########################################################################
 # Searches forms path for file_name and returns full file name or nil if not found.
 # 
-# [Parameters:]
-# [form_file] Form file name. File name can be passed as gem_name.filename. This can
+# @param [String] Form file name. File name can be passed as gem_name.filename. This can
 # be useful when you are extending form but want to retain same name as original form
 # For example. You are extending dc_user form from drg_cms gem and want to
 # retain same dc_user name. This can be done by setting drg_cms.dc_user to extend option. 
 # 
-# [Return:]
-# String. Full form file name or nil if not found.
+# @return [String] Form file name including path or nil if not found.
 ########################################################################
 def dc_find_form_file(form_file)
   form_path=nil
@@ -137,8 +136,11 @@ end
 #######################################################################
 # Will render public/404.html file with some debug code includded.
 # 
-# [Parameters:]
-# [Object where_the_error_is] Additional data can be displayed with error.
+# @param [Object] Object where_the_error_is. Additional data can be displayed with error.
+# 
+# @example Render error 
+#   site = dc_get_site()
+#   return dc_render_404('Site') unless site
 ########################################################################
 def dc_render_404(where_the_error_is=nil)
   render(file: "#{Rails.root}/public/404", :status => 404, :layout => false, :formats => [:html], 
@@ -177,15 +179,13 @@ end
 # Checks if user can perform (read, create, edit, delete) document in specified
 # table (collection).
 # 
-# [Parameters:]
-# [Integer permission] Required permission level
-# [String table] Name of table(collection) for which permission is required. Defaults to params[table].
+# @param [Integer] Required permission level
+# @param [String] Collection (table) name for which permission is queried. Defaults to params[table].
 # 
-# [Returns:]
-# Boolean true if user's role permits operation on a table(collection) with required permission.
+# @return [Boolean] true if user's role permits (is higher or equal then required) operation on a table (collection). 
 # 
-# [Example:]
-#     dc_user_can(DcPermission::CAN_VIEW, params[:table])
+# @Example True when user has view permission on the table
+#   if dc_user_can(DcPermission::CAN_VIEW, params[:table]) then ...
 ############################################################################
 def dc_user_can(permission, table=params[:table])
   if @permissions.nil?
@@ -220,8 +220,8 @@ end
 
 ##########################################################################
 # Merge values from parameters fields (from site, page ...) into internal @options hash.
-# [Parameters:]
-# [String parameters] String in yaml syntax.
+# 
+# @param [String] YAML string.
 ##########################################################################
 def dc_set_options(parameters)
   @options ||= {}
@@ -242,10 +242,13 @@ def dc_set_options(parameters)
 end
 
 ##########################################################################
-# Check if document(s) has been modified since last visit. 
-# [Parameters:]
-# [Documents]: List of documents which are checked against last visit date. If
-# document
+# Check if document(s) has been modified since last visit. It turned out that caching
+# is not that simple and that there are multiple caching scenarios that can be used.
+# So this code is here just for a example, how documents can be checked for changed status.
+# 
+# @param [Documents] List of documents which are checked against last visit date
+# 
+# @return [Boolean] true when none of documents is changed.
 ##########################################################################
 def dc_not_modified?(*documents)
 #  request.env.each {|k,v| p k,'*',v}
@@ -270,15 +273,14 @@ end
 # design documents, collect parameters from different objects, add CMS edit code if allowed
 # and at the end render design.body or design.rails_view or site.rails_view.
 # 
-# [Example:] as defined in routes.rb
-#    get '*path' => 'dc_application_controller#dc_process_default_request'
-#    # or
-#    get '*path' => 'my_controller#page'
-#    # then in my_controller.rb
-#    def page
-#      dc_process_default_request
-#    end
-#    
+# @example as defined in routes.rb
+#   get '*path' => 'dc_application_controller#dc_process_default_request'
+#   # or
+#   get '*path' => 'my_controller#page'
+#   # then in my_controller.rb
+#   def page
+#     dc_process_default_request
+#   end
 ##########################################################################
 def dc_process_default_request() 
   session[:edit_mode] ||= 0
@@ -383,12 +385,14 @@ def dc_single_sitedoc_request
 end
 
 ########################################################################
-# Decamelizes string. Does oposite from camelize method. It probably doesn't work 
+# Decamelizes string. Does oposite of camelize method. It probably doesn't work 
 # very good with non ascii chars. Since this method is used for converting from model
 # to collection names it is very unwise to use non ascii chars for table (collection) names.
 # 
-# [Parameters:]
-# [String string] String to be converted # 'DcSimpleMenu' => 'dc_simple_menu'.
+# @param [String] String to be converted 
+# 
+# @example
+#   decamelize_type(ModelName) # 'ModelName' => 'model_name'
 ########################################################################
 def decamelize_type(string)
   return nil unless string
@@ -406,11 +410,9 @@ end
 ####################################################################
 # Return's error messages for the document formated for display on edit form.
 # 
-# [Parameters:]
-# [document] Document which will be examined for errors.
+# @param [Document] Document object which will be examined for errors.
 # 
-# [Return:]
-# String. HTML code for displaying error on edit form.
+# @return [String] HTML code for displaying error on edit form.
 ####################################################################
 def dc_error_messages_for(document)
   return '' unless document.errors.any?
@@ -435,19 +437,17 @@ end
 # model errors or when saving to multiple collections and where each save must be 
 # checked if succesfull.
 # 
-# [Parameters:]
-# [Object document] Document var
-# [Boolean crash] Should crash when errors detected. Default = false.
+# @param [Document] Document object which will be checked
+# @param [Boolean] If true method should end in runtime error. Default = false.
 # 
-# [Return:]
-# String. Documents error message empty string if everything is OK.
+# @return [String] Error messages or empty string if everything is OK.
 # 
-# [Example:]
-#    model.save
-#    if (msg = dc_check_model(model) ).size > 0
-#      p msg
-#      error process ......
-#    end
+# @Example Check for error when data is saved.
+#   model.save
+#   if (msg = dc_check_model(model) ).size > 0
+#     p msg
+#     error process ......
+#   end
 #      
 ####################################################################
 def dc_check_model(document, crash=false)
@@ -464,12 +464,11 @@ end
 ######################################################################
 # Call rake task from controller.
 # 
-# [Parameters:]
-# [String task] Rake task name
-# [Hash options] Options that will be send to task as environment variables
+# @param [String] Rake task name
+# @param [Hash] Options that will be send to task as environment variables
 # 
-# [Example:]
-#    dc_call_rake('clear:all', some_parm: some_id)
+# @example Call rake task from application
+#   dc_call_rake('clear:all', some_parm: some_id)
 ######################################################################
 def dc_call_rake(task, options = {})
   options[:rails_env] ||= Rails.env
@@ -482,17 +481,15 @@ end
 # 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
+# @param [Hash] Options
 # 
-# [Return:]
-# String. Formatted to be used on ajax return.
+# @return [JSON Response] Formatted to be used for 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.
+# @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)
@@ -514,19 +511,16 @@ def dc_render_ajax(opts)
 end
 
 ########################################################################
-# Find document by parameters. This is how cmsedit finds document based
-# on url parameters.
+# Find document by parameters. This is how cmsedit finds document based on url parameters.
 # 
-# [Parameters:]
-# [String table] Table (collection) name. Could be dc_page;dc_part;... when searching for embedded document.
-# [String id] Id of the document
-# [String table] Ids of parent documents when document is embedded. Ids are separated by ; char. 
+# @param [String] Table (collection) name. Could be dc_page;dc_part;... when searching for embedded document.
+# @param [String] Id of the document
+# @param [String] Ids of parent documents when document is embedded. Ids are separated by ; char. 
 # 
-# [Return:]
-# Document. Required document or nil if not found.
+# @return [document]. Required document or nil if not found.
 # 
-# [Example:] 
-#    dc_find_document(params[:table], params[:id], params[:ids])
+# @example As used in Cmsedit_controller
+#   dc_find_document(params[:table], params[:id], params[:ids])
 ########################################################################
 def dc_find_document(table, id, ids)
   tables = table.split(';')
@@ -543,12 +537,12 @@ end
 
 ########################################################################
 # Reload patches in development. Since patching files are not automatically loaded in
-# development environment thiws litle method automatically reloads all patch files
+# development environment this little 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 }
+    Dir["#{patches}/**/*.rb"].each { |file| require_dependency(file) }
   end
 end