Changeset 540

Timestamp:

2007-05-19 11:51:09 (2 years ago)

Author:

gaspard

Message:

[change] syntax for zafu changed from '<z:method>' to '<r:method>' better reflecting the fact that we "render"

Files:

• trunk/app/controllers/nodes_controller.rb (modified) (1 diff)
• trunk/app/controllers/versions_controller.rb (modified) (1 diff)
• trunk/app/models/image.rb (modified) (1 diff)
• trunk/db/init/base/skins/default/Contact.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Node.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Node_admin_layout.html (modified) (3 diffs)
• trunk/db/init/base/skins/default/Node_index.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Node_login.html (modified) (3 diffs)
• trunk/db/init/base/skins/default/Node_not_found.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Node_popup_layout.html (modified) (2 diffs)
• trunk/db/init/base/skins/default/Node_search.html (modified) (2 diffs)
• trunk/db/init/base/skins/default/Node_tree.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Project.html (modified) (1 diff)
• trunk/db/init/base/skins/default/layout.html (modified) (3 diffs)
• trunk/db/init/base/skins/default/notes.html (modified) (2 diffs)
• trunk/lib/parser/lib/rules/code_syntax.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zafu.rb (modified) (3 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (5 diffs)
• trunk/lib/parser/test/zafu.yml (modified) (11 diffs)
• trunk/lib/parser/test/zafu_asset.yml (modified) (1 diff)
• trunk/lib/parser/test/zafu_insight.yml (modified) (1 diff)
• trunk/test/fixtures/versions.yml (modified) (6 diffs)
• trunk/test/helpers/basic.yml (modified) (28 diffs)
• trunk/test/helpers/relations.yml (modified) (12 diffs)
• trunk/test/helpers/zafu_ajax.yml (modified) (3 diffs)
• trunk/test/helpers/zena_parser_test.rb (modified) (1 diff)

trunk/app/controllers/nodes_controller.rb

@@ -131 +131 @@
-        # store the id used to preview versions
-        session[:preview_id] = params[:preview_id] if params[:preview_id]
+        @title_for_layout = @node.rootpath
-      end
-      format.js do

trunk/app/controllers/versions_controller.rb

@@ -61 +61 @@
-        # store the id used to preview when editing
-        session[:preview_id] = params[:node_id]
+        @title_for_layout = @node.rootpath
-        @edit = true
-      end

trunk/app/models/image.rb

@@ -47 +47 @@
-
-Same example in a zafu template:
-z
+r
-
-or to create a link to the article using the icon:
-z
+r
- 
-=end

trunk/db/init/base/skins/default/Contact.html

@@ -1 @@
-z
-z
+r
+r
-    <h1 do='title' attr='c_fullname' actions='all'>Gaspard Bucher</h1>
-z
-z
+r
+r

trunk/db/init/base/skins/default/Node.html

@@ -1 @@
-z
-z
-z
+r
+r
+r
-      <h2 do='show' attr='name'>zena</h2>
-z
-z
-z
+r
+r
+r
-          <div class='header'>
-            <p class='sign' do='version' do='author' do='show' attr='initials'>GB</p>
-          </div>
-z
-z
-z
-z
-z
-z
+r
+r
+r
+r
+r
+r
-    <div class='header'>
-      <h1 do='title' class='s30' status='true' actions='all'>this is the title</h1>
-      <div class='subtitle'>
-z
-z
-z:trans>posted by</z
-z
-z
-z:trans>original by</z
-z:trans>modified by</z
-z
-z
+r
+r
+r:trans>posted by</r
+r
+r
+r:trans>original by</r
+r:trans>modified by</r
+r
+r
-      </div>
-    </div>
-    
-z
-z
+r
+r
-    <!-- FIXME: comments -->
-z
-z
+r
+r

trunk/db/init/base/skins/default/Node_admin_layout.html

@@ -1 @@
-
-
+
+
+
+
+
-  
-z
+r
-    <div id='context' do='void' name='context'>
-      <ul>
@@ -8 +11 @@
-      </ul>
-    </div>
-z
+r
-      <div id='content' do='void' name='content'>
-        <div id='main' do='void' name='main'>
-z:trans>home of</z:trans> <z:user do='show' attr='fullname'>Panther Tigris</z
+r:trans>home of</r:trans> <r:user do='show' attr='fullname'>Panther Tigris</r
-        </div>
-
-        <div id='related' do='void' name='related'>
-          <ul class='actions' do='user'>
-z:trans>to publish</z
+r:trans>to publish</r
-              <ul class='list'>
-z:link attr='title'>title</z
+r:link attr='title'>title</r
-              </ul>
-            </li>
-z:trans>comments to publish</z
+r:trans>comments to publish</r
-              <ul class='list'>
-z:show attr='title'>title</z
+r:show attr='title'>title</r
-              </ul>
-            </li>
-z:trans>waiting for publication</z
+r:trans>waiting for publication</r
-              <ul class='list'>
-z:show attr='title'>title</z
+r:show attr='title'>title</r
-              </ul>
-            </li>
-z:trans>redactions</z
+r:trans>redactions</r
-              <ul class='list'>
-z:link attr='title'>title</z
+r:link attr='title'>title</r
-              </ul>
-            </li>
@@ -39 +42 @@
-        </div>
-      </div>
-z
-z
-z
+r
+r
+r

trunk/db/init/base/skins/default/Node_index.html

@@ -1 @@
-z
+r

trunk/db/init/base/skins/default/Node_login.html

@@ -1 @@
-z
-z
+r
+r
-  <title do='title_for_layout' do='trans'>login</title>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Language" do='void' content="fr-fr" tset_content='[v_lang]_content' />
-
-z
+r
-
-z
-z
+r
+r
-<style>
-/* login, not found */
@@ -59 +59 @@
-.search p { font-size:0.85em; }
-</style>
-z
-z
-z
+r
+r
+r
-    <div id='login_form'><div>
-      <form action="/session" method="post">    <table>
@@ -76 +76 @@
-        </table>
-      </form></div></div>
-z
-z
-z
+r
+r
+r

trunk/db/init/base/skins/default/Node_not_found.html

@@ -1 @@
-z
-z
-z
+r
+r
+r
-    <div id="not_found"><div>
-z:trans>Sorry, the requested page could not be found.</z
-z:trans>Please go </z
-z:trans>back</z
-z:trans>or</z
+r:trans>Sorry, the requested page could not be found.</r
+r:trans>Please go </r
+r:trans>back</r
+r:trans>or</r
-      </p>
-    </div></div>
-z
-z
+r
+r

trunk/db/init/base/skins/default/Node_popup_layout.html

@@ -8 +8 @@
-  <meta http-equiv="Content-Language" content="fr-fr" />
-  
-z
-z
+r
+r
-<script type="text/javascript" charset="utf-8">
-// <![CDATA[
@@ -16 +16 @@
-// ]]>
-</script>
-z
+r
-</head>
-
-<body onLoad='popup_loaded();'>
-  <div id='messages'>
-z
+r
-  </div>
-  
-z
+r
-
-</body>

trunk/db/init/base/skins/default/Node_search.html

@@ -1 @@
-z
-z
+r
+r
-
-z
+r
-    
-    <h2 do=trans>search results</h2>
@@ -8 +8 @@
-    <ul id='search_results' do='search_results'>
-      <li class='result_entry' do='each'>
-z
-z:show attr='score' format='%.1f'/>%</em> <z
-z
-z
+r
+r:show attr='score' format='%.1f'/>%</em> <r
+r
+r
-        <div class='clear'></div>
-      </li>
-z
+r
-        <p do='trans'>no result found</p>
-z
+r
-    </ul>
-z
-z
+r
+r

trunk/db/init/base/skins/default/Node_tree.html

@@ -1 @@
-z
-z
+r
+r
-  
-z
+r
-  <div class='header'><h1 do='title' class='s30' status='true' actions='all'>this is the title</h1></div>
-    <ul class='tree' do='nodes'>
-z
-z
-z
+r
+r
+r
-        <ul do='nodes' name='tree'>
-          <li do='each'>
-z
+r
-          </li>
-        </ul>
-      </li>
-    </ul>
-z
+r
-
-z
+r

trunk/db/init/base/skins/default/Project.html

@@ -1 @@
-z
-z
+r
+r
-    <div id='small_calendar' do='calendar'/>
-z
+r
-      <div class='header'>
-        <h2 do='title' actions='all'>hot news</h2>
-        <p class='sign' do='version' do='author' do='show' attr='initials'>GB</p>
-      </div>
-z
-z
-z
-z
+r
+r
+r
+r
-    
-z
+r
-      <div class='header'>
-        <h1 do='title' class='s30' status='true' actions='all'>this is the title</h1>
-        <div class='subtitle'>
-z
-z
-z:trans>posted by</z
-z
-z
-z:trans>original by</z
-z:trans>modified by</z
-z
-z
+r
+r
+r:trans>posted by</r
+r
+r
+r:trans>original by</r
+r:trans>modified by</r
+r
+r
-        </div>
-      </div>
-
-z
-z
-z
+r
+r
+r
-        <h1 do='title' class='s30' status='true' actions='all'>this is the title</h1>
-z
-z
+r
+r
-    
-    <div id='largecal' style='display:none;'></div>
-z
-z
-z
+r
+r
+r

trunk/db/init/base/skins/default/layout.html

@@ -7 +7 @@
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Language" do='void' content="fr-fr" tset_content='[v_lang]_content' />
+  <r:void name='stylesheets'>
+    <r:stylesheets list='reset,zena,code'/>
+    <link href="default.css" rel="Stylesheet" type="text/css"/>
+  </r:void>
-
-
-
-
-
-
+
+
-</head>
-
@@ -27 +28 @@
-    <div id='nav_menu' do='node' name='menu' select='root'>
-      <ul do='pages'>
-z
+r
-          <ul do='pages'>
-z
+r
-          </ul>
-        </li>
-      </ul>
-    </div>
-
+name='branding' 
-  </div>
-
-
-z
+r
-
-z
+r
-    <div id='context' do='void' name='context'>
-    </div>
@@ -49 +50 @@
-
-      <div id='related' do='void' name='related'>
-z
+r
-            <ol>
-z:link format='data'><z:img mode='tiny'/></z:link> <z:link><z:show attr='name'/>.<z:show attr='c_ext'/></z
-z:trans>btn_add_doc</z
+r:link format='data'><r:img mode='tiny'/></r:link> <r:link><r:show attr='name'/>.<r:show attr='c_ext'/></r
+r:trans>btn_add_doc</r
-            </ol>
-z
-z
+r
+r
-            <ol>
-              <li do='each' set_class='li_s[v_status]' do='link'/>
-z
-z
+r
+r
-                <li class='inline_form'>
-                  <form>
-                    <p class='hidden'>      <input type='hidden' name='node[parent_id]' value='' do='void' set_value='[id]'/></p>
-z
+r
-                    <p class='node_v_title'><input type='text' name='node[v_title]' value=''/></p>
-                    <p class='btn_validate'><input type="submit" value='validate' do='void' tset_value='validate'/></p>
-                  </form>
-                </li>
-z
+r
-            </ol>
-z
+r
-      </div>
-    </div>
-z
+r
-  <ul id='siteinfo' do='void' name='siteinfo'>
-    <li do='design'><a href='http://teti.ch'>teti.ch</a></li>

trunk/db/init/base/skins/default/notes.html

@@ -1 +1 @@
-<div id='notes' do='notes_all' limit='10' order='log_at DESC'>
-  <ul class='note_list'>
-z
-z
+r
+r
-        <p class='hidden'>      <input type='hidden' name='node[parent_id]' value='' do='void' set_value='[project_id]'/></p>
-z
-z
+r
+r
-        <p class='node_v_title'><input type='text' name='node[v_title]' do='void' set_value='[v_title]' size='25'/></p>
-        <p class='validate'>    <input type="submit" value='validate' do='void' tset_value='validate'/></p>
-      </form></li>
-z
+r
-    <li class='note' do='each'>
-      <div class='header'>
@@ -16 +16 @@
-          <p class='title' do='title'>our new cms runs in a zen garden</p>
-          <p class='sign' do='version' do='author' do='show' attr='initials'>GB</p>
-z
+r
-        </div>
-      </div>
-z
+r
-      <div class='clear'></div>
-    </li>

trunk/lib/parser/lib/rules/code_syntax.rb

@@ -101 +101 @@
-class ZafuTokenizer < Syntax::Tokenizer
-  def step
-z
-z
-z
+r
+r
+r
-      start_group :ztag, $2
-      trailing = $4

trunk/lib/parser/lib/rules/zafu.rb

@@ -123 +123 @@
-      
-      # end_tag
-z
+r
-      @end_tag_count  = 1
-      
@@ -206 +206 @@
-            flush $&
-          end
-z
-z
+r
+r
-          eat $&
-          if $1 != @end_tag
+            puts [@end_tag, $1].inspect
-            # error bad closing ztag
-            store "<span class='parser_error'>#{$&.gsub('<', '&lt;').gsub('>','&gt;')}</span>"
@@ -240 +241 @@
-    def scan_tag(opts={})
-      # puts "TAG(#{@method}): [#{@text}]"
-z
-Z
+r
+R
-        eat $&
-        opts.merge!(:method=>$1, :params=>$2)

trunk/lib/parser/lib/rules/zena.rb

@@ -325 +325 @@
-    
-    # TODO: add parent_id into the form !
-z:form href='self'> or <z
+r:form href='self'> or <r
-    def r_form
-      @pass[:form] = self
@@ -683 +683 @@
-    # Shows a 'made with zena' link or logo. ;-) Thanks for using this !
-    # TODO: test and add translation.
-z:zena show='logo'/> or <z:zena show='text'/> == <z
+r:zena show='logo'/> or <r:zena show='text'/> == <r
-    def r_zena
-      if @params[:show] == 'logo'
@@ -715 +715 @@
-    # :tattr (translated attribute used as text link)
-    # :attr (attribute used as text link)
-z:link href='node'><z:trans attr='lang'/></z
-z
+r:link href='node'><r:trans attr='lang'/></r
+r
-    def r_link
-      # text
@@ -850 +850 @@
-        
-        # FIXME: stored should be clarified and managed in a single way through links and contexts.
-z
-z
-z
-z
+r
+r
+r
+r
-        # ...
-        if value = @params[:author]
@@ -916 +916 @@
-      end
-    end
-z
-z
+r
+r
-    # relation ? get ? role ? go ?
-    

trunk/lib/parser/test/zafu.yml

@@ -4 +4 @@
-
-hello:
-z
+r
-  res: "hello world!"
-  
-double_hello:
-z:hello/> <z
+r:hello/> <r
-  res: "hello world! hello world!"
-
@@ -16 +16 @@
-
-hello_skip_content:
-z:hello>I want to live forever</z
+r:hello>I want to live forever</r
-  res: "hello world!"
-
-tag_not_closed:
-z
-z
+r
+r
-
-hello_not_closed:
-z
+r
-  res: "I say hello world!"
-
-test:
-z:test>is a test</z:test> <z
+r:test>is a test</r:test> <r
-  res: "this [test]is a test[/test] hello world!"
-  
-very_messy:
-z: blah> </z
-z
+r: blah> </r
+r
-
-bad_closing_tag:
-z:test>looks </z
+r:test>looks </r
-  res: "this [test]looks <span class='parser_error'>&lt;/z:truc&gt;</span>[/test] ok"
-
@@ -60 +60 @@
-
-do_tag_with_ztags:
-z
+r
-  res: "I say [test]<div>this [hello/]</div>[/test]"
-
@@ -72 +72 @@
-
-do_and_ztags:
-z:test>this is <p do='hello'>ok</p></z
+r:test>this is <p do='hello'>ok</p></r
-  res: "Hey [test]this is [hello]<p>ok</p>[/hello][/test]"
-
@@ -79 +79 @@
-  res: "Hey [test]<p> is [hello]<p>hello <p>cool</p></p>[/hello]</p>[/test]"  
-expand_with:
-z:test>looks </z
+r:test>looks </r
-  res: "this [test]looks [/test] ok"
-  
-params:
-z:test good='choice' nice='work'>things</z
+r:test good='choice' nice='work'>things</r
-  res: "some [test {= :good=>'choice', :nice=>'work'}]things[/test] are fine"
-
-default_menu:
-z:test>menu</z
+r:test>menu</r
-  res: "the [test]menu[/test] is nice"
-  
-include_menu:
-z
+r
-  res: "include_menu: the [test]menu[/test] is nice"
-
-include_context:
-z
+r
-  res: "include_context: include_menu: the [test]menu[/test] is nice"
-
-infinite_loop:
-z
+r
-  res: "<span class='parser_error'>[include error: /infinite/loop --&gt; /infinite/loop ]</span>"
-  
-infinite_foo:
-z
+r
-  res: "<span class='parser_error'>[include error: /infinite/foo --&gt; /infinite/bar --&gt; /infinite/foo ]</span>"
-  
-infinite_bar:
-z
+r
-  res: "<span class='parser_error'>[include error: /infinite/bar --&gt; /infinite/foo --&gt; /infinite/bar ]</span>"
-  
-default_context:
-z:include template='menu'/> and <z
+r:include template='menu'/> and <r
-  res: "from other: the [test]menu[/test] is nice and include_menu: the [test]menu[/test] is nice"
-
-set_context:
-z:test/> <z:set_context truc='machin'>src:<z:test/></z:set_context> res:<z
+r:test/> <r:set_context truc='machin'>src:<r:test/></r:set_context> res:<r
-  res: "res:[test/] src:[test {> :truc=>'machin'}/] res:[test/]"
-  
-nested_set_context:
-z:set_context var1='out' var2='foo'>1:<z:test/><z:set_context var1='in'>2:<z:test/></z:set_context>3:<z:test/></z
+r:set_context var1='out' var2='foo'>1:<r:test/><r:set_context var1='in'>2:<r:test/></r:set_context>3:<r:test/></r
-  res: "1:[test {> :var1=>'out', :var2=>'foo'}/]2:[test {> :var1=>'in', :var2=>'foo'}/]3:[test {> :var1=>'out', :var2=>'foo'}/]"
-
-complex_example:
-  src: |
-z
-z
+r
+r
-      <ul class='list' do='set_context' life='ok'>
-        <li>truc</li>
@@ -131 +131 @@
-        <li do='test'>sunny day</li>
-      </ul>
-z:set_context var='complex'><z:include template='/default/menu'/></z
+r:set_context var='complex'><r:include template='/default/menu'/></r
-  res: |
-    Some people say hello world!
@@ -143 +143 @@
-
-unknown:
-z
+r
-  res: "this looks bad: <span class='parser_unknown'>&lt;z:system truc='lala'/&gt;</span>"
-  
-check_params:
-z
+r
-  res: "bad [missing parameter(s) missing:good, night] params"
-
-check_params_partial:
-z
+r
-  res: "bad [missing parameter(s) missing:night] params"
-
-check_params_ok:
-z
+r
-  res: "bad nothing missing params"
-
@@ -170 +170 @@
-    [/test]end
-no_tag:
-z:set_context no_test='true'>this is a <z:test>test</z:test>dog</z
+r:set_context no_test='true'>this is a <r:test>test</r:test>dog</r
-  res: "this is a dog"
-  
-html_comments:
-z:test><z:hello/><!-- this is nothing > <z:hello/>  --></z
-z
+r:test><r:hello/><!-- this is nothing > <r:hello/>  --></r
+r
-
-html_do_comment:
-z:test><z:hello/><!--|this is not a comment <z:hello/>  --></z
+r:test><r:hello/><!--|this is not a comment <r:hello/>  --></r
-  res: "[test][hello/]this is not a comment [hello/]  [/test]"
-
-do_simple:
-z
+r
-  res: "[test][hello/][/test]"
-  
@@ -190 +190 @@
-  
-do_multiple:
-z
+r
-  res: "[test {= :param=>'1'}][test {= :param=>'2'}][hello {= :param=>'3'}/][/test][/test]"
-
-do_with_inner:
-z:test do='hello'>a thing <z:hello/> here</z
+r:test do='hello'>a thing <r:hello/> here</r