drg_cms 0.5.52.12 → 0.5.52.16

data/app/forms/cms_menu.yml

@@ -118,6 +118,11 @@ menu:
         controller: cmsedit
         icon: filter lg        
         table: dc_filter
+      90: 
+        caption: helpers.label.dc_removed_url.tabletitle
+        controller: cmsedit
+        icon: trash-o lg        
+        table: dc_removed_url
       500: 
         caption: helpers.label.dc_journal.tabletitle
         controller: cmsedit

data/app/forms/dc_gallery.yml

@@ -0,0 +1,53 @@
+# Form for dc_gallery
+table: dc_gallery
+index:
+  filter: id as text_field, doc_id as text_field
+  actions: standard
+
+result_set:
+  actions: standard
+
+# Choose from
+# _id,created_at,updated_at,title,description,picture,thumbnail,doc_id,order,active,created_by,updated_by
+  columns:
+    10: 
+      name: doc_id
+    20: 
+      name: title
+    30:  
+      name: created_at
+      width: 10%
+    50: 
+      name: active
+      eval: dc_icon4_boolean
+
+form:
+  actions: standard
+
+  fields:
+    10:
+      name: doc_id
+      type: readonly
+    20:
+      name: title
+      type: text_field
+      size: 50
+    30:
+      name: description
+      type: text_area
+      size: 80x10
+    40:
+      name: picture
+      type: file_select
+      size: 50
+    50:
+      name: thumbnail
+      type: file_select
+      size: 50
+    60:
+      name: order
+      type: text_field
+      size: 3
+    70:
+      name: active
+      type: check_box

data/app/forms/dc_link.yml

@@ -14,13 +14,14 @@ result_set:
     3: delete
 
   columns:
-    1:  
+    10:  
       name: name
-      style: "text-align: left;"
-      width: 40%
-    2: 
+      width: 20%
+    20: 
+      name: redirect
+      width: 20%
+    30: 
       name: params
-      style: "text-align: left;"
 
 form:
   title: 
@@ -32,24 +33,29 @@ form:
     10:
       name: name
       type: text_field
-      html:
-        size: 30
+      size: 40
 
     20:
       name: dc_site_id
       type: select
       eval: DcSite.choices4_site
+      html:
+        include_blank: true      
 
     30:
+      name: redirect
+      type: text_field
+      size: 40
+     
+    40:
       name: page_id
       type: text_autocomplete
       table: 
         eval: '@parent.session[:site_page_table]'
       search: subject
-      html:
-        size: 80
+      size: 60
      
-    40:
+    50:
       name: params
       type: text_area
       html:

data/app/forms/dc_menu_item.yml

@@ -19,6 +19,11 @@ result_set:
     3: 
       name: order
       align: right
+      width: 10%
+    4: 
+      name: active
+      eval: dc_icon4_boolean      
+      width: 10%
 
 form:
   title: 

data/app/forms/dc_page.yml

@@ -69,8 +69,7 @@ form:
         size: 50
       90:
         name: gallery
-        type: text_field
-        size: 20
+        type: check_box
       100:
         name: valid_from
         type: datetime_select

data/app/forms/dc_removed_url.yml

@@ -0,0 +1,42 @@
+# Form for dc_removed_url
+table: dc_removed_url
+
+index:
+  filter: url, dc_site_id
+  actions: standard
+
+result_set:
+  actions: standard
+
+  columns:
+    10: 
+      name: dc_site_id
+      eval: dc_name4_id,dc_site,name
+    20:
+      name: url
+      width: 40%
+    30: 
+      name: updated_at
+      format: '%d.%m.%Y'
+
+form:
+  title:
+    field: url
+
+  actions: standard
+
+  fields:
+    10:
+      name: url
+      type: text_field
+      size: 50
+    20:
+      name: description
+      type: text_field
+      size: 50
+    30:
+      name: dc_site_id
+      type: select
+      eval: dc_choices4('dc_site','name','_id')
+      html:
+        include_blank: true

data/app/helpers/cmsedit_helper.rb

@@ -134,6 +134,16 @@ EOT
     when action == 'menu' then  
       caption = t(v['caption'], v['caption']) + ' ' + fa_icon('caret-down lg')
       caption + eval(v['eval'])      
+=begin
+# reorder      
+    when action == 'reorder' then  
+      caption = t('drgcms.reorder')
+      parms = @parms.clone
+      parms['operation'] = v
+      parms['id']       = params[:ids]
+      parms['table']     = @form['table']
+      dc_link_to( caption, 'reorder', parms, method: :delete )              
+=end      
     else 
       caption = yaml['caption'] || yaml['text']
       icon    = yaml['icon'] ? yaml['icon'] : action
@@ -173,7 +183,7 @@ def dc_div_filter()
     field_name, operators_value = nil, nil
   end
   #{ form_tag :table => @form['table'], filter: :on, filter_input: 1, action: :index, method: :post }
-  url = url_for(:table => @form['table'], filter: :on, filter_input: 1, action: :index, controller: :cmsedit)  
+  url = url_for(table: @form['table'],form_name: params['form_name'], filter: :on, filter_input: 1, action: :index, controller: :cmsedit)  
   html =<<EOT
   <div id="drgcms_filter" class="div-hidden">
     <h1>#{t('drgcms.filter_set')}</h1>
@@ -350,7 +360,7 @@ def dc_clicks_for_result(document)
     html << ' data-dblclick=' + url_for(opts) 
   else
      html << (' data-dblclick=' +
-       url_for(action: 'show', controller: 'cmsedit', id: document, 
+       url_for(action: 'show', controller: 'cmsedit', id: document.id, 
        readonly: (params[:readonly] ? 2 : 1), table: params[:table],
        form_name: params[:form_name], ids: params[:ids])  ) if @form['form'] 
   end
@@ -475,6 +485,17 @@ def dc_columns_for_result(document)
   html.html_safe
 end
 
+############################################################################
+# Will return value for parameter required on form
+############################################################################
+def dc_value_for_parameter(param)
+  if param.class == Hash
+    dc_internal_var(param['object'] || 'record', param['method'])
+  else
+    param    
+  end
+end
+
 ############################################################################
 # Creates actions div for edit form.
 # 
@@ -490,6 +511,7 @@ def dc_actions_for_form()
   unless @record.id.nil?
     std_actions.merge!({' 6' => 'new'} )
     std_actions.merge!(@record.active ? {' 5' => 'disable'} : {' 5' => 'enable'} ) if @record.respond_to?('active')
+    std_actions.merge!({' 7' => 'refresh'} )
   end
   actions = @form['form']['actions']
 # shortcut for actions: standard 
@@ -531,6 +553,8 @@ def dc_actions_for_form()
       next
     end    
 #    
+    action_active = !(dc_dont?(v['when_new']) and @record.new_record?)
+#    p [v['caption'], action_active]
     parms = @parms.clone
     if v.class == String
       next if params[:readonly] and !(v == 'back')
@@ -562,21 +586,28 @@ def dc_actions_for_form()
           parms['operation'] = v
           parms['id']        = @record.id
           dc_link_to( "drgcms.#{v}",v, parms )
+        when v == 'refresh' then
+          "<span onclick='window.location.href=window.location.href;'>#{fa_icon('refresh')} #{t('drgcms.refresh')}</span></li>"
       else 
         "err1 #{element[0]}=>#{v}"
       end
       c << '</td>'
-# non standard actions      
+    # non standard actions      
     else
       c << case 
-# submit button
+      # submit button
       when v['type'] == 'submit'
         caption = v['caption'] || 'drgcms.save'
         icon    = v['icon'] || 'save'
-        '<li class="dc-link-submit dc-animate">' + 
-          dc_submit_tag(caption, icon, {:data => v['params'], :title => v['title']}) + 
-        '</li>'
-# delete with some sugar added
+        if action_active 
+          '<li class="dc-link-submit dc-animate">' + 
+             dc_submit_tag(caption, icon, {:data => v['params'], :title => v['title'] }) +
+          '</li>'
+        else
+          "<li class=\"dc-link-no\">#{fa_icon(icon)} #{caption}</li>"
+        end
+      
+      # delete with some sugar added
       when v['type'] == 'delete'
         parms['id']   = @record.id
         parms.merge!(v['params'])
@@ -585,40 +616,50 @@ def dc_actions_for_form()
         '<li class="dc-link dc-animate">' + 
           dc_link_to( caption, icon, parms, data: t('drgcms.confirm_delete'), method: :delete ) +
         '</li>'
-# ajax or link button
-      when v['type'] == 'ajax' || v['type'] == 'link'
+      
+      # ajax or link button
+      when v['type'] == 'ajax' || v['type'] == 'link' || v['type'] == 'window'
         parms = {}
-  # direct url        
+        # direct url        
         if v['url']
           parms['controller'] = v['url'] 
-          parms['idr']        = @record.id
-  # make url          
+          parms['idr']        = dc_document_path(@record)
+        # make url from action controller
         else
           parms['controller'] = v['controller'] 
           parms['action']     = v['action'] 
           parms['table']      = v['table'] 
           parms['form_name']  = v['form_name']
-          parms['id']         = @record.id
-  # additional parameters          
-          v['params'].each { |k,v| parms[k] = v } if v['params']
         end
-  # Error if controller param is missing
+        # add current id to parameters
+        parms['id'] = dc_document_path(@record)
+        # additional parameters          
+        v['params'].each { |k,v| parms[k] = dc_value_for_parameter(v) } if v['params']
+        # Error if controller parameter is missing
         if parms['controller'].nil?
           "<li>#{t('drgcms.error')}</li>"
         else
           v['caption'] ||= v['text'] 
           caption = t("#{v['caption'].downcase}", v['caption'])
-          url     = url_for(parms)
+          #
+          url = url_for(parms) rescue ''
           request = v['request'] || v['method'] || 'get'
           icon    = v['icon'] ? "#{fa_icon(v['icon'])} " : ''
           if v['type'] == 'ajax' # ajax button
-            %Q[<li class="dc-link-ajax dc-animate" id="dc-submit-ajax" data-url="#{url}" 
+            clas = action_active ? "dc-link-ajax dc-animate" : "dc-link-no"
+            %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}" 
                data-request="#{request}" title="#{v['title']}">#{icon}#{caption}</li>]
-          else                   # link button
-#            %Q[<td class="dc-link dc-animate" title="#{v['title']}><a href="#{url}">#{icon}#{caption}</a></td>]
-            %Q[<li class="dc-link dc-animate">#{dc_link_to(v['caption'],v['icon'], parms)}</li>]
+          elsif v['type'] == 'link'  # link button
+            clas = action_active ? "dc-link dc-animate" : "dc-link-no"
+            %Q[<li class="#{clas}">#{action_active ? dc_link_to(v['caption'],v['icon'], parms, {target: v['target']} ) : caption}</li>]
+          elsif v['type'] == 'window' 
+            clas = action_active ? "dc-link dc-animate dc-window-open" : "dc-link-no"
+            %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}">#{icon}#{caption}</li>]
+          else 
+            'Action Type error'
           end
         end
+        
 # Javascript action        
       when v['type'] == 'script'
 #          v['caption'] ||= 'Caption missing!'

data/app/helpers/dc_application_helper.rb

@@ -54,7 +54,9 @@ attr_reader :part
 attr_accessor :page_title
 # all parts read from page, design, ...
 attr_accessor :parts
-
+#
+attr_accessor :record
+#
 attr_accessor :record_footer
 
 ############################################################################
@@ -283,7 +285,7 @@ def dc_edit_title()
     dc_deprecate('form:edit_title will be deprecated. Use form:title:field instead.') if @form['form']['edit_title']
 #
     c << "#{@record[ title ]} : " if title and @record.respond_to?(title)
-    c << @record._id if @record
+    c << @record.id if @record
   end
   c
 end
@@ -440,7 +442,7 @@ end
 # String. HTML code formatted for display.
 ####################################################################
 def dc_error_messages_for(doc)
-  return '' unless doc.errors.any?
+  return '' unless doc and doc.errors.any?
   msgs = ''
   doc.errors.each do |attribute, errors_array|
     label = t("helpers.label.#{decamelize_type(doc.class)}.#{attribute}", attribute)
@@ -527,13 +529,15 @@ end
 # Create edit link with edit picture. Subroutine of dc_page_edit_menu.
 ####################################################################
 def dc_link_menu_tag(title) #:nodoc:
-  html =<<EOT
-  <dl>
+  html = %Q[
+<dl>
   <dt><div class='drgcms_popmenu' href="#">
-   #{_origin.fa_icon('edit lg', class: 'dc-inline-link', title: title)}</div></dt>
-    <dd>
-    <ul class=' div-hidden drgcms_popmenu_class'> 
-EOT
+    #{_origin.fa_icon('file-text-o lg', class: 'dc-inline-link', title: title)}
+  </div></dt>
+  <dd>
+    <ul class=' div-hidden drgcms_popmenu_class'>
+]
+
   yield html
   html << "</ul></dd></dl>"
 end
@@ -1288,7 +1292,7 @@ end
 # [var_name] String[symbol]: Variable name (:user_name, 'user_id', ...)
 # 
 # Example:
-#    # called when constructiong iframe for display
+#    # called when constructing iframe for display
 #    dc_internal_var(session, :user_id)
 #    dc_internal_var(params, :some_external_parameter)
 #    dc_internal_var(site, :name)
@@ -1303,13 +1307,33 @@ def dc_internal_var(object, var_name)
       when object == 'params'  then _origin.params[var_name]
       when object == 'site'    then _origin.dc_get_site.send(var_name)
       when object == 'page'    then _origin.page.send(var_name)
+      when object == 'record'  then _origin.record.send(var_name)
     else
       'VARIABLE: UNKNOWN OBJECT'
     end
   rescue Exception => e
-    Rails.logger.debug "Method dc_internal var. Runtime error. #{e.message}"
+    Rails.logger.error "Method dc_internal var. Runtime error. #{e.message}"
     'VARIABLE: ERROR'
   end
 end
 
+
+########################################################################
+# Will return whole path to document if document is embedded in another document.
+# 
+# Parameters:
+# [document] Object: Document object
+# 
+# Returns:
+# String of ID-s separated by semicolon.
+#######################################################################
+def dc_document_path(document)
+  path, parent = [document.id], document._parent
+  while parent
+    path << parent.id
+    parent = parent._parent
+  end 
+  path.reverse.join(';')
+end
+
 end

data/app/helpers/dc_gallery_renderer.rb

@@ -0,0 +1,94 @@
+#--
+# 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
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+########################################################################
+# DcGalleryRenderer renders data for displaying picture galary under the document.
+# 
+# Example:
+#    <div id="page">
+#      <%= dc_render(:dc_gallery) if document.gallery %>
+#    </div>
+#
+########################################################################
+class DcGalleryRenderer
+
+include DcApplicationHelper
+
+########################################################################
+# Object initialization.
+########################################################################
+def initialize( parent, opts={} ) #:nodoc:
+  @parent = parent
+  @opts   = opts
+  @page   = @parent.page
+  @css    = ''
+end
+
+#########################################################################
+# Default DcGallery render method. It will simply put thumbnail pictures side by side and
+# open big picture when clicked on thumbnail.
+#########################################################################
+def default
+  can_view, msg = dc_user_can_view(@parent, @page)
+  return msg unless can_view
+# 
+  html = '<div class="picture-gallery"><ul>'
+  DcGallery.where(doc_id: @opts[:doc_id], active: true).order_by(order: 1).each do |picture|
+    html << '<li>'
+    html << edit_menu(picture) if @opts[:edit_mode] > 1
+    html << "#{@parent.link_to(i@parent.mage_tag(picture.thumbnail, title: picture.title), picture.picture)}<li>"
+  end
+# 
+  html << '</ul></div>'
+end
+
+#########################################################################
+# Renderer dispatcher. Method returns HTML part of code.
+########################################################################
+def render_html
+  method = @opts[:method] || 'default'
+  respond_to?(method) ? send(method) : "Error DcPage: Method #{method} doesn't exist!"
+end
+
+########################################################################
+# Return CSS part of code.
+########################################################################
+def render_css
+  @css
+end
+
+private
+########################################################################
+# 
+########################################################################
+def edit_menu(picture)
+  opts = { controller: 'cmsedit', action: 'edit' }
+  opts[:title] = "#{t('drgcms.edit')}: #{picture.title}"
+  opts[:id]    = picture.id
+  opts[:table] = 'dc_gallery'
+  
+  '<li>'+dc_link_for_edit(opts)+'</li>'
+end
+
+
+end