zena 1.2.7 → 1.2.8

data/public/javascripts/zena.js

@@ -226,8 +226,8 @@ Zena.resizeElement = function(name) {
   }
   var hMargin = obj.offsetLeft;
   var vMargin = obj.offsetTop;
-  obj.style.width  = (myWidth  - hMargin - 5) + 'px';
-  obj.style.height = (myHeight - vMargin - 5) + 'px';
+  // obj.style.width  = (myWidth  - hMargin - 5) + 'px';
+  obj.style.height = (myHeight - vMargin - 12) + 'px';
 }
 
 // transfer html from src tag to trgt tag
@@ -839,10 +839,10 @@ Zena.set_toggle = function(dom_id, definition) {
     if (elem.tagName == 'TR') {
       target = elem.select('td')[0];
     }
-		var input_type = 'checkbox'
-		if (definition['arity'] == 'one') {
-			input_type = 'radio'
-		}
+    var input_type = 'checkbox'
+    if (definition['arity'] == 'one') {
+      input_type = 'radio'
+    }
     target.insert({top:"<input type='"+input_type+"' class='cb'/>"});
   }
 
@@ -1018,6 +1018,7 @@ Zena.do = function(method, dom, query, opts) {
     var todo = list.length
     for (var i=0; i < list.length; i++) {
       var q = list[i]
+      q.zs = Zena.stamp(dom.id)
       new Ajax.Request(makeUrl(method, dom, q), {
         method:method,
         parameters:Zena.prepare_query(q),
@@ -1041,6 +1042,7 @@ Zena.do = function(method, dom, query, opts) {
     query.dom_id = dom.id
     if (!query.s) query.s = $(document.body).getAttribute('data-z')
     if (!query.t_url) query.t_url = $(document.body).getAttribute('data-t') + '/' + (dom.getAttribute('data-t') || dom.id)
+    query.zs = Zena.stamp(dom.id)
     new Ajax.Request(makeUrl(method, dom, query), {
       method:method,
       parameters:Zena.prepare_query(query),
@@ -1067,18 +1069,25 @@ Zena.post = function(dom_name, query) {
 }
 
 Zena.loading = function(e) {
-  e.addClassName('zloading')
+  var id = e.id
+  e.addClassName('zloading_s')
+  setTimeout(function() {
+    e = $(id)
+    if (e.hasClassName('zloading_s')) {
+      e.addClassName('zloading')
+    }
+  }, 300)
 }
 
-Zena._add_sort = function(dom, upd, elem, val) {
+Zena._add_sort = function(upd, elem, val) {
   var query
   elem.setAttribute('data-p',val)
   var link_id = elem.getAttribute('data-l')
   if (link_id) {
     query = {
-      id:elem.id.gsub(/^[^0-9]+/,''),
+      id:elem.id.gsub(/^.*?_/,''),
       node: {
-        link_id:elem.getAttribute('data-l'),
+        link_id:link_id,
         l_status:val
       }
     }
@@ -1087,7 +1096,7 @@ Zena._add_sort = function(dom, upd, elem, val) {
       id:elem.id.gsub(/^.*?_/,''),
       node: {}
     }
-    query.node[dom.getAttribute('data-a') || 'position'] = val
+    query.node[elem.getAttribute('data-a') || 'position'] = val
   }
   upd.push(query)
 }
@@ -1107,7 +1116,7 @@ Zena._sortable_upd = function(dom) {
   
   if (p_s == 0) {
     p_s = 1
-    Zena._add_sort(dom, upd, prev, p_s)
+    Zena._add_sort(upd, prev, p_s)
   }
 
   var list_len = list.length
@@ -1118,7 +1127,7 @@ Zena._sortable_upd = function(dom) {
     var n_s  = next ? parseFloat(next.getAttribute('data-p')) || 0 : false
     if (i == 1 && p_s > c_s) {
       p_s = c_s > 0.01 ? c_s / 2 : 1
-      Zena._add_sort(dom, upd, prev, p_s)
+      Zena._add_sort(upd, prev, p_s)
     }
 
     if(p_s < c_s) {
@@ -1129,7 +1138,7 @@ Zena._sortable_upd = function(dom) {
       } else {
         c_s = p_s + 1
       }
-      Zena._add_sort(dom, upd, curr, c_s)
+      Zena._add_sort(upd, curr, c_s)
     }
     prev = curr
     p_s = c_s
@@ -1191,4 +1200,23 @@ Zena.resetSort = function(ref) {
       Zena.reload(dom)
     }
   })
-}
+}
+
+var stamps = {}
+Zena.stamp = function (dom) {
+  var s = (stamps[dom] || 0) + 1
+  stamps[dom] = s
+  return s
+}
+
+// Used to make sure requests are served in chronological order. Stores stamp by dom_id.
+Zena.stampOk = function(dom, stamp) {
+  var c = stamps[dom]
+  if (
+    !c ||            // this happens if Zena.stamp was not called prior to the ajax query (old templates)
+    (stamp == c) ||  // this is normal behavior
+    stamp == 0) {    // this happens with pagination (Zena.stamp is called for query but not for pagination so the stamp is always 0)
+    return true
+  }
+  return false
+}

data/public/stylesheets/admin.css

@@ -15,7 +15,7 @@
 
 
 table.admin, table.admin table { border-collapse:separate; border-width:0; margin:auto; border-color:#999; border-style:solid; }
-table.admin { width:500px; }
+table.admin { width:650px; }
 .admin_group { display:table; margin:1em auto; width:500px; border:1px solid grey; padding:5px; background:#eee;}
 .admin_group .btn_validate { float:right;}
 table.admin table { width:90%; }
@@ -27,6 +27,7 @@ table.admin td:first-child { border-left: 1px solid #999; }
 #add_user  td { border: 0;}
 #add_group td { border: 0;}
 #virtual_class_list td, #virtual_class_list, #virtual_class_list th {border-color:#ccc;}
+.admin .profile {font-weight: bold;}
 .admin td { padding: 3px; height:18px; border-right:1px solid #999; border-bottom:1px solid #999; }
 .admin th { border-bottom:1px solid #999; padding:4px;}
 .admin .adm_icon, .admin .adm_add, .admin .action { width:22px; text-align:center; margin:0;}
@@ -43,6 +44,8 @@ table.admin td:first-child { border-left: 1px solid #999; }
 .admin th { background:#999; color:#222; font-weight:bold;}
 .admin .Role { color:#eee;}
 .admin .name { font-weight:bold;}
+.admin .name.versioned { color:#1F8A1F}
+.admin .name.not-versioned { color:#5699B9}
 .admin .blank { text-align:center; background:none; padding-top:2em;}
 .admin th .kpath {font-weight:normal; font-family:Monaco, monospace; color:#ccc;}
 .admin .light { background:#eee;}
@@ -94,7 +97,7 @@ ul.actions select { width:186px; }
 .actions .errors li { margin-left:0.4em; background:inherit; line-height:1.2em;}
 
 /* forms */
-label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:10px 0 5px; clear:left;}
+.nform label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:10px 0 5px; clear:left;}
 
 .comment { font-style:italic; color:#777}
 .comment strong {font-weight:bold; font-style:italic;}
@@ -107,3 +110,6 @@ label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:
 .virtual_class .nav.constant {color: #003F9D;}
 .role .constant {color:#0C9616;}
 .role .nav.constant {color:#05540B;}
+.boxes p {margin:2px 0}
+.boxes input {}
+.boxes label {padding-left:8px; }

data/public/stylesheets/grid.css

@@ -1,3 +1,4 @@
+.grid td {white-space:pre-line}
 .grid td.action {border-width:0 0 0 1px; font-size:70%}
 .grid tr.action td {border-width:0 0 1px 0; font-size:70%}
 .grid tr.action td.action {border:0}
@@ -15,14 +16,16 @@
 .grid .action .del {background:url('/images/bullet_delete.png') no-repeat; padding:5px;}
 .grid .action .copy {background:url('/images/table_go.png') no-repeat; padding:8px;}
 
-.grid_btn a {text-decoration:none; border:1px solid #333; border-radius:4px; padding:2px 5px; color:white;}
+.grid_btn a {text-decoration:none; border:1px solid #333; border-radius:4px; padding:2px 5px; color:#333;}
 .grid_btn {margin:1em 0}
 .grid_btn a.save {background:#80B62D}
 .grid_btn a.undo {background:#AAB76D}
+.grid_btn a.save:active {position:relative; top:1px; background:#97D13E}
+.grid_btn a.undo:active {position:relative; top:1px; background:#D8E69B}
 .grid_msg {border:1px solid #888; background:#eee; border-radius:4px; padding:5px; display:table}
 
 .tags li {border-radius:2px; background:#ccc url('/images/remove_tag.png') no-repeat; padding:2px 5px 2px 15px; margin:3px; display:inline; background-position:2px 4px}
 .tags li.add {background:#8c8 url('/images/add.png') no-repeat;background-position:1px 2px}
 
 .grid .asc  {background:#7b7}
-.grid .desc {background:#fa0}
+.grid .desc {background:#fa0}

data/public/stylesheets/popup.css

@@ -48,7 +48,7 @@ form .infos li { clear:none;}
 .tab_content { font-size:0.9em; padding:30px 0 2px 8px; }
 /* text */
 #text_tab { padding:0;}
-#node_text { width:95%; height:75%; margin:30px 5px 5px 5px; font:inherit; padding:5px;}
+#node_text { width:97%; height:75%; margin:30px 0px 5px 0px; font:inherit; padding:5px;}
 
 /* title */
 .full_width { width:96%; font:inherit; font-size:0.9em; padding:2px;}

data/test/fixtures/files/TestNode.zafu

@@ -408,8 +408,59 @@
     <r:js>
 $$('.grid').each(function(e) {
    Grid.make(e);
+   $('grid1').insert({bottom:'grid setup done'})
  });
     </r:js>
   </div>
+  
+  //! grid table edit
+  <div class='test' id='grid2' do='selenium'>
+    <h3>grid table</h3>
+    <p>Batch create and edit objects</h3>
+    <table class='grid' id='grid2_table' do='posts in site'>
+      <tr>
+        <th data-a='date' do='t'>date</th>
+        <th data-a='parent_id' do='t'>parent</th>
+        <th data-a='title' do='t'>title</th>
+        <th data-a='summary' do='t'>summary</th>
+      </tr>
+
+      <r:each>
+        <tr id='id_#{id}'>
+          <td class='date' do='this.date' format='%d.%m.%Y %H:%M'/>
+          <r:parent>
+            <td data-v='#{id}' do='title'/>
+          </r:parent>
+          <td class='title' do='title'/>
+          <td class='summary' do='summary'/>
+        </tr>
+      </r:each>
+    </table>
+
+    <div id='h_grid' style='display:none'>
+      <select name='parent_id' do='projects in site'>
+        <option value='#{id}' do='each' do='title'/>
+      </select>
+      <r:input data-d='true' type='hidden' param='klass' value='Post'/>
+    </div>
+
+    <table style='display:none'>
+      <tr id='new_row'>
+        <td class='date'></td>
+        <td></td>
+        <td class='title'></td>
+        <td class='summary'></td>
+      </tr>
+    </table>
+
+    <r:js>
+      Grid.make('grid2_table', {
+        newRow: 'new_row',
+        helper: 'h_grid',
+        fdate: '%d.%m.%Y %H:%M',
+        contenteditable: true,
+      })
+    </r:js>
+  </div>
   </r:with>
 </r:include>

data/test/functional/nodes_controller_test.rb

@@ -359,7 +359,7 @@ class NodesControllerTest < Zena::Controller::TestCase
           assert_redirected_to '/foo/bar/baz'
         end
       end # with a redir param
-
+      
       context 'by changing a link comment' do
         subject do
           {:action => 'update', :controller => 'nodes', :id => nodes_zip(:opening), :node => {:link_id => links_id(:opening_in_art), :l_comment => 'To be removed'}}
@@ -409,8 +409,9 @@ class NodesControllerTest < Zena::Controller::TestCase
 
           should 'set error message on skin_id' do
             put_subject
-            assert_response :success
+            assert_response :redirect
             assert_equal 'type mismatch (Page is not a Skin)', assigns(:node).errors[:skin_id]
+            assert_equal %Q{<table class='errors'>\n<tr><td><b>skin_id</b></td><td>type mismatch (Page is not a Skin)</td></tr>\n</table>}, flash[:error]
           end
         end # with a bad value
 
@@ -538,6 +539,18 @@ class NodesControllerTest < Zena::Controller::TestCase
             assert_redirected_to '/foo/bar/baz'
           end
         end # with a redir param
+        
+
+        context 'with a redir param with NODE_ID' do
+          subject do
+            {:action => 'create', :controller => 'nodes', :node => {:parent_id => nodes_zip(:zena), :title => 'hello'}, :redir => '/foo/bar/baz/NODE_ID'}
+          end
+
+          should 'replace NODE_ID in redirect' do
+            post_subject
+            assert_redirected_to "/foo/bar/baz/66"
+          end
+        end # with a redir param
 
         context 'with a mode param' do
           subject do
@@ -727,8 +740,9 @@ class NodesControllerTest < Zena::Controller::TestCase
     test_site(:zena)
     without_files('/test.host/public') do
       name = "section#{nodes_zip(:people)}.xml"
+      cache_path = "#{SITES_ROOT}/test.host/public/en/#{name}"
       with_caching do
-        assert !File.exist?("#{SITES_ROOT}/test.host/public/fr/#{name}")
+        assert !File.exist?(cache_path)
         login(:lion)
         doc = secure!(Template) { Template.create('title'=>'Node', 'format'=>'xml', 'text' => '<?xml version="1.0" encoding="utf-8"?><node><title do="title"/></node>', 'parent_id'=>nodes_id(:default))}
         assert !doc.new_record?, "Not a new record"
@@ -736,8 +750,9 @@ class NodesControllerTest < Zena::Controller::TestCase
         login(:anon)
         get 'show', :prefix => 'en', :path => [name]
         assert_response :success
-        assert_equal "<?xml version=\"1.0\" encoding=\"utf-8\"?><node><title>people</title></node>", @response.body
-        assert File.exist?("#{SITES_ROOT}/test.host/public/en/#{name}")
+        assert_equal '<?xml version="1.0" encoding="utf-8"?><node><title>people</title></node>', @response.body
+        assert File.exist?(cache_path)
+        assert_equal '<?xml version="1.0" encoding="utf-8"?><node><title>people</title></node>', File.read(cache_path)
       end
     end
   end

data/test/functional/user_sessions_controller_test.rb

@@ -14,11 +14,41 @@ class UserSessionsControllerTest < Zena::Controller::TestCase
       assert assigns(:user_session).persisting?
       assert_response 302
     end
-
-    should "redirect to login page if login failed" do
-      post 'create', :login=>'ant', :password=>'boom'
-      assert !assigns(:user_session).persisting?
-      assert_redirected_to login_path
+    
+    context 'on failure' do
+      should "redirect to login page" do
+        post 'create', :login=>'ant', :password=>'boom'
+        assert !assigns(:user_session).persisting?
+        assert_redirected_to login_path
+      end
+      
+      should 'increment user login_attempt_count' do
+        assert_nil users(:ant).login_attempt_count
+        post 'create', :login=>'ant', :password=>'boom'
+        assert_equal 1, users(:ant).login_attempt_count
+      end
+      
+      should 'set attempt datetime' do
+        a = Time.now.utc.to_i
+        assert_nil users(:ant).login_attempted_at
+        post 'create', :login=>'ant', :password=>'boom'
+        b = Time.now.utc.to_i
+        assert a <= users(:ant).login_attempted_at.to_i
+        assert b >= users(:ant).login_attempted_at.to_i
+      end
+    end
+    
+    context 'with a large attempt count' do
+      setup do
+        Zena::Db.set_attribute(users(:ant), 'login_attempt_count', 10)
+        Zena::Db.set_attribute(users(:ant), 'login_attempted_at', Time.now.utc)
+      end
+      
+      should 'refuse login' do
+        post 'create', :login => 'ant', :password => 'ant'
+        assert_redirected_to login_path
+        assert_equal 'You need to wait 0h 17m 4s before any new attempt (10 failed attempts).', flash[:error]
+      end
     end
 
   end
@@ -40,6 +70,11 @@ class UserSessionsControllerTest < Zena::Controller::TestCase
     should "check if visitor is admin" do
       assert visitor.is_admin?
     end
+    
+    should 'redirect to home on login' do
+      get :new
+      assert_redirected_to 'oo'
+    end
 
   end
 
@@ -50,7 +85,7 @@ class UserSessionsControllerTest < Zena::Controller::TestCase
 
     should 'not be allowed to login' do
       post 'create', :login => 'ant', :password => 'ant'
-      assert !assigns(:user_session).persisting?
+      assert !assigns(:user_session)
       assert_redirected_to login_path
     end
   end

data/test/functional/users_controller_test.rb

@@ -29,9 +29,8 @@ class UsersControllerTest < Zena::Controller::TestCase
       setup do
         login(:lion)
         # Make a bad admin layout
-        Version.connection.execute "UPDATE #{Version.table_name} SET properties = '{\"data\":{\"title\":\"foo\",\"text\":\"empty\"},\"json_class\":\"Property::Properties\"}' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
+        Version.connection.execute "UPDATE #{Version.table_name} SET properties = '{\"data\":{\"title\":\"foo\",\"text\":\"empty\",\"tkpath\":\"N\"},\"json_class\":\"Property::Properties\"}' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
         without_files('test.host/zafu') do
-            get 'index'
           get 'index'
         end
       end

data/test/integration/navigation_test.rb

@@ -11,7 +11,7 @@ class NavigationTest < Zena::Integration::TestCase
     # 1. site forces authentication
     Site.connection.execute "UPDATE sites SET authentication = 1 WHERE id = #{sites_id(:zena)}"
     get 'http://test.host/'
-    assert_redirected_to 'http://test.host/login'
+    assert_redirected_to 'http://test.host/login?lang=en'
 
     post 'http://test.host/session', :login=>'tiger', :password=>'tiger'
     assert_redirected_to "http://test.host/"
@@ -31,7 +31,7 @@ class NavigationTest < Zena::Integration::TestCase
     # 1. site forces authentication
     Site.connection.execute "UPDATE sites SET authentication = 1 WHERE id = #{sites_id(:zena)}"
     get 'http://test.host/en/textdocument53.css' # style_css
-    assert_redirected_to 'http://test.host/login'
+    assert_redirected_to 'http://test.host/login?lang=en'
 
     post 'http://test.host/session', :login=>'tiger', :password=>'tiger'
     assert_redirected_to "http://test.host/oo"
@@ -81,7 +81,7 @@ class NavigationTest < Zena::Integration::TestCase
           reset!
           get *subject
           assert_response :redirect
-          assert_redirected_to 'http://ocean.host/login'
+          assert_redirected_to 'http://ocean.host/login?lang=en'
           assert_equal users_id(:incognito), visitor.id
         end
       end # but invalid host
@@ -339,6 +339,24 @@ class NavigationTest < Zena::Integration::TestCase
     end # with a mode
 
   end # On a page with custom base
+  
+  context 'on a site alias with custom base' do
+    setup do
+      login(:lion, 'alias.host')
+      # home = wiki
+      # create 'foo' with custom_base and 'bar' inside wiki
+      @foo = secure(Page) { Page.create(:parent_id => nodes_id(:wiki), :title => 'foo', :custom_base => true, :v_status => Zena::Status::Pub)}
+      @bar = secure(Page) { Page.create(:parent_id => @foo.id,          :title => 'bar') }
+    end
+
+    should 'render page' do
+      get 'http://alias.host/fr/foo'
+      assert_response :success
+      get "http://alias.host/fr/foo/page#{@bar.zip}.html"
+      assert_response :success
+    end
+  end
+  
 
   def test_url_with_custom_base
     get 'http://test.host/en/projects-list/Clean-Water-project'
@@ -516,7 +534,7 @@ class NavigationTest < Zena::Integration::TestCase
     assert_redirected_to 'http://test.host/en'
     assert_equal 'en', session[:lang]
     get 'http://test.host/oo'
-    assert_redirected_to 'http://test.host/login'
+    assert_redirected_to 'http://test.host/login?lang=en'
     post 'http://test.host/session', :login => 'ant', :password => 'ant'
     assert_redirected_to 'http://test.host/oo'
     # should not change session lang