drg_cms 0.5.6 → 0.5.7

data/app/helpers/dc_common_renderer.rb

@@ -55,8 +55,9 @@ end
 # Renderer for Google analytics code.
 # 
 # Parameters:
-# Are passed through @opts hash and can therefore be set on site or design 
-# or page document parameters field as ga_acc key.
+# Are passed through @opts hash and can therefore be set on site  
+# or page document parameters field as ga_acc key. You may also disable sending 
+# 
 # 
 # If eu_cookies_allowed function is defined in javascript libraries it will be
 # called and if false is returned GA code will not be executed. This is in 
@@ -67,7 +68,7 @@ end
 ########################################################################
 def google_analytics
   ga_acc = @opts[:code] || @opts[:ga_acc]
-  return '' if ga_acc.nil?
+  return '' if ga_acc.nil? or ga_acc == '/'
   html =<<EOT 
   <!-- Google analytics. -->
 <script type="text/javascript">
@@ -93,7 +94,7 @@ end
 # are found in url iframe will be initial loaded with url parameters thus
 # enabling forms load on page display.
 ########################################################################
-def iframe_edit()
+def _remove_iframe_edit()
   @parent.render(partial: 'dc_common/iframe_edit', formats: [:html])
 end
 

data/app/helpers/dc_menu_renderer.rb

@@ -126,8 +126,8 @@ def do_menu_level(menu, options={})
     if (sub = item.dc_menu_items).size > 0
       if @opts[:edit_mode] > 1
         opts = options.clone
-        opts[:ids]   = (opts[:ids]   ? "#{opts[:ids]};" : '')   + menu._id.to_s
-        opts[:table] = (opts[:table] ? "#{opts[:table]};" : '') + 'dc_menu_item'
+        opts['ids']   = (opts['ids']   ? "#{opts['ids']};" : '')   + menu._id.to_s
+        opts['table'] = (opts['table'] ? "#{opts['table']};" : '') + 'dc_menu_item'
       end
       html << do_menu_level(item, opts)
     end

data/app/helpers/dc_page_renderer.rb

@@ -44,6 +44,7 @@ def initialize( parent, opts={} ) #:nodoc:
   @parent = parent
   @opts   = opts
   @page   = @parent.page
+  @css    = ''
 end
 
 #########################################################################
@@ -55,6 +56,7 @@ def default
 #  
   html = ''
   html << dc_page_edit_menu() if @opts[:edit_mode] > 1
+  @parent.page_title = @page.title.blank? ? @page.subject : @page.title
   html << @page.body
 end
 
@@ -70,7 +72,7 @@ end
 # Return CSS part of code.
 ########################################################################
 def render_css
-  @page.css
+  @css
 end
 
 end

data/app/helpers/dc_part_renderer.rb

@@ -97,6 +97,11 @@ def load_parts #:nodoc:
     type = decamelize_type(part._type) || 'dc_part'
     @parent.parts << [part, @parent.page.id, type, "#{@parent.site.page_table};#{type}"]
   end
+# add parts in page
+  @parent.site.dc_parts.where(active: true).each do |part|
+    type = decamelize_type(part._type) || 'dc_part'
+    @parent.parts << [part, @parent.site.id, type, "dc_site;#{type}"]
+  end
 # add parts belonging to site, defined in dc_pieces
   DcPiece.where(site_id: @parent.site._id, active: true).each do |part|
     @parent.parts << [part, part._id, 'dc_piece', 'dc_piece']
@@ -142,7 +147,7 @@ end
 
 ########################################################################
 # This method will search and render single part defined in pages file. Part may
-# be defined in current page document or in any page document in found in pages file. Parameters
+# be defined in current page document or in any page document found in pages file. Parameters
 # are send through options hash. 
 # 
 # Options: 
@@ -173,6 +178,41 @@ def in_page
   end
 end
 
+########################################################################
+# Renderer for single datapage kind of sites.
+########################################################################
+def single_sitedoc
+# if div_id option specified search for part with this div_id. 
+# This can be used to render footer or header of site.
+  part = if @opts[:div_id]
+    @parent.parts.find_by(div_id: @opts[:div_id])
+  else
+    @parent.part
+  end
+# part not found. Render error message.
+  return "Part #{@opts[:div_id]} not found!" if part.nil?
+# prepare edit parameters  
+  @opts[:editparams].merge!(id: part, ids: @parent.site._id, formname: 'dc_part', 
+                            table: "dc_site;dc_part", record_div_id: 'document' )
+  render_particle(part, @opts) 
+end
+
+########################################################################
+# Render menu for single datapage kind of sites.
+########################################################################
+def single_sitedoc_menu
+# prepare div markup
+  menu_div = @opts[:menu_div] ? "id=#{@opts[:menu_div]}" : ''
+  html = "<div #{menu_div}><ul>\n"
+# collect all dc_part documents which make menu
+  @parent.parts.where(div_id: 'document').order_by(order: 1).each do |part|
+# mark selected item    
+    selected = (part == @parent.part) ? 'class="menu-selected"' : ''
+    html << "<li #{selected}>#{ @parent.link_to(part.name, part.link ) }</li>\n"
+  end
+  html << "</ul></div>\n"
+end
+
 ########################################################################
 # Renderer dispatcher. Method returns HTML part of code.
 ########################################################################

data/app/helpers/dc_simple_menu_renderer.rb

@@ -107,9 +107,10 @@ def link_4menu(item)
     else
       @parent.fa_icon(item.picture)
     end
+    caption << ' '
    end
   # - in first place won't write caption text
-  caption = caption.html_safe + (item.caption[0] == '-' ? '' : (' ' + item.caption) )
+  caption = caption.html_safe + (item.caption[0] == '-' ? '' : item.caption )
   
   target = item.target.blank? ? nil : item.target
   @parent.link_to(caption, link, {target: target})

data/app/models/dc_page.rb

@@ -60,8 +60,6 @@ field :kats,         type: Array         # Categories
 field :policy_id,    type: BSON::ObjectId
 
 embeds_many :dc_parts
-#embeds_many :dc_parts, as: :dc_parts
-
 
 belongs_to  :dc_site
 belongs_to  :dc_design

data/app/models/dc_site.rb

@@ -56,9 +56,13 @@ included do
   field :design,              type: String,  default: ''
   
   embeds_many :dc_policies
+  embeds_many :dc_parts
   
   index( { name: 1 }, { unique: true } )
   
+  validates :name, presence: true
+  validates :name, uniqueness: true      
+  
 ########################################################################
 # Return choices for select for site_id
 ########################################################################

data/app/models/drgcms_form_fields.rb

@@ -221,7 +221,13 @@ def render
   @html << if @yaml['eval']
     if @yaml['eval'].match('dc_name4_id')
       a = @yaml['eval'].split(',')
-      @parent.dc_name4_id(a[1], a[2], @record[ @yaml['name'] ])
+      if a.size == 3
+        @parent.dc_name4_id(a[1], a[2], nil, @record[ @yaml['name'] ])
+      else
+        @parent.dc_name4_id(a[1], a[2], a[3], @record[ @yaml['name'] ])
+      end
+      
+#      @parent.dc_name4_id(a[1], a[2], @record[ @yaml['name'] ])
     else
       eval( "#{@yaml['eval']} '#{@record[ @yaml['name'] ]}'") 
     end
@@ -379,9 +385,11 @@ def ro_standard(table, search)
   result = ''
   table = table.classify.constantize
   return self if @record[@yaml['name']].nil?
-    @record[@yaml['name']].each do |element|
-      result << table.find(element)[search] + '<br>'
-    end
+# when field name and method are defined together
+  search = search.split('.').first if search.match('.')
+  @record[@yaml['name']].each do |element|
+    result << table.find(element)[search] + '<br>'
+  end
   super(result)
 end
 
@@ -587,7 +595,6 @@ def ro_standard
   return self if value.nil?
 #  
   get_choices.each do |choice|
-      p choice, value
     if choice.class == Array
       return super(choice.first) if choice.last == value
     else
@@ -1215,21 +1222,23 @@ end
 # * +type:+ text_with_select (required)
 # * +choices:+ Values for choices separated by comma. Values can also be specified like description:value.
 # In this case description will be shown to user, but value will be saved to document.
-#   * choices: 'OK:0,Ready:1,Error:2'
-#   * choices: Ruby,Pyton,PHP
+#   choices: 'OK:0,Ready:1,Error:2'
+#   choices: Ruby,Pyton,PHP
 # * +eval:+ Choices will be provided by evaluating expression
-#   * eval: dc_choices4('model_name','description_field_name','_id'); dc_choices4 helper will provide data for select field. 
-#   * eval: ModelName.choices4_field; ModelName class will define method choices4_field which 
+#   eval: dc_choices4('model_name','description_field_name','_id'); dc_choices4 helper will provide data for select field. 
+#   eval: ModelName.choices4_field; ModelName class will define method choices4_field which 
 #   will provide data for select field. Since expression is evaluated in the context of Form Field object
-#   even session session variables can be accessed. Ex. +eval: 'MyClass.method(@parent.session[:user_id])'+
-#   * collection_name.search_field_name.method_name; When searching is more complex custom search
-#   method may be defined in CollectionName model which will provide result set for search.
-# * If choices or eval is not defined choices will be provided from translation helpers. For example: 
-#   Collection has field status choices for field may be provided by en.helpers.model_name.choices4_status 
-#   entry of english translation. English is of course default translation. If you provide translations in
-#   your local language then select choices will be localized.
-#   * en.helpers.model_name.choices4_status: 'OK:0,Ready:1,Error:2'
-#   * sl.helpers.model_name.choices4_status: 'V redu:0,Pripravljen:1,Napaka:2'
+# Even session session variables can be accessed. 
+#   eval: 'MyClass.method(@parent.session[:user_id])'
+# When searching is more complex custom search method may be defined in CollectionName 
+# model which will provide result set for search.
+#   eval: collection_name.search_field_name.method_name; 
+# If choices or eval is not defined choices will be provided from translation helpers. For example: 
+# Collection has field status. Choices for field will be provided by en.helpers.model_name.choices4_status 
+# entry of english translation. English is of course default translation. If you provide translations in
+# your local language then select choices will be localized.
+#   en.helpers.model_name.choices4_status: 'OK:0,Ready:1,Error:2'
+#   sl.helpers.model_name.choices4_status: 'V redu:0,Pripravljen:1,Napaka:2'
 # * +html:+ html options which apply to select and text_field fields (optional)
 # 
 # Form example:

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

@@ -2,50 +2,66 @@
 <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">
-          <%#= 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( fa_icon('edit lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
+    <table class="cmsedit-table">
+    <tr>
+      <td class="cmsedit-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 %> 
+        <ul><li>
+         <%= fa_icon('bars lg') %>
+         <ul>
+          <%= dc_choices4_cmsmenu.html_safe %>
+         </ul>
+        </li></ul>
+        
+        <% if @page %>
+          <%= link_to( fa_icon('file-text-o lg', class: "dc-animate", title: "#{t('drgcms.edit_page')}"),
               {controller: 'cmsedit', action: 'edit', table: @site.page_table, id: @page._id}, target: 'iframe_cms') %>
+        <% end %>
 
+        <% if @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') %>
-          
+        <% end %>
+
+        <% if @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( fa_icon('compress lg', class: "dc-animate", title: t('drgcms.minimize')), '#',
-              onclick: "$('#iframe_cms').height(1); return false;" ) %>
-          
-          <%= 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( 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( fa_icon('bars lg', class: "dc-animate", title: t('drgcms.edit_selected')), '#',
-              onclick: "$('#iframe_cms').attr('src', $('#record_select').val() ); return false;")  %>
-
-          <%= link_to( fa_icon('copy lg', class: "dc-animate", title: "#{t('drgcms.doc_paste_title')}"),
-              {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
-
-          <%= DrgcmsFormFields::Elfinder.file_manager_url(self) %>
-          
-        </td>
-      </tr>
-
-      <tr class="cmsedit-menu-plus" class="div-hidden dc-form-frame"><td>
-        <%= @menu_plus %>
-      </td><tr>
-
-      <tr class="cmsedit-iframe"><td class="cmsedit-iframe">
-        <div><iframe id="iframe_cms" name="iframe_cms"></iframe></div>
-      </td></tr>
+        <% end %>
+        <b>&nbsp; | &nbsp; </b>
+        <%= link_to( fa_icon('compress lg', class: "dc-animate", title: t('drgcms.minimize')), '#',
+            onclick: "$('#iframe_cms').height(1); return false;" ) %>
+
+        <%= 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( 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 ) %>
+        
+        <%= link_to( fa_icon('bars lg', class: "dc-animate", title: t('drgcms.edit_selected')), '#',
+            onclick: "$('#iframe_cms').attr('src', $('#record_select').val() ); return false;")  %>
+  <% end %>
+
+        <%= link_to( fa_icon('copy lg', class: "dc-animate", title: "#{t('drgcms.doc_paste_title')}"),
+            {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
+
+        <%= 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>
   <% end %>
 </div>

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

@@ -17,4 +17,4 @@
   
 </div>
 
-<%= javascript_tag @js if @js.to_s.size > 0 %>
+<%= javascript_tag(@js) unless @js.blank? %>

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

@@ -1,4 +1,3 @@
-
 <%= dc_table_title dc_edit_title() %>
 
 <%= form_tag @parms, method: :put, id: 'cmsform' do %>

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

@@ -1,7 +1,7 @@
 <% if session[:edit_mode] and session[:edit_mode] > 0 %>
   <%= render partial: 'edit_stuff' %>
-  <%= render partial: 'edit_stuff', formats: ['js']  %>
 <% else %>
+  <div id="dc-login">
   <h2>CMS login</h2>
   <%= dc_flash_messages %>   
   <%= form_tag controller: 'dc_common', action: 'process_login', return_to: '/cmsedit/login?ok=1', method: :put do %>
@@ -18,4 +18,5 @@
     </table>
     <%= hidden_field_tag('return_to_error', request.url ) %>
   <% end %>
+  </div>
 <% end %>

data/app/views/layouts/cms.html.erb

@@ -4,8 +4,10 @@
   <title><%= @page_title %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <%= stylesheet_link_tag "cms", media: 'all' %>
-  <style type="text/css" media="all"><%= "#{@site.css}#{@design.css}\n#{@page.css}".html_safe if @page %></style>
+<% if false %>  not require in cms mode
+  <style type="text/css" media="all"><%= "#{@site.css if @site}#{@design.css if @design}\n#{@page.css if @page}".html_safe  %></style>
   <%= @site.header.html_safe if @site %>
+<% end %>
   <%= javascript_include_tag "cms" %>
   <%= csrf_meta_tags %>
 </head>

data/app/views/layouts/content.html.erb

@@ -4,7 +4,7 @@
   <title><%= @page_title %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <%= stylesheet_link_tag "application", media: 'all' %>
-  <style type="text/css" media="all"><%= "#{@site.css}#{@design.css}\n#{@page.css}".html_safe %></style>
+  <style type="text/css" media="all"><%= "#{@site.css if @site}#{@design.css if @design}\n#{@page.css if @page}".html_safe %></style>
   <%= @site.header.html_safe %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

data/config/locales/drgcms_en.yml

@@ -36,6 +36,8 @@ en:
     doc_paste_clipboard: Start update
     doc_paste_title: Insert (update) documents from JSON data
     doc_paste_update: Update existing document if document._id exists
+    doc_no_delete: Document can not be deleted!
+    doc_no_update: Document can not be updated!
     edit_content: Edit content
     edit_advanced: Advanced edit
     edit_new_page: Create new page

data/config/locales/drgcms_sl.yml

@@ -36,6 +36,8 @@ sl:
     doc_paste_clipboard: Obdelaj podatke    
     doc_paste_title: Ustvari (spremeni) dokumente iz JSON zapisa
     doc_paste_update: Spremeni obstoječ dokument, če dokument._id obstaja
+    doc_no_delete: Dokumenta ni možno izbrisati!
+    doc_no_update: Dokumenta ni možno spremeniti!
     edit_content: Urejanje vsebine
     edit_advanced: Napredno urejanje
     edit_new_page: Ustvarite novo stran

data/config/locales/models_en.yml

@@ -35,6 +35,7 @@ en:
         3advanced: Advanced
         4design: Design
         5permissions: Permissions
+        6parts: Parts
 
         name: Name
         description: Description
@@ -53,6 +54,7 @@ en:
         files_directory: Files directory
         active: Active
         dc_policies: Access policies
+        dc_parts: Parts
         settings: Settings
         menu_name: Menu name
         alias_for: Alias for
@@ -179,7 +181,7 @@ en:
         active: Active
 
       dc_simple_menu:
-        tabletitle: Simple (my first) menus
+        tabletitle: Simple menus
         tab1: Base
         tab2: Items
         tab3: CSS
@@ -504,6 +506,7 @@ en:
         alias_for: Is alias name for entered site name
         rails_view: Rails view filename used as standard design
         design: Standard design can also be defined at the site level
+        dc_parts: Parts contained in site
         
       dc_user:
         username: Username