zena 0.15.0 → 0.15.1

data/lib/zena/use/rendering.rb

@@ -3,8 +3,21 @@ require 'tempfile'
 module Zena
   module Use
     module Rendering
+      module ViewMethods
+        def render_js
+          return '' unless self.js_data
+          javascript_tag(self.js_data.join("\n"))
+        end
+      end
+
       module ControllerMethods
+        def self.included(base)
+          base.send(:helper_attr, :js_data)
+        end
 
+        def js_data
+          @js_data ||= []
+        end
 
         # TODO: test
         # Our own handling of exceptions

data/lib/zena/use/zafu.rb

@@ -34,20 +34,30 @@ module Zena
               src2, mode2 = $1, $2
             end
 
+            paths = []
             if src[0..0] == '/'
-              path1 = src[1..-1]
-              path2 = src2[1..-1] if src2
+              paths << src[1..-1]
+              paths << src2[1..-1] if src2
             else
-              path1 = current_folder + '/' + src
-              path2 = current_folder + '/' + src2 if src2
+              paths << (current_folder + '/' + src)
+              paths << (current_folder + '/' + src2) if src2
             end
 
             # make sure path elements are url_names
-            path1 = path1.split('/').map {|s| s.url_name!}.join('/')
-            path2 = path2.split('/').map {|s| s.url_name!}.join('/') if src2
+            paths.map! do |path|
+              res = []
+              path.split('/').each do |e|
+                if e == '..'
+                  res.pop
+                else
+                  res << e.url_name
+                end
+              end
+              res.join('/')
+            end
 
-            if asset = secure(Document) { Document.find_by_path(path1) }
-            elsif src2 && (asset = secure(Document) { Document.find_by_path(path2) })
+            if asset = secure(Document) { Document.find_by_path(paths[0]) }
+            elsif src2 && (asset = secure(Document) { Document.find_by_path(paths[1]) })
               mode = mode2
             else
               return nil
@@ -283,10 +293,12 @@ module Zena
               dev_box << "      <li>skins used: #{skin_names.join(', ')}</li>\n"
               dev_box << "    </ul>\n  </li>\n</ul></div>"
               if res =~ /<\/body>/
-                res.sub!('</body>', "#{dev_box}</body>")
+                res.sub!('</body>', "#{dev_box}<%= render_js %></body>")
               else
                 res << dev_box
               end
+            else
+              res.sub!('</body>', "<%= render_js %></body>")
             end
 
             secure!(CachedPage) { CachedPage.create(

data/lib/zena.rb

@@ -2,11 +2,8 @@
 require 'yaml'
 require 'date'
 require 'fileutils'
+require File.join(File.dirname(__FILE__), 'zena', 'info')
 
-AUTHENTICATED_PREFIX = "oo"
-SITES_ROOT = "#{RAILS_ROOT}/sites"
-PASSWORD_SALT = "jf93jfnvnas09093nas0923" # type anything here (but change this line !)
-ZENA_CALENDAR_LANGS = ["en", "fr"] # FIXME: build this dynamically from existing files
 def has_executable(*list)
   list.inject(true) do |s,e|
     s && !(`which #{e} || echo 'no #{e}'` =~ /^no #{e}/)
@@ -16,17 +13,13 @@ ENABLE_LATEX   = true  && has_executable('pdflatex') # enable LateX post-renderi
 ENABLE_FOP     = true  && has_executable('fop', 'xsltproc') # enable xsl-fo post-rendering
 ENABLE_MATH    = true  && has_executable('latex', 'dvips', 'convert', 'gs')
 ENABLE_ZENA_UP = false && has_executable('zena_up')
-ENABLE_XSENDFILE = false
 
 UPLOAD_KEY     = defined?(Mongrel) ? 'upload_id' : "X-Progress-ID"
 
 require 'bricks/patcher'
 
 module Zena
-  VERSION = '0.15.0'
-  REVISION = 1336
-  ROOT    = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
+  # VERSION is defined in root.rb
   class << self
     attr_accessor :tools_enabled
     def add_load_paths(config = nil)
@@ -180,8 +173,8 @@ end
 
 
 # test if DRB started
-unless RAILS_ENV == 'test' || File.exist?(File.join(File.dirname(__FILE__), '..', 'log', 'upload_progress_drb.pid'))
-  puts "\n** WARNING: drb server not running. Upload progress will not work."
+if RAILS_ENV == 'production' && defined?(Mongrel) && !File.exist?(File.join(File.dirname(__FILE__), '..', 'log', 'upload_progress_drb.pid'))
+  puts "\n** WARNING: drb server not running. Upload progress will not work using Mongrel."
   puts " * WARNING: you should start the drb server with 'lib/upload_progress_server.rb start'\n\n"
 end
 

data/locale/en/zena.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.0\n"
 "POT-Creation-Date: 2008-09-26 20:39-0000\n"
-"PO-Revision-Date: 2008-09-26 23:21+0100\n"
+"PO-Revision-Date: 2009-10-17 21:34+0100\n"
 "Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
 "Language-Team: en <gaspard@teti.ch>\n"
 "MIME-Version: 1.0\n"
@@ -1816,6 +1816,34 @@ msgstr "removed"
 msgid "status_0"
 msgstr "deleted"
 
+#: lib/gettext_strings.rb:92
+msgid "status_50_img"
+msgstr "<img src='/images/weather_sun.png'/>"
+
+#: lib/gettext_strings.rb:93
+msgid "status_60_img"
+msgstr "<img src='/images/magnifier.png'/>"
+
+#: lib/gettext_strings.rb:94
+msgid "status_65_img"
+msgstr "<img src='/images/magnifier.png'/>"
+
+#: lib/gettext_strings.rb:95
+msgid "status_70_img"
+msgstr "<img src='/images/pencil.png'/>"
+
+#: lib/gettext_strings.rb:96
+msgid "status_20_img"
+msgstr "<img src='/images/weather_clouds.png'/>"
+
+#: lib/gettext_strings.rb:97
+msgid "status_10_img"
+msgstr "<img src='/images/weather_rain.png'/>"
+
+#: lib/gettext_strings.rb:98
+msgid "status_0_img"
+msgstr "<img src='/images/weather_lightning.png'/>"
+
 #: lib/gettext_strings.rb:94
 msgid "en"
 msgstr "english"

data/locale/fr/zena.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.0\n"
 "POT-Creation-Date: 2008-09-26 20:39-0000\n"
-"PO-Revision-Date: 2008-09-26 23:22+0100\n"
+"PO-Revision-Date: 2009-10-17 21:32+0100\n"
 "Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
 "Language-Team: fr <gaspard@teti.ch>\n"
 "MIME-Version: 1.0\n"
@@ -1810,6 +1810,34 @@ msgstr "enlevé"
 msgid "status_0"
 msgstr "effacé"
 
+#: lib/gettext_strings.rb:92
+msgid "status_50_img"
+msgstr "<img src='/images/weather_sun.png'/>"
+
+#: lib/gettext_strings.rb:93
+msgid "status_60_img"
+msgstr "<img src='/images/magnifier.png'/>"
+
+#: lib/gettext_strings.rb:94
+msgid "status_65_img"
+msgstr "<img src='/images/magnifier.png'/>"
+
+#: lib/gettext_strings.rb:95
+msgid "status_70_img"
+msgstr "<img src='/images/pencil.png'/>"
+
+#: lib/gettext_strings.rb:96
+msgid "status_20_img"
+msgstr "<img src='/images/weather_clouds.png'/>"
+
+#: lib/gettext_strings.rb:97
+msgid "status_10_img"
+msgstr "<img src='/images/weather_rain.png'/>"
+
+#: lib/gettext_strings.rb:98
+msgid "status_0_img"
+msgstr "<img src='/images/weather_lightning.png'/>"
+
 #: lib/gettext_strings.rb:94
 msgid "en"
 msgstr "anglais"

data/locale/zena.pot

@@ -1665,6 +1665,34 @@ msgstr ""
 msgid "status_0"
 msgstr ""
 
+#: lib/gettext_strings.rb:92
+msgid "status_50_img"
+msgstr ""
+
+#: lib/gettext_strings.rb:93
+msgid "status_60_img"
+msgstr ""
+
+#: lib/gettext_strings.rb:94
+msgid "status_65_img"
+msgstr ""
+
+#: lib/gettext_strings.rb:95
+msgid "status_70_img"
+msgstr ""
+
+#: lib/gettext_strings.rb:96
+msgid "status_20_img"
+msgstr ""
+
+#: lib/gettext_strings.rb:97
+msgid "status_10_img"
+msgstr ""
+
+#: lib/gettext_strings.rb:98
+msgid "status_0_img"
+msgstr ""
+
 #: lib/gettext_strings.rb:94
 msgid "en"
 msgstr ""

data/public/javascripts/upload-progress.js

@@ -1,3 +1,6 @@
+// This progress bar JS comes from Piotr Sarnacki (I think)
+// the code has been adapted for zena for a nicer progression (Morph)
+// and to fix some strange Safari bugs.
 
 function submitUploadForm(form, uuid) {
   if ($('progress_bar' + uuid)) return;
@@ -7,10 +10,11 @@ function submitUploadForm(form, uuid) {
     $(document.body).insert('<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>');
   }
   $(form).target = 'UploadIFrame';
-  $(form).submit();
   if (need_progress) {
-    UploadProgress.monitor(uuid) ;
+    // make sure the POST occurs before (Safari Bug)
+    UploadProgress.monitor(uuid, form);
 	}
+  $(form).submit();
 }
 
 //
@@ -34,8 +38,9 @@ var UploadProgress = {
   period: 1.0,
   morphPeriod: 1.2,
   uuid: '',
+  submitted: false,
 
-  monitor: function(uuid) {
+  monitor: function(uuid, form) {
     this.uuid = uuid;
     this.buildProgressBar();
     this.setAsStarting();
@@ -49,6 +54,11 @@ var UploadProgress = {
             UploadProgress.update(upload.size, upload.received);
           } else if (upload.state == 'done') {
             UploadProgress.setAsFinished();
+          } else if (upload.state == 'starting' && !this.submitted) {
+            // This is to solve a bug in Safari where the form is sometimes not
+            // submitted before the monitoring occurs. We just resubmit the form.
+            this.submitted = true;
+            $(form).submit();
           } else {
             UploadProgress.message(upload.state);
           }

data/public/javascripts/zena.js

@@ -39,38 +39,42 @@ Zena.save = function(url, form, close_on_complete) {
   }
 }
 
-var diff_from = '';
-var diff_to = '';
-var diff_next_sel = 'from';
+var diff_from = false;
+var diff_to   = false;
 
 Zena.diff_select = function(tag) {
-  if (diff_next_sel == 'from') {
-    if (diff_from != '') {
-      diff_from.style.background = 'none';
-    }
-    diff_from = tag;
-    diff_next_sel = 'to';
-  } else {
-    if (diff_to != '') {
+  tag_number = parseInt(tag.innerHTML);
+  if (tag == diff_from || tag == diff_to) {
+    // reset
+    if (diff_from) diff_from.style.background = 'none';
+    if (diff_to  ) diff_to.style.background   = 'none';
+    diff_from = false;
+    diff_to   = false;
+    opener.window.location.href = '/nodes/' + $('node_zip').innerHTML;
+    return;
+  } else if (diff_to && diff_from) {
+    // update
+    if (parseInt(diff_to.innerHTML) - tag_number < tag_number - parseInt(diff_from.innerHTML)) {
       diff_to.style.background = 'none';
+      diff_to = tag;
+    } else {
+      diff_from.style.background = 'none';
+      diff_from = tag;
     }
+  } else if (!diff_to) {
     diff_to = tag;
-    diff_next_sel = 'from';
-  }
-  if (diff_from != '' && diff_to != '' && parseInt(diff_from.innerHTML) > parseInt(diff_to.innerHTML)) {
-    var tmp = diff_from;
-    diff_from = diff_to;
-    diff_to = tmp;
-    if (diff_next_sel == 'from') {
-      diff_next_sel = 'to';
+  } else {
+    if (tag_number > parseInt(diff_to.innerHTML)) {
+      diff_from = diff_to;
+      diff_to   = tag;
     } else {
-      diff_next_sel = 'from';
+      diff_from = tag;
     }
   }
 
-  diff_from.style.background = '#7A6414';
-  diff_to.style.background = '#FAD12A';
-  if (diff_from != '' && diff_to != '') {
+  if (diff_from) diff_from.style.background = '#7A6414';
+  if (diff_to)   diff_to.style.background   = '#FAD12A';
+  if (diff_from && diff_to) {
     opener.Zena.version_diff($('node_zip').innerHTML, diff_from, diff_to);
   }
 }
@@ -498,4 +502,154 @@ Zena.select_tab = function(name) {
   current_tab = $(name+'_tab');
   current_sel.className = 'selected';
   current_tab.style.display = '';
+}
+
+Zena.popup_gallery = null;
+
+Zena.popup = function(elem) {
+  var offsets = elem.positionedOffset();
+  var e_left    = offsets[0];
+  var e_top     = offsets[1];
+  var e_width   = elem.clientWidth;
+  var e_height  = elem.clientHeight;
+  var config    = elem._popup;
+
+  var cont = $('pg_cont');
+  // FIXME copy border style from 'elem'
+  var border_width = 1;
+
+  if (!cont) {
+    // open popup
+    var html_img = "<img onclick='Zena.popup_close();' id='pg_img' style='position:absolute; z-index:10001; border:" + border_width + "px solid grey; top:"+e_top+"px; left:"+e_left+"px; width:"+e_width+"px;height:"+e_height+"px;' src='" + config.src + "'/>"
+    Element.insert(document.body, "<div id='pg_cont' style='position:absolute; top:0; left:0;'><div id='pg_mask' onclick='Zena.popup_close();'>&nbsp;</div>" + html_img + "</div>");
+    img = $('pg_img');
+  } else {
+    // next, previous image
+    img = $('pg_img');
+    img.src = config.src;
+  }
+
+  // used when closing
+  img._elem_top    = e_top;
+  img._elem_left   = e_left;
+  img._elem_width  = e_width;
+  img._elem_height = e_height;
+
+  var view   = document.viewport.getDimensions();
+  var offset = document.viewport.getScrollOffsets();
+  config.left  = (view.width  -  config.width)/2 + offset[0];
+  config.top   = (view.height - config.height)/2 + offset[1];
+  config.klass = elem.className;
+
+  // get next/previous elements
+  if (config.navigation) {
+    var gallery;
+    if (false && !this.popup_gallery) {
+      document.observe('keydown', function(e, el) {
+        if (!$('pg_info')) {
+          e.stop();
+          this.popup_gallery = null;
+        } else if (e.keyCode == 37) {
+          if (gallery.prev) {
+            Zena.popup(gallery.prev);
+          } else {
+            Zena.popup(gallery.list[gallery.list.size()-1]);
+          }
+        } else if (e.keyCode == 39) {
+          if (gallery.next) {
+            Zena.popup(gallery.next);
+          } else {
+            Zena.popup(gallery.list[0]);
+          }
+        } else {
+          e.stop();
+          this.popup_gallery = null;
+          Zena.popup_close();
+        }
+      });
+    }
+    if (!this.popup_gallery || this.popup_gallery.klass != config.klass) {
+      this.popup_gallery = {
+        klass: config.klass,
+        list: elem.up('div').select('img.' + config.klass)
+      };
+    }
+    this.popup_gallery.current = elem;
+    this.popup_gallery.index = this.popup_gallery.list.indexOf(elem);
+    gallery = this.popup_gallery;
+  }
+
+  if (!config.pg_info_style) {
+    config.pg_info_style = 'top:' + (config.top-10) + 'px; left:' + (config.left-10) + 'px; width:' + (config.width+20) + 'px; padding-top:' + (config.height+20) + 'px;';
+    if (config.keys.size() == 0 && config.navigation) {
+      config.pg_info_style += ' min-height:30px;';
+    }
+  }
+
+  if ($('pg_info')) {
+    Zena.popup_wrap(img, config);
+    new Effect.Morph(img, {
+      style: 'width:'+config.width+'px; height:'+config.height+'px; top:'+config.top+'px; left:'+config.left+'px;',
+      duration: 0.2
+      });
+    new Effect.Morph('pg_info', {
+      style: config.pg_info_style,
+      duration: 0.2
+      });
+    $(img).appear();
+  } else {
+    new Effect.Morph(img, {
+      style: 'width:'+config.width+'px; height:'+config.height+'px; top:'+config.top+'px; left:'+config.left+'px;',
+      duration: 0.5,
+      afterFinishInternal: function(effect) {
+        Zena.popup_wrap(img, config);
+      }
+    });
+  }
+}
+
+Zena.popup_wrap = function(img, config) {
+  cont = $('pg_cont');
+  var content = '';
+  var border_width = 1;
+  gallery = this.popup_gallery;
+
+  config.keys.each(function(key, index) {
+    if (key == 'navigation') {
+      var index = gallery.index;
+      gallery.prev  = gallery.list[index - 1];
+      gallery.next  = gallery.list[index + 1];
+
+      if (gallery.prev) content += "<a id='pg_prev' href='#' onclick='Zena.popup($(\""+gallery.prev.id+"\"));return false;' title='previous image'>&nbsp;</a>";
+      if (gallery.next) content += "<a id='pg_next' href='#' onclick='Zena.popup($(\""+gallery.next.id+"\"));return false;' title='next image'>&nbsp;</a>";
+    } else {
+      content += "<div class='"+key+"'>" + config.fields[key] + "</div>";
+    }
+  });
+
+  if ($('pg_info')) {
+    if (content != '') {
+      $('pg_info').update(content);
+    } else {
+      $('pg_info').remove();
+    }
+  } else if (content != '') {
+    cont.insert("<div id='pg_info' class='" + config.klass + "' style='position:absolute; " + config.pg_info_style + "'>" + content + "</div>");
+  }
+}
+
+Zena.popup_close = function() {
+  var cont = $('pg_cont');
+  if (cont) {
+    var img = $('pg_img');
+    var pg_info = $('pg_info');
+    if (pg_info) pg_info.remove();
+    new Effect.Morph(img, {
+      style: 'width:'+(img._elem_width)+'px; height:'+(img._elem_height)+'px; top:'+img._elem_top+'px; left:'+img._elem_left+'px;',
+      duration: 0.5,
+      afterFinishInternal: function(effect) {
+        cont.remove();
+      }
+    });
+  }
 }

data/public/stylesheets/popup.css

@@ -145,7 +145,7 @@ ul.infos li { padding:0.4em 0.4em; list-style:none; display:block; }
 #links_tab .add { text-align:left;}
 #links_tab .date { width:95px; }
 #links_tab .status { width:70px; }
-#links_tab .box { width:18px;}
+#links_tab .box { width:15px;}
 #links_tab .comment { font-style:italic; width:auto; text-align:left;}
 #links_tab .actions { width:100px;}
 
@@ -171,8 +171,10 @@ ul.infos li { padding:0.4em 0.4em; list-style:none; display:block; }
 
 #versions_list { max-height:230px; overflow:auto;}
 #versions .sign { width:20px; }
-#links_tab .diff .box { border-right-width:0; }
-#links_tab .diff .text { font-style:italic; text-align:left;}
+#versions .number { width:25px; font-size:13px; padding:0 5px; font-weight:bold; cursor:pointer;}
+#versions .actions { width:100px; }
+
+.import { max-height:400px; overflow:auto;}
 
 #discussions .inline_form div { float: left; padding:0 8px; }
 #discussions .inline_form .inside { margin-top:2px; }

data/public/stylesheets/zena.css

@@ -75,4 +75,13 @@ padding:5px; border:1px solid #714D3D; text-align:left; color:#444; z-index:9999
 
 /* diff */
 del.differ, del.differ * { background:#fcc; padding:1px 2px;}
-ins.differ, ins.differ * { background:#cfc; text-decoration:none; padding:1px 2px;}
+ins.differ, ins.differ * { background:#cfc; text-decoration:none; padding:1px 2px;}
+
+/* popup gallery */
+#pg_mask { position:fixed; top:0; left:0; width:100%; height:100%; background:black; opacity:0.8; z-index:9999;}
+#pg_info { z-index:10000; background:white; border:1px solid grey;}
+#pg_info .v_title {text-align:center; font-weight:bold;}
+#pg_info .v_summary {clear:both; padding:3px 10px 10px;}
+#pg_info a { width:100px; height:40px;}
+#pg_next {position:absolute; right:0; background:url('/images/popup_next.png') no-repeat right top;}
+#pg_prev {position:absolute; left:0; background:url('/images/popup_prev.png') no-repeat left top;}

data/test/fixtures/iformats.yml

@@ -23,6 +23,7 @@ zena_med:
   site_id:         705790409
   name:            med
   size:            1
+  popup:           std
   width:           300
   height:          200
   updated_at:      2008-05-01

data/test/fixtures/nodes.yml

@@ -1615,7 +1615,7 @@ zena_lake:
   type:            Contact
   kpath:           NRC
   zip:             23
-  publish_from:    Thu Oct 15 18:31:52 +0000 2009
+  publish_from:    Tue Oct 27 13:14:13 +0000 2009
   vhash:           '{"w":{"en":1833724126},"r":{"en":618648829}}'
   inherit:         yes
   skin:            default

data/test/fixtures/versions.yml

@@ -860,7 +860,9 @@ zena_letter_en:
   type:            Version
   comment:         letter for testing
   summary:         This page is a *Letter*.
-  text:            letter content
+  text:            "letter content
+
+  !30_med! !31_med! !24_med!"
 
 
 zena_wiki_skin_en:

data/test/sites/zena/iformats.yml

@@ -1,6 +1,7 @@
 
 med:
   size:            limit
+  popup:           std
   width:           300
   height:          200
   updated_at:      2008-05-01

data/test/sites/zena/versions.yml

@@ -375,7 +375,9 @@ letter_en:
   comment:         letter for testing
   title:           zena enhancements
   summary:         This page is a *Letter*.
-  text:            letter content
+  text:            "letter content
+
+  !30_med! !31_med! !24_med!"
 
 wiki_skin_en:
   type:            Version

data/test/test_helper.rb

@@ -23,6 +23,8 @@ end
 class SubPagerDummy < PagerDummy
 end
 
+NodeQuery.load_custom_queries File.join(Zena::ROOT, 'test', 'custom_queries')
+
 class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the