Changeset 497

Timestamp:

2007-05-08 13:21:43 (2 years ago)

Author:

gaspard

Message:

[design] fixed a lot of issues related to the display of the default skin

Files:

• trunk/app/controllers/application.rb (modified) (1 diff)
• trunk/app/helpers/application_helper.rb (modified) (5 diffs)
• trunk/config/routes.rb (modified) (1 diff)
• trunk/db/init/base/skins/default/Node.html (modified) (1 diff)
• trunk/db/init/base/skins/default/Project.html (modified) (1 diff)
• trunk/db/init/base/skins/default/default.css (modified) (4 diffs)
• trunk/db/init/base/skins/default/layout.html (modified) (2 diffs)
• trunk/db/init/base/skins/default/notes.html (modified) (1 diff)
• trunk/lib/image_builder.rb (modified) (1 diff)
• trunk/lib/parser/lib/parser.rb (modified) (3 diffs)
• trunk/lib/parser/lib/rules/zafu.rb (modified) (4 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (8 diffs)
• trunk/lib/parser/test/parser_test.rb (modified) (1 diff)
• trunk/lib/parser/test/zafu.yml (modified) (1 diff)
• trunk/lib/secure.rb (modified) (1 diff)
• trunk/public/stylesheets/zena.css (modified) (1 diff)
• trunk/test/fixtures/links.yml (modified) (1 diff)
• trunk/test/fixtures/nodes.yml (modified) (2 diffs)
• trunk/test/helpers/basic.yml (modified) (3 diffs)
• trunk/test/helpers/relations.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser_test.rb (modified) (1 diff)

trunk/app/controllers/application.rb

@@ -247 +247 @@
-        flash[:notice] = trans "Please log in"
-        session[:after_login_url] = request.parameters
-:controller =>'login', :action=>'login'
+login_path
-      end
-    end

trunk/app/helpers/application_helper.rb

@@ -21 +21 @@
-        def date_box(obj, var, opts = {})
-          rnd_id = rand(100000000000)
-, :class=>var.to_s
+
-          opts = defaults.merge(opts)
-          date = eval("@#{obj} ? @#{obj}.#{var} : nil") || Time.now.utc
@@ -508 +508 @@
-        week.step(week+6,1) do |day|
-          # each day
-<p>#{on_day.call(calendar[day.strftime("%Y-%m-%d")], day)}</p>
+#{on_day.call(calendar[day.strftime("%Y-%m-%d")], day)}
-        end
-        content << '</tr>'
@@ -549 +549 @@
-    end
-    unless opts.include?(:project)
-[:project_id]
+.get_project_id
-    end
-    title = opts[:text] || obj.version.title
@@ -995 +995 @@
-    when :tiny
-      day_names = Date::ABBR_DAYNAMES
-b>#{date.day}</b
+em>#{date.day}</em
-    when :large
-      day_names = Date::DAYNAMES
@@ -1002 +1002 @@
-          res = ["#{date.day}"]
-          events.each do |e| #largecal_preview
-div
+p
-                                  :update=>'largecal_preview',
-                                  :url=>{:controller=>'note', :action=>'day_list', :id=>source[:id], :find=>method, 
-div
+p
-          end
-          res.join("\n")

trunk/config/routes.rb

@@ -4 +4 @@
-  map.not_found '404.html',  :controller => 'nodes',    :action => 'not_found'
-  map.user_home     'home',  :controller => 'users',    :action => 'home'
-connect
+login  
-  map.logout      'logout',  :controller => 'session',  :action => 'destroy'
-  

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

@@ -1 +1 @@
-<z:include template='layout.html'>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </z:with>
-  <z:with part='body/container/content/main'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      </div>
-    </div>

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

@@ -1 +1 @@
-<z:include template='layout.html'>
-
+ainer/cont
-    <div id='small_calendar' do='calendar'/>
+    <z:hot>
+      <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:summary or='v_text'/>
+    </z:hot>
-  </z:with>
-  <z:with part='body/container/content/main'>
+    
+    <z:home>
+      <div class='header'>
+        <h1 do='title' class='s30' status='true' actions='all'>this is the title</h1>
+        <div class='subtitle'>
+          <z:case>
+            <z:when test='[user_id] == [v_user_id]'>
+              <z:trans>posted by</z:trans> <b do='author' do='show' attr='fullname'>Super Man</b>
+            </z:when>
+            <z:else>
+              <z:trans>original by</z:trans> <b do='show' attr='fullname'>Platon</b>
+              <z:trans>modified by</z:trans> <b do='version' do='author' do='show' attr='fullname'>Socrate</b>
+            </z:else>
+          </z:case>
+        </div>
+      </div>
+
+      <z:summary text=''/>
+      <z:text/>
+    </z:home>
+    
-    <div id='largecal' style='display:none;'></div>
-    <z:include template='notes.html'/>

trunk/db/init/base/skins/default/default.css

@@ -79 +79 @@
-ul ul, ul ol, ol ol, ol ul { margin-bottom:0; }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* navigation */
@@ -109 +122 @@
-/* context, content, related */
-#context { }
-
+
+
+
-#related { border-left:1px solid grey; font-size:0.9em; }
-#related .group { font-size:1em; font-weight:normal;}
@@ -123 +138 @@
-
-.note { padding:10px 3px 10px; border-left:4px solid white; border-top:1px solid #ddd;}
-
-
-
+
+
-.note .header a { color:inherit;}
-
-
+
+
+
-
-/* tree */
@@ -145 +160 @@
-.tinycal td { text-align:center; color:#333; }
-.tinycal a { color:inherit; }
-b
-font-size:0.9em; color:#655
+em
+line-height:1.5; font-size:0.9em; color:#655; padding:2px; text-align:center
-.tinycal .head td.button a { border:0; text-decoration:none; color:#568BB9;}
-p { line-height:1.5; margin:0; padding:2px; text-align:center; cursor:pointer
+td { height:1.8em
-.tinycal .body #tiny_today p { background:#CFD6DA; }
-.tinycal .body td.other, .tinycal .body td.other a { color:#ccc; }

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

@@ -56 +56 @@
-            <ol>
-              <li do='each'><z:link format='data'><z:img mode='tiny'/></z:link> <z:link><z:show attr='name'/>.<z:show attr='c_ext'/></z:link></li>
-
+ set_href='/documents/new?parent_id=[id]'
-            </ol>
-          </z:documents>
@@ -63 +63 @@
-              <li do='each' do='link'/>
-              <z:add before='self' tag='li'/>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-              </z:form>
-            </ol>

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

@@ -3 +3 @@
-    <z:add after='self' tag='li'/>
-    <z:form><li class='inline_form'><form>
-
-
-
-
-
-
+
+
+
+
+
+
+
-    <li class='note' do='each'>
-      <div class='header'>

trunk/lib/image_builder.rb

@@ -249 +249 @@
-  'pv'   => { :size=>:force, :width=>70,  :ratio=>1.0                 },
-  'med'  => { :size=>:limit, :width=>280, :ratio=>2/3.0               },
-
-
-
-
+
+
+
+
+
-  'std'  => { :size=>:limit, :width=>600, :ratio=>2/3.0               },
-
+                                           
-  'sepia'=> { :size=>:limit, :width=>280, :ratio=>2/3.0, :post=>Proc.new {|img| img.sepiatone(Magick::MaxRGB * 0.8) }},
-}

trunk/lib/parser/lib/parser.rb

@@ -81 +81 @@
-    @stack   = []
-    @ok      = true
-    if opts[:sub]
-      @text = text
-    else
-      @text = before_parse(text)
-    end
-    @blocks  = []
-    
@@ -95 +90 @@
-    @options.delete(:method)
-    @options.delete(:mode)
+    
+    if opts[:sub]
+      @text = text
+    else
+      @text = before_parse(text)
+    end
+    
-    start(mode)
+    
-    unless opts[:sub]
-      @text = after_parse(@text)
@@ -401 +404 @@
-    @pass  = {} # current object sees some information from it's direct descendants
-    @parts = {}
+    
-    new_context = @context.merge(acontext)
-    blocks.each do |b|

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

@@ -119 +119 @@
-      
-      # end_tag
-[:end_do]
+.delete(:end_do)
-      @end_tag_count  = 1
-      
@@ -141 +141 @@
-          include_template
-        end
-  
+
-        @params = parse_params(@params)
+        
-        if @method == 'include'
-          include_template
@@ -206 +207 @@
-          if $1 != @end_tag
-            # error bad closing ztag
+            debugger
-            store "<span class='parser_error'>#{$&.gsub('<', '&lt;').gsub('>','&gt;')}</span>"
-          end
@@ -236 +238 @@
-      # puts "TAG(#{@method}): [#{@text}]"
-      if @text =~ /\A<z:([\w_]+)([^>]*?)(\/?)>/
-[#{$&}]
+#{$~.to_a.inspect}
-        eat $&
-        opts.merge!(:method=>$1, :params=>$2)

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

@@ -35 +35 @@
-      @html_tag_params_bak = @html_tag_params
-      @html_tag_params     = @html_tag_params.merge(@context[:html_tag_params] || {})
-if @params[:store
-@context["stored_#{@params[:store]}".to_sym] = node
-@params.delete(:store)
-
-if @params[:anchor] && !@context[:preflight]
-
-@params.delete(:anchor)
+unless @context[:preflight
+if store = @params.delete(:store)
+  @context["stored_#{store}".to_sym] = node
+  
+  if @params.delete(:anchor)
+  
+end
-      end
-      true
@@ -338 +338 @@
-END_TXT
-        end
+        form << "<div class='hidden'>"
-        form << "<input type='hidden' name='template_url' value='#{@context[:template_url]}'/>\n"
-        
@@ -351 +352 @@
-          end
-        end
+        form << "</div>"
-      else
-        # no ajax
@@ -684 +686 @@
-      end
-      if @params[:href]
+        # FIXME: add 'stored'
-        href = ", :href=>#{@params[:href].inspect}"
-      else
@@ -728 +731 @@
-      end
-      mode = @params[:mode] || 'std'
-
-
-
+
+
+
+
+
+
+
-      else
-        res = "img_tag(#{img}, :mode=>#{mode.inspect})"
@@ -773 +780 @@
-      else
-        rel = @method
-      end
-      if @params[:store]
-        @context["stored_#{@params[:store]}".to_sym] = node
-      end
-      if Zena::Acts::Linkable::plural_method?(@method) || @params[:from]
@@ -796 +800 @@
-        end
-        conditions = []
+        
+        # FIXME: stored should be clarified and managed in a single way through links and contexts.
+        # <z:link href='stored_whatever'/>
+        # <z:pages from='stored_whatever'/>
+        # <z:pages from='project' project='stored_whatever'/>
+        # <z:img link='stored_whatever'/>
+        # ...
-        if value = @params[:author]
-          if value == 'stored' && stored = @context[:stored_author]
@@ -812 +823 @@
-        if value = @params[:project]
-          if value == 'stored' && stored = @context[:stored_project]
+            conditions << "project_id = '\#{#{stored}[:project_id]}'"
+          elsif value == 'current'
+            conditions << "project_id = '\#{#{node}[:project_id]}'"
+          elsif value =~ /\A\d+\Z/
+            conditions << "project_id = '#{value.to_i}'"
+          elsif value =~ /\A[\w\/]+\Z/
+            # not implemented yet
+          end
+        end
+        
+        if value = @params[:section]
+          if value == 'stored' && stored = @context[:stored_section]
-            conditions << "section_id = '\#{#{stored}[:section_id]}'"
-          elsif value == 'current'

trunk/lib/parser/test/parser_test.rb

@@ -36 +36 @@
-  testfile :zafu, :zafu_asset, :zafu_insight, :zazen
-  def test_single
-zen', 'link_with_mode_and_format
+fu', 'ztag_same_name_as_tag
-  end
-  

trunk/lib/parser/test/zafu.yml

@@ -217 +217 @@
-  res: "title: <h1>dummy</h1>"
-
+ztag_same_name_as_tag:
+  src: "<z:test>this is a <test>test</test></z:test>"
+  res: "[test]this is a <test>test</test>[/test]"
+
-include_with:
-  src: "include_with: <z:include template='/name/title'><h1 do='with' part='title' do='hello'/></z:include>"

trunk/lib/secure.rb

@@ -623 +623 @@
-        "#<#{self.class}:#{sprintf('%x',self.object_id)}\n" +
-        "@attributes =\n{ " +
-@attributes
+(@attributes || {})
-           sprintf("%15s => %s", k, v.inspect)
-         end + [
-id
+self[:id]
-            sprintf("%15s => %s", '@new_record', new_record?.to_s),
-            sprintf("%15s => %s", '@visitor', (@visitor ? "User#{@visitor[:id]}" : 'nil'))

trunk/public/stylesheets/zena.css

@@ -20 +20 @@
-.btn_add:hover a { visibility:visible; }
-
+.hidden { display:none; }
-
-/* ========================= Zazen css ======================== */

trunk/test/fixtures/links.yml

@@ -40 +40 @@
-  target_id:      29
-  role:           favorite
+  
+lake_icon_for_cleanWater:
+  id:             8
+  source_id:      11
+  target_id:      14
+  role:           icon

trunk/test/fixtures/nodes.yml

@@ -429 +429 @@
-  kpath:          NP
-  name:           strange
-
-
+1
+1
-  parent_id:      22
-  user_id:        5
@@ -449 +449 @@
-  kpath:          NPA
-  name:           track
-
-
+1
+1
-  parent_id:      11
-  user_id:        4

trunk/test/helpers/basic.yml

@@ -171 +171 @@
-  src: "<z:parent><h1 do='title'>parent title</h1></z:parent>"
-  tem: "<% if var1 = @node.relation(\"parent\") -%><h1><%= show_title(:node=>var1)%></h1><% end -%>"
-zena / 
+
-
-show_bad_attr:
@@ -346 +346 @@
-  context:
-    node: 'bird_jpg'
-href
+link
-  res: "<a href='/oo/image30.html'><img src='/oo/image30_std.jpg' width='440' height='400' alt='bird' class='std'/></a>"
-
@@ -472 +472 @@
-  src: "<z:summary or='v_text'/>"
-  res: "<div id='v_text11' class='zazen'><p>This is the root of your peaceful tests.</p></div>"
+
+ztag_form_and_form:
+  src: |
+    <z:form>
+      <li class='inline_form'>
+        <form>
+          <input type='hidden' name='node[parent_id]' value='' do='void' set_value='[id]'/>
+          <z:input type='select' attr='klass' options='Page,Section,Project'/>
+          <input type='text' name='node[v_title]' value='' size='25'/>
+          <input type="submit" class="btn_validate" value='validate' do='void' tset_value='validate'/>
+        </form>
+      </li>
+    </z:form>
+  tem: ".."

trunk/test/helpers/relations.yml

@@ -74 +74 @@
-  res: "cleanWater: status + 22"
-
+store_img:
+  src: "<z:parent><z:icon store='bob'><z:show attr='name'/><z:img link='stored_bob'/></z:icon></z:parent>"
+  tem: "<% if var1 = @node.relation(\"parent\") -%><% if var2 = var1.relation(\"icon\") -%><%= var2.name %><%= node_link(:node=>var1, :text=>img_tag(var2, :mode=>\"std\")) %><% end -%><% end -%>"
+  
-author_visitor:
-  src: "<z:pages from='site' author='visitor' limit='5'><z:each join=', ' do='show' attr='name'/></z:pages>"

trunk/test/helpers/zena_parser_test.rb

@@ -9 +9 @@
-  
-  def test_single
-title_link_data
+ztag_form_and_form
-  end
-