drg_cms 0.5.52.5 → 0.5.52.7

data/app/helpers/dc_application_helper.rb

@@ -55,6 +55,7 @@ attr_accessor :page_title
 # all parts read from page, design, ...
 attr_accessor :parts
 
+attr_accessor :record_footer
 
 ############################################################################
 # When @parent is present then helper methods are called from parent class otherwise 
@@ -253,11 +254,11 @@ end
 # String. HTML code for title.
 ############################################################################
 def dc_table_title(text, result_set=nil)
-  c = "<table width='100%' class='dc-title'><tr><td>#{text}</td>"
+  c = %Q[<div class="dc-title">#{text}]
   if result_set and result_set.respond_to?(:current_page)
-    c << "<td align='right' style='font-size: 0.8em;'> #{paginate(result_set, :params => {:action => 'index'})}</td>" 
+    c << %Q[<div class="dc-paginate">#{paginate(result_set, :params => {:action => 'index'})}</div>]
   end
-  c << '<tr></table>'
+  c << '<div style="clear: both;"></div></div>'
   c.html_safe
 end
 
@@ -350,11 +351,14 @@ end
 # Similar to rails link_to, but also takes care of link icon, translation, ...
 ############################################################################
 def dc_link_to(caption, icon, parms, rest={})
+  icon_pos = 'first'
   if parms.class == Hash
     parms.stringify_keys!
     rest.stringify_keys!
     rest['class'] = rest['class'].to_s + ' dc-animate'
     rest['target'] ||=  parms.delete('target')
+    parms['controller'] ||= 'cmsedit'
+    icon_pos = parms.delete('icon_pos') || 'first'
   end
 #  
   if icon
@@ -371,7 +375,9 @@ def dc_link_to(caption, icon, parms, rest={})
     caption = t(caption, caption)
     icon_image << ' ' if icon_image
   end
-  _origin.link_to("#{icon_image}#{caption}".html_safe, parms, rest)  
+  icon_pos == 'first' ?
+    _origin.link_to("#{icon_image}#{caption}".html_safe, parms, rest) :
+    _origin.link_to("#{caption} #{icon_image}".html_safe, parms, rest)
 end
 
 ####################################################################

data/app/helpers/dc_menu_renderer.rb

@@ -40,8 +40,9 @@ include DcApplicationHelper
 ########################################################################
 def initialize( parent, opts ) #:nodoc:
   @parent = parent
-  opts[:name] ||= parent.site.menu_name # default in site
-  @menu = DcMenu.find_by(name: opts[:name].to_s)
+  @menu = opts[:name] ?
+    DcMenu.find_by(name: opts[:name].to_s) :
+    DcMenu.find(@parent.site.menu_id)
   @opts = opts
   self
 end
@@ -108,7 +109,7 @@ end
 # Creates HTML code required for submenu on single level. Subroutine of default.
 ########################################################################
 def do_menu_level(menu, options={})
-  html = '<ul>' 
+  html = "<ul id=\"#{menu.name}\">"
   if @opts[:edit_mode] > 1
     options[:title] = menu.respond_to?('name') ? menu.name : menu.caption # 1. level or submenus
     options[:id] = menu._id
@@ -152,6 +153,7 @@ def default
   html << "<div id='#{@menu.div_name}'>" unless @menu.div_name.blank?  
   html << do_menu_level(@menu, table: 'dc_menu')
   html << "</div>" unless @menu.div_name.blank? 
+  html
 end
 
 ########################################################################

data/app/models/drgcms_form_fields.rb

@@ -1027,7 +1027,7 @@ class DatePicker < DrgcmsField
 # Render date_picker field html code
 ###########################################################################
 def render
-  value = (@record and @record[@yaml['name']]) ? I18n.localize(@record[@yaml['name']].localtime.to_date) : nil
+  value = (@record and @record[@yaml['name']]) ? I18n.localize(@record[@yaml['name']].to_date) : nil
   return ro_standard( @parent.dc_format_value(value)) if @readonly
 #
   @yaml['options'] ||= {}

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

@@ -0,0 +1,20 @@
+
+<div class="dc-table-frame">
+
+  <%= dc_table_title_for_result @records %>
+
+  <% unless @records.nil? %>
+      <%= dc_background_for_result(:start) %>
+  
+      <tr><%= dc_header_for_result %></tr>
+      <% for document in @records %>
+        <%= dc_row_for_result(document) %>
+        <%= dc_actions_for_result(document) %>
+        <%= dc_columns_for_result(document) %>
+        </tr>
+      <% end %>
+        
+      <%= dc_background_for_result(:end) %>
+  <% end %>
+  
+</div>

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

@@ -2,19 +2,14 @@
 <%= dc_flash_messages %> 
 <%= dc_error_messages_for @record %> 
 
-<div class="dc-form-frame" width="99%">
+<div class="dc-form-frame">
 
-  <table class='dc-menu'>
-    <%= dc_actions_for_form %>
-  </table>
+  <%= dc_actions_for_form %>
   
   <%= dc_fields_for_form %>
   <%= dc_document_statistics %>
 
-  <table class='dc-menu'>
-    <%= dc_actions_for_form %>
-  </table>
-  
+  <%= dc_actions_for_form %>
 </div>
 
 <%= javascript_tag(@js) unless @js.blank? %>

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

@@ -6,12 +6,18 @@
   <% unless @records.nil? %>
       <%= dc_background_for_result(:start) %>
   
-      <tr><%= dc_header_for_result %></tr>
+      <%= dc_header_for_result %>
       <% for document in @records %>
         <%= dc_row_for_result(document) %>
         <%= dc_actions_for_result(document) %>
         <%= dc_columns_for_result(document) %>
-        </tr>
+        </div>
+      <% end %>
+      <% if @record_footer %>
+        <div class="dc-result-data footer">
+        <%= ignore, code = dc_actions_column(); code.html_safe %></div>
+        <%= dc_columns_for_result(@record_footer) %>
+        </div>
       <% end %>
         
       <%= dc_background_for_result(:end) %>

data/config/locales/drgcms_en.yml

@@ -59,6 +59,7 @@ en:
     username: User name
     password: Password
     form_error: Error loading form #{form_name}
+    img_large: Click for larger image
     
     edit: Edit
     show: Prikaz

data/config/locales/drgcms_sl.yml

@@ -59,6 +59,7 @@ sl:
     username: Uporabnik
     password: Geslo
     form_error: Napaka pri branju forme #{form_name}
+    img_large: Klik za večjo sliko
 
     edit: Urejanje
     show: Prikaz

data/config/locales/models_en.yml

@@ -408,7 +408,7 @@ en:
         parent: Parent
         active: Active
         dc_site_id: Valid for site
-        updated_at: Spremenjen
+        updated_at: Last update
 
       dc_mail:
         tabletitle: Mails
@@ -456,7 +456,7 @@ en:
         tabletitle: Big Table
 
         key: Key
-        active: Description       
+        Description: Description       
         site_id: Site
         dc_big_table_values: Values
         active: Active       

data/lib/drg_cms/version.rb

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

data/lib/tasks/dc_at_the_beginning.rake

@@ -24,7 +24,7 @@ end
 #
 #########################################################################
 def read_input(message, default='')
-  print "#{message} "
+  p "#{message} "
   response = STDIN.gets.chomp
   response.blank? ? default : response
  end
@@ -33,15 +33,14 @@ def read_input(message, default='')
 #
 ########################################################################
 def create_superadmin
-  username = read_input('Enter username for superadmin role:')
-  return p 'Username should be at least 6 character long' unless username.size >=6
-#
-  password1 = read_input("Enter password for #{username} user :")
-  return p 'Password should be at least 8 character long' unless password1.size >=8
-#
-  password2 = read_input("Please repeat password for #{username} user :")
-  return p 'Passwords are not equal' unless password2 == password1
-#  
+  begin
+    username = read_input('Enter username for superadmin role:')
+    p 'Username should be at least 6 character long' if username.size < 6
+  end while username.size < 6
+  begin
+    password = read_input("Enter password for #{username} user :")
+    p 'Password should be at least 8 character long' if password.size < 8
+  end while password.size < 8
 # Guest role first
   role = DcPolicyRole.new
   role.name = 'guest'
@@ -55,17 +54,14 @@ def create_superadmin
 # Superadmin user
   usr = DcUser.new
   usr.username    = username
-  usr.password    = password1
-  usr.password_confirmation = password2
+  usr.password    = password
+  usr.password_confirmation = password
   usr.first_name  = 'superadmin'
   usr.save
 # user role 
-#  r = usr.dc_user_roles.new
-#  r.dc_policy_role_id = role._id
-#  r.save
-  r = DcUserRole.new
-  r.dc_policy_role_id = sa._id
-  usr.dc_user_roles << r
+  user_role = DcUserRole.new
+  user_role.dc_policy_role_id = sa._id
+  usr.dc_user_roles << user_role
 # cmsedit permission
   permission = DcPermission.new
   permission.table_name = 'Default permission'
@@ -105,8 +101,8 @@ def create_superadmin
   i.type = 'submit_tag'
   i.save
 #
-  p "Superadmin user created. Please remember login data #{username}/#{password1}"
-end  
+  p "Superadmin user created. Remember login data #{username}/#{password}"
+end 
 
 ########################################################################
 # Initial database seed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52.5
+  version: 0.5.52.7
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -303,6 +303,7 @@ files:
 - app/models/dc_user_role.rb
 - app/models/dc_visit.rb
 - app/models/drgcms_form_fields.rb
+- app/views/cmsedit/__result.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
 - app/views/cmsedit/_form.html.erb
 - app/views/cmsedit/_result.html.erb