drg_cms 0.5.10.10 → 0.5.50.2

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

@@ -2,19 +2,24 @@
 <div id="cmsedit-div">
   <%= link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
   <% if session[:edit_mode] > 1 %>
-    <table class="cmsedit-table">
-    <tr>
-      <td class="cmsedit-menu">
+    <div class="cmsedit-table cmsedit-top">
+      <div id="menu">
+        
   <% if false %>     
         <%= link_to(image_tag('drg_cms/view_tile.png', class: 'dc-link-img', title: t('drgcms.menu_plus')), '#', 
             onclick: "$('#cmsedit-menu-plus').toggleClass('div-hidden');")  %>
   <% end %> 
+        
+  <% if false %>     
         <ul><li>
          <%= fa_icon('bars lg') %>
          <ul>
           <%= dc_choices4_cmsmenu.html_safe %>
          </ul>
-        </li></ul>
+        </li>
+        
+        </ul>
+  <% end %> 
         
         <% if @page %>
           <%= link_to( fa_icon('file-text-o lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
@@ -40,6 +45,7 @@
         <%= link_to( fa_icon('refresh lg', class: "dc-animate", title: t('drgcms.reload')), '#',
             onclick: "document.location.reload(true); return false;")  %>
         <b>&nbsp; | &nbsp; </b>
+        
   <% if false %>     
         <%= select('record', 'select', dc_choices4_cmsmenu ) %>
         
@@ -52,20 +58,26 @@
 
         <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
 
-      </td>
-    </tr>
-<% if false %>
-    <tr class="cmsedit-menu-plus div-hidden dc-form-frame"><td>
-      <%= @menu_plus %>
-    </td><tr>
-<% end %>
-    <tr class="cmsedit-iframe"><td class="cmsedit-iframe">
-      <div><iframe id="iframe_cms" name="iframe_cms"></iframe></div>
-    </td></tr>
-    </table>
+      </div>
+    </div>
+    
+    <div class="cmsedit-container">  
+      <div id="menu">
+        <%= dc_choices4_cmsmenu.html_safe %>
+      </div>
+      <div class="cmsedit-iframe" style="width: 99%;">
+        <iframe id="iframe_cms" name="iframe_cms"></iframe>
+      </div>
+
+      <div style="clear: both;"></div>    
+    </div>
+
+  
   <% end %>
 </div>
 
+
+<% if false %>
 <%= javascript_tag do %>
 // 
 $('#cmsedit-edit-button').click(function() {
@@ -74,4 +86,5 @@ $('#cmsedit-edit-button').click(function() {
 $('#record_select').change( function(e) {
   $('#iframe_cms').attr('src', e.target.value );
 });
-<% end %>
+<% end %>
+<% end %>

data/config/initializers/kaminari_patch.rb

@@ -25,13 +25,33 @@
 ###########################################################################
 # This patch adds page param to url when page one is choosed. This is needed
 # for paging to work as expected.
+# 
+# Since Kaminari 1.0 functionality can be set by Kaminari.configure.
 ###########################################################################
-module Kaminari #:nodoc:
-  module Helpers #:nodoc:
-    class Tag #:nodoc:
-      def page_url_for(page)
-        @template.url_for @params.merge(@param_name => (page < 1 ? 1 : page))
+
+begin
+# Kaminari >= 1.0
+Kaminari.configure do |config|
+  # config.default_per_page = 25
+  # config.max_per_page = nil
+  # config.window = 4
+  # config.outer_window = 0
+  # config.left = 0
+  # config.right = 0
+  # config.page_method_name = :page
+  # config.param_name = :page
+  config.params_on_first_page = true
+end 
+# Kaminari = 0.17
+rescue Exception => e
+  module Kaminari #:nodoc:
+    module Helpers #:nodoc:
+      class Tag #:nodoc:
+        def page_url_for(page)
+          @template.url_for @params.merge(@param_name => (page < 1 ? 1 : page))
+        end
       end
     end
   end
+  
 end

data/config/locales/models_en.yml

@@ -77,6 +77,8 @@ en:
         dc_parts: Parts
         site_id: Site name
         rails_view: Rails view filename
+        control: Control file
+        control_method: Control method
 
       dc_user_role:
         tabletitle: User roles
@@ -571,6 +573,9 @@ en:
         dc_parts: Parts of design
         rails_view: Rails view (file) name which will be used to render design
         site_id: Select site name if this design belongs to singe site
+        control: Control file which holds actions for rendering design
+        control_method: Control method (action) which will be invoked in control file
+        
 
       dc_poll:
         name: Unique poll name

data/config/locales/models_sl.yml

@@ -78,6 +78,9 @@ sl:
         dc_parts: Elementi 
         rails_view: Rails view datoteka
         site_id: Spletišče
+        control: Kontrolna datoteka
+        control_method: Kontrolna metoda
+        
 
       dc_user:
         tabletitle: Uporabniki
@@ -543,6 +546,9 @@ sl:
         dc_parts: Elementi, sestavni deli dizajna
         rails_view: Ime Rails view datoteke, ki bo uporabljena za izris strani
         site_id: Izberite spletišče, če dizajn pripada samo enemu spletišču
+        control: Izvorna datoteka z akcijami za izris dizajna
+        control_method: Kontrolna metoda (akcija), ki se bo klicala v izvorni datoteki
+        
 
       dc_user:
         username: Uporabniško ime

data/drg_cms.gemspec

@@ -18,15 +18,17 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "History.log", "drg_cms.gemspec"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails', '~> 4'
+  s.add_dependency 'rails'#, '~> 4'
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'jquery-ui-rails', '~> 5'
+  s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'non-stupid-digest-assets'  
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
-  s.add_dependency 'mongoid', '~> 5'
-  s.add_dependency 'mongo_session_store-rails4'  
-  s.add_dependency 'kaminari'
+  s.add_dependency 'mongoid'#, '~> 5'
+#  s.add_dependency 'mongo_session_store-rails4'  
+#  s.add_dependency 'kaminari'
+  s.add_dependency 'kaminari-mongoid'
+  s.add_dependency 'kaminari-actionview'
   s.add_dependency 'font-awesome-rails'
   s.add_dependency 'sort_alphabetical'
 end

data/lib/drg_cms.rb

@@ -12,7 +12,7 @@ module DrgCms
 # Used wherever end user wants to extend basic DrgCms model. Model source definition 
 # file is tricky to require since it is included in DrgCms gem and thus a moving 
 # target. Whenever gem version changes file location changes with it. This way 
-# end user doesn't have to care about actual source file location.
+# programmer doesn't have to care about actual source file location.
 #   
 # Parameters:
 # [ model_name ] String. Must be passed in lower case, just like the file name is. 
@@ -99,13 +99,6 @@ def self.add_path(type, path)
   @@paths[type] << path  
 end
 
-###############################################################################
-###############################################################################
-def self.add_form_path(path) #:nodoc:
-  p 'DrgCms.add_form_path will be deprecated. Use add_forms_path instead.'
-  self.add_forms_path(path)
-end
-
 ###############################################################################
 # Will return value saved to internal @@paths hash.
 # 
@@ -118,4 +111,29 @@ def self.paths(key)
   @@paths[key]
 end
 
+###############################################################################
+# All Routes required by DrgCms. 
+# 
+# Usage:
+# put DrgCms.routes line anywhere into your application routes file
+###############################################################################
+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
+      get '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/copy_clipboard'    => :copy_clipboard
+      post 'dc_common/paste_clipboard'  => :paste_clipboard
+      put 'dc_common/restore_from_journal'  => :restore_from_journal
+    end
+    match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
+    resources :cmsedit
+  end
+end
+
 end

data/lib/drg_cms/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.10.10
+  version: 0.5.50.2
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: non-stupid-digest-assets
   requirement: !ruby/object:Gem::Requirement
@@ -84,18 +84,18 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo_session_store-rails4
+  name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: kaminari-actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -190,20 +190,20 @@ files:
 - app/assets/javascripts/drg_cms/some_scripts.js
 - app/assets/javascripts/drg_cms_application.js
 - app/assets/javascripts/drg_cms_cms.js
+- app/assets/stylesheets/drg_cms/__jquery-ui.css
 - app/assets/stylesheets/drg_cms/drg_cms.css
-- app/assets/stylesheets/drg_cms/jquery-ui.css
 - app/assets/stylesheets/drg_cms/jquery.datetimepicker.css
 - app/assets/stylesheets/drg_cms/select-multiple.css
 - app/assets/stylesheets/drg_cms/th-bg.png
 - app/assets/stylesheets/drg_cms/theme.css
 - app/assets/stylesheets/drg_cms_application.css
 - app/assets/stylesheets/drg_cms_cms.css
+- app/controllers/browse_models_control.rb
 - app/controllers/cmsedit_controller.rb
 - app/controllers/dc_application_controller.rb
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
-- app/controllers/drgcms_controls/browse_models_control.rb
-- app/controllers/drgcms_controls/dc_page_control.rb
+- app/controllers/dc_page_control.rb
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
 - app/forms/cms_menu.yml