drg_cms 0.6.1.6 → 0.6.1.9

data/config/locales/drgcms_sl.yml

@@ -70,6 +70,7 @@ sl:
     edit: Urejanje
     show: Prikaz
     new: Dodaj
+    duplicate: Podvoji
     sort: Razvrsti
     filter: Filter
     refresh: Osveži
@@ -114,7 +115,7 @@ sl:
       restore: Restavriraj      
       
     filters:
-      this_site_only: Dokumenti samo trenutno izbrane strani
+      this_site_only: Samo dokumenti trenutne spletne strani
 
     dc_help:
       help: POMOČ

data/config/locales/kaminari.yml

@@ -23,4 +23,4 @@ sx:
       last: "Zadnja »"
       previous: "‹ Nazaj"
       next: "Naprej ›"
-      truncate: "..."            
+      truncate: "..."

data/drg_cms.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'kaminari-mongoid'
   s.add_dependency 'kaminari-actionview'
-  s.add_dependency 'font-awesome-rails'
+  s.add_dependency 'drg_material_icons'
   s.add_dependency 'sort_alphabetical'
 end

data/lib/drg_cms/version.rb

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

data/lib/drg_cms.rb

@@ -219,24 +219,24 @@ end
 ###############################################################################
 def self.routes
   Rails.application.routes.draw do
-    #  match '/dc_common/:action' => 'dc_common#:action', via: [:get, :put, :post]
     controller :dc_common do
       post 'dc_common/autocomplete'     => :autocomplete
       post 'dc_common/ad_click'         => :ad_click
       get 'dc_common/toggle_edit_mode'  => :toggle_edit_mode
       match 'dc_common/process_login'   => :process_login, via: [:put, :post]
-      get 'dc_common/logout'            => :logout
       get 'dc_common/login'             => :login
+      get 'dc_common/logout'            => :logout
       get 'dc_common/copy_clipboard'    => :copy_clipboard
       match 'dc_common/paste_clipboard' => :paste_clipboard, via: [:get, :post]
       put 'dc_common/restore_from_journal'  => :restore_from_journal
       get 'dc_common/add_json_ld_schema'    => :add_json_ld_schema
       get 'dc_common/help' => :help
     end
-    match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
+    match 'elfinder'    => 'dc_elfinder#connector', via: [:get, :post]
+    get   'cms/login'   => 'cmsedit#login'
+    get   'cms/logout'  => 'cmsedit#logout'
     match 'cmsedit/run' => 'cmsedit#run', via: [:get, :put, :post]
     resources :cmsedit
-    resources :cms, controller: :cmsedit
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.6
+  version: 0.6.1.9
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: drg_material_icons
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -216,6 +216,7 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controls/browse_models_control.rb
+- app/controls/cmsedit_control.rb
 - app/controls/dc_help_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
@@ -358,8 +359,6 @@ files:
 - app/renderers/dc_poll_renderer.rb
 - app/renderers/dc_renderer.rb
 - app/renderers/dc_simple_menu_renderer.rb
-- app/views/cmsedit/__remove_edit_stuff.js.erb
-- app/views/cmsedit/__show.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
 - app/views/cmsedit/_form.html.erb
 - app/views/cmsedit/_result.html.erb

data/app/views/cmsedit/__remove_edit_stuff.js.erb

@@ -1,6 +0,0 @@
-
-<% if session[:edit_mode] == 2 %>
-  <%= javascript_tag do %>
-    /* $('div[id^="drgcms-"]').css('border', '1px dotted blue') */
-  <% end %>
-<% end %>

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

@@ -1,21 +0,0 @@
-<% 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/show', 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 %>