zena 1.0.0.rc2 → 1.0.0.rc3

data/app/models/site.rb

@@ -50,7 +50,7 @@ class Site < ActiveRecord::Base
         :languages       => '',
         :default_lang    => "en",
       }.merge(opts)
-      langs = params[:languages].split('.')
+      langs = params[:languages].split(',').map(&:strip)
       langs += [params[:default_lang]] unless langs.include?(params[:default_lang])
       params[:languages] = langs.map{|l| l[0..1]}.join(',')
       params[:default_lang] = params[:default_lang][0..1]
@@ -90,11 +90,11 @@ class Site < ActiveRecord::Base
       raise Exception.new("Could not create public group for site [#{host}] (site#{site[:id]})\n#{pub.errors.map{|k,v| "[#{k}] #{v}"}.join("\n")}") if pub.new_record?
 
       # create admin group
-      admin = site.send(:secure,Group) { Group.create( :name => 'admin') }
-      raise Exception.new("Could not create admin group for site [#{host}] (site#{site[:id]})\n#{admin.errors.map{|k,v| "[#{k}] #{v}"}.join("\n")}") if admin.new_record?
+      editors = site.send(:secure,Group) { Group.create( :name => 'editors') }
+      raise Exception.new("Could not create editors group for site [#{host}] (site#{site[:id]})\n#{editors.errors.map{|k,v| "[#{k}] #{v}"}.join("\n")}") if editors.new_record?
 
-      # add admin to the 'admin group'
-      admin.users << admin_user
+      # add admin to the 'editors group'
+      editors.users << admin_user
 
       # create site group
       sgroup = site.send(:secure,Group) { Group.create( :name => 'site') }
@@ -102,7 +102,7 @@ class Site < ActiveRecord::Base
 
       site.public_group_id = pub[:id]
       site.site_group_id   = sgroup[:id]
-      site.groups << pub << sgroup << admin
+      site.groups << pub << sgroup << editors
 
       # Reload group_ids in admin
       admin_user.instance_variable_set(:@group_ids, nil)
@@ -122,7 +122,7 @@ class Site < ActiveRecord::Base
       # =========== CREATE ROOT NODE ============================
 
       root = site.send(:secure,Project) do
-        Project.create( :title => site.name, :rgroup_id => pub[:id], :wgroup_id => sgroup[:id], :dgroup_id => admin[:id], :title => site.name, :v_status => Zena::Status[:pub])
+        Project.create( :title => site.name, :rgroup_id => pub[:id], :wgroup_id => sgroup[:id], :dgroup_id => editors[:id], :title => site.name, :v_status => Zena::Status[:pub])
       end
 
       raise Exception.new("Could not create root node for site [#{host}] (site#{site[:id]})\n#{root.errors.map{|k,v| "[#{k}] #{v}"}.join("\n")}") if root.new_record?
@@ -147,7 +147,7 @@ class Site < ActiveRecord::Base
 
       # =========== LOAD INITIAL DATA (default skin) =============
 
-      nodes = site.send(:secure, Node) { Node.create_nodes_from_folder(:folder => File.join(Zena::ROOT, 'db', 'init', 'base'), :parent_id => root[:id], :defaults => { :v_status => Zena::Status[:pub], :rgroup_id => pub[:id], :wgroup_id => sgroup[:id], :dgroup_id => admin[:id] } ) }.values
+      nodes = site.send(:secure, Node) { Node.create_nodes_from_folder(:folder => File.join(Zena::ROOT, 'db', 'init', 'base'), :parent_id => root[:id], :defaults => { :v_status => Zena::Status[:pub], :rgroup_id => pub[:id], :wgroup_id => sgroup[:id], :dgroup_id => editors[:id] } ) }.values
       # == set skin id to 'default' for all elements in the site == #
       skin = nodes.detect {|n| n.kind_of?(Skin) }
       Node.connection.execute "UPDATE nodes SET skin_id = '#{skin.id}' WHERE site_id = '#{site[:id]}'"
@@ -176,6 +176,7 @@ class Site < ActiveRecord::Base
   property.string 'usr_prototype_attributes'
 
   Site.attributes_for_form[:text] << 'usr_prototype_attributes'
+  attr_accessible :usr_prototype_attributes
 
   # Return path for static/cached content served by proxy: RAILS_ROOT/sites/_host_/public
   # If you need to serve from another directory, we do not store the path into the sites table
@@ -201,6 +202,11 @@ class Site < ActiveRecord::Base
     @anon ||= User.find_by_id_and_site_id(self[:anon_id], self.id)
   end
 
+  # Return an admin user, this user is used to rebuild index/vhash/etc.
+  def any_admin
+    @any_admin ||= User.find_by_status_and_site_id(User::Status[:admin], self.id)
+  end
+
   # TODO: test
   def root_node
     secure(Node) { Node.find(self[:root_id]) }
@@ -297,7 +303,7 @@ class Site < ActiveRecord::Base
       $iformats[self[:id]] = @iformats = nil
     end
   end
-  
+
   def virtual_classes
    @iformats ||= begin
      $iformats ||= {} # mem cache
@@ -359,7 +365,7 @@ class Site < ActiveRecord::Base
   end
 
   # Recreates the fullpath ('/zip/zip/zip').
-  # TODO: find a way to use SiteWorker (need to remove get_nodes)
+  # TODO: find a way to use SiteWorker (need to remove get_nodes): fix rake when this is done.
   def rebuild_fullpath(parent_id = nil, parent_fullpath = "", parent_basepath = "", start=[])
     raise Zena::InvalidRecord, "Infinit loop in 'ancestors' (#{start.inspect} --> #{parent_id})" if start.include?(parent_id)
     start += [parent_id]
@@ -400,7 +406,8 @@ class Site < ActiveRecord::Base
   # Rebuild property indices for the Site. This method uses the Worker thread to rebuild and works on
   # chunks of 50 nodes.
   #
-  # The visitor used during index rebuild is the anonymous user.
+  # The visitor used during index rebuild should be an admin user (to index
+  # unpublished templates).
   def rebuild_index(nodes = nil, page = nil, page_count = nil)
     if !nodes
       Site.logger.error("\n----------------- REBUILD INDEX FOR SITE #{host} -----------------\n")

data/app/models/template.rb

@@ -34,8 +34,8 @@ class Template < TextDocument
   end
 
   attr_protected    :tkpath
+  before_validation :rebuild_tkpath
   validate          :validate_section, :validate_target_klass
-  before_validation :template_content_before_validation
 
   # Class Methods
   class << self
@@ -49,12 +49,30 @@ class Template < TextDocument
   end
 
   def skin
-    @skin ||= secure(Skin) { Skin.find(prop['skin_id']) }
+    @skin ||= secure(Skin) { Skin.find(skin_id) }
+  end
+  
+  def rebuild_tkpath(rebuild_tklass = nil)
+    if target_klass
+      # this is a master template (found when choosing the template for rendering)
+      if klass = rebuild_tklass
+        # rebuilding index
+        self.target_klass = klass.name
+        self.tkpath       = klass.kpath
+        self.title = title_from_mode_and_format
+      elsif klass = VirtualClass[target_klass]
+        self.tkpath = klass.kpath
+      end
+    else
+      self.tkpath = nil
+    end
   end
 
   private
 
     def set_defaults
+      self.mode  = nil if mode.blank?
+      self.target_klass = nil if target_klass.blank?
       super
 
       # Force template extension to zafu
@@ -66,29 +84,29 @@ class Template < TextDocument
       if prop.title_changed?
         if title =~ /^([A-Z][a-zA-Z]+?)(-(([a-zA-Z_\+]*)(-([a-zA-Z_]+)|))|)(\.|\Z)/
           # title changed force  update
-          prop['target_klass']  = $1            unless prop.target_klass_changed?
-          prop['mode']   = ($4 || '')           unless prop.mode_changed?
-          prop['format'] = ($6 || 'html')       unless prop.format_changed?
+          self.target_klass  = $1            unless prop.target_klass_changed?
+          self.mode   = ($4 || '')           unless prop.mode_changed?
+          self.format = ($6 || 'html')       unless prop.format_changed?
         else
           # title set but it is not a master template name
-          prop['target_klass']  = nil
-          prop['mode']   = nil
-          prop['format'] = nil
+          self.target_klass  = nil
+          self.mode   = nil
+          self.format = nil
         end
       end
 
       if version.edited?
-         prop['mode'] = prop['mode'].gsub(/[^a-zA-Z\+]/, '') if prop['mode']
+         self.mode = mode.gsub(/[^a-zA-Z\+]/, '') if mode
 
-        if !prop['target_klass'].blank?
+        if !target_klass.blank?
           # update title
-          prop['format'] = 'html' if prop['format'].blank?
+          self.format = 'html' if format.blank?
           self.title = title_from_mode_and_format
 
-          if text.blank? && prop['format'] == 'html' && prop['mode'] != '+edit'
+          if text.blank? && format == 'html' && mode != '+edit'
             # set a default text
 
-            if prop['target_klass'] == 'Node'
+            if target_klass == 'Node'
               self.text = <<END_TXT
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -121,9 +139,9 @@ END_TXT
     end
 
     def title_from_mode_and_format(opts={})
-      opts[:format]  ||= prop['format']
-      opts[:mode  ]  ||= prop['mode']
-      opts[:target_klass ]  ||= prop['target_klass']
+      opts[:format]  ||= format
+      opts[:mode  ]  ||= mode
+      opts[:target_klass ]  ||= target_klass
       format = opts[:format] == 'html' ? '' : "-#{opts[:format]}"
       mode   = (!opts[:mode].blank? || format != '') ? "-#{opts[:mode]}" : ''
       "#{opts[:target_klass]}#{mode}#{format}"
@@ -134,25 +152,9 @@ END_TXT
     end
 
     def validate_target_klass
-      if prop.target_klass_changed? && prop['target_klass']
-        errors.add('format', "can't be blank") unless prop['format']
-        # this is a master template (found when choosing the template for rendering)
-        if target_klass = Node.get_class(prop['target_klass'])
-          prop['tkpath'] = target_klass.kpath
-        else
-          errors.add('target_klass', 'invalid')
-        end
-      end
-    end
-
-    def template_content_before_validation
-      prop['mode']  = nil if prop['mode' ].blank?
-      prop['target_klass'] = nil if prop['target_klass'].blank?
-      unless prop['target_klass']
-        # this template is not meant to be accessed directly (partial used for inclusion)
-        prop['tkpath'] = nil
-        prop['mode']   = nil
-        prop['format'] = nil
+      if target_klass
+        errors.add('format', "can't be blank") unless format
+        errors.add('target_klass', 'invalid') unless VirtualClass[target_klass]
       end
     end
 end

data/app/models/version.rb

@@ -5,7 +5,7 @@ class Version < ActiveRecord::Base
   include RubyLess
   safe_attribute     :created_at, :updated_at, :publish_from, :status, :lang
   safe_method        :node => 'Node', :id => {:class => Number, :method => 'number'},
-                     :number => Number, :user => 'User',
+                     :number => Number, :user => 'User', :user_id => Number, :user_zip => {:class => Number, :method => 'user_id'},
                      :author => Node.author_proc
 
   # We need to include Property::Base so that we can read the properties that

data/app/models/virtual_class.rb

@@ -30,10 +30,20 @@
 # VirtualClass itself for real classes.
 #
 class VirtualClass < Role
+  class << self
+    attr_accessor :export_attributes
+  end
+
+  self.export_attributes = %w{auto_create_discussion}
+
   attr_accessor :import_result
   belongs_to    :create_group, :class_name => 'Group', :foreign_key => 'create_group_id'
   validate      :valid_virtual_class
-  attr_accessible :create_group_id, :auto_create_discussion
+
+  attr_accessible *self.export_attributes
+  attr_accessible :create_group_id
+
+  after_update  :propagate_kpath_change
 
   include Property::StoredSchema
   include Zena::Use::Relations::ClassMethods
@@ -154,6 +164,7 @@ class VirtualClass < Role
       vclass.real_class = real_class
       vclass.include_role real_class.schema
       vclass.instance_variable_set(:@is_real_class, true)
+      vclass.site_id = current_site.id
       vclass
     end
 
@@ -168,13 +179,6 @@ class VirtualClass < Role
   class << self
     attr_accessor :caches_by_site
 
-    # Import a hash of virtual class definitions and try to build the virtual classes.
-    def import(data)
-      data.keys.map do |klass|
-        build_virtual_class(klass, data)
-      end
-    end
-
     def [](name)
       find_by_name(name)
     end
@@ -199,48 +203,6 @@ class VirtualClass < Role
     def all_classes(base_kpath = 'N', without_list = nil)
       (self.caches_by_site[current_site.id] ||= Cache.new).all_classes(base_kpath, without_list)
     end
-
-    # Build a virtual class from a name and a hash of virtual class definitions. If
-    # the superclass is in the data hash, it is built first.
-    def build_virtual_class(klass, data)
-      return data[klass]['result'] if data[klass].has_key?('result')
-      if virtual_class = VirtualClass[klass]
-        virtual_class = virtual_class.dup
-        if virtual_class.superclass.to_s == data[klass]['superclass']
-          virtual_class.import_result = 'same'
-          return data[klass]['result'] = virtual_class
-        else
-          virtual_class.errors.add(:base, 'conflict')
-          return data[klass]['result'] = virtual_class
-        end
-      else
-        superclass_name = data[klass]['superclass']
-        if data[superclass_name]
-          superclass = build_virtual_class(superclass_name, data)
-          unless superclass.errors.empty?
-            virtual_class = VirtualClass.new(:name => klass, :superclass => superclass_name, :create_group_id => current_site.public_group_id)
-            virtual_class.errors.add(:base, 'conflict in superclass')
-            return data[klass]['result'] = virtual_class
-          end
-        elsif superclass = Node.get_class(superclass_name)
-          # ok
-        else
-          virtual_class = VirtualClass.new(:name => klass, :superclass => superclass_name, :create_group_id => current_site.public_group_id)
-          virtual_class.errors.add(:base, 'missing superclass')
-          return data[klass]['result'] = virtual_class
-        end
-
-        # build
-        create_group_id = superclass.id ? superclass.create_group_id : current_site.public_group_id
-        virtual_class = create(data[klass].merge(:name => klass, :create_group_id => create_group_id))
-        virtual_class.import_result = 'new'
-        return data[klass]['result'] = virtual_class
-      end
-    end
-
-    def export
-      # TODO
-    end
   end
 
   self.caches_by_site ||= {}
@@ -261,11 +223,13 @@ class VirtualClass < Role
 
     kpath_len = base_kpath.size
 
+    attribute = opts[:class_attr] || 'name'
+
     VirtualClass.all_classes(base_kpath, opts[:without]).map do |vclass|
       if vclass.create_group_id.nil? || group_ids.include?(vclass.create_group_id)
         # white spaces are insecable spaces (not ' ')
         a, b = vclass.kpath, vclass.name
-        [('  ' * (a.size - kpath_len)) + b, b]
+        [('  ' * (a.size - kpath_len)) + b, vclass[attribute]]
       else
         nil
       end
@@ -293,8 +257,56 @@ class VirtualClass < Role
     name
   end
 
-  def icon=(txt)
-    self[:icon] = txt.gsub('..', '.') # SECURITY
+  def export
+    res = super
+    self.class.export_attributes.each do |k|
+      value = self[k]
+      next if value.blank?
+      res[k] = value
+    end
+    subclasses = secure(::Role) do
+      ::Role.find(:all, :conditions => [
+        '(kpath LIKE ? and type = ?) OR (kpath = ? AND id <> ?)', "#{kpath}_", "VirtualClass", kpath, self.id.to_i
+      ], :order => 'kpath ASC')
+    end
+    if real_class?
+      # insert native subclasses
+      Node.native_classes.each do |kpath, klass|
+        if kpath =~ /\A#{self.kpath}.\Z/
+          subclasses ||= []
+          subclasses << VirtualClass[klass.name]
+        end
+      end
+
+      if subclasses
+        subclasses.sort! do |a,b|
+          if a.class != b.class
+            # Roles before subclasses
+            b.class <=> a.class
+          else
+            a.kpath <=> b.kpath
+          end
+        end
+      end
+    end
+
+    if subclasses
+      subclasses.each do |sub|
+        res[sub.name] = sub.export
+      end
+    end
+
+    relations = Relation.all(
+      :conditions => ['source_kpath = ? AND site_id = ?', kpath, site_id],
+      :order      => 'target_role ASC'
+    )
+    if !relations.empty?
+      res['relations'] = list = Zafu::OrderedHash.new
+      relations.each do |rel|
+        list[rel.target_role] = rel.export
+      end
+    end
+    res
   end
 
   # check inheritance chain through kpath
@@ -314,11 +326,31 @@ class VirtualClass < Role
   # explicitely declared as safe are safe. If the VirtualClass reflects a virtual
   # class, all properties are considered safe.
   def safe_method_type(signature, receiver = nil)
-    if signature.size == 1 && (type = safe_column_types[signature.first])
-      type
-    else
-      real_class.safe_method_type(signature, receiver)
+
+    if signature.size == 1
+      method = signature.first
+      if receiver && (query = receiver.opts[:query])
+        if query.select_keys.include?(method)
+          # Resolve by using information in the SELECT part
+          # of the custom_query that found this node
+
+          # In order to use types other then String, we use the overwritten property's
+          # type.
+          if type = safe_column_types[method]
+            return type.merge(:method => "attributes[#{method.inspect}]", :nil => true)
+          elsif type = real_class.safe_method_type(signature)
+            return type.merge(:nil => true)
+          else
+            return {:class => String, :method => "attributes[#{method.inspect}]", :nil => true}
+          end
+        end
+      end
+      if type = safe_column_types[method]
+        return type
+      end
     end
+
+    real_class.safe_method_type(signature, receiver)
   end
 
   # Return safe columns including super class's safe columns
@@ -426,14 +458,6 @@ class VirtualClass < Role
     real_class.do_find(*args)
   end
 
-  def superclass=(klass)
-    if k = VirtualClass[klass]
-      @superclass = k
-    else
-      errors.add('superclass', 'invalid')
-    end
-  end
-
   # Build new nodes instances of this VirtualClass
   def new_instance(hash={})
     real_class.new(hash, self)
@@ -458,10 +482,6 @@ class VirtualClass < Role
     @real_class = klass
   end
 
-  def import_result
-    @import_result || errors[:base]
-  end
-
   # List all relations that can be set for this class, filtering by
   # relation group.
   def filtered_relations(group_filter)
@@ -473,6 +493,27 @@ class VirtualClass < Role
     @index_groups ||= super
   end
 
+  protected
+    def rebuild_kpath(superclass)
+      index = 0
+      kpath = nil
+      while index < self[:name].length
+        try_kpath = superclass.kpath + self[:name][index..index].upcase
+        if found = VirtualClass.find_by_kpath(try_kpath)
+          if found.id && found.id == self[:id]
+            kpath = try_kpath
+            break
+          end
+        else
+          kpath = try_kpath
+          break
+        end
+        index += 1
+      end
+      errors.add('name', 'invalid (could not build unique kpath)') unless kpath
+      self[:kpath] = kpath
+    end
+
   private
     def attached_roles
       ::Role.all(
@@ -483,27 +524,15 @@ class VirtualClass < Role
     end
 
     def valid_virtual_class
+      if create_group_id.blank? && new_record?
+        self.create_group_id = current_site.public_group_id
+      end
+
       return if !errors.empty?
       @superclass ||= self.superclass
 
       if real_class? || name_changed? || @superclass != old.superclass
-        index = 0
-        kpath = nil
-        while index < self[:name].length
-          try_kpath = @superclass.kpath + self[:name][index..index].upcase
-          if found = VirtualClass.find_by_kpath(try_kpath)
-            if found.id && found.id == self[:id]
-              kpath = try_kpath
-              break
-            end
-          else
-            kpath = try_kpath
-            break
-          end
-          index += 1
-        end
-        errors.add('name', 'invalid (could not build unique kpath)') unless kpath
-        self[:kpath] = kpath
+        rebuild_kpath(@superclass)
       end
 
       self[:real_class] = get_real_class(@superclass)
@@ -524,4 +553,43 @@ class VirtualClass < Role
     def old
       @old ||= self.class.find(self[:id])
     end
+
+    def propagate_kpath_change
+      if kpath_changed?
+        old_kpath = kpath_was
+        Zena::Db.execute "UPDATE nodes SET kpath = '#{kpath}' WHERE vclass_id = #{self.id} AND site_id = #{current_site.id}"
+        Zena::Db.execute "UPDATE roles SET kpath = '#{kpath}' WHERE kpath = '#{old_kpath}' AND site_id = #{current_site.id} AND (type = 'Role' or type IS NULL)"
+        # Find templates
+        idx_templates = IdxTemplate.all(
+          :conditions => ['tkpath = ? AND site_id = ?', old_kpath, site_id]
+        )
+
+        if !idx_templates.empty?
+          # update related templates
+          if templates = secure(Node) { Node.all(
+              :conditions => "id IN (#{idx_templates.map{|r| r.node_id}.join(',')})")}
+            templates.each do |t|
+              t.visible_versions.each do |version|
+                t.version = version
+                t.instance_variable_set(:@properties, version.prop)
+                t.rebuild_tkpath(self)
+                Zena::Db.execute "UPDATE #{version.class.table_name} SET properties=#{Zena::Db.quote(version.class.encode_properties(version.prop))} WHERE id=#{version[:id]}"
+              end
+              t.rebuild_index!
+            end
+          end
+        end
+
+        # Sub-classes
+        if sub_classes = secure(VirtualClass) { VirtualClass.all(
+            :conditions => ['kpath LIKE ?', "#{old_kpath}_"]
+            )}
+          sub_classes.each do |sub|
+            sub.rebuild_kpath(self)
+            # What if this fails ? Abort all ?
+            sub.save!
+          end
+        end
+      end
+    end
 end

data/app/views/columns/_li.html.erb

@@ -7,6 +7,6 @@
     <span class='spacer'><%= (li.role.kind_of?(VirtualClass) ? '+ ' : '<span>* </span>') %></span>
     <span class='constant'><%= li.role.name %></span>
     <span class='text'>p.<%= li.ptype %></span>
-    <span class='string'>'<%= li.name %>'<span><%= li.import_result ? " (#{li.import_result})" : ''%><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index_name %></span><% end -%>
+    <span class='string'>'<%= li.name %>'<span><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index_name %></span><% end -%>
   </td>
 </tr>

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

@@ -1,15 +1,7 @@
-<h2 class='title'><%= _('manage properties') %></h2>
+<h2 class='title'><%= _('properties') %></h2>
 
 <table id='column_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='7'><%= will_paginate @columns %></th></tr>
   <%= render :partial=>'columns/li',  :collection=>@columns %>
   <%= render :partial=>'columns/add' %>
 </table>
-
-<div class='admin_group'><h3><%= _('import definitions') %></h3>
-
-<%= form_tag({ :controller => 'columns', :action => 'import'}, {:multipart => true} ) %>
-<input style='line-height:1.5em;' name="attachment" class='file' type="file" />
-<p class="btn_validate"><input type="submit" value='<%= _('import') %>'/></p>
-</form>
-</div>

data/app/views/comments/index.rhtml

@@ -1,12 +1,14 @@
-<h2 class='title'><%= _('manage comments') %></h2>
-<div id='comment_errors'></div>
+<h2 class='title'><%= _('comments') %></h2>
 
-<%= will_paginate @comments %>
-<ul class='comments' id='comments_list'>
-  <%= render :partial=>'comments/li', :collection=>@comments %>
-</ul>
+<div id='comments'>
+  <div id='comment_errors'></div>
+  <%= will_paginate @comments %>
+  <ul class='comments' id='comments_list'>
+    <%= render :partial=>'comments/li', :collection=>@comments %>
+  </ul>
 
 
-<div id='bin'>
-  <%= render :partial=>'comments/bin' %>
+  <div id='bin'>
+    <%= render :partial=>'comments/bin' %>
+  </div>
 </div>

data/app/views/documents/_crop.rhtml

@@ -1,10 +1,9 @@
-<%= link_to_function(_('cancel'), "['crop', 'crop_form'].each(Element.toggle);$('crop_form').innerHTML = '';")%>
-<ul class='infos' id='crop_options'>
+<ul class='crop_options'>
   <li>x: <input type='text' id='posx' name='node[crop][x]' size='4'/> y: <input type='text' id='posy'   name='node[crop][y]' size='4'/> // w: <input type='text' id='width' name='node[crop][w]' size='4'/> h: <input type='text' id='height' name='node[crop][h]' size='4'/></li>
-  <li><b><%= _('convert') + '</b> ' + crop_formats(@node).join(' ') %></li>
-  <li><b><%= _('max size') %></b> <input type='text' name='node[crop][max_value]' size='4' value='<%= fs = fsize(@node.size); fs.to_f %>'/>
+  <li><b><%= _('convert') + '</b> ' + crop_formats(node).join(' ') %></li>
+  <li><b><%= _('max size') %></b> <input type='text' name='node[crop][max_value]' size='4' value='<%= fs = fsize(node.size); fs.to_f %>'/>
     <%= ['Kb', 'Mb'].inject('') {|r,e| r + "<input type='radio' name='node[crop][max_unit]' value='#{e}'#{fs =~ /#{e}/ ? " checked='checked'" : ''}/> #{e} " }%>
   </li>
 </ul>
-<p class='edit_info'><%= _('original') %> <%= @node.width %>x<%= @node.height %>, <%= _('original is #X this view').sub('#X', "<b>#{sprintf('%.1f', @node.width.to_f / @node.width(Iformat['edit']))}x</b>")%></p>
-<%= img_tag(@node, :mode=>'edit', :id=>'edit_img') %>
+<p class='edit_info'><%= _('original') %> <%= node.width %>x<%= node.height %>, <%= _('original is #X this view').sub('#X', "<b>#{sprintf('%.1f', node.width.to_f / node.width(Iformat['edit']))}x</b>")%></p>
+<%= img_tag(node, :mode=>'edit', :id=>img_id) %>

data/app/views/documents/crop_form.rjs

@@ -1,4 +1,5 @@
-page.replace_html 'crop_form', :partial=>'documents/crop'
+page.replace_html 'crop_form', :partial=>'documents/crop', :locals => {:node => @node, :img_id => 'edit_img'}
+page.insert_html :top, 'crop_form', :inline => %Q{<%= link_to_function(_('cancel'), "['crop', 'crop_form'].each(Element.toggle);$('crop_form').innerHTML = '';")%>}
 page.toggle 'crop_form', 'crop'
-page << "new Zena.Div_editor('edit_img', 'posx', 'posy', 'width', 'height', #{@node.width / @node.width(Iformat['edit']).to_f}, 20, 220);"
+page << "new Zena.Div_editor('edit_img', 'posx', 'posy', 'width', 'height', #{@node.width / @node.width(Iformat['edit']).to_f});"
 page << "self.resizeTo(520,770);"

data/app/views/groups/index.rhtml

@@ -1,4 +1,4 @@
-<h2 class='title'><%= _('manage groups') %></h2>
+<h2 class='title'><%= _('groups') %></h2>
 <table class="admin" cellspacing="0">
   <tr><th class='nav' colspan='3'><%= will_paginate @groups %></th></tr>
   <%= render :partial=>'groups/li',  :collection=>@groups %>

data/app/views/iformats/index.rhtml

@@ -1,4 +1,4 @@
-<h2 class='title'><%= _('manage image formats') %></h2>
+<h2 class='title'><%= _('image formats') %></h2>
 
 <table id='iformat_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='7'>&nbsp;</th></tr>

data/app/views/nodes/_import_results.rhtml

@@ -6,7 +6,7 @@
     <% @nodes.each do |node| -%>
       <tr class='import_<%= node.errors.empty? ? (node[:create_or_update]) : 'error' %>'>
         <td><%= img_tag(node, :mode=>'tiny') %></td>
-        <td><%= node.short_path %></td>
+        <td><%= node.short_path.join('/') %></td>
         <% if node[:create_or_update] == 'same' && node.errors.empty? -%>
         <td colspan='3'><%= _('same') %></td>
         <% else -%>