zena 0.15.0 → 0.15.1

data/{config → lib/zena/deploy}/vhost.rhtml

@@ -1,21 +1,21 @@
-# zena apache2 vhost for <%= host %>
+# zena apache2 vhost for <%= config[:host] %>
 # automatically generated file
 
 <VirtualHost *>
-  ServerName <%= host %>
+  ServerName <%= config[:host] %>
 
-  DocumentRoot /var/www/zena/<%= host %>/public
-  ErrorLog     /var/www/zena/<%= host %>/log/apache2.error.log
-  CustomLog    /var/www/zena/<%= host %>/log/apache2.access.log combined
+  DocumentRoot <%= config[:sites_root] %>/<%= config[:host] %>/public
+  ErrorLog     <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.error.log
+  CustomLog    <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.access.log combined
 
-  <Directory "/var/www/zena/<%= host %>/public">
+  <Directory "<%= config[:sites_root] %>/<%= config[:host] %>/public">
     Options FollowSymLinks
     AllowOverride None
     Order allow,deny
     Allow from all
   </Directory>
 
-  <% if static.include?('cgi-bin') %>
+  <% if config[:static].include?('cgi-bin') %>
   ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
   <Directory "/usr/lib/cgi-bin">
     AllowOverride None
@@ -24,7 +24,7 @@
     Allow from all
   </Directory>
   <% end %>
-  <% if static.include?('awstats-icon') %>
+  <% if config[:static].include?('awstats-icon') %>
   Alias /awstats-icon/ /usr/share/awstats/icon/
   <Directory "/usr/share/awstats/icon">
     Options None
@@ -42,10 +42,11 @@
     Satisfy All
   </DirectoryMatch>
 
+<% if config[:app_type] == :mongrel %>
   RewriteEngine On
-  <% if debug_rewrite %>
+  <% if config[:debug_rewrite] %>
   # rewrite debugging
-  RewriteLog /var/www/zena/<%= host %>/log/rewrite.log
+  RewriteLog <%= config[:sites_root] %>/<%= config[:host] %>/log/rewrite.log
   RewriteLogLevel 9
 
   <% end %>
@@ -63,9 +64,22 @@
 
   # Redirect all non-static requests to cluster
   RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME}%{QUERY_STRING} !-f
-  RewriteRule ^/(.*)$ balancer://<%= balancer %>%{REQUEST_URI} [P,QSA,L]
+  RewriteRule ^/(.*)$ balancer://<%= config[:balancer] %>%{REQUEST_URI} [P,QSA,L]
+<% elsif config[:app_type] == :passenger %>
+  PassengerAppRoot <% config[:app_root] %>
 
-  <% if deflate %>
+  <Location />
+    # enable tracking uploads in /
+    TrackUploads On
+  </Location>
+
+  <Location /upload_progress>
+    # enable upload progress reports
+    ReportUploads On
+  </Location>
+<% end %>
+
+  <% if config[:deflate] %>
   # Deflate (compress data before sending to browser)
   AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml application/xhtml+xml text/javascript text/css
   BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -73,12 +87,12 @@
   BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
   <% end %>
 
-  <% if debug_deflate && deflate %>
+  <% if config[:debug_deflate] && config[:deflate] %>
   # Deflate debugging
   DeflateFilterNote Input input_info
   DeflateFilterNote Output output_info
   DeflateFilterNote Ratio ratio_info
   LogFormat '"%r" %{output_info}n/%{input_info}n (%{ratio_info}n%%)' deflate
-  CustomLog /var/www/zena/<%= host %>/log/deflate.log deflate
+  CustomLog <%= config[:sites_root] %>/<%= config[:host] %>/log/deflate.log deflate
   <% end %>
 </VirtualHost>

data/lib/zena/deploy.rb

@@ -0,0 +1,377 @@
+=begin
+
+Deployment 'recipe' for capistrano. Creates everything for your zena app.
+
+Assumed:
+  - mysql root user has the same password as ssh
+  - you are using apache 2.2+ (using balance_proxy)
+  - server is running debian etch
+  - you have installed subversion on the server (aptitude install subversion)
+  - you have installed mysql on the server (aptitude install mysql...)
+  - you have installed the required dependencies (see main README file)
+
+========== USAGE ==========
+
+1. Copy the file 'deploy_config_example.rb' to 'deploy_config.rb' and edit the entries in this new file.
+2. Run => cap initial_setup
+3. Run => cap mksite -s host='example.com' -s pass='secret' -s lang='en'
+
+If anything goes wrong, ask the mailing list (lists.zenadmin.org) or read the content of this file to understand what went wrong...
+
+And yes, 'pass' is not as intuitive as 'password' but we cannot use the latter because it's used for the ssh login.
+
+
+=end
+require 'erb'
+Capistrano::Configuration.instance(:must_exist).load do
+
+  set :templates, File.join(File.dirname(__FILE__), 'deploy')
+  self[:app_type]   ||= :mongrel
+  self[:app_root]   ||= '/var/zena/current'
+  self[:sites_root] ||= '/var/www/zena'
+  self[:balancer]   ||= db_name
+
+  set :in_current, "cd #{deploy_to}/current &&"
+  class RenderClass
+    def initialize(path)
+      @text = File.read(path)
+    end
+
+    def render(hash)
+      @values = hash
+      ERB.new(@text).result(binding)
+    end
+
+    def method_missing(sym)
+      return @values[sym] if @values.has_key?(sym)
+      super
+    end
+  end
+
+  def render(file, hash)
+    RenderClass.new(file).render(hash)
+  end
+
+  #========================== SOURCE CODE   =========================#
+
+
+  desc "set permissions to www-data"
+  task :set_permissions, :roles => :app do
+    run "chown -R www-data:www-data #{deploy_to}/current/public #{deploy_to}/current/log"
+  end
+
+  "Update the currently released version of the software directly via an SCM update operation"
+  task :update_current do
+    source.sync(revision, self[:release_path])
+  end
+
+  desc "clear all zafu compiled templates"
+  task :clear_zafu, :roles => :app do
+    run "#{in_current} rake zena:clear_zafu RAILS_ENV=production"
+  end
+
+  desc "clear all cache compiled templates"
+  task :clear_cache, :roles => :app do
+    run "#{in_current} rake zena:clear_cache RAILS_ENV=production"
+  end
+
+  desc "after code update"
+  task :after_update, :roles => :app do
+    app_update_symlinks
+    db_update_config
+    apache2_setup
+    migrate
+    clear_zafu
+    clear_cache
+  end
+
+  desc "update symlink to 'sites' directory"
+  task :app_update_symlinks, :roles => :app do
+    run "test ! -e #{deploy_to}/current/sites || rm #{deploy_to}/current/sites"
+    run "ln -sf #{sites_root} #{deploy_to}/current/sites"
+    set_permissions
+  end
+
+  desc "migrate database (zena version)"
+  task :migrate, :roles => :db do
+    run "#{in_current} rake zena:migrate RAILS_ENV=production"
+  end
+
+  desc "initial app setup"
+  task :app_setup, :roles => :app do
+    gem_update
+    run "test -e #{deploy_to}  || mkdir #{deploy_to}"
+    run "test -e #{sites_root} || mkdir #{sites_root}"
+    deploy::setup
+  end
+
+  #========================== MANAGE HOST   =========================#
+  desc "create a new site"
+  task :mksite, :roles => :app do
+    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' LANG='#{self[:lang] || 'en'}'"
+    create_vhost
+    create_awstats
+    run "chown -R www-data:www-data #{sites_root}/#{self[:host]}"
+  end
+
+  desc "update code in the current version"
+  task :up, :roles => :app do
+    run "cd #{deploy_to}/current && #{self[:scm] == 'git' ? "git pull origin #{self[:branch] || 'master'}" : 'svn up'} && (echo #{strategy.configuration[:real_revision]} > #{deploy_to}/current/REVISION)"
+    db_update_config
+    clear_zafu
+    clear_cache
+    migrate
+    restart
+  end
+
+  desc "light update code (no migration, no clear)"
+  task :lightup, :roles => :app do
+    run "cd #{deploy_to}/current && #{self[:scm] == 'git' ? "git pull origin #{self[:branch] || 'master'}" : 'svn up'}"
+    restart
+  end
+
+  #========================== MONGREL ===============================#
+  desc "configure mongrel"
+  task :mongrel_setup, :roles => :app do
+    run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
+    run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
+  end
+
+  desc "Stop the drb upload_progress server"
+  task :stop_upload_progress , :roles => :app do
+    run "#{in_current} ruby lib/upload_progress_server.rb stop"
+  end
+
+  desc "Start the drb upload_progress server"
+  task :start_upload_progress , :roles => :app do
+    run "#{in_current} lib/upload_progress_server.rb start"
+  end
+
+  desc "Restart the upload_progress server"
+  task :restart_upload_progress, :roles => :app do
+    stop_upload_progress
+    start_upload_progress
+  end
+
+  desc "Start mongrel"
+  task :start, :roles => :app do
+    restart_upload_progress
+    run "#{in_current} mongrel_rails cluster::start"
+  end
+
+  desc "Stop mongrel"
+  task :stop, :roles => :app do
+    stop_upload_progress
+    run "#{in_current} mongrel_rails cluster::stop"
+  end
+
+  desc "Restart mongrel"
+  task :restart, :roles => :app do
+    stop
+    restart_upload_progress
+    start
+  end
+
+  #========================== APACHE2 ===============================#
+  desc "Update vhost configuration file"
+  task :create_vhost, :roles => :web do
+    unless self[:host]
+      puts "HOST not set (use -s host=...)"
+    else
+      vhost = render("#{templates}/vhost.rhtml", :config => self)
+      put(vhost, "#{vhost_root}/#{self[:host]}")
+
+      run "test -e /etc/apache2/sites-enabled/#{self[:host]} || a2ensite #{self[:host]}" if debian_host
+
+      unless self[:host] =~ /^www/
+        vhost_www = render("#{templates}/vhost_www.rhtml",
+                      :host        => self[:host]
+                      )
+        put(vhost_www, "#{vhost_root}/www.#{self[:host]}")
+        run "test -e /etc/apache2/sites-enabled/www.#{self[:host]} || a2ensite www.#{self[:host]}" if debian_host
+      end
+      run apache2_reload_cmd
+    end
+  end
+
+  #========================== APACHE2 ===============================#
+  desc "Update awstats configuration file"
+  task :create_awstats, :roles => :web do
+    unless debian_host
+      puts "skipping debian specific awstats"
+    else
+      unless self[:host] && self[:pass]
+        puts "host or password not set (use -s host=... -s pass=...)"
+      else
+        # create awstats config file
+        awstats_conf = render("#{templates}/awstats.conf.rhtml", :host => self[:host] )
+        put(awstats_conf, "/etc/awstats/awstats.#{self[:host]}.conf")
+        run "chown www-data:www-data /etc/awstats/awstats.#{self[:host]}.conf"
+        run "chmod 640 /etc/awstats/awstats.#{self[:host]}.conf"
+
+        # create stats vhost
+        stats_vhost = render("#{templates}/stats.vhost.rhtml", :host => self[:host] )
+        put(stats_vhost, "#{vhost_root}/stats.#{self[:host]}")
+        run "test -e /etc/apache2/sites-enabled/stats.#{self[:host]} || a2ensite stats.#{self[:host]}"
+
+        # directory setup for stats
+        run "test -e #{sites_root}/#{self[:host]}/log/awstats || mkdir #{sites_root}/#{self[:host]}/log/awstats"
+        run "chown www-data:www-data #{sites_root}/#{self[:host]}/log/awstats"
+
+        # setup cron task for awstats
+        run "cat /etc/cron.d/awstats | grep \"#{self[:host]}\" || echo \"0,10,20,30,40,50 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.#{self[:host]}.conf -a -r #{sites_root}/#{self[:host]}/log/apache2.access.log ] && /usr/lib/cgi-bin/awstats.pl -config=#{self[:host]} -update >/dev/null\n\" >> /etc/cron.d/awstats"
+
+        # create .htpasswd file
+        run "test ! -e #{sites_root}/#{self[:host]}/log/.awstatspw || rm #{sites_root}/#{self[:host]}/log/.awstatspw"
+        run "htpasswd -c -b #{sites_root}/#{self[:host]}/log/.awstatspw 'admin' '#{self[:pass]}'"
+
+        # reload apache
+        apache2_reload_cmd
+      end
+    end
+  end
+
+  desc "Rename a webhost"
+  task :rename_host, :roles => :web do
+    unless self[:host] && self[:old_host] && self[:pass]
+      puts "host or old_host not set (use -s host=... -s pass=... -s old_host=...)"
+    else
+      run "#{in_current} rake zena:rename_host OLD_HOST='#{self[:old_host]}' HOST='#{self[:host]}' RAILS_ENV='production'"
+      old_vhosts = ["#{self[:old_host]}",
+                    "stats.#{self[:old_host]}",
+                    "www.#{self[:old_host]}"]
+      old_vhosts.each do |vhost|
+        run "test -e /etc/apache2/sites-enabled/#{vhost} && a2dissite #{vhost} || true"
+        vhost_path = "#{vhost_root}/#{vhost}"
+        run "test -e #{vhost_path} && rm #{vhost_path} || true"
+      end
+
+      awstat_conf = "/etc/awstats/awstats.#{self[:old_host]}.conf"
+      run "test -e#{awstat_conf} && rm #{awstat_conf} || true"
+
+      create_vhost
+      create_awstats
+      clear_zafu
+      clear_cache
+      set_permissions
+    end
+  end
+
+  desc "Apache2 initial setup"
+  task :apache2_setup, :roles => :web do
+    self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
+    httpd_conf = render("#{templates}/httpd.rhtml", :config => self)
+    if debian_host
+      put(httpd_conf, "/etc/apache2/conf.d/#{db_name}")
+    else
+      put(httpd_conf, "/etc/apache2/conf.d/#{db_name}")
+    end
+
+    run "test -e /etc/apache2/sites-enabled/000-default && a2dissite default || echo 'default already disabled'"
+    run "test -e /etc/apache2/mods-enabled/rewrite.load || a2enmod rewrite"
+    run "test -e /etc/apache2/mods-enabled/deflate.load || a2enmod deflate"
+    run "test -e /etc/apache2/mods-enabled/proxy_balancer.load || a2enmod proxy_balancer"
+    run "test -e /etc/apache2/mods-enabled/proxy.load || a2enmod proxy"
+    run "test -e /etc/apache2/mods-enabled/proxy_http.load || a2enmod proxy_http"
+    run "test -e /etc/apache2/mods-enabled/expires.load || a2enmod expires"
+    run "/etc/init.d/apache2 force-reload"
+  end
+
+  #========================== GEM     ===============================#
+
+  desc "install zena gem on remote server"
+  task :gem_update, :roles => :app do
+    run "gem sources -a http://gems.github.com"
+    run "gem install zena"
+  end
+
+  #========================== MYSQL   ===============================#
+
+  desc "set database.yml file according to settings"
+  task :db_update_config, :roles => :app do
+    db_app_config = render("#{templates}/database.rhtml",
+                  :db_name     => db_name,
+                  :db_user     => db_user,
+                  :db_password => db_password
+                  )
+    put(db_app_config, "#{deploy_to}/current/config/database.yml")
+  end
+
+  desc "create database"
+  task :db_create, :roles => :db do
+    on_rollback do
+      run "mysql -u root -p -e \"DROP DATABASE #{db_name};\"" do |channel, stream, data|
+        if data =~ /^Enter password:\s*/m
+          logger.info "#{channel[:host]} asked for password"
+          channel.send_data "#{password}\n"
+        end
+        puts data
+      end
+    end
+
+    run "mysql -u root -p -e \"CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; GRANT ALL ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}';\"" do |channel, stream, data|
+      if data =~ /^Enter password:\s*/m
+        logger.info "#{channel[:host]} asked for password"
+        channel.send_data "#{password}\n"
+      end
+      puts data
+    end
+  end
+
+  desc "initial database setup"
+  task :db_setup, :roles => :db do
+    transaction do
+      db_create
+    end
+  end
+
+
+  desc "Full initial setup"
+  task :initial_setup do
+    transaction do
+      app_setup
+
+      db_setup
+
+      deploy::update
+
+      mongrel_setup
+
+      apache2_setup
+
+      set_permissions
+
+      start
+    end
+  end
+
+  desc "Database dump"
+  task :db_dump, :roles => :db do
+    run "mysqldump #{db_name} -u root -p > #{deploy_to}/current/#{db_name}.sql" do |channel, stream, data|
+      if data =~ /^Enter password:\s*/m
+        logger.info "#{channel[:host]} asked for password"
+        channel.send_data "#{password}\n"
+      end
+      puts data
+    end
+    run "#{in_current} tar czf #{db_name}.sql.tgz #{db_name}.sql"
+    run "#{in_current} rm #{db_name}.sql"
+  end
+
+  desc "Get backup file back"
+  task :get_backup, :roles => :app do
+    get "#{deploy_to}/current/#{db_name}_data.tgz", "./#{db_name}_#{Time.now.strftime '%Y-%m-%d-%H'}.tgz"
+  end
+
+  # FIXME: backup not loading data for every site...
+  desc "Backup all data and bring it backup here"
+  task :backup, :roles => :app do
+    db_dump
+    # key track of the current svn revision for app
+
+    run "#{in_current} svn info > #{deploy_to}/current/zena_version.txt"
+    run "#{in_current} rake zena:full_backup RAILS_ENV='production'"
+    run "#{in_current} tar czf #{db_name}_data.tgz #{db_name}.sql.tgz sites_data.tgz zena_version.txt"
+    get_backup
+  end
+end

data/lib/zena/info.rb

@@ -0,0 +1,13 @@
+if defined?(RAILS_ROOT)
+  SITES_ROOT = "#{RAILS_ROOT}/sites"
+end
+AUTHENTICATED_PREFIX = "oo"
+PASSWORD_SALT = "jf93jfnvnas09093nas0923" # type anything here (but change this line !)
+ZENA_CALENDAR_LANGS = ["en", "fr"] # FIXME: build this dynamically from existing files
+ENABLE_XSENDFILE = false
+
+module Zena
+  VERSION = '0.15.1'
+  REVISION = 1336
+  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+end

data/lib/zena/parser/zena_tags.rb

@@ -41,6 +41,7 @@ require 'yaml'
 
 module Zena
   module Parser
+    include RubyLess::SafeClass
     # Zafu tags used to display / edit nodes and versions
     module ZenaTags
       PSEUDO_ATTRIBUTES = {
@@ -3029,6 +3030,8 @@ module Zena
             params[:mode]   = @params[:mode]   if @params[:mode]
             params[:format] = @params[:format] if @params[:format]
             "zen_#{real_attribute}(#{node}#{params_to_erb(params)})"
+          elsif type = safe_method_type([real_attribute])
+            type[:method]
           elsif type = klass.safe_method_type([real_attribute])
             "#{att_node}.#{type[:method]}"
           else

data/lib/zena/parser.rb

@@ -49,6 +49,7 @@ module Zena
     end # DummyHelper
 
     class Processor
+      include RubyLess::SafeClass
       attr_accessor :text, :method, :pass, :options, :blocks, :params, :ids, :defined_ids, :parent
 
       class << self

data/lib/zena/use/calendar.rb

@@ -114,7 +114,8 @@ module Zena
           if state == 'used' && remove_used.nil?
             res << title
           else
-            opts = {:url => "/nodes/#{node.zip}?node[rel][#{role}][date]=#{date.strftime("%Y-%m-%d+%H")}&node[rel][#{role}][other_id]=#{state == 'free' ? target_zip : ''}&s=#{target_zip}&dom_id=#{full_dom_id}&t_url=#{CGI.escape(template_url)}&date=#{date.strftime("%Y-%m-%d+%H")}", :method => :put}
+            date_format = "%Y-%m-%d+%H"
+            opts = {:url => "/nodes/#{node.zip}?node[rel][#{role}][date]=#{date.strftime(date_format)}&node[rel][#{role}][other_id]=#{state == 'free' ? target_zip : ''}&s=#{target_zip}&dom_id=#{full_dom_id}&t_url=#{CGI.escape(template_url)}&date=#{date.strftime(date_format)}", :method => :put}
             if state == 'used' && remove_used == 'warn'
               opts[:confirm] = _("Delete relation '%{role}' between '%{source}' and '%{target}' ?") % {:role => role, :source => node.version.title, :target => node.linked_node.version.title}
             end

data/lib/zena/use/dates.rb

@@ -170,7 +170,12 @@ module Zena
             hash['%S'] ||= 0
             if hash['%Y'] && hash['%m'] && hash['%d']
               res = Time.utc(hash['%Y'], hash['%m'], hash['%d'], hash['%H'], hash['%M'], hash['%S'])
-              timezone ? timezone.local_to_utc(res) : res
+              begin
+                timezone ? timezone.local_to_utc(res, true) : res
+              rescue TZInfo::AmbiguousTime
+                # Better a bad date then nothing
+                res
+              end
             else
               nil
             end

data/lib/zena/use/fixtures.rb

@@ -127,6 +127,15 @@ module Zena
             end
           end
         end
+
+        unless File.exist?("#{SITES_ROOT}/test.host/public")
+          FileUtils::mkpath("#{SITES_ROOT}/test.host/public")
+          ['images', 'calendar', 'stylesheets', 'javascripts'].each do |dir|
+            FileUtils.ln_s("../../../public/#{dir}", "#{SITES_ROOT}/test.host/public/#{dir}")
+          end
+        end
+
+        FileUtils::mkpath("#{SITES_ROOT}/test.host/log") unless File.exist?("#{SITES_ROOT}/test.host/log")
       end
     end # Fixtures
   end # use

data/lib/zena/use/html_tags.rb

@@ -43,7 +43,7 @@ module Zena
 
           if res.kind_of?(Hash)
             out = "<img"
-            [:src, :width, :height, :alt, :id, :class, :style, :border].each do |k|
+            [:src, :width, :height, :alt, :id, :class, :style, :border, :onclick].each do |k|
               next unless v = res[k]
               out << " #{k}='#{v}'"
             end
@@ -73,6 +73,43 @@ module Zena
             # compute image size
             res[:width]  = content.width(format)
             res[:height] = content.height(format)
+            if popup = format[:popup]
+
+              if popup_fmt = Iformat[popup[:name]]
+                options = popup[:options]
+                keys    = popup[:show]
+                res[:onclick] = 'Zena.popup(this)'
+                res[:id]    ||= unique_id
+                data = {}
+                data['src'] = data_path(obj, :mode => (popup[:size] == :keep ? nil : popup[:name]), :host => opts[:host])
+                data['width']   = content.width(popup_fmt)
+                data['height']  = content.height(popup_fmt)
+
+                data['fields'] = fields = {}
+                data['keys']   = field_keys = []
+                keys.each do |k|
+                  case k
+                  when 'navigation'
+                    field_keys << k
+                    data[k] = true
+                  else
+                    if v = obj.safe_read(k)
+                      field_keys << k
+                      case options[k]
+                      when 'raw'
+                        fields[k] = v
+                      when 'link'
+                        fields[k] = link_to(v, zen_path(obj))
+                      else
+                        fields[k] = zazen(v)
+                      end
+                    end
+                  end
+                end
+
+                self.js_data << "$('#{res[:id]}')._popup = #{data.to_json};"
+              end
+            end
             res
           elsif obj.kind_of?(Document) && obj.version.content.ext == 'mp3' && (opts[:mode].nil? || opts[:mode] == 'std' || opts[:mode] == 'button')
             # rough wrap to use the 'button'
@@ -171,10 +208,10 @@ module Zena
           <script src="/calendar/calendar-setup.js" type="text/javascript"></script>
           <script src="/calendar/lang/calendar-#{l}-utf8.js" type="text/javascript"></script>
           <link href="/calendar/calendar-brown.css" media="screen" rel="Stylesheet" type="text/css" />
-          #{javascript_start}
+          <% javascript_tag do -%>
           Calendar._TT["DEF_DATE_FORMAT"] = "#{_('datetime')}";
           Calendar._TT["FIRST_DAY"] = #{_('week_start_day')};
-          #{javascript_end}
+          <% end -%>
           EOL
         end
 
@@ -500,7 +537,7 @@ module Zena
             "<a href='#{url}#{publish_after_save ? "?pub=#{publish_after_save}" : ''}' target='_blank' title='#{_('btn_title_edit')}' onclick=\"editor=window.open('#{url}#{publish_after_save ? "?pub=#{publish_after_save}" : ''}', \'#{current_site.host}#{node[:zip]}\', 'location=0,width=300,height=400,resizable=1');return false;\">" +
                    _('btn_edit') + "</a>"
           when 'drive'
-            "<a href='#' title='#{_('btn_title_drive')}' onclick=\"editor=window.open('" +
+            "<a href='#{edit_node_url(:id => node[:zip])}' target='_blank' title='#{_('btn_title_drive')}' onclick=\"editor=window.open('" +
                    edit_node_url(:id => node[:zip] ) +
                    "', '_blank', 'location=0,width=300,height=400,resizable=1');return false;\">" +
                    _('btn_drive') + "</a>"
@@ -534,7 +571,9 @@ module Zena
         def version_action_link(action,version)
           if action == 'view'
             # FIXME
-            link_to_function(_('btn_view'), "opener.Zena.version_preview('/nodes/#{version.node.zip}/versions/#{version.number}');")
+            link_to_function(
+            _("status_#{version.status}_img"),
+            "opener.Zena.version_preview('/nodes/#{version.node.zip}/versions/#{version.number}');", :title => _("status_#{version.status}"))
           else
             if action == 'destroy_version'
               action = 'destroy'

data/lib/zena/use/node_query_finders.rb

@@ -8,8 +8,7 @@ class NodeQuery < QueryBuilder
   set_main_class 'Node'
   @@filter_fields = {'id' => {:key => 'zip'}}
 
-  # TODO: should glob SITES_ROOT/**/custom_queries...
-  load_custom_queries File.join(File.dirname(__FILE__), 'custom_queries')
+  load_custom_queries ["#{RAILS_ROOT}/bricks/*/queries"]
 
   def self.insert_zero_link(link_class)
     return if link_class.find_by_id(0)

data/lib/zena/use/refactor.rb

@@ -37,19 +37,6 @@ module Zena
         include Common
 
         # TODO: use Rails native helper.
-        def javascript( string )
-          javascript_start +
-          string +
-          javascript_end
-        end
-
-        def javascript_start
-          "<script type=\"text/javascript\" charset=\"utf-8\">\n// <![CDATA[\n"
-        end
-
-        def javascript_end
-          "\n// ]]>\n</script>"
-        end
 
         # Quote for html values (input tag, alt attribute, etc)
         def fquote(text)