[Jifty-commit] r471 - wifty/trunk/web/templates

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Fri Jan  6 08:38:18 2006
New Revision: 471

Added:
   wifty/trunk/web/templates/create
   wifty/trunk/web/templates/edit
   wifty/trunk/web/templates/history   (contents, props changed)
   wifty/trunk/web/templates/view
Modified:
   /   (props changed)
   wifty/trunk/lib/Wifty/Dispatcher.pm

Log:
 r22178 at truegrounds:  jesse | 2006-01-06 13:54:54 +0100
 
 r22179 at truegrounds:  jesse | 2006-01-06 13:55:50 +0100
 
 r22180 at truegrounds:  jesse | 2006-01-06 13:57:57 +0100
 
 r22181 at truegrounds:  jesse | 2006-01-06 13:58:39 +0100
 
 r22183 at truegrounds:  jesse | 2006-01-06 14:16:26 +0100
 checkpoint
 r22185 at truegrounds:  jesse | 2006-01-06 14:36:38 +0100
 * wifty checkpoint


Modified: wifty/trunk/lib/Wifty/Dispatcher.pm
==============================================================================
--- wifty/trunk/lib/Wifty/Dispatcher.pm	(original)
+++ wifty/trunk/lib/Wifty/Dispatcher.pm	Fri Jan  6 08:38:18 2006
@@ -1,9 +1,7 @@
 package Wifty::Dispatcher;
 use Jifty::Dispatcher -base;
 
-on '/', run {
-    redirect( '/view/HomePage');
-};
+on '/', redirect( '/view/HomePage');
 
 under '/create/*', run {
      set page => $1;
@@ -11,9 +9,9 @@
 };
 
 
-under ['view/*', 'edit/*'], run {
+on qr{(view|edit)/(.*)}, run {
     my ( $name, $rev );
-    if ( $1 =~ qr{^(.*?)/?(\d*?)$} ) {
+    if ( $2 =~ qr{^(.*?)/?(\d*?)$} ) {
         $name = $1;
         $rev  = $2;
     }
@@ -25,9 +23,10 @@
     set page => $page;
     set revision => $revision;
     set viewer => Jifty->web->new_action( class => 'UpdatePage', record => $page );
+    show("/view");
 };
 
-under 'history/*', run {
+on 'history/*', run {
     my $name = $1;
     my $page = Wifty::Model::Page->new();
     $page->load_by_cols( name => $name );

Added: wifty/trunk/web/templates/create
==============================================================================
--- (empty file)
+++ wifty/trunk/web/templates/create	Fri Jan  6 08:38:18 2006
@@ -0,0 +1,13 @@
+<&|/_elements/wrapper, title => 'New page: '. $page&>
+<% Jifty->web->form->start %>
+<% Jifty->web->form->next_page( url => '/view/'.$page) %>
+<% $action->form_field('name', render_as => 'hidden', default_value => $page) %>
+<% $action->form_field('content')%>
+<% Jifty->web->form->submit( label => 'Save')%>
+<% Jifty->web->form->end %>
+<& /_elements/markup &>
+</&>
+<%args>
+$action => undef
+$page => undef
+</%args>

Added: wifty/trunk/web/templates/edit
==============================================================================
--- (empty file)
+++ wifty/trunk/web/templates/edit	Fri Jan  6 08:38:18 2006
@@ -0,0 +1,18 @@
+<%args>
+$page
+$revision
+$viewer 
+</%args>
+<&/_elements/page_nav, page => $page->name, rev => $revision->id &>
+<&|/_elements/wrapper, title => 'Edit: '.$page->name . ($revision->id ? " as of ".$revision->created : '')  &>
+<% Jifty->web->form->start %>
+<% Jifty->web->form->next_page( url => '/view/'.$page->name) %>
+% if ($revision->id) {
+<% $viewer->form_field('content', default_value => $revision->content )%>
+% } else { 
+<% $viewer->form_field('content') %>
+% }
+<% Jifty->web->form->submit( label => 'Save') %>
+<% Jifty->web->form->end %>
+<& /_elements/markup &>
+</&>

Added: wifty/trunk/web/templates/history
==============================================================================
--- (empty file)
+++ wifty/trunk/web/templates/history	Fri Jan  6 08:38:18 2006
@@ -0,0 +1,15 @@
+<%args>
+$page
+$revisions
+</%args>
+<& /_elements/page_nav, page => $page->name &>
+<&|/_elements/wrapper, title => $revisions->count ." revisions of " .$page->name &>
+<ul>
+% while (my $rev = $revisions->next) {
+<dt><% Jifty->web->link( label => $rev->created, 
+                          url => '/view/'.$page->name.'/'.$rev->id
+                        ) %></dt>
+<dd><%length($rev->content)%> bytes</dd>
+% }
+</ul>
+</&>

Added: wifty/trunk/web/templates/view
==============================================================================
--- (empty file)
+++ wifty/trunk/web/templates/view	Fri Jan  6 08:38:18 2006
@@ -0,0 +1,12 @@
+<%args>
+$page
+$revision
+</%args>
+<& /_elements/page_nav, page => $page->name, rev => $revision->id &>
+<&|/_elements/wrapper, title => $page->name . ($revision->id ? " as of ".$revision->created : '') &>
+% if ($revision->id) {
+<% $page->wiki_content($revision->content) |n%>
+% } else {
+<% $page->wiki_content |n %>
+% }
+</&>