[Jifty-commit] r821 - in wifty/trunk: . share share/web
share/web/static share/web/static/css share/web/static/js
share/web/templates share/web/templates/_elements
share/web/templates/fragments share/web/templates/let
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Thu Apr 6 15:57:04 EDT 2006
Author: alexmv
Date: Thu Apr 6 15:57:03 2006
New Revision: 821
Added:
wifty/trunk/share/
wifty/trunk/share/web/
wifty/trunk/share/web/static/
wifty/trunk/share/web/static/css/
wifty/trunk/share/web/static/css/app-base.css
wifty/trunk/share/web/static/js/
wifty/trunk/share/web/templates/
wifty/trunk/share/web/templates/_elements/
wifty/trunk/share/web/templates/_elements/markup
wifty/trunk/share/web/templates/_elements/nav
wifty/trunk/share/web/templates/_elements/page_nav
wifty/trunk/share/web/templates/_elements/sidebar
wifty/trunk/share/web/templates/create
wifty/trunk/share/web/templates/edit
wifty/trunk/share/web/templates/fragments/
wifty/trunk/share/web/templates/history
wifty/trunk/share/web/templates/let/
wifty/trunk/share/web/templates/let/confirm_email
wifty/trunk/share/web/templates/login
wifty/trunk/share/web/templates/logout
wifty/trunk/share/web/templates/pages
wifty/trunk/share/web/templates/recent
wifty/trunk/share/web/templates/signup
wifty/trunk/share/web/templates/view
Removed:
wifty/trunk/web/
Modified:
wifty/trunk/ (props changed)
Log:
r12173 at zoq-fot-pik: chmrr | 2006-04-06 15:56:06 -0400
* Move files into share directory
Added: wifty/trunk/share/web/static/css/app-base.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/app-base.css Thu Apr 6 15:57:03 2006
@@ -0,0 +1,66 @@
+body {
+ background-color: #dddddd;
+
+
+}
+
+div#headers h1 {
+ background: green;
+ color: white;
+ padding: 0.2em;
+ border: 0;
+ margin: 0;
+ margin: -10px 0 0 -10px ;
+ margin-right: -10px;
+
+}
+
+a {
+ color: black;
+ font-style: bold;
+}
+
+#jifty-wait-message {
+ display: none;
+}
+
+div#content {
+ background: #ffffff;
+ padding: 2em;
+}
+
+div#salutation {
+ float: right;
+ font-style: italic;
+}
+
+textarea.content {
+ height: 50em;
+ background: #ddd;
+ border: 1px solid black;
+ padding: 5px;
+}
+
+
+input[type=submit] {
+ border: 1px solid black;
+ font-size: 1.5em;
+ margin: 5px;
+
+}
+
+div#syntax {
+ float: right;
+ background: white;
+ border: 1px solid #333;
+ padding: 3px;
+ font-size: 0.8em;
+ width: 25%;
+ position: absolute;
+ top: 10em;
+ right: 2em;
+}
+
+
+
+
Added: wifty/trunk/share/web/templates/_elements/markup
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/markup Thu Apr 6 15:57:03 2006
@@ -0,0 +1,57 @@
+<div id="syntax">
+<h2>Wiki Syntax</h2>
+
+<h3>Phrase Emphasis</h3>
+
+<code> <b>**bold**</b> <i>_italic_</i> </code>
+
+<h3>Links</h3>
+
+<code>Show me a [wiki page](WikiPage)</code>
+<code>An [example](http://url.com/ "Title")</code>
+
+<h3>Headers</h3>
+
+<pre><code># Header 1
+## Header 2
+###### Header 6
+</code></pre>
+
+<h3>Lists</h3>
+
+<p>Ordered, without paragraphs:</p>
+
+<pre><code>1. Foo
+2. Bar
+</code></pre>
+
+<p>Unordered, with paragraphs:</p>
+
+<pre><code>* A list item.
+
+ With multiple paragraphs.
+
+* Bar</code></pre>
+
+<h3>Code Spans</h3>
+
+<p><code>`<code>`</code> spans are
+delimited by backticks.</p>
+
+<h3>Preformatted Code Blocks</h3>
+
+<p>Indent every line of a code block
+by at least 4 spaces.</p>
+
+<pre><code>This is a normal paragraph.
+
+ This is a preformatted
+ code block.
+</code></pre>
+
+<h3>Horizontal Rules</h3>
+
+<p>Three or more dashes: <code>---</code></p>
+
+<address>(Thanks to <a href="http://daringfireball.net/projects/markdown/dingus">Daring Fireball</a>)</address>
+</div>
Added: wifty/trunk/share/web/templates/_elements/nav
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/nav Thu Apr 6 15:57:03 2006
@@ -0,0 +1,11 @@
+<%init>
+my $top = Jifty->web->navigation;
+$top->child( Home => url => "/", sort_order => 1 );
+$top->child( Recent => url => "/recent", label => "Recent Changes", sort_order => 2);
+ if (Jifty->config->framework('AdminMode') ) {
+ $top->child(Administration => url => "/__jifty/admin/", sort_order => 998);
+ $top->child(OnlineDocs => url => "/__jifty/online_docs/", label => 'Online docs', sort_order => 999);
+}
+
+return();
+</%init>
Added: wifty/trunk/share/web/templates/_elements/page_nav
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/page_nav Thu Apr 6 15:57:03 2006
@@ -0,0 +1,21 @@
+<%init>
+my $subpath = $page . ($rev ? "/$rev" : '');
+my $top = Jifty->web->navigation;
+my $this = $top->child(
+ This =>
+ url => "/view/".$subpath,
+ label => $page,
+ sort_order => 5
+);
+
+
+$this->child( View => url => '/view/'.$subpath);
+$this->child( Edit => url => '/edit/'.$subpath);
+$this->child( History => url => '/history/'.$page);
+$this->child( Latest => url => '/view/'.$page) if ($rev);
+
+</%init>
+<%args>
+$page => 'HomePage'
+$rev => undef
+</%args>
Added: wifty/trunk/share/web/templates/_elements/sidebar
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/sidebar Thu Apr 6 15:57:03 2006
@@ -0,0 +1,11 @@
+<div id="salutation">
+% if (Jifty->web->current_user->id and Jifty->web->current_user->user_object) {
+Hiya, <span class="user"><%Jifty->web->current_user->user_object->name%></span>.<br />
+(<% Jifty->web->link( label => q{Logout}, url => '/logout' )%>)
+% } else {
+<% Jifty->web->tangent( label => q{You're not currently signed in.}, url => '/login' )%>
+% }
+</div>
+<div id="navigation">
+<& /_elements/menu &>
+</div>
Added: wifty/trunk/share/web/templates/create
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/create Thu Apr 6 15:57:03 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/share/web/templates/edit
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/edit Thu Apr 6 15:57:03 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/share/web/templates/history
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/history Thu Apr 6 15:57:03 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/share/web/templates/let/confirm_email
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/let/confirm_email Thu Apr 6 15:57:03 2006
@@ -0,0 +1,8 @@
+<%init>
+Jifty->api->allow( 'ConfirmEmail');
+Jifty->web->new_action(
+ moniker => 'confirm_email',
+ class => 'Wifty::Action::ConfirmEmail',
+)->run;
+Jifty->web->redirect("/");
+</%init>
Added: wifty/trunk/share/web/templates/login
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/login Thu Apr 6 15:57:03 2006
@@ -0,0 +1,20 @@
+<%args>
+$action => undef
+$next => undef
+</%args>
+<&|/_elements/wrapper, title => 'Login' &>
+
+% if (not Jifty->web->current_user->id) {
+<h2>Login</h2>
+<% Jifty->web->form->start(call => $next, name => "loginbox") %>
+<% $action->form_field('email') %>
+<% $action->form_field('password') %>
+<% $action->form_field('remember') %>
+<% Jifty->web->form->submit(label => 'Login', submit => $action) %>
+<% Jifty->web->form->end %>
+<% Jifty->web->tangent( label => q{Don't have an account?}, url => '/signup' )%>
+% }
+% else {
+You're already logged in.
+% }
+</&>
Added: wifty/trunk/share/web/templates/logout
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/logout Thu Apr 6 15:57:03 2006
@@ -0,0 +1,3 @@
+<&| /_elements/wrapper, title => "Logged out" &>
+<p>Ok, you're now logged out. Have a good day.</p>
+</&>
Added: wifty/trunk/share/web/templates/pages
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/pages Thu Apr 6 15:57:03 2006
@@ -0,0 +1,16 @@
+<%args>
+$pages
+</%args>
+<&|/_elements/wrapper, title => 'These are the pages on your wiki!' &>
+<ul id="pagelist">
+% while (my $page = $pages->next) {
+<li><%
+ Jifty->web->link(
+ label => $page->name,
+ url => '/view/' . $page->name
+ );
+
+ %></li>
+% }
+</ul>
+</&>
Added: wifty/trunk/share/web/templates/recent
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/recent Thu Apr 6 15:57:03 2006
@@ -0,0 +1,11 @@
+<%args>
+$pages
+</%args>
+<&|/_elements/wrapper, title => 'Updated this week' &>
+<dl id="recentudates">
+% while (my $page = $pages->next) {
+<dt><% Jifty->web->link( label => $page->name, url => '/view/'.$page->name)%></dt>
+<dd><%$page->updated%></dd>
+% }
+</dl>
+</&>
Added: wifty/trunk/share/web/templates/signup
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/signup Thu Apr 6 15:57:03 2006
@@ -0,0 +1,14 @@
+<%args>
+$action
+$next
+</%args>
+<&|/_elements/wrapper, title => 'Signup' &>
+<h2>Signup</h2>
+<% Jifty->web->form->start(call => $next, name => "signupbox") %>
+<% $action->form_field('email') %>
+<% $action->form_field('name') %>
+<% $action->form_field('password') %>
+<% $action->form_field('password_confirm') %>
+<% Jifty->web->form->submit(label => 'Signup', submit => $action) %>
+<% Jifty->web->form->end %>
+</&>
Added: wifty/trunk/share/web/templates/view
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/view Thu Apr 6 15:57:03 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 %>
+% }
+</&>
More information about the Jifty-commit
mailing list