drg_cms 0.6.0.1 → 0.6.1.1.1

data/app/{helpers → renderers}/dc_renderer.rb

@@ -32,6 +32,7 @@ class DcRenderer
 ########################################################################
 def initialize( parent, opts={} )
   @parent   = parent
+  @page     = parent.page
   @opts     = opts
   @css = ''
   self

data/app/{helpers → renderers}/dc_simple_menu_renderer.rb

@@ -34,6 +34,7 @@
 class DcSimpleMenuRenderer
 
 include DcApplicationHelper
+include CmsCommonHelper
 ########################################################################
 # Object initialization.
 ########################################################################

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

@@ -1,15 +1,13 @@
-
 <div id="cmsedit-div">
-  <%= link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
+  <button class="cms-toggle mode-<%= session[:edit_mode] %>" title="<%= t('drgcms.toggle_cms')%>">CMS</button>
+  <% # = link_to('CMS', controller: 'dc_common', action: 'toggle_edit_mode', return_to: request.url) %>
   <% if session[:edit_mode] > 1 %>
     <div class="cmsedit-table cmsedit-top">
       <div id="menu">
-        
-        <%= link_to( fa_icon('user lg',class: "dc-animate", title: "#{t('drgcms.login')}"), '/cms/login' ) %>
 
         <% 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') %>
+              {controller: 'cmsedit', action: 'edit', table: @site.page_class, id: @page._id}, target: 'iframe_cms') %>
         <% end %>
 
         <% if @design %>
@@ -22,6 +20,7 @@
               {controller: 'cmsedit', action: 'edit', table: 'dc_site', id: @site._id}, target: 'iframe_cms') %>
         <% 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;" ) %>
 
@@ -31,13 +30,6 @@
         <%= 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') %>
@@ -61,16 +53,3 @@
   
   <% end %>
 </div>
-
-
-<% if false %>
-<%= javascript_tag do %>
-// 
-$('#cmsedit-edit-button').click(function() {
-  $('#iframe_cms').attr('src', $('#record_select').val() );
-});
-$('#record_select').change( function(e) {
-  $('#iframe_cms').attr('src', e.target.value );
-});
-<% end %>
-<% end %>

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

@@ -4,12 +4,13 @@
 
 <div class="dc-form-frame">
 
-  <%= dc_actions_for_form %>
+  <%= dc_actions_for_form 'top' %>
   
   <%= dc_fields_for_form %>
   <%= dc_document_statistics %>
 
-  <%= dc_actions_for_form %>
+  <%= dc_actions_for_form 'bottom' %>
 </div>
 
-<%= javascript_tag(@js) unless @js.blank? %>
+<%= javascript_tag(@js)  unless @js.blank? %>
+<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>

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,8 @@
+<%= 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 %>
+
+<div id="popup" style="display: none;"></div>

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

@@ -1,6 +1,12 @@
 <div class="dc-form-frame">
+  <%= dc_title_for_index @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 %>
+<div id="popup" style="display: none;"></div>

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

@@ -1,5 +1,7 @@
 <%= 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 %>
+
+<div id="popup" style="display: none;"></div>

data/app/views/dc_common/_help.html.erb

@@ -0,0 +1,17 @@
+
+<div class="dc-help"><a id="help-top"></a>
+  <h1><%= t('drgcms.dc_help.help') %>: <%= dc_form_title %></h1>
+  <div class="help-buttons">
+    <% if params[:type] == 'form' %>
+      <button onclick="location.href='#fields'; return false;"><%= t('drgcms.dc_help.fields_button') %></button>
+    <% end %>
+    <% if @commnets %>
+      <button onclick="location.href='#comments'; return false;"><%= t('drgcms.dc_help.comments_button') %></button>
+    <% end %>
+  </div>
+
+  <div class="help-body"><%= dc_help_body if @help %></div>
+  <div class="help-fields"><%= dc_help_fields if params[:type] == 'form' %></div>
+
+  <div class="help-top" onclick="location.href='#help-top'; return false;"><%= fa_icon('arrow-up') %></div>
+</div>

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

@@ -3,8 +3,9 @@
 <head>
   <title>Models dump</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
   <%= stylesheet_link_tag "cms", media: 'all' %>
-   <%= javascript_include_tag "cms" %>
+  <%= javascript_include_tag "cms" %>
 </head>
 <body>
 

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,9 +63,11 @@ 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
@@ -85,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
@@ -92,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'
     
@@ -108,3 +118,17 @@ en:
     filters:
       this_site_only: Documents for currently selected site only
 
+    dc_help:
+      help: HELP
+      fields_button: Data description
+      comments_button: Comments
+      title: Manage help documents
+      project: Project
+      lang: Locale
+      project_refresh: Refresh
+      project_refresh_title: Refresh list of available documents
+      form_name: Form
+      updated_at: Updated
+      1basic: Basic
+      2index: Index
+      3form: Form

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,7 +63,9 @@ 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
@@ -84,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
@@ -92,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'
     
@@ -104,3 +114,20 @@ sl:
       
     filters:
       this_site_only: Dokumenti samo trenutno izbrane strani
+
+    dc_help:
+      help: POMOČ
+      fields_button: Opis podatkov
+      comments_button: Opombe
+      title: Urejanje dokumentov pomoči
+      project: Projekt
+      lang: Jezik
+      project_refresh: Osveži
+      project_refresh_title: Osveži seznam že pripravljenih dokumentov
+      form_name: Forma
+      updated_at: Spremenjeno
+      1basic: Osnovno
+      2index: Index
+      3form: Forma
+
+

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
@@ -92,7 +94,7 @@ en:
 
       dc_user:
         tabletitle: Users
-        tab1: Base
+        1base: Base
 
         id: Id
         username: Username
@@ -114,8 +116,8 @@ en:
         valid_from: Valid from   
         valid_to: Valid to
         updated_by: Updated by
-        type: Type
-        members: Members
+        group: Is group
+        member: Member in groups
         dc_user_roles: Roles 
         password: Password
         password_confirmation: Confirm password
@@ -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,7 +149,7 @@ 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
@@ -156,6 +161,14 @@ en:
         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,7 +270,6 @@ en:
 
         subject: Subject
         subject_link: Subject link
-        title: Browser title
         sub_subject: Sub subject
         picture: Picture
         gallery: Gallery
@@ -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
@@ -538,6 +557,17 @@ en:
         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 #####################################################
 
@@ -590,8 +620,8 @@ en:
         valid_from: Account is valid from    
         valid_to: Account is valid until
         updated_by: Account last updated by
-        type: Type of user account
-        members: Members (if type is group)
+        group: This is group account
+        member: User is member in selected groups
         dc_user_roles: Roles for this user
         password: Password
         password_confirmation: Password confirmation
@@ -608,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
@@ -625,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
@@ -634,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
@@ -648,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
@@ -714,7 +749,6 @@ 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
@@ -745,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
@@ -923,3 +963,11 @@ en:
         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!