drg_cms 0.6.1.9 → 0.6.1.11

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

@@ -1,12 +1,14 @@
-<div id="<%= params['form_name'] || params['table'] %>" class="dc-form-frame">
+<% dc_form_update %>
+
+<div <%= dc_form_id %> class="dc-form-frame">
   <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
   <%= dc_flash_messages %> 
-  <div id='result'> <%= render partial: 'result' %></div>
+  <div id="result"> <%= render partial: 'result' %></div>
 </div>
 
 <%= javascript_tag(@js) unless @js.blank? %>
-<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+<% unless @css.blank? %><style><%= @css %></style><% end %>
 <div id="popup" style="display: none;"></div>

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

@@ -1,8 +1,12 @@
-<%= dc_table_title dc_new_title %>
+<% dc_form_update %>
 
-<%= form_tag(@parms, method: :post, id: params['form_name'] || params['table'],
-             class: 'cmsform', multipart: @form['form']['multipart']) do %>
-  <%= render partial: 'form' %>
-<% end %>
+<div <%= dc_form_id %>>
+  <%= dc_table_title dc_new_title %>
+
+  <%= form_tag(@form_params, method: :post, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
+               class: 'cmsform', multipart: @form['form']['multipart']) do %>
+    <%= render partial: 'form' %>
+  <% end %>
+</div>
 
 <div id="popup" style="display: none;"></div>

data/app/views/dc_common/_help.html.erb

@@ -8,6 +8,7 @@
     <% if @commnets %>
       <button onclick="location.href='#comments'; return false;"><%= t('drgcms.dc_help.comments_button') %></button>
     <% end %>
+    <div style="float: right"><%= fa_icon('close', class: 'dc-link') %></div>
   </div>
 
   <div class="help-body"><%= dc_help_body if @help %></div>

data/config/locales/drgcms_en.yml

@@ -75,7 +75,11 @@ en:
     filter: Filter
     refresh: Refresh
     back: Back
+    next: Next
+    finish: Finish
+    steps: Steps
     close: Close
+    cancel: Cancel
     delete: Delete
     enable: Enable
     disable: Disable
@@ -98,6 +102,7 @@ en:
     updated_by: Updated by
     created_at: Created at
     updated_at: Updated at
+    active: Active
     new_record: New record
     
     filter_poll: Filter

data/config/locales/drgcms_sl.yml

@@ -75,7 +75,11 @@ sl:
     filter: Filter
     refresh: Osveži
     back: Nazaj
+    next: Naprej
+    steps: Koraki
+    finish: Zaključek
     close: Zapri
+    cancel: Preklic
     delete: Izbris
     enable: Omogoči
     disable: Onemogoči
@@ -98,6 +102,7 @@ sl:
     updated_by: Spremenil
     created_at: Ustvarjeno
     updated_at: Spremenjeno
+    active: Aktiven
     new_record: Nov zapis
     
     filter_poll: Filter

data/drg_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'rails', '~> 6.1'
+  s.add_dependency 'rails'#, '~> 6.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'non-stupid-digest-assets'  

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.1.9'.freeze
+  VERSION = '0.6.1.11'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.9
+  version: 0.6.1.11
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - app/forms/dc_simple_menu.yml
 - app/forms/dc_simple_menu_item.yml
 - app/forms/dc_site.yml
+- app/forms/dc_steps_template.yml
 - app/forms/dc_user.yml
 - app/forms/dc_user_role.yml
 - app/forms/drgcms_cms.yml
@@ -449,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and