drg_cms 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31aa0b6c5076624acd107471ba082d927e096cb5
-  data.tar.gz: bf9048314d21555c052cca5394b7723fac605e85
+  metadata.gz: fd80aba913afa715795f1a5e814d44400b5f7f0a
+  data.tar.gz: ee6d578127bd8196b70f07b97e0b3245e4deb861
 SHA512:
-  metadata.gz: 6e1df8ad23c73f14ad9094a7dc132dea6ceecebb2aadb89ec800a909007ff859b16d5b7f3f6b652b8dfc0b0c97623e69552f8dc107bae18d79485cff833aa9b4
-  data.tar.gz: d6dc1617e911aa3924f0f8e00a546b4e9eb45c0a49e3352bd8d40523550feabf80b61858ec2e85a5ac5751e796e139b7789224de3a2b35153516c7f52e4d482c
+  metadata.gz: 857de918747abfe9c56afbe92ee350d60947f641f16648135474157ac0bf3faddec43194abffdf644dbaa1cfebb8c3a24b04e74cb0d98f57ba027f2bd3876903
+  data.tar.gz: 4a888718ed39eb65e58fd611feb82444121e53c2f218c6c0e1a6866c2840a87774f60f5c681752fc0f14c79f540b8e356e8d123cf7288d006807eac9077c7c89

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

@@ -241,7 +241,6 @@ background-color: #888;
   border: 0px;
   color: #888;
   font-weight: bold;
-  font-size: 12px;
   box-shadow: none;
   background: none;
 /*  background-color: none;   */

data/app/assets/stylesheets/drg_cms_cms.css

@@ -18,10 +18,5 @@
  *= require font-awesome
 */
 
-
-/* IMPORTANT
-
-  Don't forget to update elfinder.min.css and replace all occurences of ../img/ with /assets/elfinder/
-  and copy elfinder/img to images/elfinder folder. 
-
-*/   
+/* Required for link buttons to look alike */
+.dc-link a, .dc-link-submit input {font-weight: bold; font-family: helvetica; font-size: 12px; }   

data/app/controllers/cmsedit_controller.rb

@@ -743,6 +743,7 @@ def save_data
     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
+    next if v['readonly'] # fields with readonly option don't retain value and would be wiped
 # return value from form field definition
     value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
     @record.send("#{v['name']}=", value)

data/app/helpers/cmsedit_helper.rb

@@ -114,7 +114,7 @@ EOT
 end
 
 ############################################################################
-# Will return field form definition. Subroutine of dc_div_filter
+# Will return field form definition if field is defined on form. Subroutine of dc_div_filter
 ############################################################################
 def _get_field_def(name) #:nodoc:
   @form['form']['tabs'].each do |tab|
@@ -125,7 +125,7 @@ def _get_field_def(name) #:nodoc:
   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 }
+    return field.last if field.last['name'] == name
   end if @form['form']['fields']
   nil
 end

data/app/helpers/dc_application_helper.rb

@@ -451,7 +451,7 @@ def dc_page_edit_menu(opts=@opts)
   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 => _origin.site.page_table, formname: nil, edit_only: 'body' )
+    opts[:editparams].merge!( :id => @page.id, :table => _origin.site.page_table, formname: opts[:formname], edit_only: 'body' )
     html << dc_link_for_edit1( opts[:editparams], t('drgcms.edit_content') )
     
 #    opts[:editparams][:edit_only] = nil

data/app/helpers/dc_poll_renderer.rb

@@ -95,7 +95,7 @@ def do_one_item(poll, yaml)
       html << if poll.display == 'lr'
         "</table><br>\n"
       else
-        "</div><br>\n"
+        "</div>\n"
       end
       # captcha
       if poll.captcha_type.to_s.size > 1
@@ -107,7 +107,7 @@ def do_one_item(poll, yaml)
       @end_od_data = true
     end
 # submit and link tag      
-    html << "<span class='poll-data-submit'>#{field_html}#{yaml['separator']}</span>"
+    html << "<span class='dc-link-submit dc-animate'>#{field_html}#{yaml['separator']}</span>"
 # other elements
   else
     html << if poll.display == 'lr'
@@ -123,7 +123,7 @@ end
 ########################################################################
 def default
 # poll_id may be defined in params or opts
-  poll_id = @parent.params[:poll_id] || @opts[:poll_id]
+  poll_id = @opts[:poll_id] || @parent.params[:poll_id]
   return '<br>Poll id is not defined?<br>' if poll_id.nil?
 #  
   poll = DcPoll.find(poll_id)
@@ -187,10 +187,9 @@ def default
       yaml['name'] = item.name
       yaml['html'] ||= {}
       yaml['html']['size'] = item.size
-      (yaml['html']['class'] ||= 'poll-submit') if item.type == 'submit_tag'
+      (yaml['html']['class'] ||= 'dc-submit') if item.type == 'submit_tag'
       yaml['text'] = item.text
       yaml['mandatory']  = item.mandatory
-#      y['options']    = item.options
       yaml['type']       = item.type
       html << do_one_item(poll, yaml)
     end
@@ -206,7 +205,7 @@ def default
   html << @parent.hidden_field_tag('return_to_error', @parent.request.url )
   html << @parent.hidden_field_tag('poll_id', poll_id )
   html << @parent.hidden_field_tag('page_id', @parent.page.id )
-  html << "</form><br /></div>"
+  html << "</form></div>"
   
   @part_css = poll.css
   html

data/app/models/drgcms_form_fields.rb

@@ -854,7 +854,7 @@ end
 # Create datetime_select form field
 # 
 # ===Form options:
-# * +type:+ date_select (required)
+# * +type:+ datetime_select (required)
 # * +name:+ Field name (required) 
 # * +options:+ options which apply to date_select field (optional)
 # * +html:+ html options which apply to password field (optional)
@@ -862,7 +862,7 @@ end
 # Form example:
 #    60:
 #      name: end_time
-#      type: date_time_select
+#      type: datetime_select
 #      options:
 #        include_blank: true
 ###########################################################################
@@ -974,7 +974,7 @@ end
 # Implementation of date_time_picker DRG CMS form field with help of jQuery DateTimePicker plugin
 # 
 # ===Form options:
-# * +type:+ date_time_picker (required)
+# * +type:+ datetime_picker (required)
 # * +name:+ Field name (required) 
 # * +options:+ options which apply to date_picker field. All options can be found here http://xdsoft.net/jqplugins/datetimepicker/ .
 # Options can be defined in single line like:
@@ -990,7 +990,7 @@ end
 # Form example:
 #    10:
 #      name: valid_to
-#      type: date_time_picker
+#      type: datetime_picker
 #      options: 'step: 60'
 ###########################################################################
 class DatetimePicker < DrgcmsField

data/lib/drg_cms/version.rb

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

data/lib/tasks/dc_at_the_beginning.rake

@@ -3,19 +3,19 @@
 #########################################################################
 def ok_to_start
   p ''
-  DcPermission.all.delete
-  DcPolicyRole.all.delete
-  DcUser.all.delete
+#  DcPermission.all.delete
+#  DcPolicyRole.all.delete
+#  DcUser.all.delete
   if DcPermission.all.size > 0
-    p 'DcPermission (Permissions) collection is not empty!'
+    p 'DcPermission (Permissions) collection is not empty! Aborting.'
     return false
   end
   if DcPolicyRole.all.size > 0
-    p 'DcUserRole (User roles) collection is not empty!'
+    p 'DcUserRole (User roles) collection is not empty! Aborting.'
     return false
   end
   if DcUser.all.size > 0
-    p 'DcUser (Users) collection is not empty!'
+    p 'DcUser (Users) collection is not empty! Aborting.'
     return false
   end
   true
@@ -43,12 +43,17 @@ def create_superadmin
   password2 = read_input("Please repeat password for #{username} user :")
   return p 'Passwords are not equal' unless password2 == password1
 #  
-# New role
+# Guest role first
   role = DcPolicyRole.new
-  role.name = 'superadmin'
-  role.system_name = 'superadmin'
+  role.name = 'guest'
+  role.system_name = 'guest'
   role.save
-# User
+# Superadmin role
+  sa = DcPolicyRole.new
+  sa.name = 'superadmin'
+  sa.system_name = 'superadmin'
+  sa.save
+# Superadmin user
   usr = DcUser.new
   usr.username    = username
   usr.password    = password1
@@ -60,7 +65,7 @@ def create_superadmin
 #  r.dc_policy_role_id = role._id
 #  r.save
   r = DcUserRole.new
-  r.dc_policy_role_id = role._id
+  r.dc_policy_role_id = sa._id
   usr.dc_user_roles << r
 # cmsedit permission
   permission = DcPermission.new
@@ -69,7 +74,7 @@ def create_superadmin
   permission.save
 # 
   r = DcPolicyRule.new
-  r.dc_policy_role_id = role._id
+  r.dc_policy_role_id = sa._id
   r.permission = DcPermission::SUPERADMIN
   permission.dc_policy_rules << r
 # create login poll
@@ -104,6 +109,75 @@ def create_superadmin
   p "Superadmin user created. Please remember login data #{username}/#{password1}"
 end  
 
+########################################################################
+# Initial database seed
+########################################################################
+def seed
+  if DcSite.all.size > 0
+    p 'DcSite (Sites) collection is not empty! Aborting.'
+    return 
+  end
+#
+  if (sa = DcPolicyRole.find_by(system_name: 'superadmin')).nil?
+    p 'superadmin role not defined! Aborting.'
+    return 
+  end
+#
+  if (guest = DcPolicyRole.find_by(system_name: 'guest')).nil?
+    p 'guest role not defined! Aborting.'
+    return 
+  end
+# Site document
+  site = DcSite.new(
+    name: 'www.mysite.com',
+    homepage_link: "home",
+    menu_class: "DcSimpleMenu",
+    menu_name: "site-menu",
+    page_class: "DcPage",
+    page_table: "dc_page",
+    files_directory: "files",    
+    settings: "ckeditor:\n config_file: /files/ck_config.js\n css_file: /files/ck_css.css\n",
+    site_layout: "content")
+  site.save
+#
+  policy = DcPolicy.new(
+    description: "Default policy",
+    is_default: true,
+    message: "Access denied.",
+    name: "Default policy")
+  site.dc_policies << policy
+#
+  rule = DcPolicyRule.new( dc_policy_role_id: sa._id, permission: 4)
+  policy << rule
+  rule = DcPolicyRule.new( dc_policy_role_id: guest._id, permission: 1)
+  policy << rule
+# Design document  
+  design = DcDesign.new(name: 'simple',description: 'Simple page')
+  design.body =<<EOT
+<div id="site">
+  <div id="site-top">
+    <a href="/">SITE LOGO</a>
+  </div>
+  <div id="site-menu" 
+    <%= dc_render(:dc_simple_menu, method: 'as_table') %>\
+  </div> 
+  <div id="site-main">
+   <%= dc_render(:dc_page) %>
+  </div>
+  <div id="site-bottom">
+   <%= dc_render(:dc_piece, name: 'site-bottom') %>
+  </div>
+</div>
+EOT
+  design.save
+#
+  page = DcPage.new(
+    subject: 'Home page',
+    subject_link: 'home',
+    dc_design_id: design._id,
+    dc_site_id: site._id,
+  )
+end
 
 #########################################################################
 #
@@ -115,4 +189,10 @@ namespace :drg_cms do
       create_superadmin
     end
   end
+
+  desc "Seed initial data"
+  task :seed => :environment do
+    seed
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails