drg_cms 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0544d2cf8584b8b6081d9303dc5eafed7c61f2
-  data.tar.gz: 03ff0ee749f6ec797edd6b185fc7775fe56df7e6
+  metadata.gz: 31aa0b6c5076624acd107471ba082d927e096cb5
+  data.tar.gz: bf9048314d21555c052cca5394b7723fac605e85
 SHA512:
-  metadata.gz: 37f38a5123df485097ea0838d1d8c44fe22ead095961b6d5ee6f8f5d0f0a41ab42c6bc9227cd620231a77a454b1c895b71ff38df0a8cb204b4d252b81e5ae358
-  data.tar.gz: 4d4a60ea1524ed9feecfe25f1c1fc86dee7c8a43c077ad9846de6143355a763351c2f6ca156b6c8551725166867f66bfb3e03af8a42305b916878f8b5314c738
+  metadata.gz: 6e1df8ad23c73f14ad9094a7dc132dea6ceecebb2aadb89ec800a909007ff859b16d5b7f3f6b652b8dfc0b0c97623e69552f8dc107bae18d79485cff833aa9b4
+  data.tar.gz: d6dc1617e911aa3924f0f8e00a546b4e9eb45c0a49e3352bd8d40523550feabf80b61858ec2e85a5ac5751e796e139b7789224de3a2b35153516c7f52e4d482c

data/app/controllers/cmsedit_controller.rb

@@ -76,7 +76,7 @@
 # If filter method returns false user will be presented with flash error.
 ########################################################################
 class CmseditController < DcApplicationController
-before_action :check_authorization, :except => [:login]
+before_action :check_authorization, :except => [:login, :logout]
 before_filter :dc_reload_patches if Rails.env.development?
   
 layout 'cms'
@@ -242,29 +242,34 @@ def filter
 end
 
 ########################################################################
-# Show is (ab)used for direct login and logout into cmsedit controller. Login
-# and logout actions can be directly performed by calling http://site.com/cmsedit/login
+# Show displays record in readonly mode.
 ########################################################################
 def show
-=begin  
-  case
-  when params[:id].in?(%w(login logout)) then # show login menu
-    session[:edit_mode] = 0 
-    render action: 'show'#, layout: 'cms'
-  end
-=end
   find_record
   render action: 'edit', layout: 'cms'
 end
 
 ########################################################################
-# Login action. Used to login direct to CMS.
+# Login action. Used to login direct to CMS. It is mostly used when first time
+# creating site and when something goes so wrong, that traditional login procedure 
+# is not available.
+# 
+# Login can be called directly with url http://site.com/cmsedit/login
+########################################################################
+def login
+  session[:edit_mode] = 0 unless params[:ok]
+  render action: 'login', layout: 'cms'
+end
+
+########################################################################
+# Logout action. Used to logout direct from CMS.
+# 
+# Logout can be called directly with url http://site.com/cmsedit/logout
 ########################################################################
-def login #:nodoc:
-#  session[:edit_mode] = 0 if params[:id].in? %w(login logout) # show login menu
-#  dc_collect_menu_forms
-  session[:edit_mode] = 0 
-  render action: 'show', layout: 'cms'
+def logout 
+  session[:edit_mode] = 0
+  session[:user_id]   = nil
+  render action: 'login', layout: 'cms'
 end
 
 ########################################################################

data/app/controllers/dc_application_controller.rb

@@ -285,9 +285,7 @@ def dc_process_default_request()
     return dc_render_404('Design!') unless @design
   end
 # Add edit menu
-  layout = 'content'
   if session[:edit_mode] > 0
-#    layout = 'cms'
     session[:site_id]         = @site.id
     session[:site_page_table] = @site.page_table
     session[:page_id]         = @page.id
@@ -296,6 +294,7 @@ def dc_process_default_request()
     dc_log_visit()
   end
   @page_title = @page.subject.empty? ? @site.page_title : @page.subject
+  layout      = @site.site_layout.to_s.size > 2 ? @site.site_layout : 'content'
 # render view. inline if defined in design
   view_filename = ''
   view_filename = @design.rails_view.to_s if @design

data/app/forms/all_options.yml

@@ -79,7 +79,8 @@ result_set:
       eval: dc_icon4_boolean
 
 form:
-  edit_title: description
+  title: 
+    field: description
   height: 600
   title:
     edit: Title for edit
@@ -99,6 +100,12 @@ form:
       type: script
       caption: Cancle 
       js: parent.reload();
+    7:
+      type: submit
+      caption: Send
+      params:
+        before-save: send_mail
+        after-save: return_to parent.reload
       
   tabs:
     tab1:

data/app/forms/dc_ad.yml

@@ -29,9 +29,9 @@ result_set:
       name: active
       eval: dc_icon4_boolean      
 
-edit_title: description
-
-form:
+form: 
+  title: 
+    field: description
   actions: standard
 
   fields:

data/app/forms/dc_big_table.yml

@@ -26,9 +26,10 @@ result_set:
       name: active
       eval: dc_icon4_boolean
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: 
     standard: yes
 

data/app/forms/dc_big_table_locale.yml

@@ -23,9 +23,9 @@ result_set:
     2:  
       name: description
 
-edit_title: locale
-
 form:
+  title: 
+    field: locale  
   actions: standard
 
   fields:

data/app/forms/dc_big_table_value.yml

@@ -23,9 +23,10 @@ result_set:
     2:  
       name: description
 
-edit_title: value
-
 form:
+  title: 
+    field: value
+    
   actions: standard
 
   fields:

data/app/forms/dc_category.yml

@@ -20,9 +20,10 @@ result_set:
       name: active
       eval: dc_icon4_boolean      
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: 
     standard: yes
 

data/app/forms/dc_design.yml

@@ -25,9 +25,10 @@ result_set:
     2: 
       name: description
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: 
     standard: yes
 

data/app/forms/dc_folder_permission.yml

@@ -23,9 +23,10 @@ result_set:
       name: active
       eval: dc_icon4_boolean      
 
-edit_title: folder_name
-
 form:
+  title: 
+    field: folder_name
+    
   actions: standard
 
   fields:

data/app/forms/dc_ident.yml

@@ -19,7 +19,9 @@ result_set:
       style: "text-align: left;"
 
 form:
-  edit_title: caption
+  title: 
+    field: caption
+    
   actions: standard
 
   fields:

data/app/forms/dc_link.yml

@@ -21,9 +21,10 @@ result_set:
       name: params
       style: "text-align: left;"
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
     
   fields:

data/app/forms/dc_menu.yml

@@ -22,9 +22,10 @@ result_set:
       name: description
       style: "text-align: left;"
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
   tabs:
     tab1:

data/app/forms/dc_menu_item.yml

@@ -25,7 +25,9 @@ result_set:
 
 
 form:
-  edit_title: caption
+  title: 
+    field: caption
+    
   actions: standard
 
   tabs:

data/app/forms/dc_page.yml

@@ -24,8 +24,10 @@ result_set:
     4: 
       name: updated_at
 
-edit_title: subject
 form:
+  title: 
+    field: subject
+    
   actions: standard
   tabs:
     1base:

data/app/forms/dc_part.yml

@@ -23,9 +23,10 @@ result_set:
     4: 
       name: updated_at
 
-edit_title: subject
-
 form:
+  title: 
+    field: subject
+    
   actions: standard
   tabs:
     1base:

data/app/forms/dc_permission.yml

@@ -23,9 +23,10 @@ result_set:
       name: active
       eval: dc_icon4_boolean      
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
 
   fields:

data/app/forms/dc_piece.yml

@@ -24,9 +24,10 @@ result_set:
     4: 
       name: updated_at
 
-edit_title: subject
-
 form:
+  title: 
+    field: subject
+    
   actions: standard
 
   tabs:

data/app/forms/dc_policy.yml

@@ -18,9 +18,9 @@ result_set:
       name: description
       style: "text-align: left;"
 
-edit_title: name
-
 form:
+  title: 
+    field: name  
 
   fields:
     10:

data/app/forms/dc_policy_role.yml

@@ -20,9 +20,10 @@ result_set:
       name: active
       eval: dc_icon4_boolean      
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
 
   fields:

data/app/forms/dc_policy_rule.yml

@@ -20,9 +20,10 @@ result_set:
       name: permission
       eval: DcPolicyRule.permission_name_for_value
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
 
   fields:

data/app/forms/dc_policy_rule_nocms.yml

@@ -20,9 +20,10 @@ result_set:
       name: permission
       eval: DcPolicyRule.permission_name_for_value      
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
 
   fields:

data/app/forms/dc_poll.yml

@@ -25,9 +25,10 @@ result_set:
     4: 
       name: valid_to
 
-edit_title: description
-
 form:
+  title: 
+    field: description
+    
   actions: standard
 
   tabs:

data/app/forms/dc_poll_item.yml

@@ -23,9 +23,10 @@ result_set:
       name: order
       style: "text-align: right;"
 
-edit_title: text
-
 form:
+  title: 
+    field: text
+    
   actions: standard
 
   fields:

data/app/forms/dc_simple_menu.yml

@@ -22,8 +22,10 @@ result_set:
       name: description
       style: "text-align: left;"
 
-edit_title: name
 form:  
+  title: 
+    field: name
+    
   actions: standard
 
   tabs:

data/app/forms/dc_simple_menu_item.yml

@@ -26,9 +26,10 @@ result_set:
       name: order
       style: "text-align: right;"
 
-edit_title: caption
-
 form:
+  title: 
+    field: caption
+    
   actions: standard
 
   fields:

data/app/forms/dc_site.yml

@@ -21,9 +21,10 @@ result_set:
     2: 
       name: description
 
-edit_title: name
-
 form:
+  title: 
+    field: name
+    
   actions: standard
 
   tabs:
@@ -89,6 +90,11 @@ form:
         type: text_field
         html:
           size: 10
+      25:
+        name: site_layout
+        type: text_field
+        html:
+          size: 20
       30:
         name: page_table
         type: text_field

data/app/forms/dc_user.yml

@@ -22,9 +22,10 @@ result_set:
     4: 
       name: last_visit
 
-edit_title: user
-
 form:
+  title: 
+    field: user
+    
   actions: standard
 
   fields:

data/app/forms/dc_user_role.yml

@@ -16,13 +16,15 @@ result_set:
       name: dc_policy_role_id
       eval: dc_name4_id,dc_policy_role,name
 
-    3: 
+    2: 
       name: valid_from
 
-    4: 
+    3: 
       name: valid_to
 
-edit_title: Policy rule
+    4: 
+      name: active
+      eval: dc_icon4_boolean
 
 form:
   actions: standard

data/app/helpers/cmsedit_helper.rb

@@ -59,7 +59,7 @@ EOT
     yaml = v.class == String ? {'type' => v} : v # if single definition simulate type parameter
     action = yaml['type'].to_s.downcase 
     if action == 'url'
-      p "action: url will be deprecated. Use action: link in index: actions"
+      dc_deprecate "action: url will be deprecated. Use action: link in index: actions"
       action = 'link' 
     end
 # if return_to is present link directly to URL 
@@ -114,16 +114,19 @@ EOT
 end
 
 ############################################################################
-# Subroutine of dc_div_filter
+# Will return field form definition. Subroutine of dc_div_filter
 ############################################################################
 def _get_field_def(name) #:nodoc:
-  @form['form'].each do |tab|
-    next if tab.first.match('actions')
+  @form['form']['tabs'].each do |tab|
     tab.each do |field|
-      next if field.class == String
+      next if field.class == String # tab name
       field.each {|k,v| return v if v['name'] == name }
     end
-  end   
+  end if @form['form']['tabs'] #  I know. But nice. 
+#
+  @form['form']['fields'].each do |field|
+    field.last.each {|k,v| return v if v['name'] == name }
+  end if @form['form']['fields']
   nil
 end
 
@@ -131,12 +134,12 @@ end
 # Finds field definition on form and use it for filter input. Subroutine of dc_div_filter.
 ############################################################################
 def _get_field_div(name) #:nodoc:
-# field not defined on form. Must be defined: name as form_field_type  
   filter = nil
+# old filter saved to session  
   if session[@form['table']] and session[@form['table']][:filter]
     filter, operation, value = session[@form['table']][:filter].split("\t")
   end
-#
+# field not defined on form. Must be defined: name as form_field_type  
   if name.match(' as ')
     name, dummy, type = name.split(' ')
     field = {"name" => name, "type" => type, "html"=>{"size"=>20}}
@@ -229,7 +232,7 @@ def dc_link_or_ajax(yaml, parms) #:nodoc:
   
 #  method  = yaml['method'] || yaml['request'] || 'get'
 #  caption = yaml['caption'] || yaml['text']
-  p "Form: result_set:action:text directive will be deprecated. Use caption instead of text." if yaml['text']
+  dc_deprecate "Form: result_set:action:text directive will be deprecated. Use caption instead of text." if yaml['text']
 #
 =begin
   if yaml['type'] == 'link'
@@ -627,8 +630,13 @@ def dc_fields_for_tab(fields) #:nodoc:
       next
     end
 # label
-    options['text'] ||= options['name'].capitalize.gsub('_',' ')
-    text = options['text'].match('helpers.') ? t(options['text']) : t_name(options['name'], options['text']) 
+    text = if options['text']
+      t(options['text'], options['text'])
+    else
+      t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
+    end
+#    options['text'] ||= options['name'].capitalize.gsub('_',' ')
+#    text = options['text'].match('helpers.') ? t(options['text']) : t_name(options['name'], options['text']) 
 # help text can be defined in form or in translations starting with helpers. or as helpers.help.collection.field
     help = if options['help'] 
       options['help'].match('helpers.') ? t(options['help']) : options['help']

data/app/helpers/dc_application_helper.rb

@@ -56,6 +56,14 @@ def _origin #:nodoc:
   @parent ? @parent : self  
 end
 
+############################################################################
+# Writes out deprication msg. It also adds site_name to message, so it is easier to
+# find where the message is comming from.
+############################################################################
+def dc_deprecate(msg)
+  p "#{dc_get_site.name}: #{msg}"
+end
+
 ############################################################################
 # This is main method used for render parts of design into final HTML document.
 # 
@@ -103,6 +111,7 @@ end
 ########################################################################
 def dc_replace_in_design(opts={})
   design = opts[:piece] ? DcPiece.find(name: opts[:piece]).script : dc_get_site.design
+  layout = opts[:layout] || (dc_get_site.site_layout.size > 2 ? dc_get_site.site_layout : nil)
   if opts[:replace]
 # replace more than one part of code
     if opts[:replace].class == Array
@@ -118,7 +127,7 @@ end
 # Old method name. 
 ########################################################################
 def dc_render_design(opts={}) #:nodoc:
-  p "dc_render_design will be deprecated. Use dc_replace_in_design instead."  
+  dc_deprecate "dc_render_design will be deprecated. Use dc_replace_in_design instead."  
   dc_replace_in_design(opts)
 end
 
@@ -160,8 +169,9 @@ def dc_edit_title()
     c = (@form['readonly'] ? t('drgcms.show') : t('drgcms.edit')) + " : "
     c << (@form['title'] ? t( @form['title'], @form['title'] ) : t_tablename(@form['table'])) + ' : '
     title = (title and title['field']) ? title['field'] : @form['form']['edit_title']
+    dc_deprecate('form:edit_title will be deprecated. Use form:title:field instead.') if @form['form']['edit_title']
     c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
-    c << @record._id 
+    c << @record._id #if @record._id 
   end
 end
 
@@ -404,7 +414,7 @@ end
 ####################################################################
 def dc_link_for_edit1(opts, link_text) #:nodoc:
   icon = opts.delete('icon')
-  url  = @parent.url_for(opts)
+  url  = _origin.url_for(opts)
   "<li><div class='drgcms_popmenu_item' style='cursor: pointer;' data-url='#{url}'>
 #{_origin.fa_icon(icon)} #{link_text}</div></li>\n"
 end
@@ -430,18 +440,18 @@ end
 def dc_page_edit_menu(opts=@opts)
   return '' if opts[:edit_mode] < 2
 # save some data to cookie. This can not go to session.
-  table = @parent.site.page_table
+  table = _origin.site.page_table
   kukis = { "#{table}.dc_design_id" => @page.dc_design_id,
             "#{table}.menu_id"      => @page.menu_id,
             "#{table}.kats"         => @page.kats,
             "#{table}.page_id"      => @page.id,
-            "#{table}.dc_site_id"   => @parent.site.id
+            "#{table}.dc_site_id"   => _origin.site.id
   }
-  @parent.cookies[:record] = Marshal.dump(kukis)
+  _origin.cookies[:record] = Marshal.dump(kukis)
   title = "#{t('drgcms.edit')}: #{@page.subject}"
   dc_link_menu_tag(title) do |html|
     opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', 'icon' => 'edit' )
-    opts[:editparams].merge!( :id => @page.id, :table => @parent.site.page_table, formname: nil, edit_only: 'body' )
+    opts[:editparams].merge!( :id => @page.id, :table => _origin.site.page_table, formname: nil, edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
 #    opts[:editparams][:edit_only] = nil
@@ -453,7 +463,7 @@ def dc_page_edit_menu(opts=@opts)
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_page') )
 
     opts[:editparams].merge!(ids: @page.id, formname: 'dc_part', 'icon' => 'plus-square-o', 
-                             table: "#{@parent.site.page_table};dc_part"  )
+                             table: "#{_origin.site.page_table};dc_part"  )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_new_part') )
   end
 end
@@ -624,7 +634,7 @@ end
 #
 ####################################################################
 def dc_date_time(value, format) #:nodoc:
-  p 'dc_date_time will be deprecated! Use dc_format_date_time instead.'
+  dc_deprecate 'dc_date_time will be deprecated! Use dc_format_date_time instead.'
   dc_format_date_time(value, format)
 end
 
@@ -857,16 +867,15 @@ def dc_user_can_view(ctrl, policy_id)
   default_policy = policies.find_by(is_default: true)
   return false, 'Default accsess policy not found for the site!' unless default_policy
 #  
-  h = {}
-  default_policy.dc_policy_rules.to_a.each { |v| h[v.dc_policy_role_id] = v.permission }
+  permissions = {}
+  default_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
 # update permissions with defined policy 
   part_policy = nil
   if policy_id
     part_policy = policies.find(policy_id)
     return false, 'Access policy not found for part!' unless part_policy
-    part_policy.dc_policy_rules.to_a.each { |v| h[v.dc_policy_role_id] = v.permission }
+    part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
-#  p h
 # apply guest role if user has no roles defined
   if ctrl.session[:user_roles].nil?
     role = DcPolicyRole.find_by(system_name: 'guest', active: true)
@@ -874,10 +883,11 @@ def dc_user_can_view(ctrl, policy_id)
     ctrl.session[:user_roles] = [role.id]
   end
 # Check if user has any role that allows him to view part
+#  p h, ctrl.session[:user_roles]
   can_view, msg = false,''
   ctrl.session[:user_roles].each do |role|
-    next unless h[role]          # role not yet defined. Will die in next line.
-    if h[role] > 0
+    next unless permissions[role]          # role not yet defined. Will die in next line.
+    if permissions[role] > 0
       can_view = true
       break
     end

data/app/helpers/dc_part_renderer.rb

@@ -121,7 +121,7 @@ def default
   html = ''
 # Load all parts only once per call  
   load_parts if @parent.parts.nil?
-  p 'DcPart: Parameter location will be deprecated! Please use position keyword.' if @opts['location']
+  dc_deprecate 'DcPart: Parameter location will be deprecated! Please use position keyword.' if @opts['location']
   
   @opts[:position] ||= @opts['position'] # symbols are not strings. Ensure that it works.
 # Select parts

data/app/helpers/dc_simple_menu_renderer.rb

@@ -62,14 +62,17 @@ def link_4edit()  #:nodoc:
   return html unless @opts[:edit_mode] > 1
 #
   @opts[:editparams].merge!( { table: 'dc_simple_menu', controller: 'cmsedit', action: 'edit' } )
-  title = "#{t('drgcms.edit')}: "
   if @menu # edit, when menu exists
+    title = "#{t('drgcms.edit')}: "
     @opts[:editparams].merge!( { id: @menu.id, title: "#{title}#{@menu.name}" } ) 
+    html << dc_link_for_edit( @opts[:editparams] )
   else # list available menus when menu does not yet exist
+    title = "#{t('drgcms.new')}: "
     title << t('helpers.label.dc_simple_menu.tabletitle')
     @opts[:editparams].merge!( { action: 'index', title: title })
+    html << dc_link_for_create( @opts[:editparams] )
   end
-  html << dc_link_for_edit( @opts[:editparams] )
+  html
 end
 
 ########################################################################
@@ -144,6 +147,7 @@ def as_responsive
   items.each do |item|
 # menu can be hidden from user
     can_view, msg = dc_user_can_view(@parent, item)
+    p msg unless can_view
     next unless can_view
     html << "<li class=\"#{klas}#{(item.id == @selected.id) ? 'selected' : 'item'}\">#{ link_4menu(item) }</li>" #
   end

data/app/models/dc_dummy.rb

@@ -62,9 +62,39 @@ class DcDummy
   include Mongoid::Document
   
 ########################################################################
-# Ignore errors.
+# Respond_to should always return true.
 ########################################################################
-  def method_missing(m, *args, &block) #:nodoc:
-    nil
+def respond_to?(m)
+#  p "respond_to #{m}"
+  true
+end
+
+########################################################################
+# Redefine send method. Send is used to assign value by cmsedit controller.
+########################################################################
+def send(field,value)
+#  p "send #{field} #{value}"
+  if field.to_s.match('=')
+    field.chomp!('=')
+    @internals ||= {}
+    @internals[field] = value
   end
 end
+  
+########################################################################
+# Method missing will return value if value defined by m parameter is saved to
+# @internals array or will assign new value to @internals hash if m matches '='.
+########################################################################
+def method_missing(m, *args, &block) #:nodoc:
+#  p "#{m},#{args},#{block}"
+  @internals ||= {}
+  m = m.to_s
+  if m.match('=')
+    m.chomp!('=')
+    @internals[m] = args.first
+  else
+    @internals[m]
+  end   
+end
+
+end

data/app/models/dc_part.rb

@@ -50,7 +50,7 @@ class DcPart
 # Implementation of before_save callback.
 ######################################################################
 def do_before_save
-  if self.link.empty?
+  if self.link.blank?
     self.link = self.name.strip.downcase.gsub(' ','-')
   end
 end

data/app/models/dc_site.rb

@@ -36,11 +36,12 @@ included do
   field :error_link,          type: String
   field :header,              type: String, default: ''
   field :css,                 type: String, default: ''
-  field :route_name,          type: String, default: 'page'
+  field :route_name,          type: String, default: ''
   field :page_title,          type: String  
   field :document_extension,  type: String  
   field :page_table,          type: String
   field :page_class,          type: String, default: 'DcPage'
+  field :site_layout,         type: String, default: 'content'
   field :menu_class,          type: String, default: 'DcSimpleMenu'
   field :files_directory,     type: String
   field :logo,                type: String

data/app/views/cmsedit/login.html.erb

@@ -0,0 +1,21 @@
+<% if session[:edit_mode] and session[:edit_mode] > 0 %>
+  <%= render partial: 'edit_stuff' %>
+  <%= render partial: 'edit_stuff', formats: ['js']  %>
+<% else %>
+  <h2>CMS login</h2>
+  <%= dc_flash_messages %>   
+  <%= form_tag controller: 'dc_common', action: 'process_login', return_to: '/cmsedit/login?ok=1', method: :put do %>
+    <table>
+      <tr>
+        <td>Username:</td>
+        <td><%=  text_field('record', 'username') %>
+      </tr><tr>  
+        <td>Password:</td>
+        <td><%=  password_field('record', 'password') %>
+      </tr><tr>  
+        <td><%= submit_tag 'Login' %></td>
+      </tr>
+    </table>
+    <%= hidden_field_tag('return_to_error', request.url ) %>
+  <% end %>
+<% end %>

data/config/locales/models_en.yml

@@ -42,13 +42,14 @@ en:
         error_link: Error link
         css: CSS
         header: Header
-        route_name: Route name
+        route_name: Default route name
         page_title: Page title
         logo: Logo picture
         document_extension: Document extension
         page_table: Page table
         page_class: Page class
         menu_class: Menu class
+        site_layout: Rails layout
         files_directory: Files directory
         active: Active
         dc_policies: Access policies
@@ -482,12 +483,13 @@ en:
         error_link: Link to error page 
         css: Site wide CSS
         header: Additional data used in page html header
-        route_name: Route  name used when creating page link. Defaults to page.
+        route_name: Default route name for creating page link. ex. page. Leave blank if not used.
         page_title: Default page title displayed in browser's top menu when title can not be extracted from document
         document_extension: Default document extension eg. html
         page_table: Name of table holding data for pages
         page_class: Rails model class name which defines table holding pages data usually DcPage
         menu_class: Rails model class name which defines table holding menu data usually DcMenu
+        site_layout: Rails layout used to draw response. This is by default application.
         files_directory: Directory name where uploaded files are located
         logo: Logotype picture for the site
         dc_policies: Access policies defined for the site

data/config/locales/models_sl.yml

@@ -46,7 +46,8 @@ sl:
         document_extension: Podaljšek
         page_table: Tabela strani
         page_class: Razred strani
-        menu_class: Razred menija        
+        menu_class: Razred menija
+        site_layout: Rails layout
         files_directory: Mapa z datotekami
         logo: Logotip
         dc_policies: Politike za dostop
@@ -494,6 +495,7 @@ sl:
         page_table: Ime tabele (mongo collection), ki vsebuje podatke o straneh
         page_class: Ime Rails razreda modela, ki določa tabelo s podatki o straneh. Običajno DcPage.
         menu_class: Ime Rails razreda modela, ki določa tabelo s podatki o meniju. Običajno DcMenu.
+        site_layout: Rails layout, ki se bo uporabil za izris strani. Privzet je application.
         files_directory: Ime direktorija, kjer se nahajajo dokumenti, slike, priponke
         logo: Slika logotip podjetja
         dc_policies: Privzete politike za dostop do podatkov spletišča

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/generators/new_drg_form/USAGE

@@ -0,0 +1,8 @@
+Description:
+    new_drg_form_generator will create DRG form from model description. 
+
+Example:
+    rails generate new_drg_form model_name
+
+    This will create:
+        forms/model_name.yml

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -0,0 +1,217 @@
+class NewDrgFormGenerator < Rails::Generators::NamedBase
+  
+source_root File.expand_path('../templates', __FILE__)
+#desc "This generator creates form for model at app/forms"
+#argument :formname, :type => :string, :default => ''
+class_option :tabs, :type => :boolean, :default => false, :description => "Create form with tabulators" 
+
+###########################################################################
+# Will create output and save it to form filename.
+###########################################################################
+def create_form_file
+#:TODO: find out how to prevent error when model class is not defined
+  @file_name = file_name
+  formname = file_name #if formname.size == 0
+  @model = file_name.classify.constantize rescue nil
+  return (p "Model #{file_name.classify} not found! Aborting.") if @model.nil?
+#  
+  yml = top_level_options + index_options + result_set_options + form_top_options + form_fields_options
+  create_file "app/forms/#{formname}.yml", yml
+end
+
+private
+###########################################################################
+#
+###########################################################################
+def top_level_options
+  <<EOT 
+# Form for #{file_name}
+table: #{file_name}
+#title: Alternative title
+#extend: extend
+#controls: controls_file
+#readonly: 1
+#permissions:
+#  can_view: role_name
+
+EOT
+end
+  
+###########################################################################
+#
+###########################################################################
+def index_options
+  <<EOT 
+index:
+  filter: id as text_field
+  actions: standard
+  
+#  actions:
+#    3: 
+#      type: link
+#      controller: controller_name
+#      action: action_name
+#      table: table_name
+#      formname: form_name
+
+EOT
+end
+
+###########################################################################
+#
+###########################################################################
+def result_set_options
+  <<EOT 
+result_set:
+#  filter: controls_flter
+#  actions_width: 100
+#  per_page: 10
+  
+  actions: standard
+
+#  actions: 
+#    1:
+#      type: link
+#      controller: controller_name
+#      action: action_name
+#      table: table_name
+#      formname: form_name
+#      target: target      
+#      method: (get),put,post      
+# 
+# Choose from
+# #{@model.attribute_names.join(',')}
+  columns:
+    1:  
+      name: #{@model.attribute_names[1]}
+      style: 'align: left; width: 100px'
+    2:  
+      name: #{@model.attribute_names[2]}
+    3: 
+      name: created_at
+      format: '%d.%m.%Y'
+    4: 
+      name: active
+      eval: dc_icon4_boolean
+
+EOT
+end
+
+###########################################################################
+#
+###########################################################################
+def form_top_options
+  <<EOT
+form:
+#  height: 600
+#  title:
+#    field: name
+#    edit: Title for edit
+#    show: Title for show
+
+  actions: standard
+#
+#  actions: 
+#    1: 
+#      type: ajax
+#      controller: ppk
+#      action: prepare_document
+#      method: (get),put,post
+#      caption: Prepare document
+#    2: 
+#      type: script
+#      caption: Cancle 
+#      js: parent.reload();
+#    3:
+#      type: submit
+#      caption: Send
+#      params:
+#        before-save: send_mail
+#        after-save: return_to parent.reload
+
+EOT
+end
+
+###########################################################################
+#
+###########################################################################
+def form_field(field, index, offset)
+  helper = I18n.t("helpers.label.#{@file_name}.choices4_#{field}")
+  type, eval = 'select',''
+  if helper.class == Hash or helper.match( 'translation missing' )
+    if field[-3,3] == '_id'
+      eval = "eval: dc_choices4('#{field[0,field.size-3]}','change_to_description_field_name','_id')\n"
+    else
+      type = 'text_field'
+    end
+  end
+#
+  yml = ' '*offset
+  yml << "#{index}:\n"
+  offset += 2
+#
+  yml << ' '*offset + "name: #{field}\n"
+  yml << ' '*offset + "type: #{type}\n"
+  yml << ' '*offset + eval if eval.size > 0
+  yml << ' '*offset + "html:\n"
+  offset += 2
+  if type == 'text_field'
+    yml << ' '*offset + "size: 50\n"
+  else
+    yml << ' '*offset + "include_blank: true\n"
+  end 
+  yml
+end
+
+###########################################################################
+#
+###########################################################################
+def embedded_form_field(offset)
+  yml = ''
+  field_index = 10
+  @model.embedded_relations.keys.each do |embedded_name|
+    yml << ' '*offset + "#{field_index}:\n"
+    yml << ' '*(offset+2) + "name: #{embedded_name}\n"
+    yml << ' '*(offset+2) + "type: embedded\n"
+    yml << ' '*(offset+2) + "formname: #{embedded_name[0,embedded_name.size - 1]}\n"
+    yml << '#' + ' '*(offset+2) + "html:\n"
+    yml << '#' + ' '*(offset+4) + "height: 500\n"
+    field_index += 10      
+  end
+  yml
+end
+
+###########################################################################
+#
+###########################################################################
+def form_fields_options
+  forbidden = ['_id','created_by','updated_by','created_at','updated_at']
+  tab_index = 1
+  field_index = 0
+  if options.tabs? 
+    yml = "  tabs:\n"
+    @model.attribute_names.each do |attr_name|
+      next if forbidden.include?(attr_name)
+      if field_index%100 == 0
+        yml << "    tab#{tab_index}:\n"
+        field_index = 0
+        tab_index += 1
+      end
+      field_index += 10
+      yml << form_field(attr_name, field_index, 6)
+    end
+    yml << "    tab#{tab_index}:\n"
+    yml << embedded_form_field(6)
+  else  
+    yml = "  fields:\n"
+    @model.attribute_names.each do |attr_name|
+      next if forbidden.include?(attr_name)
+      field_index += 10      
+      yml << form_field(attr_name, field_index, 4)
+    end
+    yml << embedded_form_field(4)
+  end
+  yml
+end
+    
+end

data/test/lib/generators/new_drg_form_generator_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+require 'generators/new_drg_form/new_drg_form_generator'
+
+class NewDrgFormGeneratorTest < Rails::Generators::TestCase
+  tests NewDrgFormGenerator
+  destination Rails.root.join('tmp/generators')
+  setup :prepare_destination
+
+  # test "generator runs without errors" do
+  #   assert_nothing_raised do
+  #     run_generator ["arguments"]
+  #   end
+  # end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -249,8 +249,6 @@ files:
 - app/models/dc_user_role.rb
 - app/models/dc_visit.rb
 - app/models/drgcms_form_fields.rb
-- app/views/__dc_at_the_beginning/create.html.erb
-- app/views/__dc_at_the_beginning/index.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
 - app/views/cmsedit/_edit_stuff.js.erb
 - app/views/cmsedit/_form.html.erb
@@ -258,10 +256,9 @@ files:
 - app/views/cmsedit/edit.html.erb
 - app/views/cmsedit/error.html.erb
 - app/views/cmsedit/index.html.erb
+- app/views/cmsedit/login.html.erb
 - app/views/cmsedit/new.html.erb
 - app/views/cmsedit/show.html.erb
-- app/views/dc_at_the_beginning/create.html.erb
-- app/views/dc_at_the_beginning/index.html.erb
 - app/views/dc_common/_iframe_edit.html.erb
 - app/views/dc_common/paste_clipboard.html.erb
 - app/views/dc_mail/subscribe.html.erb
@@ -284,6 +281,8 @@ files:
 - lib/drg_cms.rb
 - lib/drg_cms/engine.rb
 - lib/drg_cms/version.rb
+- lib/generators/new_drg_form/USAGE
+- lib/generators/new_drg_form/new_drg_form_generator.rb
 - lib/tasks/at_the_beginning.yml
 - lib/tasks/dc_at_the_beginning.rake
 - lib/tasks/dc_cleanup.rake
@@ -321,6 +320,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
+- test/lib/generators/new_drg_form_generator_test.rb
 - test/test_helper.rb
 homepage: http://www.drgcms.org
 licenses:
@@ -348,6 +348,7 @@ specification_version: 4
 summary: 'DRG CMS: Content management system for Ruby, Rails and MongoDB'
 test_files:
 - test/test_helper.rb
+- test/lib/generators/new_drg_form_generator_test.rb
 - test/drg_cms_test.rb
 - test/integration/navigation_test.rb
 - test/dummy/README.rdoc

data/app/views/__dc_at_the_beginning/create.html.erb

@@ -1,9 +0,0 @@
-
-<h2>Superadmin account created</h2>
-Please write down username:<%= params[:username] %>
-<br>password:<%= params[:password1]  %>
-<br>
-<!-- <%= link_to('Start editing', controller: 'poll', poll_id: 'login', return_to: '/cmsedit/show') %> -->
-
-<%= link_to('Start editing', controller: 'cmsedit', action: 'show') %>
-

data/app/views/__dc_at_the_beginning/index.html.erb

@@ -1,19 +0,0 @@
-
-<h2>At the beginning GOD created superadmin</h2>
-<%= "<div style='color: red;'>#{flash[:error]}</div>".html_safe if flash[:error] %>
-<%= form_tag action: 'create', method: :put do %>
-<table>
-  <tr>
-    <td>Superadmin username:</td>
-    <td><%=  text_field(nil, 'username') %>
-  </tr><tr>  
-    <td>Superadmin password:</td>
-    <td><%=  password_field(nil, 'password1') %>
-  </tr><tr>  
-    <td>Repeat password:</td>
-    <td><%=  password_field(nil, 'password2') %>
-  </tr><tr>  
-    <td><%= submit_tag %></td>
-  </tr>
-</table>
-<% end %>

data/app/views/dc_at_the_beginning/create.html.erb

@@ -1,9 +0,0 @@
-
-<h2>Superadmin account created</h2>
-Please write down username:<%= params[:username] %>
-<br>password:<%= params[:password1]  %>
-<br>
-<!-- <%= link_to('Start editing', controller: 'poll', poll_id: 'login', return_to: '/cmsedit/show') %> -->
-
-<%= link_to('Start editing', controller: 'cmsedit', action: 'show') %>
-

data/app/views/dc_at_the_beginning/index.html.erb

@@ -1,19 +0,0 @@
-
-<h2>At the beginning GOD created superadmin</h2>
-<%= "<div style='color: red;'>#{flash[:error]}</div>".html_safe if flash[:error] %>
-<%= form_tag action: 'create', method: :put do %>
-<table>
-  <tr>
-    <td>Superadmin username:</td>
-    <td><%=  text_field(nil, 'username') %>
-  </tr><tr>  
-    <td>Superadmin password:</td>
-    <td><%=  password_field(nil, 'password1') %>
-  </tr><tr>  
-    <td>Repeat password:</td>
-    <td><%=  password_field(nil, 'password2') %>
-  </tr><tr>  
-    <td><%= submit_tag %></td>
-  </tr>
-</table>
-<% end %>