zena 1.1.1 → 1.1.2

data/lib/zena/use/rendering.rb

@@ -299,6 +299,11 @@ module Zena
             out "<% set_headers(#{headers.join(', ')}) %>"
           end
         end
+        
+        def r_style
+          @markup.tag = 'style'
+          expand_with
+        end
 
         def r_not_found
           out "<% raise ActiveRecord::RecordNotFound %>"

data/lib/zena/use/upload.rb

@@ -144,6 +144,9 @@ module Zena
       end # ControllerMethods
 
       module ViewMethods
+        include RubyLess
+        safe_method [:upload_field, {:type => String}] => String
+
         UPLOAD_KEY = defined?(Mongrel) ? 'upload_id' : "X-Progress-ID"
         def upload_form_tag(url_opts, html_opts = {})
           @uuid = UUIDTools::UUID.random_create.to_s.gsub('-','')
@@ -162,8 +165,8 @@ module Zena
         end
 
         def upload_field(opts = {})
-          case opts[:type]
-          when :onclick
+          case opts[:type].to_s
+          when 'onclick'
             link = link_to_remote(_("change"), :update=>'upload_field', :url => get_uf_documents_path(:uuid => @uuid), :method => :get, :complete=>"['file', 'upload_field'].each(Element.toggle);")
             <<-TXT
 <label for='attachment'>#{_('file')}</label>

data/lib/zena/use/version_hash.rb

@@ -6,6 +6,8 @@ module Zena
     #
     # Technically, the vhash field contains two dictionaries "readonly" and "write". Each of these dictionaries
     # provide mapping from languages to version id.
+    #
+    #     {'r' => {'en' => 1234, 'fr' => 3456}, 'w' => {'en' => 5436, 'fr' => 4526}}
     module VersionHash
       def self.cached_values_from_records(records)
         r_hash, w_hash = {}, {}

data/public/stylesheets/backend.css

@@ -8,11 +8,13 @@ a {text-decoration:none; color:inherit; }
 #container {  border:1px solid black; background:#eee; margin:3em auto;}
 #logo, #container {width:900px; display:table; margin:1em auto;}
 
-#menu li {float:left;}
+#menu {float:left; display:table; width:150px; background:#ddd; margin: 0 20px 20px 0;}
 #menu li a { padding:4px; border:1px solid #333; border-width:0 1px 1px 0; display:block;}
 #menu li a.on { background:#f7d493;}
 
-#content {clear:both; padding-top:1px;}
+#title { clear:left}
+
+#content {padding-top:1px;}
 #content h2.title {margin:20px; color:black; font-weight:bold; font-size:18px;}
 #content table.admin {margin-bottom:2em;}
 
@@ -45,7 +47,7 @@ a {text-decoration:none; color:inherit; }
 #preview .zazen {height:220px; overflow:auto; padding:10px; }
 h2.preview {position:absolute; top:7px; right:-4px;}
 h2.preview a { background:#ccc; padding:0.5em; font-size:18px; font-weight:bold;}
-h2.preview:hover a {background:#fbeab6;}
+h2.preview:hover a, #menu li:hover a {background:#fbeab6;}
 #preview .med_prev {background:#444;  width:100%;}
 #preview .crop { position:absolute; bottom:10px; right:10px; visibility:hidden; display:block;}
 #preview:hover .crop { visibility:visible;}
@@ -69,3 +71,4 @@ fieldset {float:left; border:1px solid #777; padding:3px; margin:5px;}
 #crop .win { display:table; margin:80px auto; background:#999; padding:20px;}
 #crop .crop_options {display:none;}
 #crop .btn input {float:right}
+

data/public/stylesheets/zena.css

@@ -13,7 +13,7 @@
 .actions   { margin-left:5px; }
 .actions img {border:none; vertical-align:middle;}
 .s50       .actions, .li_s50       .actions { visibility:hidden;  }
-.s50:hover .actions, .li_s50:hover .actions { visibility:visible; }
+*:hover>.s50 .actions, .li_s50:hover .actions { visibility:visible; }
 .actions a:hover { background:#F9E1AD; }
 
 /* forms & form actions */
@@ -86,4 +86,4 @@ ins.differ, ins.differ * { background:#cfc; text-decoration:none; padding:1px 2p
 #pg_info .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?1276089554') no-repeat right top;}
-#pg_prev {position:absolute; left:0; background:url('/images/popup_prev.png?1276089554') no-repeat left top;}
+#pg_prev {position:absolute; left:0; background:url('/images/popup_prev.png?1276089554') no-repeat left top;}

data/test/integration/navigation_test.rb

@@ -226,6 +226,15 @@ class NavigationTest < Zena::Integration::TestCase
         assert_redirected_to 'http://test.host/fr'
       end
     end # without clues
+
+    context 'with lang on bad url' do
+      should 'set lang from url' do
+        get 'http://test.host/de/foobar'
+        assert_response :not_found
+        assert_equal 'de', session[:lang]
+        assert_equal 'de', visitor.lang
+      end
+    end
   end # Selecting lang
 
   context 'In an intranet' do
@@ -292,6 +301,21 @@ class NavigationTest < Zena::Integration::TestCase
     assert_equal 'fr', session[:lang]
   end
 
+  context 'With new languages defined' do
+    setup do
+      login(:lion)
+      assert visitor.site.update_attributes(:languages => 'en,fr,cn')
+    end
+
+    should 'compile templates' do
+      post 'http://test.host/session', :login=>'lion', :password=>'lion'
+      get 'http://test.host/oo?lang=cn'
+      assert_redirected_to 'http://test.host/oo'
+      follow_redirect!
+      assert_response :success
+    end
+  end
+
   context 'On a page with custom base' do
     setup do
       login(:lion)
@@ -332,7 +356,7 @@ class NavigationTest < Zena::Integration::TestCase
         login(:lion)
         secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Project-changes.zafu', :v_status => Zena::Status::Pub, :text => 'nothing ever changes in "<r:title/>"') }
       end
-      
+
       subject do
         'http://test.host/en/projects-list/Clean-Water-project_changes'
       end

data/test/integration/query_node/basic.yml

@@ -140,4 +140,9 @@ paginate_two:
 
 select_index_field:
   src: "nodes select title as ti"
-  sql: "/SELECT nodes.*,ml1.value AS `ti`/"
+  sql: "/SELECT nodes.*,ml1.value AS `ti`/"
+
+coalesce:
+  src: "nodes in site order by parent_id.coalesce(0) asc limit 1"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} ORDER BY COALESCE(nodes.parent_id,0) ASC LIMIT 1}"
+  res: "Zena the wild CMS"

data/test/integration/query_node/filters.yml

@@ -131,4 +131,9 @@ quoted_literal:
   src: "nodes where tag=\"10'000\" in site"
   sql: "%Q{SELECT nodes.* FROM links AS ta1,nodes WHERE #{secure_scope('nodes')} AND ta1.comment = '10\\\\'000' AND nodes.id = ta1.source_id AND ta1.relation_id IS NULL ORDER BY nodes.zip ASC}"
   res: ''
-# filters on ml strings are in properties.yml
+# filters on ml strings are in properties.yml
+
+coalesce_in_filter:
+  src: "posts select date.coalesce('2011-11-01') as da in site"
+  sql: "%Q{SELECT nodes.*,COALESCE(nodes.idx_datetime1,'2011-11-01') AS `da` FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NNP%' ORDER BY nodes.zip ASC}"
+  res: 'super ouverture'

data/test/integration/query_node/idx_scope.yml

@@ -30,4 +30,14 @@ or_keys:
 id_key:
   src: "blogs where id = 29 in site"
   sql: '!/idx_projects/'
+  res: 'a wiki with Zena'
+
+sort_by_scoped_value:
+  src: "blogs in site order by contact.name asc"
+  sql: "%Q{SELECT nodes.* FROM idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND nodes.id = sc1.node_id AND nodes.kpath LIKE 'NPPB%' ORDER BY sc1.contact_name ASC}"
+  res: 'a wiki with Zena'
+
+should_not_mess_with_select:
+  src: "blogs select title as blog_title in site order by contact.name asc"
+  sql: "%Q{SELECT nodes.*,ml1.value AS `blog_title` FROM idx_nodes_ml_strings AS ml1,idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND nodes.id = sc1.node_id AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id AND nodes.kpath LIKE 'NPPB%' ORDER BY sc1.contact_name ASC}"
   res: 'a wiki with Zena'

data/test/integration/zafu_compiler/ajax.yml

@@ -326,6 +326,25 @@ drop_param_in_each:
   tem: "/<div class='drop' id='<%= %Q\{list1_#\{var2.zip\}\} %>'><% add_drop_id\(%Q\{list1_#\{var2.zip\}\}/"
   'ajax/drop/param/in/each/en/list1.erb': "/ndom_id.*ndom_id"
 
+drop_in_each_id:
+  context:
+    node: ant
+  src: |
+    <div class='test' id='drop1' do='Contact?'>
+      <ul do='pages in site limit 3'>
+        <li do='each' draggable='true' do='title'/>
+      </ul>
+      <ul do='drop' set='favorite' change='receiver' do='favorites'>
+        <li class='#{id}' do='each'><r:unlink/> <r:title/></li>
+      </ul>
+    </div>
+  # Should use prefix from "drop", not list of favorites.
+  res: "/drop13_39/"
+  # Show drop element
+  'ajax/drop/in/each/id/en/drop12.erb': "/^\s*<ul.*<li id='<%= %Q\{drop13_#\{var2.zip\}\} %>"
+  # Show each element
+  'ajax/drop/in/each/id/en/drop13.erb': '/^\s*<li/'
+
 update_target:
   src: "UT: <div id='foo' do='block'>...</div> <r:link update='foo'/>"
   tem: "/UT: <div id='foo'>...</div> .*Ajax.Request.*:dom_id => %Q\{foo\}/"

data/test/integration/zafu_compiler/display.yml

@@ -391,3 +391,7 @@ insert_slash_slash_exclam:
 array_literal:
   src: "<p do='%w{one two}'><span do='each' join=', ' do='this'/></p>"
   res: "<p><span>one</span>, <span>two</span></p>"
+
+style_tag:
+  src: "<r:style>.foo <r:title/></r:style>"
+  res: "<style>.foo status title</style>"

data/test/integration/zafu_compiler/meta.yml

@@ -32,6 +32,14 @@ include_part_replace_method:
   src: "include_part: <r:include template='/meta/id/name' part='bob' do='title'/>"
   tem: "include_part: <b><%= @node.prop['title'] %></b>"
 
+id_do:
+  src: "<h1 id='logo' do='title'/>"
+  res: "<h1 id='logo'>status title</h1>"
+
+id_do_with:
+  src: "include_part: <r:include template='/meta/id/do' do='with' part='logo' do='t'>foo</r:include>"
+  res: "include_part: <h1 id='logo'>foo</h1>"
+
 # this test is a dummy used by include_context
 context_dummy:
   src: "CD: <r:pages in='site' where='title like \"s%\"' name='pages'><r:each join=', ' do='title'/></r:pages>"

data/test/selenium/Drop/drop1.rsel

@@ -1,28 +1,24 @@
 open "/oo/testnode37.html?test=drop1"
-assert_element_not_present 'drop121_33'
+assert_element_not_present 'drop13_33'
 
 # Drag & Drop
 set_timeout 4000
 drag_and_drop_to_object "css=#drop11_33 > span.drag_handle", "drop12"
-wait_for_element_present "drop12_33"
-verify_text "drop12_33", "Art"
+wait_for_element_present "drop13_33"
+verify_text "drop13_33", "Art"
 # Unlink
 click "css=img[alt=remove]"
-wait_for_element_not_present "drop12_33"
+wait_for_element_not_present "drop13_33"
 
 # Restart
 
 # Drag & Drop
 drag_and_drop_to_object "css=#drop11_33 > span.drag_handle", "drop12"
-wait_for_element_present "drop12_33"
-verify_text "drop12_33", "Art"
+wait_for_element_present "drop13_33"
+verify_text "drop13_33", "Art"
 
 # Make sure the changes are commited to db
 open "/oo/testnode37.html?test=drop1"
-# This is a bug that is difficult to fix and has no consequences (drop
-# works perfectly well)
-# It should be drop12_33 but it is drop13_33 when inline.
-# assert_element_present 'drop12_33'
 assert_element_present 'drop13_33'
 # Unlink
 click "css=img[alt=remove]"

data/test/selenium/Drop/drop2.rsel

@@ -1,8 +1,9 @@
 open "/oo/testnode37.html?test=drop2"
-assert_element_not_present 'drop221_33'
+assert_element_not_present 'drop22_29_33'
 
 # Drag & Drop
 set_timeout 4000
+command 'setSpeed', 10
 drag_and_drop_to_object "css=#drop21_33 > span.drag_handle", "drop22_29"
 wait_for_element_present "drop22_29_33"
 verify_text "drop22_29_33", "Art"
@@ -19,9 +20,11 @@ verify_text "drop22_21_33", "Art"
 
 # Make sure the changes are commited to db
 open "/oo/testnode37.html?test=drop2"
-# Should be drop22_21_33 but the prefix is drop23..
-#assert_element_present 'drop22_21_33'
 assert_element_present 'drop23_21_33'
+# Should be
+# assert_element_present 'drop22_21_33'
 # Unlink
 click "css=#drop23_21_33 img[alt=remove]"
 wait_for_element_not_present "drop23_21_33"
+
+command 'setSpeed', 0

data/test/selenium/Drop/drop3.rsel

@@ -1,51 +1,36 @@
 # Drag from list in each.
-=begin
 open "/oo/testnode37.html?test=drop3"
-assert_element_not_present 'drop321_33'
+assert_element_not_present 'drop33_26'
 
 # Drag & Drop
 set_timeout 4000
-drag_and_drop_to_object "css=#drag3_33 > span.drag_handle", "drop43"
-wait_for_element_present "drop431_33"
-verify_text "drop431_33", "Art"
+drag_and_drop_to_object "css=#drop13_21_26 > span.drag_handle", "drop32"
+wait_for_element_present "drop33_26"
+verify_text "drop33_26", "crocodiles"
 # Unlink
 click "css=img[alt=remove]"
-wait_for_element_not_present "drop431_33"
+wait_for_element_not_present "drop33_26"
 
 # Restart
 
 # Drag & Drop
-drag_and_drop_to_object "css=#drag4_33 > span.drag_handle", "css=#drop43"
-wait_for_element_present "drop431_33"
-verify_text "drop431_33", "Art"
+drag_and_drop_to_object "css=#drop13_21_26 > span.drag_handle", "drop32"
+wait_for_element_present "drop33_26"
+verify_text "drop33_26", "crocodiles"
 
 # Drag & Drop from other location
-drag_and_drop_to_object "css=#drag3_29 > span.drag_handle", "css=#drop43"
-# nothing happens
-wait_for_element_present "drop431_29"
-verify_text "drop431_29", "a wiki with Zena"
+command 'setSpeed', 500
+drag_and_drop_to_object "css=#drop13_11_12 > span.drag_handle", "drop32"
+wait_for_element_present "drop33_12"
+verify_text "drop33_12", "people"
+command 'setSpeed', 0
 
 # Make sure the changes are commited to db
 open "/oo/testnode37.html?test=drop3"
-assert_element_present 'drop431_33'
-assert_element_present 'drop431_29'
+assert_element_present 'drop33_26'
+assert_element_present 'drop33_12'
 # Unlink
-click "css=#drop431_29 img[alt=remove]"
-wait_for_element_not_present "drop431_29"
-click "css=#drop431_33 img[alt=remove]"
-wait_for_element_not_present "drop431_33"
-
-<div class='test' id='drop3' do='selenium'>
-  <h3>drop3</h3>
-  <p>Drag from list in each loop.</p>
-  <r:projects in='site' do='each'>
-    <ul class='box' do='pages'>
-      <li class='#{id}' do='each' draggable='true' do='title'/>
-    </ul>
-  </r:projects>
-
-  <ul do='drop' set='reference' change='receiver' do='references'>
-    <li class='#{id}' do='each'><r:unlink/> <r:title/></li>
-  </ul>
-</div>
-=end
+click "css=#drop33_26 img[alt=remove]"
+wait_for_element_not_present "drop33_26"
+click "css=#drop33_12 img[alt=remove]"
+wait_for_element_not_present "drop33_12"

data/test/selenium/Drop/drop4.rsel

@@ -1,44 +1,36 @@
-=begin
-open "/oo/testnode37.html?test=drop1"
-assert_element_not_present 'drop121_33'
+# Drag from list in each.
+open "/oo/testnode37.html?test=drop4"
+assert_element_not_present 'drop43_26'
 
 # Drag & Drop
 set_timeout 4000
-drag_and_drop_to_object "css=#drag_33 > span.drag_handle", "css=#drop12"
-wait_for_element_present "drop121_33"
-verify_text "drop121_33", "Art"
+drag_and_drop_to_object "css=#drop41_29 > span.drag_handle", "drop43"
+wait_for_element_present "drop44_29"
+verify_text "drop44_29", "a wiki with Zena"
 # Unlink
-click "css=img[alt=remove]"
-wait_for_element_not_present "drop121_33"
+click "css=#drop44_29 img[alt=remove]"
+wait_for_element_not_present "drop44_29"
 
 # Restart
 
 # Drag & Drop
-drag_and_drop_to_object "css=#drag_33 > span.drag_handle", "css=#drop12"
-wait_for_element_present "drop121_33"
-verify_text "drop121_33", "Art"
+drag_and_drop_to_object "css=#drop41_29 > span.drag_handle", "drop43"
+wait_for_element_present "drop44_29"
+verify_text "drop44_29", "a wiki with Zena"
+
+# Drag & Drop from other location
+command 'setSpeed', 500
+drag_and_drop_to_object "css=#drop42_33 > span.drag_handle", "drop43"
+wait_for_element_present "drop44_33"
+verify_text "drop44_33", "Art"
+command 'setSpeed', 0
 
 # Make sure the changes are commited to db
-open "/oo/testnode37.html?test=drop1"
-assert_element_present 'drop121_33'
+open "/oo/testnode37.html?test=drop4"
+assert_element_present 'drop44_29'
+assert_element_present 'drop44_33'
 # Unlink
-click "css=img[alt=remove]"
-wait_for_element_not_present "drop121_33"
-
-<div class='test' id='drop4' do='selenium'>
-  <h3>drop4</h3>
-  <p>Drag duplicate elements in source.</p>
-
-  <ul class='box' do='pages in project limit 3'>
-    <li class='#{id}' do='each' draggable='true' do='title'/>
-  </ul>
-
-  <ul class='box' do='pages in project limit 3'>
-    <li class='#{id}' do='each' draggable='true' do='title'/>
-  </ul>
-
-  <ul do='drop' set='reference' change='receiver' do='references'>
-    <li class='#{id}' do='each'><r:unlink/> <r:title/></li>
-  </ul>
-</div>
-=end
+click "css=#drop44_29 img[alt=remove]"
+wait_for_element_not_present "drop44_29"
+click "css=#drop44_33 img[alt=remove]"
+wait_for_element_not_present "drop44_33"

data/test/sites/zena/columns.yml

@@ -3,6 +3,7 @@ DEFAULTS:
 
 
 Task_assigned:
+  comment:         Name of user.
 
 Original_origin:
   index:           string
@@ -12,7 +13,7 @@ Original_weight:
 
 Original_tz:
 
-Letter_paper:  
+Letter_paper:
 
 Letter_search:
   index:           ml_string
@@ -26,7 +27,8 @@ Contact_name:
 Post_date:
   index:           '.idx_datetime1'
   ptype:           datetime
-  
+  comment:         Publication date of the post (see "doc":20).
+
 Contact_first_name:
 
 Contact_email:
@@ -34,4 +36,3 @@ Contact_email:
 Contact_address:
 
 Contact_country:
-