[Jifty-commit] r1711 - in wifty/trunk: . share/web/static/css
share/web/templates share/web/templates/_elements t
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Jul 31 01:59:50 EDT 2006
Author: trs
Date: Mon Jul 31 01:59:48 2006
New Revision: 1711
Added:
wifty/trunk/share/web/static/css/app.css
wifty/trunk/share/web/static/css/base.css
wifty/trunk/share/web/static/css/forms.css
wifty/trunk/share/web/static/css/keybindings.css
wifty/trunk/share/web/static/css/main.css
wifty/trunk/share/web/static/css/nav.css
wifty/trunk/share/web/templates/_elements/header
wifty/trunk/share/web/templates/_elements/salutation
wifty/trunk/share/web/templates/_elements/wrapper
Removed:
wifty/trunk/share/web/templates/_elements/sidebar
Modified:
wifty/trunk/ (props changed)
wifty/trunk/etc/config.yml
wifty/trunk/share/web/static/css/app-base.css
wifty/trunk/share/web/templates/_elements/diff
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/create
wifty/trunk/share/web/templates/edit
wifty/trunk/share/web/templates/history
wifty/trunk/share/web/templates/login
wifty/trunk/share/web/templates/recent
wifty/trunk/share/web/templates/signup
wifty/trunk/share/web/templates/view
wifty/trunk/t/02-login.t
Log:
r14984 at zot: tom | 2006-07-31 01:59:02 -0400
* Add WikiName preference
* Give wifty a big layout/styling overhaul to make it look nicer by default (and more like a wiki)
Modified: wifty/trunk/etc/config.yml
==============================================================================
--- wifty/trunk/etc/config.yml (original)
+++ wifty/trunk/etc/config.yml Mon Jul 31 01:59:48 2006
@@ -19,3 +19,4 @@
TemplateRoot: share/web/templates
application:
# RequireAuth: 1
+ WikiName: A Wiki
Modified: wifty/trunk/share/web/static/css/app-base.css
==============================================================================
--- wifty/trunk/share/web/static/css/app-base.css (original)
+++ wifty/trunk/share/web/static/css/app-base.css Mon Jul 31 01:59:48 2006
@@ -1,72 +1,132 @@
body {
- background-color: #dddddd;
- font-size: 85%;
+ background-color: #ddd;
+ font-size: 76%;
+ margin: 0 1.5em 1.5em 1.5em;
+}
+a {
+ color: #c12d06;
}
-div#headers h1 {
- background: green;
- color: white;
- padding: 0.2em;
- border: 0;
- margin: 0;
- margin: -10px 0 0 -10px ;
- margin-right: -10px;
+#salutation {
+ position: absolute;
+ top: 0.5em;
+ right: 1.8em;
+ font-family: sans-serif;
+ font-size: 0.9em;
+}
+#header {
+ margin-top: 2.3em;
}
-div#headers { margin-left: 10px; }
-div#headers a { position: absolute; top: 0.5em; right: 1em; }
+#wikiheader {
+ float: right;
+ text-align: right;
+ padding-right: 1px;
+ width: 28%;
+}
+#wikiname {
+ margin: 0;
+ font-size: 1.7em;
+}
-a {
- color: black;
- font-style: bold;
+#wikiname a {
+ color: black;
+ text-decoration: none;
}
-#jifty-wait-message {
- display: none;
+#pageheader {
+ margin-top: 1em;
+ width: 70%;
+ padding-left: 1px;
}
-div#content {
- background: #ffffff;
- padding: 2em;
+h1, h2, h3, h4, h5, h6 {
+ font-family: sans-serif;
}
-div#salutation {
- float: right;
- font-style: italic;
+h1 { font-size: 1.5em; }
+h2 { font-size: 1.3em; }
+h3 { font-size: 1.2em; }
+h4 { font-size: 1.1em; }
+
+#pagename {
+ margin: 0.2em 0 0 0;
+ font-size: 2em;
}
-textarea.content {
- height: 50em;
- background: #ddd;
- border: 1px solid black;
- padding: 5px;
+#content {
+ background: white;
+ padding: 0.3em 1em 0.5em 1em;
+ border: 1px solid #ccc;
+ clear: both;
+ margin-top: 0.5em;
+ font-family: sans-serif;
+ font-size: 1.1em;
}
+* html #content { margin-top: 0; }
-input[type=submit] {
- border: 1px solid black;
- font-size: 1.5em;
- margin: 5px;
-
+#update #content, #create #content {
+ position: relative;
}
-div#syntax {
+#content h1,
+#content h2,
+#content h3,
+#content h4
+{
+ margin: 0.2em 0;
+}
+
+#syntax {
float: right;
background: white;
- border: 1px solid #333;
- padding: 3px;
- font-size: 0.8em;
- width: 20em;
+ border: 1px solid #888;
+ padding: 0.2em 0.4em;
+ font-size: 0.9em;
+ width: 25%;
position: absolute;
- top: 10em;
- right: 2em;
+ top: 1em;
+ right: 1em;
+}
+
+#syntax code, #syntax tt {
+ font-size: 1.2em;
+}
+
+.diff {
+ font-size: 1.1em;
+ overflow: auto;
+}
+
+.file span {
+ display: block;
+ clear: both;
+}
+
+.file .fileheader, .file .hunkheader {
+ color: #666;
}
-.file span { display: block; clear: both; }
-.file .fileheader, .file .hunkheader {color: #888; }
-.file .hunk .ctx { background: #eee;}
-.file .hunk ins { background: #dfd; text-decoration: none; display: block; }
-.file .hunk del { background: #fdd; text-decoration: none; display: block; }
+.file .hunk .ctx {
+ background: #eee;
+}
+
+.file .hunk ins {
+ background: #dfd;
+ text-decoration: none;
+ display: block;
+}
+
+.file .hunk del {
+ background: #fdd;
+ text-decoration: none;
+ display: block;
+}
+
+#jifty-wait-message {
+ display: none;
+}
Added: wifty/trunk/share/web/static/css/app.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/app.css Mon Jul 31 01:59:48 2006
@@ -0,0 +1,96 @@
+div.argument-content {
+ width: 70%;
+}
+
+* html div.form_field,
+* html form .submit_button { position: relative; }
+
+label.argument-content {
+ display: none !important;
+}
+
+textarea.argument-content {
+ width: 100%;
+ font-size: 1.2em;
+}
+
+* html textarea.argument-content {
+ font-size: 1em;
+}
+
+form .submit_button input {
+ margin-left: 0;
+ font-size: 1.1em;
+ color: white;
+ background: #3d4286;
+ border: 1px outset #3d4286;
+}
+
+#recentupdates dt {
+ float: left;
+ clear: left;
+ width: 45%;
+}
+
+#recentupdates dd {
+ margin-left: 2em;
+ padding-left: 0;
+ margin-bottom: 0.5em;
+ float: left;
+ width: 50%;
+}
+
+* html #recentupdates dt,
+* html #recentupdates dd { position: relative; }
+
+#history dd {
+ font-size: 0.95em;
+ color: #444;
+ margin-left: 2em;
+ padding-left: 0;
+ margin-bottom: 0.5em;
+}
+
+hr {
+ border: none;
+ border-top: 1px solid #777;
+}
+
+.revision_nav {
+ margin-top: 0.5em;
+}
+
+/* Login box */
+
+#login-box form {
+ padding-bottom: 0;
+}
+
+#login-box label {
+ width: 10em;
+}
+
+#login-box input.text,
+#login-box input.password {
+ font-size: 1.1em;
+}
+
+#login-box span.error {
+ font-size: 0.8em;
+}
+
+#login-box .argument-remember .hints {
+ float: left;
+ clear: none;
+ width: 50%;
+ font-size: 0.8em;
+ padding: 0 0 0 0.3em;
+}
+
+* html #login-box .argument-remember .hints {
+ width: auto;
+}
+
+#login-box input.argument-remember {
+ float: left;
+}
Added: wifty/trunk/share/web/static/css/base.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/base.css Mon Jul 31 01:59:48 2006
@@ -0,0 +1,68 @@
+.error {
+ color: #a00000;
+}
+
+.warning {
+ color: #00a0a0;
+}
+
+hr.clear {
+ clear: both;
+ visibility: hidden;
+ height: 0;
+ padding: 0;
+ margin: 0;
+}
+
+.messages .message {
+ display: block;
+}
+
+div#messages, div#errors {
+ background-color: rgb(240,234,183);
+ border: 1px solid rgb(230,224,173);
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding: 5px;
+ font-size: 1.2em;
+}
+
+div.spacer {
+ clear: both;
+}
+
+.next-page, .prev-page {
+ display: block;
+ float: left;
+ margin: 0.5em 0;
+ padding: 0.2em 0.5em 0.5em 0.5em;
+ border-top: 1px solid gray;
+}
+
+.next-page { padding-right: 1em; }
+.prev-page { padding-left: 1em; }
+
+div#jifty-wait-message {
+ color: red;
+ background: black;
+ font-size: 2em;
+ position: fixed;
+ top: 10px;
+ right: 10px;
+ z-index: 42;
+}
+
+div.warning {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ background-color: red;
+ color: white;
+ padding: .5em;
+ border-bottom: 1px solid #000;
+}
+
+div.warning a {
+ color: white;
+}
Added: wifty/trunk/share/web/static/css/forms.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/forms.css Mon Jul 31 01:59:48 2006
@@ -0,0 +1,107 @@
+/* buttons */
+
+input.button {
+ margin-top: 0.6em;
+ padding: 0.15em 1em;
+ font-weight: bold;
+}
+
+* html input.button {
+ padding: 0 0.1em;
+}
+
+/* fields */
+
+input.text, input.date, input.password, input.combo-text, textarea, select {
+ border-top: 1px solid #7c7c7c;
+ border-left: 1px solid #c3c3c3;
+ border-right: 1px solid #c3c3c3;
+ border-bottom: 1px solid #ddd;
+ background: #fff url(/static/images/css/fieldbg.gif) repeat-x top;
+ padding: 0.2em;
+ font-size: 1em;
+}
+
+label, span.label {
+ font-size: 0.9em;
+}
+
+.form_field .hints {
+ font-size: 0.9em;
+ color: #777;
+}
+
+/* layout */
+
+.form_field {
+ clear: both;
+}
+
+label, span.label {
+ display: block;
+ width: 20%;
+ float: left;
+ text-align: right;
+ margin-right: 0.5em;
+}
+
+* html label, * html span.label {
+ width: 22%;
+}
+
+form .hints {
+ display: block;
+ clear: both;
+}
+
+html>body form .hints {
+ padding: 0.2em 0 0.2em 21%;
+}
+
+* html form .hints {
+ padding-left: 11.5%;
+}
+
+form .error {
+ display: block;
+ clear: both;
+}
+
+.form_field {
+ padding: 0.3em 0 0 0;
+}
+
+.inline .hints {
+ padding-left: 0;
+}
+
+.inline label, .inline span.label {
+ float: none;
+ width: auto;
+ text-align: left;
+ margin-right: auto;
+ font-weight: bold;
+}
+
+.inline .form_field {
+ float: left;
+ clear: none;
+ margin-right: 0.5em;
+}
+
+.inline .button {
+ margin-top: 1.1em;
+}
+
+.button_line {
+ border-top: 1px solid #ccc;
+ padding-right: 5em;
+ margin-top: 1.5em;
+ clear: both;
+ direction: rtl;
+}
+
+form .line {
+ clear: both;
+}
+
Added: wifty/trunk/share/web/static/css/keybindings.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/keybindings.css Mon Jul 31 01:59:48 2006
@@ -0,0 +1,25 @@
+div#keybindings {
+ color: #666666;
+ margin-top: 2em;
+}
+
+dl.keybindings .keybinding {
+ display: inline;
+}
+
+dl.keybindings dt {
+ margin: 0;
+ font-weight: bold;
+ display: inline;
+
+}
+dl.keybindings dt:after {
+ content: ":";
+
+}
+dl.keybindings dd {
+ margin-right: 1.5em;
+ margin-left: 0.5em;
+ display: inline;
+ white-space: nowrap;
+}
Added: wifty/trunk/share/web/static/css/main.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/main.css Mon Jul 31 01:59:48 2006
@@ -0,0 +1,9 @@
+ at import "app-base.css";
+ at import "base.css";
+ at import "nav.css";
+ at import "keybindings.css";
+ at import "forms.css";
+ at import "halos.css";
+ at import "app.css";
+ at import "autocomplete.css";
+ at import "notices.css";
Added: wifty/trunk/share/web/static/css/nav.css
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/static/css/nav.css Mon Jul 31 01:59:48 2006
@@ -0,0 +1,21 @@
+ul.menu {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ font-size: 1.2em;
+ font-family: sans-serif;
+}
+
+ul.menu li {
+ display: inline;
+ padding-right: 1em;
+}
+
+#pageheader ul.menu {
+ margin-top: -0.1em;
+}
+
+#wikiheader ul.menu li {
+ padding-right: 0;
+ padding-left: 1em;
+}
\ No newline at end of file
Modified: wifty/trunk/share/web/templates/_elements/diff
==============================================================================
--- wifty/trunk/share/web/templates/_elements/diff (original)
+++ wifty/trunk/share/web/templates/_elements/diff Mon Jul 31 01:59:48 2006
@@ -15,10 +15,16 @@
my $diff = Text::Diff::diff(\($from->content), \($to->content), { STYLE => 'Text::Diff::HTML' });
</%init>
+<div class="revision_nav">
% if ($before) {
-<span style="float: left"><% Jifty->web->link(url => "/view/".$page->name."/".$before->id, label => "Previous revision") %></span>
+<span class="prev"><% Jifty->web->link(url => "/view/".$page->name."/".$before->id, label => "Previous revision") %></span>
+% }
+% if ( $before and $after ) {
+ |
% }
% if ($after) {
-<span style="float: right"><% Jifty->web->link(url => "/view/".$page->name."/".$after->id, label => "Next revision") %></span>
+<span class="next"><% Jifty->web->link(url => "/view/".$page->name."/".$after->id, label => "Next revision") %></span>
% }
-<pre><% $diff |n%></pre><hr />
+</div>
+<pre class="diff"><% $diff |n%></pre>
+<hr />
Added: wifty/trunk/share/web/templates/_elements/header
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/header Mon Jul 31 01:59:48 2006
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta name="robots" content="all" />
+
+ <title><% _( $title ) %> - <% _( $wikiname ) %></title>
+
+ <% Jifty->web->include_css %>
+ <% Jifty->web->include_javascript %>
+</head>
+<%args>
+$title => ""
+$wikiname => ""
+</%args>
+<%init>
+$r->content_type('text/html; charset=utf-8');
+</%init>
Modified: wifty/trunk/share/web/templates/_elements/markup
==============================================================================
--- wifty/trunk/share/web/templates/_elements/markup (original)
+++ wifty/trunk/share/web/templates/_elements/markup Mon Jul 31 01:59:48 2006
@@ -1,5 +1,5 @@
<div id="syntax">
-<div><a href="javascript:;" onclick="Element.toggle('syntax_content');return(false);"><b>Wiki Syntax Help</b></a>
+<div><a href="#" onclick="Element.toggle('syntax_content');return(false);"><b>Wiki Syntax Help</b></a>
</div>
<div id="syntax_content">
Modified: wifty/trunk/share/web/templates/_elements/nav
==============================================================================
--- wifty/trunk/share/web/templates/_elements/nav (original)
+++ wifty/trunk/share/web/templates/_elements/nav Mon Jul 31 01:59:48 2006
@@ -1,11 +1,12 @@
<%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);
+$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();
+return;
</%init>
Modified: wifty/trunk/share/web/templates/_elements/page_nav
==============================================================================
--- wifty/trunk/share/web/templates/_elements/page_nav (original)
+++ wifty/trunk/share/web/templates/_elements/page_nav Mon Jul 31 01:59:48 2006
@@ -1,20 +1,14 @@
<%init>
my $subpath = $page . ($rev ? "/$rev" : '');
-my $top = Jifty->web->navigation;
-my $this = $top->child(
- This =>
- url => "/view/".$subpath,
- label => $page,
- sort_order => 5
-);
+my $top = Jifty->web->page_navigation;
my $page_obj = Wifty::Model::Page->new();
$page_obj->load_by_cols(name => $page);
-$this->child( View => url => '/view/'.$subpath);
-$this->child( Edit => url => '/edit/'.$subpath) if $page_obj->current_user_can('update');
-$this->child( History => url => '/history/'.$page);
-$this->child( Latest => url => '/view/'.$page) if ($rev);
+$top->child( View => url => '/view/'.$subpath);
+$top->child( Edit => url => '/edit/'.$subpath);
+$top->child( History => url => '/history/'.$page);
+$top->child( Latest => url => '/view/'.$page) if ($rev);
</%init>
<%args>
Added: wifty/trunk/share/web/templates/_elements/salutation
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/salutation Mon Jul 31 01:59:48 2006
@@ -0,0 +1,9 @@
+<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>.
+ (<% Jifty->web->link( label => q{Logout}, url => '/logout' )%>)
+% } else {
+ You're not currently signed in.
+ <% Jifty->web->tangent( label => q{Sign in}, url => '/login' ) %>.
+% }
+</div>
Added: wifty/trunk/share/web/templates/_elements/wrapper
==============================================================================
--- (empty file)
+++ wifty/trunk/share/web/templates/_elements/wrapper Mon Jul 31 01:59:48 2006
@@ -0,0 +1,49 @@
+<& /_elements/header, title => $title, wikiname => $wikiname &>
+% Jifty->handler->stash->{'in_body'} = 1;
+<body<% $id && qq[ id="$id"]|n%>>
+% if (Jifty->config->framework('AdminMode') ) {
+ <div class="warning admin_mode">
+ <%_('Alert')%>: <% Jifty->web->tangent( label => _('Administration mode is enabled'),
+ url => '/__jifty/admin/') %>.
+ </div>
+% }
+
+ <div id="header">
+ <div id="wikiheader">
+ <h1 id="wikiname">
+ <% Jifty->web->link( url => "/", label => _($wikiname) ) %>
+ </h1>
+
+ <% Jifty->web->navigation->render_as_menu %>
+ </div>
+
+ <div id="pageheader">
+ <h1 id="pagename"><% _($title) %></h1>
+
+ <% Jifty->web->page_navigation->render_as_menu %>
+ </div>
+ </div>
+
+ <& /_elements/salutation &>
+
+ <hr class="clear" />
+
+ <div id="content">
+ <% Jifty->web->render_messages %>
+ <% $m->content |n%>
+ <& /_elements/keybindings &>
+ <hr class="clear" />
+ </div>
+
+ <div id="jifty-wait-message" style="display: none"><%_('Loading...')%></div>
+% Jifty::Mason::Halo->render_component_tree() if Jifty->config->framework('DevelMode');
+</body>
+</html>
+% Jifty->handler->stash->{'in_body'} = 0;
+<%args>
+$title => ""
+$id => ''
+</%args>
+<%init>
+my $wikiname = Jifty->config->app('WikiName') || "Wifty";
+</%init>
Modified: wifty/trunk/share/web/templates/create
==============================================================================
--- wifty/trunk/share/web/templates/create (original)
+++ wifty/trunk/share/web/templates/create Mon Jul 31 01:59:48 2006
@@ -1,9 +1,15 @@
-<&|/_elements/wrapper, title => 'New page: '. $page&>
+<&|/_elements/wrapper, title => 'New page: '. $page, id => 'create'&>
<% Jifty->web->form->start %>
+<div class="form_wrapper">
<% 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')%>
+<div class="inline">
+<% $action->form_field('content', rows => 30)%>
+</div>
+<div class="line">
+<% Jifty->web->form->submit( label => 'Create' )%>
+</div>
+</div>
<% Jifty->web->form->end %>
<& /_elements/markup &>
</&>
Modified: wifty/trunk/share/web/templates/edit
==============================================================================
--- wifty/trunk/share/web/templates/edit (original)
+++ wifty/trunk/share/web/templates/edit Mon Jul 31 01:59:48 2006
@@ -7,19 +7,25 @@
my $can_edit = $page->current_user_can('update');
</%init>
<&/_elements/page_nav, page => $page->name, rev => $revision->id &>
-<&|/_elements/wrapper, title => 'Edit: '.$page->name . ($revision->id ? " as of ".$revision->created : '') &>
+<&|/_elements/wrapper, title => 'Edit: '.$page->name . ($revision->id ? " as of ".$revision->created : ''), id => "update" &>
<% Jifty->web->form->start %>
+<div class="form_wrapper">
+<div class="inline">
% unless($can_edit) {
- <p> You don't have permission to edit this page. Perhaps
+ <p style="width: 70%"> You don't have permission to edit this page. Perhaps
<% Jifty->web->tangent(url => '/login', label => 'logging in') %>
would help. In the mean time, though, you're welcome to view and
copy the source of this page. </p>
% }
<% Jifty->web->form->next_page( url => '/view/'.$page->name) %>
-<% $viewer->form_field('content', ($revision->id ? (default_value => $revision->content) : (undef, undef)), rows=> 30, cols => 80 )%>
+<% $viewer->form_field('content', ($revision->id ? (default_value => $revision->content) : (undef, undef)), rows => 30 )%>
+</div>
% if($can_edit) {
+<div class="line">
<% Jifty->web->form->submit( label => 'Save') %>
+</div>
% }
+</div>
<% Jifty->web->form->end %>
<& /_elements/markup &>
</&>
Modified: wifty/trunk/share/web/templates/history
==============================================================================
--- wifty/trunk/share/web/templates/history (original)
+++ wifty/trunk/share/web/templates/history Mon Jul 31 01:59:48 2006
@@ -4,7 +4,7 @@
</%args>
<& /_elements/page_nav, page => $page->name &>
<&|/_elements/wrapper, title => $revisions->count ." revisions of " .$page->name &>
-<ul>
+<dl id="history">
% while (my $rev = $revisions->next) {
<dt><% Jifty->web->link( label => $rev->created,
url => '/view/'.$page->name.'/'.$rev->id
@@ -17,5 +17,5 @@
</dt>
<dd><%length($rev->content)%> bytes</dd>
% }
-</ul>
+</dl>
</&>
Modified: wifty/trunk/share/web/templates/login
==============================================================================
--- wifty/trunk/share/web/templates/login (original)
+++ wifty/trunk/share/web/templates/login Mon Jul 31 01:59:48 2006
@@ -4,17 +4,23 @@
</%args>
<&|/_elements/wrapper, title => 'Login' &>
-% if (not Jifty->web->current_user->id) {
-<h2>Login</h2>
+% if ( not Jifty->web->current_user->id ) {
+<div id="login-box">
<% 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' )%>
+</div>
+
+<p><% Jifty->web->tangent( label => q{Don't have an account?}, url => '/signup' )%></p>
+
% }
% else {
-You're already logged in.
+<p>
+You're already logged in as <% Jifty->web->current_user->user_object->name %>.
+If this isn't you, <% Jifty->web->tangent( url => '/logout', label => 'click here') %>.
+</p>
% }
</&>
Modified: wifty/trunk/share/web/templates/recent
==============================================================================
--- wifty/trunk/share/web/templates/recent (original)
+++ wifty/trunk/share/web/templates/recent Mon Jul 31 01:59:48 2006
@@ -2,7 +2,7 @@
$pages
</%args>
<&|/_elements/wrapper, title => 'Updated this week' &>
-<dl id="recentudates">
+<dl id="recentupdates">
% while (my $page = $pages->next) {
<dt><% Jifty->web->link( label => $page->name, url => '/view/'.$page->name)%></dt>
<dd><%$page->updated%>
Modified: wifty/trunk/share/web/templates/signup
==============================================================================
--- wifty/trunk/share/web/templates/signup (original)
+++ wifty/trunk/share/web/templates/signup Mon Jul 31 01:59:48 2006
@@ -3,7 +3,7 @@
$next
</%args>
<&|/_elements/wrapper, title => 'Signup' &>
-<h2>Signup</h2>
+<p>Just a few bits of information are all that's needed.</p>
<% Jifty->web->form->start(call => $next, name => "signupbox") %>
<% $action->form_field('email') %>
<% $action->form_field('name') %>
Modified: wifty/trunk/share/web/templates/view
==============================================================================
--- wifty/trunk/share/web/templates/view (original)
+++ wifty/trunk/share/web/templates/view Mon Jul 31 01:59:48 2006
@@ -5,7 +5,7 @@
<& /_elements/page_nav, page => $page->name, rev => $revision->id &>
<&|/_elements/wrapper, title => $page->name . ($revision->id ? " as of ".$revision->created : '') &>
% if ($revision->id) {
-<& _elements/diff, page => $page, to => $revision &>
+<& /_elements/diff, page => $page, to => $revision &>
<% $page->wiki_content($revision->content) |n%>
% } else {
Modified: wifty/trunk/t/02-login.t
==============================================================================
--- wifty/trunk/t/02-login.t (original)
+++ wifty/trunk/t/02-login.t Mon Jul 31 01:59:48 2006
@@ -22,8 +22,8 @@
my $mech = Jifty::Test::WWW::Mechanize->new();
$mech->get_ok($URL, "Got the homepage");
-ok($mech->find_link(text_regex => qr/currently signed in/), 'Got the signin link');
-$mech->follow_link_ok(text_regex => qr/currently signed in/);
+ok($mech->find_link(text_regex => qr/Sign in/), 'Got the signin link');
+$mech->follow_link_ok(text_regex => qr/Sign in/);
sub try_login {
my $mech = shift;
More information about the Jifty-commit
mailing list