drg_cms 0.4.58 → 0.4.61

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

@@ -8,33 +8,33 @@
           <%#= 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');")  %>
           <% if @page %>
-          <%= link_to( image_tag('drg_cms/edit_page.png', class: 'dc-link-img', title: "#{t('drgcms.edit_page')}"),
+          <%= link_to( fa_icon('edit lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
               {controller: 'cmsedit', action: 'edit', table: @site.page_table, id: @page._id}, target: 'iframe_cms') %>
 
-          <%= link_to( image_tag('drg_cms/edit_design.png', class: 'dc-link-img', title: "#{t('drgcms.edit_design')}"),
+          <%= link_to( fa_icon('credit-card lg', class: "dc-animate", title: "#{t('drgcms.edit_design')}"),
               {controller: 'cmsedit', action: 'edit', table: 'dc_design', id: @design._id}, target: 'iframe_cms') %>
           
-          <%= link_to( image_tag('drg_cms/edit_site.png', class: 'dc-link-img', title: "#{t('drgcms.edit_site')}"),
+          <%= link_to( fa_icon('globe lg', class: "dc-animate", title: "#{t('drgcms.edit_site')}"),
               {controller: 'cmsedit', action: 'edit', table: 'dc_site', id: @site._id}, target: 'iframe_cms') %>
           <% end %>
 
-          <%= link_to( image_tag('drg_cms/arrow_in.png',  class: 'dc-link-img', title: t('drgcms.minimize')), '#',
+          <%= link_to( fa_icon('compress lg', class: "dc-animate", title: t('drgcms.minimize')), '#',
               onclick: "$('#iframe_cms').height(1); return false;" ) %>
           
-          <%= link_to( image_tag('drg_cms/arrow_out.png', class: 'dc-link-img', title: t('drgcms.maximize')), '#',
+          <%= link_to( fa_icon('expand lg', class: "dc-animate", title: t('drgcms.maximize')), '#',
               onclick: "$('#iframe_cms').height( $('#iframe_cms').height() + 500);; return false;")  %>
           
-          <%= link_to( image_tag('drg_cms/reload.png', class: 'dc-link-img', title: t('drgcms.reload')), '#',
+          <%= link_to( fa_icon('refresh lg', class: "dc-animate", title: t('drgcms.reload')), '#',
               onclick: "document.location.reload(true); return false;")  %>
           
           <%= select('record', 'select', dc_choices4_cmsmenu ) %>
-          <%= link_to( image_tag('drg_cms/edit.png', class: 'dc-link-img', title: t('drgcms.edit_selected')), '#',
+          <%= link_to( fa_icon('bars lg', class: "dc-animate", title: t('drgcms.edit_selected')), '#',
               onclick: "$('#iframe_cms').attr('src', $('#record_select').val() ); return false;")  %>
 
-          <%= link_to( image_tag('drg_cms/copy.png', class: 'dc-link-img', title: "#{t('drgcms.doc_paste_title')}"),
+          <%= link_to( fa_icon('copy lg', class: "dc-animate", title: "#{t('drgcms.doc_paste_title')}"),
               {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
 
-          <%= DrgcmsFormField::Elfinder.file_manager_url(self) %>
+          <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
           
         </td>
       </tr>

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

@@ -8,7 +8,10 @@
       <tr><%= dc_header_for_result %></tr>
 
       <% for r in @records %>
-        <tr class="dc-<%= cycle("odd","even") %>">
+        <tr class="dc-<%= cycle("odd","even")%>" 
+            data="<%= url_for(action: 'show', controller: 'cmsedit', id: r, 
+                      readonly: (params[:readonly] ? 2 : 1), table: params[:table],
+                      formname: params[:formname], ids: params[:ids]) %>" >
           <%= dc_actions_for_result r %>
           <%= dc_columns_for_result r %>
         </tr>

data/config/initializers/kaminari_patch.rb

@@ -1,6 +1,6 @@
 #coding: utf-8
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# Copyright (c) 2012+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/config/locales/drgcms_en.yml

@@ -44,12 +44,13 @@ en:
     edit_site: 'Edit: Site'
     edit_page: 'Edit: Page'
     file_manager: File manager
-    edit_selected: 'Edit: Selected table (collection)'
+    edit_selected: Edit documents in selected collection
     invalid_username: Invalid username or password!
     system_menu: CMS system tables
     menu_plus: Show alternative menu
     not_email: is not valid e-mail address!
     updated_by_other: Document was updated by other user. Please reenter your data.
+    not_id: Value entered is not ID!
 
     edit: Edit
     new: New

data/config/locales/drgcms_sl.yml

@@ -50,6 +50,7 @@ sl:
     menu_plus: Malo drugačen menu
     not_email: ni veljaven e-naslov!
     updated_by_other: Dokument je spremenil drug uporabnik. Prosimo ponovite vpis podatkov.
+    not_id: Vsebina polja ni ključ ID!    
 
     edit: Urejanje
     new: Dodaj

data/drg_cms.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'bson'
   s.add_dependency 'mongoid'
   s.add_dependency 'kaminari'
+  s.add_dependency 'font-awesome-rails'
 end

data/lib/drg_cms.rb

@@ -53,6 +53,52 @@ def self.add_forms_path(path)
   @@paths[:forms] << path  
 end
 
+###############################################################################
+# Patching is one of the rubies best strenghts and also its curse. Loading 
+# patches in development has become real problem for developers. This is my
+# way of patch loading.
+# 
+# Preferred location for patch files is lib/patches. But can be located anywhere in 
+# Rails application path. Add DrgCms.add_forms_path to initialization part and pass 
+# directory name where patching files are located as parameter.  
+# 
+# Method will also load patch file so loading in config/initializers is not required.
+# 
+# Parameters:
+# [path] String. Path to patches directory
+# 
+# Example:
+#    # As used in MyPlugin plugin.
+#    require "my_plugin/engine"
+#    module MyPlugin
+#    end
+#
+#    DrgCms.add_patches_path File.dirname(__FILE__) + '/patches'
+###############################################################################
+def self.add_patches_path(path)
+  self.add_path(:patches, path)
+#  Dir["#{path}/**/*.rb"].each { |path| p path; require_dependency path }
+#  Dir["#{path}/**/*.rb"].each { |file| p file; require file }
+end
+
+###############################################################################
+# General add path method. Paths are saved into @@paths hash variable. Paths can
+# then be reused in different parts of application.
+# 
+# Adding paths is best done in plugin mudule initialization code.
+# 
+# Parameters:
+# [type] Symbol. Defines type of data. Current used values are :forms, :patches
+# [path] String. Path or string which will be added to @@paths hash.
+# 
+# Example:
+#    DrgCms.add_path(File.expand_path('patches', __FILE__), :patches)
+###############################################################################
+def self.add_path(type, path) 
+  @@paths[type] ||= []
+  @@paths[type] << path  
+end
+
 ###############################################################################
 ###############################################################################
 def self.add_form_path(path) #:nodoc:
@@ -65,7 +111,8 @@ end
 # 
 # Parameters:
 # [key] String. Key  
-# forms_paths = DrgCms.paths(:forms)
+# forms_paths   = DrgCms.paths(:forms)
+# patches_paths = DrgCms.paths(:patches)
 ###############################################################################
 def self.paths(key)
   @@paths[key]

data/lib/drg_cms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.58
+  version: 0.4.61
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'DRG CMS: Content management system for Ruby, Rails and MongoDB'
 email:
 - damjan.rems@gmail.com
@@ -156,7 +170,6 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controllers/drgcms_controls/dc_page_controls.rb
-- app/forms/__drgcms_cms.yml
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
 - app/forms/cms_menu.yml
@@ -235,6 +248,7 @@ files:
 - app/models/dc_user_role.rb
 - app/models/dc_visit.rb
 - app/models/drgcms_form_field.rb
+- app/models/drgcms_form_fields.rb
 - app/views/__dc_at_the_beginning/create.html.erb
 - app/views/__dc_at_the_beginning/index.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
@@ -328,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: CMS for Ruby, Rails and MongoDB'

data/app/forms/__drgcms_cms.yml

@@ -1,28 +0,0 @@
-## YAML Template for drgcms_menu1s
----
-title: drgCMS First Top Menu
-table: drgcms1menu
-new_part:
-  form:
-    actions: 
-      1: cancle
-      2: 
-        type: submit
-        text: Create
-
-    fields:
-      1:
-        name: part_type
-        type: select
-        choices: part,drgcms1menu
-        eval: Person.all.collect {|p| [ p.name, p.id ] }
-        
-      2:
-        name: part_embedded_in
-        type: select
-        choices: Design:design,PodjetnikPage:podjetnik_page
-        
-      3:
-        name: location_id
-        type: select
-        choices: site-top,ads-top,site-right,site-bottom,&get_all_locations