drg_cms 0.5.52.12 → 0.6.0.8

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

@@ -1,8 +1,6 @@
 
 <div class="dc-table-frame">
 
-  <%= dc_table_title_for_result @records %>
-
   <% unless @records.nil? %>
       <%= dc_background_for_result(:start) %>
   
@@ -15,12 +13,13 @@
       <% end %>
       <% if @record_footer %>
         <div class="dc-result-data footer">
-        <%= ignore, code = dc_actions_column(); code.html_safe %></div>
+        <%= dc_actions_column_for_footer() %>
         <%= dc_columns_for_result(@record_footer) %>
         </div>
       <% end %>
         
       <%= dc_background_for_result(:end) %>
   <% end %>
+  <%= dc_filter_popup() %>
   
 </div>

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

@@ -1,5 +1,6 @@
+<%= dc_head_for_form %>
 <%= dc_table_title dc_edit_title() %>
 
-<%= form_tag @parms, method: :put, id: 'cmsform' do %>
+<%= form_tag( @parms, method: :put, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>

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

@@ -1,6 +1,11 @@
 <div class="dc-form-frame">
+  <%= dc_table_title_for_result @records %>
+
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
   <%= dc_flash_messages %> 
   <div id='result'> <%= render partial: 'result' %></div>
-</div>
+</div>
+
+<%= javascript_tag(@js) unless @js.blank? %>
+<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>

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

@@ -1,5 +1,5 @@
 <%= dc_table_title dc_new_title() %>
 
-<%= form_tag @parms, method: :post, id: 'cmsform' do %>
+<%= form_tag( @parms, method: :post, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>

data/config/locales/drgcms_en.yml

@@ -24,6 +24,8 @@
 # English (en) localization for drgCMS
 en:
   drgcms:
+    "true": "yes"
+    "false": "no"
     record_deleted: Document deleted!
     confirm_delete: Confirm document deletion!
     confirm_dup: Confirm document duplication!
@@ -32,8 +34,8 @@ en:
     doc_enabled: Document enabled!
     doc_saved: Document saved!
     doc_info: Info  
-    doc_copy_clipboard: Display document data in new window
-    doc_paste_clipboard: Start update
+    doc_copy_clipboard: Copy document data into new window
+    doc_paste_clipboard: Update or create document
     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!
@@ -61,13 +63,17 @@ en:
     form_error: Error loading form #{form_name}
     img_large: Click for larger image
     no_class: Class %{class} not defined!
+    img_alt_not_present: All images in body must have alternative text entered
     
+    toggle_cms: Toggle CMS edit/view mode
     edit: Edit
-    show: Prikaz
+    show: Show
     new: New
     sort: Sort
     filter: Filter
+    refresh: Refresh
     back: Back
+    close: Close
     delete: Delete
     enable: Enable
     disable: Disable
@@ -83,6 +89,7 @@ en:
     reload: Reload
     error: Error!
     errors_no: 'No. of errors:'
+    runtime_error: Runtime error!
     two_chars: type in at least two chars
 
     created_by: Created by
@@ -90,6 +97,11 @@ en:
     created_at: Created at
     updated_at: Updated at
     new_record: New record
+    
+    filter_poll: Filter
+    filter_poll_title: Filter poll data
+    export_poll: Export
+    export_poll_title: Upload poll data in a file
 
     choices4_filter_operators: 'Equal to:eq,Contains:like,Greater then:gt,Less then:lt,Is empty:empty'
     

data/config/locales/drgcms_sl.yml

@@ -1,5 +1,5 @@
 #--
-# 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
@@ -23,16 +23,18 @@
 
 # drgCMS slovenska (sl) lokalizacija 
 sl:
-  drgcms:
+  drgcms:  
+    "true": "da"
+    "false": "ne"    
     record_deleted: Dokument izbrisan!
     confirm_delete: Potrdite izbris dokumenta!
-    confirm_dup: Potrdite podvajanje dokumenta!
+    confirm_dup: Potrdite podvajanja dokumenta!
     not_authorized: Uporabnik nima pravic za to operacijo!
     doc_disabled: Dokument onemogočen!
     doc_enabled:  Dokument omogočen!
     doc_saved: Dokument zapisan!
     doc_info: Info  
-    doc_copy_clipboard: Pripravi vsebino dokumenta v novem oknu.
+    doc_copy_clipboard: Kopija vsebine dokumenta v novem oknu.
     doc_paste_clipboard: Obdelaj podatke    
     doc_paste_title: Ustvari (spremeni) dokumente iz JSON zapisa
     doc_paste_update: Spremeni obstoječ dokument, če dokument._id obstaja
@@ -61,13 +63,17 @@ sl:
     form_error: Napaka pri branju forme #{form_name}
     img_large: Klik za večjo sliko
     no_class: Class %{class} ni definiran!
+    img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo    
 
+    toggle_cms: Preklopi med CMS urejanjem in prikazom
     edit: Urejanje
     show: Prikaz
     new: Dodaj
     sort: Razvrsti
     filter: Filter
+    refresh: Osveži
     back: Nazaj
+    close: Zapri
     delete: Izbris
     enable: Omogoči
     disable: Onemogoči
@@ -82,7 +88,8 @@ sl:
     minimize: Pomanjšaj
     reload: Osveži    
     error: Napaka!
-    errors_no: 'Število napak:' 
+    errors_no: 'Število napak:'
+    runtime_error: Napaka med izvajanjem programa!
     two_chars: vpišite vsaj dva znaka
 
     created_by: Ustvaril
@@ -90,6 +97,11 @@ sl:
     created_at: Ustvarjeno
     updated_at: Spremenjeno
     new_record: Nov zapis
+    
+    filter_poll: Filter
+    filter_poll_title: Filtriraj podatke
+    export_poll: Izvoz
+    export_poll_title: Izvoz in prenos rezultatov ankete v datoteko
 
     choices4_filter_operators: 'Je enak:eq,Vsebuje:like,Je večji od:gt,Je manjši od:lt,Je prazen:empty'
     
@@ -101,4 +113,4 @@ sl:
       restore: Restavriraj      
       
     filters:
-      this_site_only: Dokumenti samo trenutnoo izbrane strani
+      this_site_only: Dokumenti samo trenutno izbrane strani

data/config/locales/models_en.yml

@@ -73,6 +73,7 @@ en:
         body: Body
         css: CSS
         author: Author
+        params: Parameters        
         updated_by: Updated by
         active: Active
         dc_parts: Parts
@@ -80,6 +81,7 @@ en:
         rails_view: Rails view filename
         control: Control file
         control_method: Control method
+        updated_at: Updated
 
       dc_user_role:
         tabletitle: User roles
@@ -123,10 +125,11 @@ en:
       dc_poll:
         tabletitle: Polls
         choices4_operation: 'Submit poll:poll_submit,Link:link'
-        choices4_display: 'Top-Down:td,Left-Right:lr'
+        choices4_display: 'Top:td,Left:lr,Inside:in'
         tab1: Base
-        tab2: Form
+        tab2: Script
         tab3: Items
+        tab4: Items - advanced
 
         name: Poll name
 
@@ -134,8 +137,10 @@ en:
         sub_text: Short description
         operation: Operation
         parameters: Parameters
-        display: Display
+        display: Label
+        pre_display: Pre display code
         css: CSS
+        js: Javascript
         valid_from: Valid from
         valid_to: Valid to
         dc_poll_items: Items
@@ -144,18 +149,26 @@ en:
 
       dc_poll_item:
         tabletitle: Poll items
-        choices4_type: Text:text_field,Text area:text_area,Select:select,Check box:check_box,Submit:submit_tag,Link:link_to,Password:password_field
+        choices4_type: Text:text_field,Text area:text_area,Select:select,Check box:check_box,Submit:submit_tag,Link:link_to,Password:password_field,Radio:radio
         choices4_separator: Space:&nbsp;,Empty line:<br />,Horizontal line:<hr>
 
         name: Name
         text: Caption
         type: Type
-        Size: Size
+        size: Size
         mandatory: Mandatory
         separator: Separator
         options: Options
         order: Order
         active: Active
+        
+      dc_poll_result:
+        tabletitle: Polls results
+
+        dc_poll_id: Poll name
+        created_at: Created date
+        data: Data
+        confirmed: Confirmed
 
       dc_policy:
         tabletitle: Access policy declarations
@@ -257,10 +270,9 @@ en:
 
         subject: Subject
         subject_link: Subject link
-        title: Browser title
         sub_subject: Sub subject
         picture: Picture
-        gallery: Gallery id
+        gallery: Gallery
         alt_link: Alt link
         css: CSS
         script: Skript
@@ -276,10 +288,10 @@ en:
         active: Active
         dc_parts: Parts
         policy_id: Access policy
+        dc_site_id: Site
         dc_design_id: Design
         dc_poll_id: Poll
         kats: Categories
-        gallery: Gallery name
         updated_at: Updated
         if_url: URL
         if_width:  Width
@@ -291,6 +303,13 @@ en:
         if_class: CSS class 
         _update_menu: Update menu
 
+      dc_seo:
+        seo: SEO
+        title: Browser title
+        meta_description: Meta description
+        meta_additional: Additional meta data
+        canonical_link: Canonical link
+        dc_json_lds: Schema data
 
       dc_part:
         tabletitle: Parts of page
@@ -393,6 +412,7 @@ en:
 
         name: Link name
         params: Parameters
+        redirect: Redirect
         dc_site_id: Valid for site
         page_id: Link to page
         active: Active
@@ -466,7 +486,7 @@ en:
 
         value: Value
         description: Value description
-        dc_big_table_values: Locales
+        dc_big_table_locales: Locales
         active: Active       
 
       dc_big_table_locale:
@@ -516,6 +536,38 @@ en:
         fields: General
         ztab: Advanced
         dc_element: Element name
+        
+      dc_removed_url:
+        tabletitle: URLs removed from site
+
+        url: URL
+        description: Description
+        dc_site_id: Site
+        updated_at: Updated
+
+      dc_gallery:
+        tabletitle: Picture gallery documents
+
+        title: Title
+        description: Description 
+        picture: Big picture
+        thumbnail: Small picture
+        doc_id: Document
+        order: Order
+        active: Active
+        created_at: Created
+
+      dc_json_ld:
+        tabletitle: Schema data
+        choices4_type: Corporate contact:Organization,Contact:ContactPoint
+
+        name: Name
+        type: Type
+        data: Data
+        created_at: Created
+        updated_at: Updated
+        dc_json_lds: Schema sub element
+        active: Active
 
 # help for forms #####################################################
 
@@ -586,6 +638,7 @@ en:
         name: Unique design name
         description: Short description of design
         body: Body of design which will be rendered like any Rails view
+        params: Parameters specific to design
         css: CSS for design
         author: Creater if design
         updated_by: Last updated by
@@ -603,8 +656,10 @@ en:
         sub_text: Short description of the poll
         operation: Operation performed on submit
         parameters: Aditional parameters for operation
-        display: Select how fields are positioned on form
+        display: How label is positioned related to input field
         css: CSS specific to this poll
+        js: Javascript code specific to this poll
+        pre_display: Method to be run before poll is displayed. Usually for initial filling of form.
         valid_from: Pole is valid from
         valid_to: Pole is valid to
         dc_poll_items: Items for this poll
@@ -612,10 +667,6 @@ en:
         form: You can specified input items by providing form acording to rules of drgCMS form.
 
       dc_poll_item:
-        tabletitle: Poll items
-        choices4_type: Text:text_field,Text area:text_area,Select:select,Check box:check_box,Submit:submit_tag,Link:link_to,Password:password_field,Comment:comment
-        choices4_separator: Space:&nbsp;,Empty line:<br />,Horizontal line:<hr>
-
         name: Name (alias) of returned field name
         text: Caption of item
         type: Input item type
@@ -626,6 +677,12 @@ en:
         order: Order of item on poll
         active: Item is active        
 
+      dc_poll_result:
+        dc_poll_id: Poll name 
+        created_at: Date when poll result was submited
+        data: Data saved in YAML format
+        confirmed: Poll data was confirmed. Ex. User must click on link in email.
+
       dc_policy:
         name: Unique policy name
         description: Description for this policy
@@ -692,10 +749,9 @@ 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
+        gallery: Picture gallery id used with page
         alt_link: Alternative link, by which page could be found
         css: CSS only for this menu page
         script: Javascript only for this page
@@ -710,10 +766,10 @@ en:
         active: Page is active
         dc_parts: Parts of the article
         policy_id: Access policy for the page
+        dc_site_id: The page belongs to one site only
         dc_design_id: Design used for rendering page
         dc_poll_id: Select poll, if poll is to be used with page
         kats: Categories for this article
-        gallery: Gallery pictures are defined in parts of page. Value defines name of parts which hold data about pictures in gallary.
         body: Content of this page
         if_url: URL adress of page which will be loaded into IFrame
         if_width:  IFrame area width
@@ -723,7 +779,13 @@ en:
         if_params: Parameters added to URL address    
         if_id: CSS id of IFrame object
         if_class: CSS class of IFrame object
-        _update_menu: Update link in selected menu to point to this document        
+        _update_menu: Update link in selected menu to point to this document
+
+      dc_seo:
+        title: SEO optimised page title
+        meta_description: SEO optimised page description
+        canonical_link: Canonical link the, when page uses aditional parameters
+        dc_json_lds: Schema data available for this web page
 
       dc_part:
         name: Parts can be searched by name or by id
@@ -801,6 +863,7 @@ en:
       dc_link:
         name: Link name ex. homepage
         params: Aditional parameters passed to document renderer
+        redirect: Redirect to another link
         page_id: Page redirected to by this shortcut link
         dc_site_id: Link is valid for site
         active: Link is active
@@ -886,4 +949,25 @@ en:
         filter: Filter definition in YAML
         public: Filter is available to all users
         sort: Default sort when selecting filter
-                
+                
+      dc_removed_url:
+        url: URL which was removed from site
+        description: Reason why was URL removed
+        dc_site_id: Site that URL belongs to
+
+      dc_gallery:
+        title: Picture title
+        description: Description of picture
+        picture: Big picture file name
+        thumbnail: Small picture file name
+        doc_id: Document associated with gallery
+        order: Order
+        active: Document is active
+
+      dc_json_ld:
+        name: Name of schema element
+        type: Type of schema structure
+        data: Data in YAML format
+        active: Document is active
+        add_schema: Add new schema
+        add_error: Schema element %{schema} already exists!