drg_cms 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd80aba913afa715795f1a5e814d44400b5f7f0a
-  data.tar.gz: ee6d578127bd8196b70f07b97e0b3245e4deb861
+  metadata.gz: 65d229ac8eb1045776751d341d8f0d15964a7006
+  data.tar.gz: 035c9ee8254c4c9c2d2933eb498366c73279afc8
 SHA512:
-  metadata.gz: 857de918747abfe9c56afbe92ee350d60947f641f16648135474157ac0bf3faddec43194abffdf644dbaa1cfebb8c3a24b04e74cb0d98f57ba027f2bd3876903
-  data.tar.gz: 4a888718ed39eb65e58fd611feb82444121e53c2f218c6c0e1a6866c2840a87774f60f5c681752fc0f14c79f540b8e356e8d123cf7288d006807eac9077c7c89
+  metadata.gz: db1f82f1c6c9bd23dbde2e59f687d4ff5890b9169600dba872c538213cb6e60866a20f32a4cb5e2e067246b046effb0975ef67c945dff6708ad1dc2d176d7ce6
+  data.tar.gz: 182856d300f43127a0539b66bfb4339e206c9e68e77e37261a24895b6edb1b8e92d8fffae9fe2ab7b65964d7309c052ce9d48fb31630062d94038d723f37631e

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -467,7 +467,7 @@ element = $(this).find(':first').attr('id');
   $('.dc-result tr').on('dblclick', function(e) {
     e.preventDefault();
     url = this.getAttribute("data");
-    if (url !== null) { location.href = url; }
+    if (url !== null & url.length > 5) { location.href = url; } // prevent when url not set
   });
 
 });

data/app/controllers/dc_application_controller.rb

@@ -109,15 +109,22 @@ end
 # Searches forms path for file_name and returns full file name or nil if not found.
 # 
 # [Parameters:]
-# [form_file] Additional data can be displayed with error.
+# [form_file] Form file name. File name can be passed as gem_name.filename. This can
+# be useful when you are extending form but want to retain same name as original form
+# For example. You are extending dc_user form from drg_cms gem and want to
+# retain same dc_user name. This can be done by setting drg_cms.dc_user to extend option. 
 # 
 # [Return:]
 # String. Full form file name or nil if not found.
 ########################################################################
 def dc_find_form_file(form_file)
+  form_path=nil
+  if form_file.match(/\.|\//)
+    form_path,form_file=form_file.split(/\.|\//)
+  end
   DrgCms.paths(:forms).reverse.each do |path|
     f = "#{path}/#{form_file}.yml"
-    return f if File.exist?(f)
+    return f if File.exist?(f) and (form_path.nil? or path.to_s.match(/\/#{form_path}\//i))
   end
   p "Form file #{form_file} not found!"
   nil
@@ -293,7 +300,7 @@ def dc_process_default_request()
 # Log only visits from non-editors
     dc_log_visit()
   end
-  @page_title = @page.subject.empty? ? @site.page_title : @page.subject
+  @page_title = @page.title.blank? ? "#{@site.page_title}-#{@page.subject}" : @page.title
   layout      = @site.site_layout.to_s.size > 2 ? @site.site_layout : 'content'
 # render view. inline if defined in design
   view_filename = ''

data/app/forms/dc_page.yml

@@ -42,47 +42,52 @@ form:
         html:
           size: 50
       30:
+        name: title
+        type: text_field
+        html:
+          size: 50
+      40:
         name: alt_link
         type: text_field
         html:
           size: 50
         text: Alternative link
-      40:
+      50:
         name: sub_subject
         type: text_area
         html:
           size: 100x10
-      45:
+      60:
         name: author_name
         type: text_field
         html:
           size: 30
 
-      50:
+      70:
         name: publish_date
         type: datetime_select
 
-      60:
+      80:
         name: picture
         type: file_select
         html:
           size: 50
-      65:
+      90:
         name: gallery
         type: text_field
         html:
           size: 20
-      70:
+      100:
         name: valid_from
         type: datetime_select
         options:
           include_blank: true
-      80:
+      110:
         name: valid_to
         type: datetime_select
         options:
           include_blank: true
-      90:
+      120:
         name: kats
         type: multitext_autocomplete
         search: dc_category.name      

data/app/forms/dc_user.yml

@@ -28,116 +28,112 @@ form:
     
   actions: standard
 
-  fields:
-
-    0:
-      name: username
-      type: text_field
-      html:
-        size: 10
-    10:
-      name: title
-      type: text_field
-      html:
-        size: 5
-    20:
-      name: first_name
-      type: text_field
-      html:
-        size: 20
-
-    30:
-      name: middle_name
-      type: text_field
-      html:
-        size: 20
-
-    40:
-      name: last_name
-      type: text_field
-      html:
-        size: 20
-
-    45:
-      name: company
-      type: text_field
-      html:
-        size: 50
-
-    50:
-      name: address
-      type: text_field
-      html:
-        size: 50
-
-    55:
-      name: post
-      type: text_field
-      html:
-        size: 50
-
-    60:
-      name: country
-      type: text_field
-      html:
-        size: 20
-
-    70:
-      name: email
-      type: text_field
-      html:
-        size: 30
-
-    80:
-      name: phone
-      type: text_field
-      html:
-        size: 30
-
-    90:
-      name: birthdate
-      type: date_select
-      options:
-        start_year: 1930
-
-    100:
-      name: picture
-      type: text_field
-      html:
-        size: 50
-
-    110:
-      name: about
-      type: text_area
-      html:
-        size: 100x10
-
-    120:
-      name: password
-      type: password_field
-      html:
-        size: 20
-
-    130:
-      name: password_confirmation
-      type: password_field
-      html:
-        size: 20
-
-    140:
-      name: dc_user_roles
-      type: embedded
-      formname: dc_user_role
-      html:
-        size: 20
-
-    150:
-      name: signature
-      type: text_area
-      html:
-        size: 100x5
-
-
-#    20:
-#      name: password_digest
-#      type: hidden_field
+  tabs:
+    tab1:
+
+      10:
+        name: username
+        type: text_field
+        html:
+          size: 10
+      20:
+        name: title
+        type: text_field
+        html:
+          size: 5
+      30:
+        name: first_name
+        type: text_field
+        html:
+          size: 20
+
+      40:
+        name: middle_name
+        type: text_field
+        html:
+          size: 20
+
+      50:
+        name: last_name
+        type: text_field
+        html:
+          size: 20
+
+      60:
+        name: company
+        type: text_field
+        html:
+          size: 50
+
+      70:
+        name: address
+        type: text_field
+        html:
+          size: 50
+
+      80:
+        name: post
+        type: text_field
+        html:
+          size: 50
+
+      90:
+        name: country
+        type: text_field
+        html:
+          size: 20
+
+      100:
+        name: email
+        type: text_field
+        html:
+          size: 30
+
+      110:
+        name: phone
+        type: text_field
+        html:
+          size: 30
+
+      120:
+        name: birthdate
+        type: date_select
+        options:
+          start_year: 1930
+
+      130:
+        name: picture
+        type: text_field
+        html:
+          size: 50
+
+      140:
+        name: about
+        type: text_area
+        html:
+          size: 100x10
+
+      150:
+        name: password
+        type: password_field
+        html:
+          size: 20
+
+      160:
+        name: password_confirmation
+        type: password_field
+        html:
+          size: 20
+
+      170:
+        name: dc_user_roles
+        type: embedded
+        formname: dc_user_role
+        html:
+          size: 20
+
+      180:
+        name: signature
+        type: text_area
+        html:
+          size: 100x5

data/app/helpers/dc_application_helper.rb

@@ -44,6 +44,8 @@ attr_reader :form
 # options object
 attr_reader :options
 
+# page title
+attr_accessor :page_title
 # all parts read from page, design, ...
 attr_accessor :parts
 
@@ -614,7 +616,7 @@ end
 #        eval: dc_icon4_boolean
 ############################################################################
 def dc_icon4_boolean(value)
-  dc_dont?(value) ? fa_icon('square-o lg') : fa_icon('check-square-o lg') 
+  dc_dont?(value, true) ? fa_icon('square-o lg') : fa_icon('check-square-o lg') 
 end
 
 ############################################################################

data/app/helpers/dc_simple_menu_renderer.rb

@@ -128,7 +128,7 @@ def as_table
     klas = item.id == @selected.id ? "#{div_name}-selected" : "#{div_name}-item"
     html << "<td class=\"td-#{klas}\">#{ link_4menu(item) }</td>" #
   end
-  html << "</table>"
+  html << "</tr></table>"
 end
 ########################################################################
 # Renders menu as table. This is single level menu only and uses table elements to 
@@ -274,9 +274,11 @@ def default
 # submenu
   html << "<div class=\"sub-#{div_name}\">
         <ul class=\"ul-sub-#{div_name}\">"
-  y = YAML.load(@selected.submenu) || {}
-  y.each do |k,v|
-    html << "<li class=\"li-sub-#{div_name}\">#{@parent.link_to(v['title'], v['link'])}</li>"
+  y = YAML.load(@selected.submenu) rescue []
+  if y.class == Array
+    y.each do |k,v|
+      html << "<li class=\"li-sub-#{div_name}\">#{@parent.link_to(v['title'], v['link'])}</li>"
+    end
   end
   html << '</ul></div>'
 end

data/app/models/dc_page.rb

@@ -33,6 +33,7 @@ include Mongoid::Document
 include Mongoid::Timestamps
 
 field :subject,      type: String,  default: ''
+field :title,        type: String
 field :subject_link, type: String,  default: ''
 field :alt_link,     type: String,  default: ''
 field :sub_subject,  type: String,  default: ''

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

@@ -11,7 +11,7 @@
         <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]) %>" >
+                      formname: params[:formname], ids: params[:ids]) if @form['form']%>" >
           <%= dc_actions_for_result r %>
           <%= dc_columns_for_result r %>
         </tr>

data/config/locales/models_en.yml

@@ -85,6 +85,7 @@ en:
 
       dc_user:
         tabletitle: Users
+        tab1: Base
 
         id: Id
         username: Username
@@ -246,6 +247,7 @@ en:
 
         subject: Subject
         subject_link: Subject link
+        title: Browser title
         sub_subject: Sub subject
         picture: Picture
         gallery: Gallery id
@@ -641,6 +643,7 @@ en:
       dc_page:
         subject: Articles subject
         subject_link: Friendly link defined
+        title: Browser title. Optimization for SEO.
         sub_subject: Sub subject, short description of text
         picture: Picture used in conjunction with page
         gallery: Picture gallery id used with page. Id defines id's of parts which consist gallery

data/config/locales/models_sl.yml

@@ -78,6 +78,7 @@ sl:
 
       dc_user:
         tabletitle: Uporabniki
+        tab1: Osnova
 
         id: Id
         username: Uporabnik
@@ -273,9 +274,10 @@ sl:
         3content: Vsebina
         4parts: Elementi
 
-        subject: Naslov
+        subject: Zadeva
         subject_link: Povezava
-        sub_subject: Podnaslov
+        title: Naslov za brskalnik
+        sub_subject: Povzetek
         picture: Slika
         gallery: Id galerije
         alt_link: Alt povezava
@@ -667,9 +669,10 @@ sl:
         link_target: Odpri povezavo v novem oknu ali v istem oknu
 
       dc_page:
-        subject: Naslov sestavka
+        subject: Zadeva (kratek naslov) sestavka
         subject_link: Povezava (link) do sestavka
-        sub_subject: Podnaslov, kratek opis vsebine
+        sub_subject: Povzetek, kratek opis vsebine
+        title: Naslov, ki se izpiše v gornji vrstici brskalnika. Optimiziraj za SEO.
         alt_link: Alternativna povezava do sestavka
         picture: Slika v povezavi s stranjo
         gallery: Id sestavnih elementov, ki sestavljajo slikovno galerijo te strani.