drg_cms 0.6.0.1 → 0.6.0.3

data/app/controllers/dc_common_controller.rb

@@ -55,7 +55,7 @@ def autocomplete
   a = if params['search'].match(/\./)
     name, method = params['search'].split('.')
     table.send(method, params['input']).inject([]) do |r,v|
-      r << { label: v[0], value: v[0], id: v[1].to_s }
+      r << { label: v[0], value: v[0], id: (v[1] || v[0]).to_s }
     end
 # simply search which will search and return field_name defined in params['search']
   else
@@ -64,7 +64,7 @@ def autocomplete
     end
   end
 
-  render inline: a.to_json, formats: 'js'
+  render plain: a.to_json
 end
 
 ########################################################################
@@ -92,8 +92,21 @@ def toggle_edit_mode
   if session[:edit_mode] < 1 
     dc_render_404 
   else
+# if return_to_ypos parameter is present it will forward it and thus scroll to
+# aproximate position it was when toggle was clicked
     session[:edit_mode] = (session[:edit_mode] == 1) ? 2 : 1
-    redirect_to params[:return_to]
+    uri = Rack::Utils.parse_nested_query(request.url)
+# it parses only on & so first (return_to) parameter also contains url
+    url = uri.first.last
+    if (i = url.index('?return_to_ypos')).to_i > 0
+      url = url[0,i]
+    end 
+# offset CMS menu
+    if (ypos = uri['return_to_ypos'].to_i) > 0
+      ypos += session[:edit_mode] == 2 ? 250 : -250
+    end
+    url << "?return_to_ypos=#{ypos}"
+    redirect_to url
   end
 end
 
@@ -149,7 +162,7 @@ end
 def restore_from_journal
 # Only administrators can perform this operation  
   unless dc_user_has_role('admin')
-    return render inline: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json, formats: 'js'
+    return render plain: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json
   end
 # selected fields to hash  
   restore = {} 
@@ -178,7 +191,7 @@ def restore_from_journal
 # TODO Error checking    
     { 'msg_info' => (t ('drgcms.dc_journal.restored')) }
   end
-  render inline: result.to_json, formats: 'js'  
+  render plain: result.to_json
 end
 
 ########################################################################
@@ -236,8 +249,54 @@ def paste_clipboard
   dc_render_ajax(div: 'result', value: result )
 end
 
+########################################################################
+# Will add new json_ld element with blank structure into dc_json_ld field on a 
+# document.
+########################################################################
+def add_json_ld_schema
+  edited_document = DcJsonLd.find_document_by_ids(params[:table], params[:ids])
+  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  schema_data = yaml[params[:schema]]
+# Existing document  
+  if edited_document.dc_json_lds.find_by(type: "@#{params[:schema]}")
+    return render json: {'msg_error' => t('helpers.help.dc_json_ld.add_error', schema: params[:schema] ) }
+  else
+    add_empty_json_ld_schema(edited_document, schema_data, params[:schema], params[:schema], yaml)
+  end
+  render json: {'reload_' => 1}
+end
+
 protected
 
+########################################################################
+# Subroutine of add_json_ld_schema for adding one element
+########################################################################
+def add_empty_json_ld_schema(edited_document, schema, schema_name, schema_type, yaml) #:nodoc
+  data = {}
+  doc = DcJsonLd.new
+  doc.name = schema_name
+  doc.type = schema_type
+ 
+  edited_document.dc_json_lds << doc
+  schema.each do |element_name, element|
+    next if element_name == 'level' # skip level element
+    if yaml[element['type']]
+      if element['n'].to_s == '1'
+        # single element
+        doc_1 = yaml[element['type'] ]
+        data[element_name] = doc_1
+      else
+        # array
+        add_empty_json_ld_schema(doc, yaml[element['type']], element_name, element['type'], yaml)
+      end
+    else
+      data[element_name] = element['text']
+    end
+  end
+  doc.data = data.to_yaml
+  doc.save
+end
+
 ########################################################################
 # Update some anomalies in json data on paste_clipboard action.
 ########################################################################

data/app/forms/all_options.yml

@@ -152,6 +152,8 @@ form:
       
   tabs:
     tab1:
+      caption: my_caption
+      caption: helpers.label.table.tab1
 
       10:
         name: name

data/app/forms/dc_ad.yml

@@ -42,14 +42,12 @@ form:
       name: position
       type: text_with_select
       eval: dc_big_table 'ads-positions'
-      html:
-        size: 20
+      size: 20
 
     20:
       name: description
       type: text_field
-      html:
-        size: 50
+      size: 50
 
     30:
       name: type
@@ -58,26 +56,22 @@ form:
     40:
       name: file
       type: file_select
-      html:
-        size: 50
+      size: 50
 
     50:
       name: width
       type: text_field
-      html:
-        size: 5
+      size: 5
 
     60:
       name: height
       type: text_field
-      html:
-        size: 5
+      size: 5
 
     70:
       name: link
       type: text_field
-      html:
-        size: 50
+      size: 50
 
     75:
       name: link_target
@@ -86,26 +80,22 @@ form:
     80:
       name: script
       type: text_area
-      html:
-        size: 100x20
+      size: 100x20
 
     90:
       name: displays
       type: text_field
-      html:
-        size: 6
+      size: 6
 
     100:
       name: clicks
       type: text_field
-      html:
-        size: 6
+      size: 6
 
     110:
       name: priority
       type: text_field
-      html:
-        size: 6
+      size: 6
 
     120:
       name: valid_from
@@ -122,8 +112,7 @@ form:
     140:
       name: active
       type: check_box
-      html:
-        size: 50
+      size: 50
 
     150:
       name: dc_site_id

data/app/forms/dc_design.yml

@@ -33,8 +33,7 @@ form:
       10:
         name: description
         type: text_field
-        html:
-          size: 50
+        size: 50
       20:
         name: site_id
         type: select
@@ -44,32 +43,33 @@ form:
       30:
         name: control
         type: text_field
-        html:
-          size: 50
+        size: 50
           
       40:
         name: control_method
         type: text_field
-        html:
-          size: 50
+        size: 50
           
       50:
         name: rails_view
         type: text_field
-        html:
-          size: 50
+        size: 50
           
       60:
+        name: params
+        type: text_area
+        size: 100x10
+          
+      70:
         name: body
         type: text_area
-        html:
-          size: 120x25
+        size: 120x25
 
-      70:
+      80:
         name: css
         type: text_area
-        html:
-          size: 100x10
+        size: 100x10
+        
     tab2:
       10:
         name: dc_parts

data/app/forms/dc_json_ld.yml

@@ -0,0 +1,59 @@
+## YAML Template for Link
+---
+table: dc_json_ld
+
+index:
+  actions:
+    1: new
+    10: 
+      type: menu
+      eval: DcJsonLd.add_schema_menu(self)
+      caption: helpers.help.dc_json_ld.add_schema
+
+result_set:
+  actions: 
+    1: edit
+    2: delete
+
+  columns:
+    10:  
+      name: name
+      width: 20%
+    20:  
+      name: type
+      width: 20%
+    30: 
+      name: updated_at
+      width: 20%
+    40: 
+      name: active
+      eval: dc_icon4_boolean
+
+form:
+  title: 
+    field: type
+    
+  actions: standard
+    
+  fields:
+    10:
+      name: name
+      type: text_field
+      size: 20
+
+    20:
+      name: type
+      type: text_with_select
+      eval: DcJsonLd.choices4_type
+
+    30:
+      name: data
+      type: text_area
+      size: 100x8
+    40:
+      name: dc_json_lds
+      type: embedded
+      table: dc_json_ld
+      html:
+        height: 400
+      

data/app/forms/dc_key_value.yml

@@ -0,0 +1,32 @@
+## YAML Template for dc_key_value_store
+---
+table: dc_key_value
+
+index:
+  actions: standard
+
+result_set:
+  actions: 
+    1: edit
+    2: delete
+
+  columns:
+    1:  
+      name: key
+    2: 
+      name: value
+
+form:
+  title: 
+    field: key  
+
+  fields:
+    10:
+      name: key
+      type: text_field
+      size: 30
+
+    20:
+      name: value
+      type: text_field
+      size: 50

data/app/forms/dc_menu_item.yml

@@ -41,6 +41,7 @@ form:
         name: picture
         type: file_select
         size: 50
+        preview: false
       30:
         name: link
         type: text_with_select

data/app/forms/dc_page.yml

@@ -1,6 +1,7 @@
 ## YAML Template for page
 ---
 table: dc_page
+include: dc_seo
 
 index:
   filter: subject, sub_subject as text_field, subject_link, alt_link, author_name, dc_site_id, body as text_field
@@ -40,10 +41,6 @@ form:
         name: subject_link
         type: text_field
         size: 50
-      30:
-        name: title
-        type: text_field
-        size: 50
       40:
         name: alt_link
         type: text_field
@@ -189,4 +186,3 @@ form:
         name: if_params
         type: text_area
         size: 80x10
-    

data/app/forms/dc_seo.yml

@@ -0,0 +1,33 @@
+form:
+  tabs:
+    seo:
+      caption: helpers.label.dc_seo.seo
+      10:
+        name: title
+        text: helpers.label.dc_seo.title
+        help: helpers.help.dc_seo.title
+        type: text_field
+        size: 70
+        
+      20:
+        name: meta_description
+        text: helpers.label.dc_seo.meta_description
+        help: helpers.help.dc_seo.meta_description
+        type: text_area
+        size: 100x2
+        
+      30:
+        name: canonical_link
+        text: helpers.label.dc_seo.canonical_link
+        help: helpers.help.dc_seo.canonical_link
+        type: text_field
+        size: 100
+        
+      40:
+        name: dc_json_lds
+        text: helpers.label.dc_seo.dc_json_lds
+        help: helpers.help.dc_seo.dc_json_lds
+        type: embedded
+        table: dc_json_ld
+        html:
+          height: 600

data/app/forms/json_ld_schema.yml

@@ -0,0 +1,168 @@
+## JSON/LD schema description
+---
+# Organization
+Organization:
+  level: 1
+  name: 
+    type: String
+    text: Organization name
+   
+  legalName: 
+    type: String
+    text: Organization legal name
+    
+  '@id': 
+    type: String
+    text: https://www.example.com
+
+  url: 
+    type: String
+    text: https://www.example.com
+
+  logo: 
+    type: String
+    text: https://www.example.com/logo.jpg
+
+  foundingDate: 
+    type: String
+    text: Year
+
+  founders: 
+    type: Person
+
+  address: 
+    type: PostalAddress
+
+  contactPoint: 
+    type: ContactPoint
+
+  sameAs:
+    type: Array
+
+# Person
+Person:
+  
+  name: 
+    type: String
+    text: Name
+
+  address: 
+    type: PostalAddress
+
+  collegue:
+    type: Array
+
+  email: 
+    type: String
+    text: eMail address
+
+  image: 
+    type: String
+    text: Image filename
+
+  jobTitle: 
+    type: String
+    text: Job title
+
+  alumniOf: 
+    type: String
+    text: School name
+
+  birthPlace: 
+    type: String
+    text: City of birth
+
+  birthDate: 
+    type: String
+    text: 1999-31-12
+
+  jobTitle: 
+    type: String
+    text: Job title
+
+  gender: 
+    type: String
+    text: male/female
+
+  telephone: 
+    type: String
+    text: (123) 456-6789
+
+  url: 
+    type: String
+    text: http://www.example.com
+
+  sameAs:
+    type: Array
+      
+#PostalAddress  
+PostalAddress:
+  
+      
+  streetAddress: 
+    type: String
+    text: address
+    
+  postalCode: 
+    type: String
+    text: 1234  
+    
+  addressLocality: 
+    type: String
+    text: CityName
+    
+  addressRegion: 
+    type: String
+    text: CA 
+    
+  addressCountry: 
+    type: String
+    text: SI or Slovenia
+    
+#ContactPoint
+ContactPoint:
+  
+  telephone: 
+    type: String
+    text: +1-877-453-1304
+    
+  contactType: 
+    type: String
+    text: technical support
+    
+  contactOption: 
+    type: String
+    text: TollFree
+    
+  areaServed: 
+    type: Array
+    text: [US,CA]
+    
+  availableLanguage: 
+    type: String
+    text: [English,French]
+    
+FAQPage:
+  level: 1
+  
+  dummy:
+    type: String
+    text: yes
+  
+  mainEntity:  
+    type: Question
+      
+Question:
+  
+  name: 
+    type: String
+    text: Question?
+    
+  acceptedAnswer:
+    type: Answer
+    n: 1
+
+Answer:
+  '@type': Answer
+  text: Your answer
+