drg_cms 0.6.0.6 → 0.6.1.4

data/app/renderers/dc_poll_renderer.rb

@@ -27,9 +27,9 @@
 ########################################################################
 class DcPollRenderer
   
-include CmseditHelper
+include CmsCommonHelper
 include DcApplicationHelper
-include ActionView::Helpers::FormHelper # for form hepers
+include ActionView::Helpers::FormHelper # for form helpers
 include ActionView::Helpers::FormOptionsHelper # for select helper
 
 ########################################################################
@@ -39,6 +39,7 @@ def initialize( parent, opts={} ) #:nodoc:
   @parent   = parent
   @opts     = opts
   @part_css = ''
+  @part_js  = ''
   self
 end
 
@@ -56,17 +57,17 @@ def do_one_item(poll, yaml)
   html = ''
   yaml['separator'] ||= ''
   yaml['text']      ||= ''
-# 
+  # label
   text = yaml['text'].match(/\./) ? t(yaml['text']) : yaml['text'] 
   if yaml['mandatory']
-    text << ( poll.display == 'in' ? ' *' : '<font color="red"> *</font>' )
+    text << ( poll.display == 'in' ? ' *' : '<span class="required"> *</span>' )
     yaml['html'] ||= {}
     yaml['html']['required'] = true
   else
     text << " &nbsp;" if poll.display == 'lr' and !yaml['type'].match(/submit_tag|link_to/)
   end
   
-# Just add text if comment and go to next one    
+  # Just add text if comment and go to next one
   if yaml['type'] == 'comment'
     html << if poll.display == 'lr'
       "<div class='row-div'><div class='dc-form-label poll-data-text comment'>#{text}</div></div>"
@@ -75,40 +76,39 @@ def do_one_item(poll, yaml)
     end    
     return html
   end
-# Set default value, if not already set
+
+  # Set default value, if not already set
   if yaml['default'] 
     if yaml['default'].match('eval')
       e = yaml['default'].match(/\((.*?)\)/)[1]
       yaml['default'] = eval e
+    elsif yaml['default'].match('params')
+      param_name = yaml['default'].split(/\.|\ |\,/)[1]
+      yaml['default'] = @parent.params[param_name]
     end
     key = "p_#{yaml['name']}"
     params[key] = yaml['default'] unless params[key]
   end
-# Label as placeholder
+  # Label as placeholder
   if poll.display == 'in'
     yaml['html'] ||= {}
     yaml['html']['placeholder'] = text
   end
-# create form_field object and retrieve html code
+  # create form_field object and retrieve html code
   clas_string = yaml['type'].camelize
   field_html = if DrgcmsFormFields.const_defined?(clas_string) 
     clas = DrgcmsFormFields.const_get(clas_string)
     field = clas.new(@parent, @record, yaml).render
-#TODO collect all javascript and add it at the end
-    field.html + (field.js.size > 0 ? @parent.javascript_tag(field.js) : '')
-  else # litle error string
+    @part_js << field.js
+    field.html
+  else # error string
     "Error: Code for field type #{yaml['type']} not defined!"
   end
 
-#  field = send('dc_' + yaml['type'], yaml) # call dc_xxx method to get field html code
   if yaml['type'].match(/submit_tag|link_to/)
-# There can be more than one links on form. End the data at first link or submit.
+    # There can be more than one links on form. End the data at first link or submit.
     if !@end_of_data 
-      html << if poll.display == 'lr'
-        "</div><br>\n"
-      else
-        "</div>\n"
-      end
+      html << (poll.display == 'lr' ? "</div><br>\n" : "</div>\n")
       # captcha
       if poll.captcha_type.to_s.size > 1
         @opts.merge!(:captcha_type => poll.captcha_type)
@@ -118,10 +118,10 @@ def do_one_item(poll, yaml)
       end
       @end_of_data = true
     end
-# submit and link tag 
+    # submit and link tag
     clas = yaml['type'].match(/submit_tag/) ? '' : 'dc-link-submit'
     html << "<span class='#{clas} dc-animate'>#{field_html}#{yaml['separator']}</span>"
-# other fields
+  # other fields
   else
     html << case
       when poll.display == 'lr' then
@@ -156,69 +156,69 @@ end
 # Default poll renderer method. Renders data for specified pool.
 ########################################################################
 def default
-# poll_id may be defined in params or opts
+  # poll_id may be defined in params or opts
   poll_id = @opts[:poll_id] || @parent.params[:poll_id]
   return '<br>Poll id is not defined?<br>' if poll_id.nil?
-#  
+
   poll = DcPoll.find(poll_id)
   poll = DcPoll.find_by(name: poll_id) if poll.nil? # name instead of id
-  return "<div class=\"dc-form-error\">Invalid Poll id #{poll_id}</div>" if poll.nil?
-# If parent cant be seen. so cant be polls
+  return %(<div class="dc-form-error">Invalid Poll id #{poll_id}</div>) if poll.nil?
+  # If parent cant be seen. so cant be polls
   can_view, message = dc_user_can_view(@parent, @parent.page)
-  return "<div class=\"dc-form-error\">#{message}</div>" unless can_view
-  
-  html = @opts[:div] ? "<div id='#{@opts[:div]}'>" : ''
+  return %(<div class="dc-form-error">#{message}</div>) unless can_view
+
+  html = @opts[:div] ? %(<div id="#{@opts[:div]}"'>) : ''
   html << '<a name="poll-top"></a>'
-  #
   unless poll.pre_display.blank?
     begin
       continue, message = eval_pre_display(poll.pre_display)
     rescue Exception => e
-      return "<div class=\"dc-form-error\">Error! Poll pre display. Error: #{e.message}</div>" 
+      return %(<div class="dc-form-error">Error! Poll pre display. Error: #{e.message}</div>)
     end
     return message unless continue
+
     html << message if message
   end
-# there might be more than one poll displayed on page. Check if messages and values are for me
-  if @parent.flash[:poll_id].nil? or @parent.flash[:poll_id].to_s == poll_id.to_s
-# If flash[:record] is present copy content to params record hash
+  # there might be more than one poll displayed on page. Check if messages and values are for me
+  if @parent.flash[:poll_id].nil? || @parent.flash[:poll_id].to_s == poll_id.to_s
+    # If flash[:record] is present copy content to params record hash
     @parent.flash[:record].each {|k,v| @parent.params["p_#{k}"] = v } if @parent.flash[:record]  
-# Error during procesing request
-    html << "<div class=\"dc-form-error\">#{@parent.flash[:error]}</div>\n" if @parent.flash[:error].to_s.size > 0
-    html << "<div class=\"dc-form-info\">#{@parent.flash[:info]}</div>\n" if @parent.flash[:info]
+    # Error during procesing request
+    html << %(<div class="dc-form-error">#{@parent.flash[:error]}</div>\n) if @parent.flash[:error].to_s.size > 0
+    html << %(<div class="dc-form-info">#{@parent.flash[:info]}</div>\n) if @parent.flash[:info]
   end
-# div and form tag
-  html <<  "<div class=\"poll-div\">\n"
-# edit link  
+  # div and form tag
+  html <<  %(<div class="poll-div">\n)
+  # edit link
   if @opts[:edit_mode] > 1
     @opts[:editparams].merge!( controller: 'cmsedit', action: 'edit', id: poll._id, table: 'dc_poll', form_name: 'dc_poll' )
     @opts[:editparams].merge!(title: "#{t('drgcms.edit')}: #{poll.name}")
     @opts[:editparams].delete(:ids) # this is from page, but it gets in a way
     html << dc_link_for_edit( @opts[:editparams] )
   end
-#  
+
   html << case
   when poll.operation == 'poll_submit' then
     @parent.form_tag(action: poll.operation, method: :put)
   when poll.operation == 'link' then
     @parent.form_tag( poll.parameters, method: :put)
   end
-# header 
-  html << "<div class='poll-title'>#{poll.title}</div>" unless poll.title[0] == '-' # - on first position will not display title
-  html << poll.sub_text.to_s # if poll.sub_text.to_s.size > 5
+  # header, - on first position will not display title
+  html << %(<div class="poll-title">#{poll.title}</div>) unless poll.title[0] == '-'
+  html << %(<div class="poll-text">#{poll.sub_text}</div>)
   html << if poll.display == 'lr'
-    "\n" + '<div class="poll-data-table">'
-  else
-    '<div class="poll-data-div">' + "\n"
-  end
-# items. Convert each item to yaml
+            %(\n<div class="poll-data-table">)
+          else
+            %(<div class="poll-data-div">\n)
+          end
+  # items. Convert each item to yaml
   @end_od_data = false
   if poll.form.to_s.size < 10
     items = poll.dc_poll_items
-    items.sort! {|a,b| a.order <=> b.order }
+    items.sort! { |a,b| a.order <=> b.order }
     items.each do |item|
       next unless item.active # disabled items
-  # convert options to yaml
+      # convert options to yaml
       yaml = YAML.load(item.options) || {}
       yaml = {} if yaml.class == String
       yaml['name'] = item.name
@@ -226,22 +226,23 @@ def default
       yaml['html']['size'] = item.size
       (yaml['html']['class'] ||= 'dc-submit') if item.type == 'submit_tag'
       yaml['text'] = item.text
-      yaml['mandatory']  = item.mandatory
-      yaml['type']       = item.type
+      yaml['mandatory'] = item.mandatory
+      yaml['type'] = item.type
+
       html << do_one_item(poll, yaml)
     end
-# Form. Just call do_one_item for each form item
   else
     yaml = YAML.load(poll.form.gsub('&nbsp;',' ')) # very annoying. They come with copy&paste ;-)
-# if entered without numbering yaml is returned as Hash otherwise as Array
+    # if entered without numbering yaml is returned as Hash otherwise as Array
     yaml.each { |i| html << do_one_item(poll, (i.class == Hash ? i : i.last)) } # 
   end
-# hide some fields usefull as parameters  
-# was html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || '/')
+  # hide some fields usefull as parameters
   html << @parent.hidden_field_tag('return_to', @opts[:return_to] || @parent.params[:return_to] || @parent.request.url)
   html << @parent.hidden_field_tag('return_to_error', @parent.request.url )
   html << @parent.hidden_field_tag('poll_id', poll_id )
   html << @parent.hidden_field_tag('page_id', @parent.page.id )
+  # Add javascript code
+  html << @parent.javascript_tag(@part_js + poll.js.to_s)
   html << "</form></div>"
   html << '</div>' if @opts[:div]
   

data/app/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/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

@@ -38,11 +38,14 @@
 
       </div>
     </div>
-    
-    <div class="cmsedit-container">  
+
+    <div id="menu-hamburger"><%= fa_icon('bars') %></div>
+
+    <div class="cmsedit-container">
       <div id="menu">
         <%= dc_choices4_cmsmenu.html_safe %>
       </div>
+
       <div class="cmsedit-iframe" style="width: 99%;">
         <iframe id="iframe_cms" name="iframe_cms"></iframe>
       </div>

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

@@ -1,6 +1,9 @@
 <%= dc_head_for_form %>
 <%= dc_table_title dc_edit_title() %>
 
-<%= form_tag( @parms, method: :put, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
+<%= form_tag( @parms, method: :put, id: params['form_name'] || params['table'],
+              class: '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,5 +1,5 @@
-<div class="dc-form-frame">
-  <%= dc_table_title_for_result @records %>
+<div id="<%= params['form_name'] || params['table'] %>" class="dc-form-frame">
+  <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
@@ -9,3 +9,4 @@
 
 <%= 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,8 @@
-<%= dc_table_title dc_new_title() %>
+<%= dc_table_title dc_new_title %>
 
-<%= form_tag( @parms, method: :post, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
+<%= form_tag(@parms, method: :post, id: params['form_name'] || params['table'],
+             class: '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

@@ -34,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!
@@ -89,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
@@ -117,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
@@ -28,13 +28,13 @@ sl:
     "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
@@ -88,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
@@ -113,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

@@ -94,7 +94,7 @@ en:
 
       dc_user:
         tabletitle: Users
-        tab1: Base
+        1base: Base
 
         id: Id
         username: Username
@@ -116,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
@@ -127,8 +127,9 @@ en:
         choices4_operation: 'Submit poll:poll_submit,Link:link'
         choices4_display: 'Top:td,Left:lr,Inside:in'
         tab1: Base
-        tab2: Form
+        tab2: Script
         tab3: Items
+        tab4: Items - advanced
 
         name: Poll name
 
@@ -137,7 +138,9 @@ en:
         operation: Operation
         parameters: Parameters
         display: Label
+        pre_display: Pre display code
         css: CSS
+        js: Javascript
         valid_from: Valid from
         valid_to: Valid to
         dc_poll_items: Items
@@ -146,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
@@ -165,6 +168,7 @@ en:
         dc_poll_id: Poll name
         created_at: Created date
         data: Data
+        confirmed: Confirmed
 
       dc_policy:
         tabletitle: Access policy declarations
@@ -298,6 +302,7 @@ en:
         if_id: CSS id
         if_class: CSS class 
         _update_menu: Update menu
+        div_class: DIV class
 
       dc_seo:
         seo: SEO
@@ -616,8 +621,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
@@ -654,6 +659,8 @@ en:
         parameters: Aditional parameters for operation
         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
@@ -675,6 +682,7 @@ en:
         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
@@ -773,6 +781,7 @@ en:
         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
+        div_class: Class name given to top level div
 
       dc_seo:
         title: SEO optimised page title

data/config/locales/models_sl.yml

@@ -86,19 +86,20 @@ sl:
 
       dc_user:
         tabletitle: Uporabniki
-        tab1: Osnova
+        1base: Osnova
 
         id: Id
         username: Uporabnik
         title: Titula
         first_name: Ime
+        middle_name: Srednje ime
         last_name: Priimek
         name: Naziv
         address: Naslov
         post: Pošta
         country: Država 
         phone: Telefon
-        email: e-Pošta
+        email: e-Naslov
         picture: Slika
         birthdate: Datum rojstva
         about: Več o
@@ -107,8 +108,8 @@ sl:
         valid_from: Velja od         
         valid_to: Velja do
         updated_by: Spremenil
-        type: Vrsta
-        members: Člani
+        group: Je skupina
+        member: Član v skupinah
         dc_user_roles: Uporabniške vloge 
         password: Geslo
         password_confirmation: Potrdi geslo
@@ -129,8 +130,9 @@ sl:
         choices4_operation: 'Poženi program:poll_submit,Povezava:link'
         choices4_display: 'Zgoraj:td,Levo:lr,Znotraj:in'
         tab1: Podatki
-        tab2: Forma
-        tab3: Vrstice
+        tab2: Skriptna koda
+        tab3: Vsebina
+        tab4: Vsebina - napredno
 
         name: Ime
         title: Naslov
@@ -139,6 +141,8 @@ sl:
         parameters: Parametri
         display: Napis
         css: CSS
+        js: Skriptna koda
+        pre_display: Pred prikazom zaženi
         valid_from: Velja od
         valid_to: Velja do
         dc_poll_items: Vrstice
@@ -148,7 +152,7 @@ sl:
 
       dc_poll_item:
         tabletitle: Vnosne vrstice
-        choices4_type: Podatek:text_field,Tekst:text_area,Izbirno:select,Izbirni gumb:check_box,Zaključek:submit_tag,Povezava:link_to,Geslo:password_field,Komentar:comment
+        choices4_type: Podatek:text_field,Tekst:text_area,Izbirno:select,Izbirni gumb:check_box,Zaključek:submit_tag,Povezava:link_to,Geslo:password_field,Komentar:comment,Radio:radio
         choices4_separator: Presledek:&nbsp;,Prazna vrstica:<br />,Ravnilo:<hr>
 
         name: Naziv
@@ -167,6 +171,7 @@ sl:
         dc_poll_id: Anketa
         created_at: Nastalo
         data: Podatki
+        confirmed: Potrjen
 
       dc_policy:
         tabletitle: Politike za dostop
@@ -328,7 +333,8 @@ sl:
         if_id: CSS id
         if_class: CSS class 
         _update_menu: Spremeni meni
-        
+        div_class: DIV class
+
       dc_seo:
         seo: SEO
         title: Naslov za brskalnik
@@ -635,8 +641,8 @@ sl:
         valid_from: Začetni datum veljavnosti         
         valid_to: Končni datum veljavnosti
         updated_by: Spremenil
-        type: Vrsta uporabniškega računa
-        members: Člani (če skupina uporabnikov)
+        group: Račun predstavlja uporabniško skupino
+        member: Seznam skupin za uporabnika
         dc_user_roles: Vloge, ki pripadajo temu uporabniku 
         password: Geslo
         password_confirmation: Še enkrat vpišite geslo
@@ -658,6 +664,8 @@ sl:
         parameters: Dodatni parametri za operacijo
         display: Postavitev napisa glede na vpisno polje
         css: CSS samo za to anketo
+        js: Javascript koda samo za to anketo
+        pre_display: Metoda. ki se zažene pred prikazom obrazca. Običajno za privzeto polnjenje podatkov obrazca
         valid_from: Anketa je veljavna od
         valid_to: Anketa je veljavna do
         dc_poll_items: Posamezni podatki ankete
@@ -679,6 +687,7 @@ sl:
         dc_poll_id: Naziv ankete
         created_at: Čas nastanka zapisa
         data: Podatki v YAML formatu
+        confirmed: Podatki potrjeni. Npr. Uporabnik mora klikniti povezavo v e-pošti.
 
       dc_policy:
         name: Naziv politike
@@ -771,7 +780,6 @@ sl:
         subject_link: Povezava (link) do sestavka
         sub_subject: Povzetek, kratek opis vsebine
         alt_link: Alternativna povezava do sestavka
-        picture: Slika v povezavi s stranjo
         gallery: Dokument vsebuje slikovno galerijo.
         css: CSS
         script: Skript
@@ -792,7 +800,7 @@ sl:
         dc_design_id: Dizajn, mu pripada sestavek
         dc_site_id: Spletišče. ki mu pripada stran
         kats: Kategorije, ki jim pripada članek
-        picture: Slika uporabljena za prikaz sestavka
+        picture: Slika uporabljena v zvezi s sestavkom
         dc_poll_id: Anketa, če sestavek vsebuje tudi anketo
         if_url: URL naslov od koder bo naložena vsebina IFrame-a
         if_width:  Širina IFrame področja
@@ -803,6 +811,7 @@ sl:
         if_id: CSS id IFrame objekta
         if_class: CSS class IFrame objekta
         _update_menu: Popravi tudi povezavo do dokumenta v menuju
+        div_class: Class, ki bo določen na vrhnem razdelku (DIV)
         
       dc_seo:
         title: Naslov, ki se izpiše v gornji vrstici brskalnika. Optimiziraj za SEO.