zena 1.0.0 → 1.1.0

data/lib/zena/use/zafu_attributes.rb

@@ -161,6 +161,7 @@ module Zena
           end
 
           def filter_prefix
+            return if %w{link url path}.include?(@method)
             if prefix = @params.delete(:prefix)
               prefix.split(',').map(&:strip).each do |cond_prefix|
                 case cond_prefix

data/lib/zena/use/zafu_safe_definitions.rb

@@ -44,6 +44,18 @@ module Zena
           end
         end
 
+        # Dynamic resolution of first
+        def self.first_proc
+          @@first_proc ||= Proc.new do |receiver, method|
+            if elem = receiver.opts[:elem] || receiver.klass.first
+              RubyLess::TypedString.new("#{receiver.raw}.first", :class => elem, :nil => true)
+            else
+              # should never happen
+              raise RubyLess::NoMethodError.new(receiver.raw, receiver.klass, ['first'])
+            end
+          end
+        end
+
         # Dynamic resolution of join
         def self.join_proc
           Proc.new do |receiver, join_arg|
@@ -76,7 +88,8 @@ module Zena
         safe_method_for String, [:gsub, Regexp, String] => {:class => String, :pre_processor => true}
         safe_method_for String, :upcase    => {:class => String, :pre_processor => true}
         safe_method_for String, :strip     => {:class => String, :pre_processor => true}
-        safe_method_for String, :urlencode => {:class => String, :pre_processor => true, :method => :url_name}
+        safe_method_for String, :urlencode => {:class => String, :pre_processor => true, :method => :urlencode}
+        safe_method_for String, :url_name  => {:class => String, :pre_processor => true, :method => :url_name}
         safe_method_for String, :to_i      => {:class => Number, :pre_processor => true}
         safe_method_for String, :to_s      => {:class => String, :pre_processor => true}
         safe_method_for String, [:limit, Number]  => {:class => String, :pre_processor => true}
@@ -116,6 +129,8 @@ module Zena
           {:method => 'nil', :nil => true, :pre_processor => join_proc}
         safe_method_for Array, [:map, Symbol]     => # supports map(:name)
           {:method => 'nil', :nil => true, :pre_processor => map_proc}
+        safe_method_for Array, [:first]    =>
+          {:method => 'nil', :nil => true, :pre_processor => first_proc}
         safe_method_for Array, [:include?, String] =>
           {:method => 'include?', :accept_nil => true, :pre_processor => true, :class => Boolean}
         safe_method_for Array, [:include?, Number] =>

data/lib/zena/use/zafu_templates.rb

@@ -171,11 +171,11 @@ module Zena
           if opts[:format] && opts[:format] != 'html'
             raise ActiveRecord::RecordNotFound
           elsif %w{+login +index +adminLayout +popupLayout +notFound admin}.include?(opts[:mode])
-            zafu_url ="$default/Node-#{opts[:mode]}"
+            zafu_url =['$default', "Node-#{opts[:mode]}"].map(&:to_filename).join('/')
           elsif opts[:mode]
             raise ActiveRecord::RecordNotFound
           else
-            zafu_url ="$default/Node"
+            zafu_url =['$default', 'Node'].map(&:to_filename).join('/')
           end
 
           # File path:
@@ -234,7 +234,7 @@ module Zena
         def self.included(base)
 #          base.send(:helper_attr, :asset_cache)
           if base.respond_to?(:helper_method)
-            base.send(:helper_method, :dev_mode?, :lang_path, :rebuild_template, :get_template_text, :template_url, :template_url_for_asset, :zafu_helper, :template_path_from_template_url)
+            base.send(:helper_method, :dev_mode?, :lang_path, :rebuild_template, :get_template_text, :template_url, :template_url_for_asset, :zafu_helper, :template_path_from_template_url, :save_erb_to_url, :default_template_url, :fullpath_from_template_url)
           end
 
           base.send(:include, ::Zafu::ControllerMethods)
@@ -251,26 +251,14 @@ module Zena
           klass     = @node.vclass
 
           # possible classes for the master template :
-          klasses = []
-          klass.kpath.split(//).each_index { |i| klasses << klass.kpath[0..i] }
+          kpaths = []
+          klass.kpath.split(//).each_index { |i| kpaths << klass.kpath[0..i] }
 
-          if @skin && template = secure(Template) { Template.find(:first,
-              :conditions => ["tkpath IN (?) AND format = ? AND mode #{mode ? '=' : 'IS'} ? AND idx_templates.node_id = nodes.id AND idx_templates.skin_id = ?", klasses, format, mode, @skin.id],
-              :from       => "nodes, idx_templates",
-              :select     => "nodes.*, tkpath",
-              :order      => "length(tkpath) DESC"
-            )}
+          if @skin
+            zafu_url, template = get_best_template(kpaths, format, mode, @skin)
+            return default_template_url(opts) unless zafu_url
 
-            # Path as seen from zafu:
-            path_in_skin = template.fullpath.gsub(/^#{@skin.fullpath}\//, '')
-
-            if path_in_skin == template.zip.to_s
-              zafu_url = [@skin.title, template.title]
-            else
-              zafu_url = [@skin.title] + Node.fullpath_map(path_in_skin, :title)
-            end
-
-            rel_path  = current_site.zafu_path + "/#{zafu_url.map(&:to_filename).join('/')}/#{lang_path}/_main.erb"
+            rel_path  = current_site.zafu_path + "/#{zafu_url}/#{lang_path}/_main.erb"
             path      = SITES_ROOT + rel_path
 
             if !File.exists?(path) || params[:rebuild]
@@ -280,7 +268,9 @@ module Zena
                 nil
               end
 
-              unless rebuild_template(template, opts.merge(:zafu_url => zafu_url.join('/'), :rel_path => rel_path, :dev_mode => (dev_box?(mode, format))))
+              # template is a new record when template is returned for
+              # a static file.
+              unless rebuild_template(template.new_record? ? nil : template, opts.merge(:zafu_url => zafu_url, :rel_path => rel_path, :dev_mode => (dev_box?(mode, format))))
                 return default_template_url(opts)
               end
             end
@@ -294,6 +284,31 @@ module Zena
           end
         end
 
+        # Find the best template to render the object.
+        # The 'template' option is used when static calls the native
+        # method to mangle the zafu_url
+        def get_best_template(kpaths, format, mode, skin, template = nil)
+          if template ||= secure(Template) { Template.find(:first,
+              :conditions => ["tkpath IN (?) AND format = ? AND mode #{mode ? '=' : 'IS'} ? AND idx_templates.node_id = nodes.id AND idx_templates.skin_id = ?", kpaths, format, mode, skin.id],
+              :from       => "nodes, idx_templates",
+              :select     => "nodes.*, tkpath",
+              :order      => "length(tkpath) DESC"
+            )}
+
+            # Path as seen from zafu:
+            path_in_skin = template.fullpath.gsub(/^#{@skin.fullpath}\//, '')
+
+            if path_in_skin == template.zip.to_s
+              zafu_url = [@skin.title, template.title]
+            else
+              zafu_url = [@skin.title] + Node.fullpath_map(path_in_skin, :title)
+            end
+            [zafu_url.map(&:to_filename).join('/'), template]
+          else
+            nil
+          end
+        end
+
         # Return the template path without '.erb' extension in case we need to append '_form'
         # from a template's url. The expected url is of the form '/skin/Klass-mode/partial'
         def template_path_from_template_url(template_url=params[:t_url])
@@ -326,7 +341,7 @@ module Zena
 
         # Return true if we should display the dev box
         def dev_box?(mode, format)
-          (format == 'html' && mode != '+popupLayout') && dev_mode?
+          (format == 'html' && !['+popupLayout', '+user'].include?(mode)) && dev_mode?
         end
 
         def lang_path
@@ -501,7 +516,7 @@ module Zena
       end # ControllerMethods
 
       module ViewMethods
-        include Common
+#        include Common
 
         def dev_skin_options
           skins = secure(Skin) { Skin.all }

data/lib/zena/use/zazen.rb

@@ -47,6 +47,7 @@ module Zena
               # TextDocument content as Zazen.
               return text
             end
+
             if !code_lang.blank?
               return Zena::CodeSyntax.new(text, code_lang).to_html(opt)
             end

data/locale/de/zena.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
-"POT-Creation-Date: 2011-06-09 19:15-0000\n"
+"POT-Creation-Date: 2011-06-27 20:32-0000\n"
 "PO-Revision-Date: 2011-06-02 10:51+0100\n"
 "Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
 "Language-Team: de <lars@greiz-reinsdorf.de>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,-1,219,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-Basepath: /Users/gaspard/svk/zena\n"
 
-#: lib/gettext_strings.rb:118
+#: lib/gettext_strings.rb:119
 msgid "%Y-%m-%d %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
@@ -67,15 +67,15 @@ msgstr "vor einer Minute"
 msgid "API group"
 msgstr "Gruppe"
 
-#: lib/gettext_strings.rb:145
+#: lib/gettext_strings.rb:146
 msgid "Apr"
 msgstr "Apr"
 
-#: lib/gettext_strings.rb:132
+#: lib/gettext_strings.rb:133
 msgid "April"
 msgstr "April"
 
-#: app/views/acls/_form.rhtml:58
+#: app/views/acls/_form.rhtml:66
 #, fuzzy
 msgid "Are you sure you want to destroy this access ?"
 msgstr "Sind sie sicher, die virtuelle Klasse zu löschen?"
@@ -106,15 +106,15 @@ msgid ""
 "Are you sure you want to permanently remove the content of this rubbish bin ?"
 msgstr "Sind Sie sicher, den Inhalt des Papierkorbs dauerhaft zu löschen?"
 
-#: lib/gettext_strings.rb:149
+#: lib/gettext_strings.rb:150
 msgid "Aug"
 msgstr "Aug"
 
-#: lib/gettext_strings.rb:136
+#: lib/gettext_strings.rb:137
 msgid "August"
 msgstr "August"
 
-#: app/controllers/nodes_controller.rb:300
+#: app/controllers/nodes_controller.rb:311
 msgid "Backup created."
 msgstr "Backup erzeugt"
 
@@ -144,15 +144,15 @@ msgstr ""
 msgid "Could not change version back to redaction."
 msgstr "Artikel konnte nicht wieder zur Begutachtung gestellt werden"
 
-#: app/controllers/nodes_controller.rb:504
+#: app/controllers/nodes_controller.rb:515
 msgid "Could not clear order."
 msgstr "Order konnte nicht gelöscht werden"
 
-#: app/controllers/nodes_controller.rb:302
+#: app/controllers/nodes_controller.rb:313
 msgid "Could not create backup."
 msgstr "Backup konnte nicht erzeugt werden"
 
-#: app/controllers/nodes_controller.rb:269
+#: app/controllers/nodes_controller.rb:280
 #, fuzzy
 msgid "Could not destroy node."
 msgstr "Order konnte nicht gelöscht werden"
@@ -186,7 +186,7 @@ msgstr "Vorschlag zur Veröffentlichung konnte nicht zurückgezogen werden"
 msgid "Could not rollback:"
 msgstr "Backup konnte nicht erzeugt werden"
 
-#: app/controllers/nodes_controller.rb:487
+#: app/controllers/nodes_controller.rb:498
 msgid "Could not update order."
 msgstr "Order konnte nicht aktualisiert werden"
 
@@ -194,11 +194,11 @@ msgstr "Order konnte nicht aktualisiert werden"
 msgid "Data entry was successfully created."
 msgstr "Dateneintrag erfolgreich angelegt"
 
-#: lib/gettext_strings.rb:153
+#: lib/gettext_strings.rb:154
 msgid "Dec"
 msgstr "Dez"
 
-#: lib/gettext_strings.rb:140
+#: lib/gettext_strings.rb:141
 msgid "December"
 msgstr "Dezember"
 
@@ -206,15 +206,15 @@ msgstr "Dezember"
 msgid "Delete relation '%{role}' between '%{source}' and '%{target}' ?"
 msgstr ""
 
-#: lib/gettext_strings.rb:143
+#: lib/gettext_strings.rb:144
 msgid "Feb"
 msgstr "Feb"
 
-#: lib/gettext_strings.rb:130
+#: lib/gettext_strings.rb:131
 msgid "February"
 msgstr "Februar"
 
-#: lib/gettext_strings.rb:125
+#: lib/gettext_strings.rb:126
 msgid "Fri"
 msgstr "Fr"
 
@@ -230,43 +230,43 @@ msgstr ""
 msgid "Invalid login or password."
 msgstr ""
 
-#: lib/gettext_strings.rb:142
+#: lib/gettext_strings.rb:143
 msgid "Jan"
 msgstr "Jan"
 
-#: lib/gettext_strings.rb:129
+#: lib/gettext_strings.rb:130
 msgid "January"
 msgstr "Januar"
 
-#: lib/gettext_strings.rb:148
+#: lib/gettext_strings.rb:149
 msgid "Jul"
 msgstr "Jul"
 
-#: lib/gettext_strings.rb:135
+#: lib/gettext_strings.rb:136
 msgid "July"
 msgstr "Juli"
 
-#: lib/gettext_strings.rb:147
+#: lib/gettext_strings.rb:148
 msgid "Jun"
 msgstr "Jun"
 
-#: lib/gettext_strings.rb:134
+#: lib/gettext_strings.rb:135
 msgid "June"
 msgstr "Juni"
 
-#: lib/gettext_strings.rb:144
+#: lib/gettext_strings.rb:145
 msgid "Mar"
 msgstr "Mär"
 
-#: lib/gettext_strings.rb:131
+#: lib/gettext_strings.rb:132
 msgid "March"
 msgstr "März"
 
-#: lib/gettext_strings.rb:133 lib/gettext_strings.rb:146
+#: lib/gettext_strings.rb:134 lib/gettext_strings.rb:147
 msgid "May"
 msgstr "Mai"
 
-#: lib/gettext_strings.rb:121
+#: lib/gettext_strings.rb:122
 msgid "Mon"
 msgstr "Mo"
 
@@ -279,19 +279,19 @@ msgstr "Montag"
 msgid "Node destroyed."
 msgstr "Löschen"
 
-#: lib/gettext_strings.rb:152
+#: lib/gettext_strings.rb:153
 msgid "Nov"
 msgstr "Nov"
 
-#: lib/gettext_strings.rb:139
+#: lib/gettext_strings.rb:140
 msgid "November"
 msgstr "November"
 
-#: lib/gettext_strings.rb:151
+#: lib/gettext_strings.rb:152
 msgid "Oct"
 msgstr "Okt"
 
-#: lib/gettext_strings.rb:138
+#: lib/gettext_strings.rb:139
 msgid "October"
 msgstr "Oktober"
 
@@ -300,11 +300,11 @@ msgstr "Oktober"
 msgid "Order cleared."
 msgstr "Zwischenspeicher gelöscht."
 
-#: app/controllers/nodes_controller.rb:485
+#: app/controllers/nodes_controller.rb:496
 msgid "Order updated"
 msgstr "Order aktualisiert"
 
-#: lib/gettext_strings.rb:156
+#: lib/gettext_strings.rb:157
 msgid "Password:"
 msgstr "Passwort"
 
@@ -342,7 +342,7 @@ msgstr "Information erfolgreich aktualisiert"
 msgid "Rolled back to redaction."
 msgstr "Artikel wieder zur Begutachtung gestellt"
 
-#: lib/gettext_strings.rb:126
+#: lib/gettext_strings.rb:127
 msgid "Sat"
 msgstr "Sa"
 
@@ -350,11 +350,11 @@ msgstr "Sa"
 msgid "Saturday"
 msgstr "Samstag"
 
-#: lib/gettext_strings.rb:150
+#: lib/gettext_strings.rb:151
 msgid "Sep"
 msgstr "Sep"
 
-#: lib/gettext_strings.rb:137
+#: lib/gettext_strings.rb:138
 msgid "September"
 msgstr "September"
 
@@ -363,7 +363,7 @@ msgstr "September"
 msgid "Site was successfully updated."
 msgstr "Passwort erfolgreich aktualisiert"
 
-#: lib/gettext_strings.rb:127
+#: lib/gettext_strings.rb:128
 msgid "Sun"
 msgstr "So"
 
@@ -376,7 +376,7 @@ msgid "This node contains sub-nodes: it cannot be destroyed."
 msgstr ""
 "Dieser Eintrag enthält Untereinträge und kann deshalb nicht gelöscht werden"
 
-#: lib/gettext_strings.rb:124
+#: lib/gettext_strings.rb:125
 msgid "Thu"
 msgstr "Do"
 
@@ -384,7 +384,7 @@ msgstr "Do"
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: lib/gettext_strings.rb:122
+#: lib/gettext_strings.rb:123
 msgid "Tue"
 msgstr "Di"
 
@@ -405,7 +405,7 @@ msgstr "Upload fehlgeschlagen"
 msgid "Upload succeeded."
 msgstr "Upload erfogreich"
 
-#: lib/gettext_strings.rb:155
+#: lib/gettext_strings.rb:156
 msgid "User name:"
 msgstr "Benutzername:"
 
@@ -427,7 +427,7 @@ msgstr "Kommentar erfolgreich angelegt"
 msgid "VirtualClass was successfully updated."
 msgstr "Passwort erfolgreich aktualisiert"
 
-#: lib/gettext_strings.rb:123
+#: lib/gettext_strings.rb:124
 msgid "Wed"
 msgstr "Mi"
 
@@ -452,29 +452,43 @@ msgid "access controls"
 msgstr ""
 
 #: app/views/acls/_form.rhtml:23
+#, fuzzy
 msgid "acl_action_help"
-msgstr ""
+msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
 
-#: app/views/acls/_form.rhtml:43
+#: app/views/acls/_form.rhtml:51
 #, fuzzy
 msgid "acl_exec_group_help"
 msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
 
-#: app/views/acls/_form.rhtml:47
+#: app/views/acls/_form.rhtml:55
+#, fuzzy
 msgid "acl_exec_skin_help"
+msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
+
+#: app/views/acls/_form.rhtml:39
+msgid "acl_format_help"
 msgstr ""
 
 #: app/views/acls/_form.rhtml:19
+#, fuzzy
 msgid "acl_group_help"
-msgstr ""
+msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
+
+#: app/views/acls/_form.rhtml:35
+#, fuzzy
+msgid "acl_mode_help"
+msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
 
 #: app/views/acls/_form.rhtml:27
+#, fuzzy
 msgid "acl_priority_help"
-msgstr ""
+msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
 
-#: app/views/acls/_form.rhtml:39
+#: app/views/acls/_form.rhtml:47
+#, fuzzy
 msgid "acl_query_help"
-msgstr ""
+msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
 
 #: lib/zena/use/display.rb:282
 #, fuzzy
@@ -487,7 +501,7 @@ msgstr "<img src='/images/lock.png' title='Klasse'/>"
 msgid "action"
 msgstr "Bezüge"
 
-#: lib/gettext_strings.rb:169
+#: lib/gettext_strings.rb:170
 msgid "address"
 msgstr "Adresse"
 
@@ -521,7 +535,7 @@ msgstr "<span title='beim Speichern Sicherungskopie anlegen'>bak</span>"
 msgid "bak"
 msgstr "<span title='beim Speichern Sicherungskopie anlegen'>bak</span>"
 
-#: lib/gettext_strings.rb:176
+#: lib/gettext_strings.rb:177
 msgid "birthday"
 msgstr "Geburtstag"
 
@@ -717,12 +731,12 @@ msgstr "Klassen"
 msgid "classes import"
 msgstr "Klassen"
 
-#: lib/gettext_strings.rb:179
+#: lib/gettext_strings.rb:180
 #, fuzzy
 msgid "clear_cache"
 msgstr "Zwischenspeicher löschen"
 
-#: lib/gettext_strings.rb:180
+#: lib/gettext_strings.rb:181
 #, fuzzy
 msgid "clear_cache done."
 msgstr "Zwischenspeicher löschen"
@@ -776,7 +790,7 @@ msgstr ""
 msgid "convert"
 msgstr "konvertieren"
 
-#: app/models/node.rb:1540 app/models/node.rb:1552
+#: app/models/node.rb:1535 app/models/node.rb:1547
 #: app/models/relation_proxy.rb:185 app/models/relation_proxy.rb:209
 #, fuzzy
 msgid "could not be found"
@@ -786,15 +800,15 @@ msgstr "Eintrag nicht gefunden"
 msgid "could not save value (bad attribute)"
 msgstr ""
 
-#: app/controllers/nodes_controller.rb:357
+#: app/controllers/nodes_controller.rb:368
 msgid "could not update"
 msgstr "Eintrag konnte nicht aktualisiert werden"
 
-#: app/controllers/users_controller.rb:119
+#: app/controllers/users_controller.rb:117
 msgid "could not update user"
 msgstr "Benutzer konnte nicht aktualisiert werden"
 
-#: lib/gettext_strings.rb:172
+#: lib/gettext_strings.rb:173
 msgid "country"
 msgstr "Land"
 
@@ -846,17 +860,17 @@ msgstr "<img src='/images/photo_grey.png' title='Standard-Bild-Format'/>"
 msgid "deleted"
 msgstr "gelöscht"
 
-#: app/views/acls/_form.rhtml:35
+#: app/views/acls/_form.rhtml:43
 msgid "description"
 msgstr ""
 
 #: app/views/columns/_form.html.erb:33 app/views/relations/_form.erb:44
-#: app/views/virtual_classes/_form.erb:52 app/views/acls/_form.rhtml:60
+#: app/views/virtual_classes/_form.erb:52 app/views/acls/_form.rhtml:68
 #: app/views/groups/_form.rhtml:41 app/views/iformats/_form.rhtml:27
 msgid "destroy"
 msgstr "Löschen"
 
-#: app/views/acls/_form.rhtml:60
+#: app/views/acls/_form.rhtml:68
 #, fuzzy
 msgid "destroy acl"
 msgstr "Löschen"
@@ -907,7 +921,7 @@ msgstr "Dokument"
 msgid "drive_tab"
 msgstr "drive"
 
-#: lib/zena/use/urls.rb:824
+#: lib/zena/use/urls.rb:834
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -920,7 +934,7 @@ msgstr "<img src='/images/target.png' title='role'/>"
 msgid "edit site"
 msgstr "Site bearbeiten"
 
-#: lib/gettext_strings.rb:175
+#: lib/gettext_strings.rb:176
 msgid "email"
 msgstr "E-Mail"
 
@@ -928,12 +942,12 @@ msgstr "E-Mail"
 msgid "en"
 msgstr "englisch"
 
-#: app/views/acls/_form.rhtml:43 app/views/acls/index.rhtml:10
+#: app/views/acls/_form.rhtml:51 app/views/acls/index.rhtml:12
 #, fuzzy
 msgid "exec group"
 msgstr "<img src='/images/group.png' title='Gruppe erzeugen'/>"
 
-#: app/views/acls/_form.rhtml:47 app/views/acls/index.rhtml:11
+#: app/views/acls/_form.rhtml:55 app/views/acls/index.rhtml:13
 #, fuzzy
 msgid "exec skin"
 msgstr "Oberfläche"
@@ -951,10 +965,11 @@ msgstr ""
 msgid "file_tab"
 msgstr "Datei"
 
-#: lib/gettext_strings.rb:167
+#: lib/gettext_strings.rb:168
 msgid "first_name"
 msgstr "Vorname"
 
+#: app/views/acls/_form.rhtml:39 app/views/acls/index.rhtml:10
 #: app/views/templates/document_create_tabs/_template.rhtml:16
 #: app/views/templates/edit_tabs/_template.rhtml:1
 msgid "format"
@@ -1086,12 +1101,12 @@ msgstr ""
 msgid "img_custom_inherit"
 msgstr "<img src='/images/cog.png' title='custom rights'/>"
 
-#: lib/gettext_strings.rb:188
+#: lib/gettext_strings.rb:189
 #, fuzzy
 msgid "img_datetime"
 msgstr "%Y-%m-%d %H:%M"
 
-#: lib/gettext_strings.rb:187
+#: lib/gettext_strings.rb:188
 #, fuzzy
 msgid "img_float"
 msgstr "Bildformate"
@@ -1118,7 +1133,7 @@ msgstr "<img src='/images/user_admin.png' title='administrator'/>"
 msgid "img_has_one"
 msgstr "übernehmen"
 
-#: lib/gettext_strings.rb:186
+#: lib/gettext_strings.rb:187
 #, fuzzy
 msgid "img_integer"
 msgstr ""
@@ -1149,7 +1164,7 @@ msgstr ""
 msgid "img_private"
 msgstr "<img src='/images/lock.png' title='Privat'/>"
 
-#: lib/gettext_strings.rb:48 lib/zena/use/html_tags.rb:109
+#: lib/gettext_strings.rb:48 lib/zena/use/html_tags.rb:112
 msgid "img_public"
 msgstr "<img src='/images/user_pub.png' title='public'/>"
 
@@ -1158,7 +1173,7 @@ msgstr "<img src='/images/user_pub.png' title='public'/>"
 msgid "img_relation"
 msgstr "Bezüge"
 
-#: lib/gettext_strings.rb:185
+#: lib/gettext_strings.rb:186
 #, fuzzy
 msgid "img_string"
 msgstr "<img src='/images/tag_blue.png' title='Link'/>"
@@ -1221,7 +1236,7 @@ msgstr "in einer Minute"
 msgid "index"
 msgstr "innerhalb"
 
-#: app/controllers/users_controller.rb:117
+#: app/controllers/users_controller.rb:115
 msgid "information successfully updated"
 msgstr "Information erfolgreich aktualisiert"
 
@@ -1260,7 +1275,7 @@ msgstr ""
 msgid "language"
 msgstr "Sprache"
 
-#: lib/gettext_strings.rb:168
+#: lib/gettext_strings.rb:169
 #, fuzzy
 msgid "last_name"
 msgstr "Vorname"
@@ -1273,7 +1288,7 @@ msgstr "Links"
 msgid "links_tab"
 msgstr "Bezüge"
 
-#: lib/gettext_strings.rb:171
+#: lib/gettext_strings.rb:172
 #, fuzzy
 msgid "locality"
 msgstr "Stadt"
@@ -1303,10 +1318,11 @@ msgstr "Max. Größe"
 msgid "missing target"
 msgstr "Ziel"
 
-#: lib/gettext_strings.rb:174
+#: lib/gettext_strings.rb:175
 msgid "mobile"
 msgstr "Mobil"
 
+#: app/views/acls/_form.rhtml:35 app/views/acls/index.rhtml:9
 #: app/views/nodes/_groups.rhtml:14
 #: app/views/templates/document_create_tabs/_template.rhtml:13
 #: app/views/templates/edit_tabs/_template.rhtml:4
@@ -1333,7 +1349,7 @@ msgstr "Benutzerseite"
 msgid "name"
 msgstr "Name"
 
-#: app/controllers/nodes_controller.rb:461
+#: app/controllers/nodes_controller.rb:472
 msgid "new"
 msgstr ""
 
@@ -1350,7 +1366,7 @@ msgstr "neues Passwort"
 msgid "new relation"
 msgstr "<img src='/images/target.png' title='role'/>"
 
-#: lib/gettext_strings.rb:119
+#: lib/gettext_strings.rb:120
 msgid "news_date"
 msgstr "%A, %B %d %Y"
 
@@ -1362,11 +1378,11 @@ msgstr ""
 msgid "no result found"
 msgstr "Kein Ergebnis gefunden"
 
-#: app/controllers/nodes_controller.rb:461
+#: app/controllers/nodes_controller.rb:472
 msgid "node not found"
 msgstr "Eintrag nicht gefunden"
 
-#: app/controllers/nodes_controller.rb:355
+#: app/controllers/nodes_controller.rb:366
 msgid "node updated"
 msgstr "Eintrag aktualisiert"
 
@@ -1428,7 +1444,7 @@ msgstr "Passwort"
 msgid "popup"
 msgstr "Auf Klick vergrößern zu Format"
 
-#: lib/gettext_strings.rb:170
+#: lib/gettext_strings.rb:171
 msgid "postal_code"
 msgstr ""
 
@@ -1484,7 +1500,7 @@ msgstr "<img src='/images/wand.png' title='publish'/>"
 msgid "publishers"
 msgstr "Veröffentlichen"
 
-#: app/views/acls/_form.rhtml:39 app/views/acls/index.rhtml:9
+#: app/views/acls/_form.rhtml:47 app/views/acls/index.rhtml:11
 #, fuzzy
 msgid "query"
 msgstr "Benutzer"
@@ -1501,25 +1517,25 @@ msgstr "nur lesen"
 msgid "readers"
 msgstr "Lesen"
 
-#: lib/gettext_strings.rb:163
+#: lib/gettext_strings.rb:164
 msgid "rebuild"
 msgstr "wieder aufbauen"
 
-#: lib/gettext_strings.rb:164
+#: lib/gettext_strings.rb:165
 msgid "rebuild_btn"
 msgstr "<img src='/images/arrow_refresh.png' title='wieder aufbauen'/>"
 
-#: lib/gettext_strings.rb:181
+#: lib/gettext_strings.rb:182
 #, fuzzy
 msgid "rebuild_index"
 msgstr "<img src='/images/arrow_refresh.png' title='wieder aufbauen'/>"
 
-#: lib/gettext_strings.rb:182
+#: lib/gettext_strings.rb:183
 #, fuzzy
 msgid "rebuild_index done."
 msgstr "<img src='/images/arrow_refresh.png' title='wieder aufbauen'/>"
 
-#: lib/gettext_strings.rb:160
+#: lib/gettext_strings.rb:161
 msgid "redaction saved"
 msgstr "zur Begutachtung gespeichert"
 
@@ -1689,7 +1705,7 @@ msgstr "Basisklasse"
 msgid "tags"
 msgstr "Schlagwörter"
 
-#: lib/gettext_strings.rb:173
+#: lib/gettext_strings.rb:174
 msgid "telephone"
 msgstr "Tel."
 
@@ -1735,7 +1751,7 @@ msgstr "Entwicklung ausschalten"
 msgid "turn dev on"
 msgstr "Entwicklung einschalten"
 
-#: lib/gettext_strings.rb:165
+#: lib/gettext_strings.rb:166
 #, fuzzy
 msgid "turn_dev_off_btn"
 msgstr "<img src='/images/bug.png' title='Entwicklung ausschalten'/>"
@@ -1745,7 +1761,7 @@ msgstr "<img src='/images/bug.png' title='Entwicklung ausschalten'/>"
 msgid "type"
 msgstr "Typ"
 
-#: app/models/node.rb:1547
+#: app/models/node.rb:1542
 msgid "type mismatch (%{type} is not a Skin)"
 msgstr ""
 
@@ -1774,7 +1790,7 @@ msgstr "Benutzer"
 #: app/views/columns/_form.html.erb:28 app/views/relations/_form.erb:39
 #: app/views/sites/_form.erb:40 app/views/users/preferences.html.erb:19
 #: app/views/users/preferences.html.erb:38
-#: app/views/virtual_classes/_form.erb:46 app/views/acls/_form.rhtml:52
+#: app/views/virtual_classes/_form.erb:46 app/views/acls/_form.rhtml:60
 #: app/views/comments/_form.rhtml:23 app/views/groups/_form.rhtml:35
 #: app/views/iformats/_form.rhtml:22 app/views/nodes/_edit_attribute.rhtml:15
 #: app/views/templates/document_create_tabs/_file.rhtml:3
@@ -1820,7 +1836,7 @@ msgstr "Schreiben"
 msgid "yesterday"
 msgstr "<img src='/images/bomb.png' title='destroy'/>"
 
-#: lib/gettext_strings.rb:159
+#: lib/gettext_strings.rb:160
 msgid "you are editing the original"
 msgstr "Sie bearbeiten das Original"