[mb-commits] r9838 - in mb_server/branches/TemplateToolkit/catalyst: lib/musicbrainz/Controller root/components root/layout root/layout/sidebar root/user

[root at musicbrainz.org]

Author: acid2
Date: 2008-05-13 17:44:07 +0000 (Tue, 13 May 2008)
New Revision: 9838

Added:
   mb_server/branches/TemplateToolkit/catalyst/root/components/piped-list.tt
   mb_server/branches/TemplateToolkit/catalyst/root/layout/sidebar/user.tt
Modified:
   mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/Root.pm
   mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/User.pm
   mb_server/branches/TemplateToolkit/catalyst/root/layout/sidebar.tt
   mb_server/branches/TemplateToolkit/catalyst/root/user/profile.tt
Log:
More fixes to the sidebar (changes depending on whether the user is logged in) and started work on the profile viewing page

Modified: mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/Root.pm
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/Root.pm	2008-05-13 15:58:27 UTC (rev 9837)
+++ mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/Root.pm	2008-05-13 17:44:07 UTC (rev 9838)
@@ -89,7 +89,8 @@
     my ($self, $c) = @_;
     
     $c->stash->{server_details}->{version} = &DBDefs::VERSION;
-    $c->stash->{user} = $c->session->{user};
+    $c->stash->{logged_in} = defined $c->session->{user};
+    $c->stash->{user}->{name} = $c->session->{user}->{name} if $c->stash->{logged_in};
 }
 
 =head1 AUTHOR

Modified: mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/User.pm
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/User.pm	2008-05-13 15:58:27 UTC (rev 9837)
+++ mb_server/branches/TemplateToolkit/catalyst/lib/musicbrainz/Controller/User.pm	2008-05-13 17:44:07 UTC (rev 9838)
@@ -63,7 +63,6 @@
     my $user = $us->Login($username, $password);
     if($user) {
 	$c->session->{user} = {
-	    logged_in => 1,
 	    name => $user->GetName
 	};
 	$c->response->redirect($c->uri_for('/user/profile'));

Added: mb_server/branches/TemplateToolkit/catalyst/root/components/piped-list.tt

Added: mb_server/branches/TemplateToolkit/catalyst/root/layout/sidebar/user.tt

Modified: mb_server/branches/TemplateToolkit/catalyst/root/layout/sidebar.tt
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/root/layout/sidebar.tt	2008-05-13 15:58:27 UTC (rev 9837)
+++ mb_server/branches/TemplateToolkit/catalyst/root/layout/sidebar.tt	2008-05-13 17:44:07 UTC (rev 9838)
@@ -1,6 +1,10 @@
 <div id="sidebar">
   [% INCLUDE "layout/sidebar/sites.tt" WRAPPER "layout/sidebar/section.tt" title="MusicBrainz sites" %]
-  [% INCLUDE "layout/sidebar/login.tt" WRAPPER "layout/sidebar/section.tt" title="Not Logged In" %]
+  [% IF !logged_in %]
+    [% INCLUDE "layout/sidebar/login.tt" WRAPPER "layout/sidebar/section.tt" title="Not Logged In" %]
+  [% ELSE %]
+    [% INCLUDE "layout/sidebar/user.tt" WRAPPER "layout/sidebar/section.tt" title=user.name %]
+  [% END %]
   [% INCLUDE "layout/sidebar/search.tt" WRAPPER "layout/sidebar/section.tt" title="Search" %]
   [% INCLUDE "layout/sidebar/top-voters.tt" WRAPPER "layout/sidebar/section.tt" title="Top Voters" %]
   [% INCLUDE "layout/sidebar/stats.tt" WRAPPER "layout/sidebar/section.tt" title="Stats" %]

Modified: mb_server/branches/TemplateToolkit/catalyst/root/user/profile.tt
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/root/user/profile.tt	2008-05-13 15:58:27 UTC (rev 9837)
+++ mb_server/branches/TemplateToolkit/catalyst/root/user/profile.tt	2008-05-13 17:44:07 UTC (rev 9838)
@@ -1,7 +1,66 @@
 [% META title = "User Profile" %]
 [% WRAPPER "layout.tt" %]
 
+[% BLOCK property %]
+  <dt>[% name %]:</dt>
+  <dd>[% content %]</dd>
+[% END %]
 
-<p>Hey [% user.name %]!</p>
+[% review_options = [
+     { link => "", text => "Votes" },
+     { link => "", text => "Edits" },
+     { link => "", text => "Open Edits" },
+     { link => "", text => "Failed Edits" },
+     { link => "", text => "Cancelled Edits" },
+     { link => "", text => "Subscriptions" },
+   ]
+%]
 
-[% END %]
\ No newline at end of file
+[% edit_account_options = [
+     { link => "", text => "Edit" },
+     { link => "", text => "Change Password" },
+     { link => "", text => "Preferences" },
+     { link => "", text => "Check Donation Status" },
+   ]
+%]
+
+[% WRAPPER "components/box.tt" header="Editor \"$user.name\"" %]
+  <h3>General Information:</h3>
+  <dl>
+    [% INCLUDE "components/piped-list.tt" list = review_options
+         WRAPPER property name = "Review" %]
+
+    [% INCLUDE "components/piped-list.tt" list = edit_account_options
+         WRAPPER property name = "Edit My Account" %]
+	
+    [% user.name WRAPPER property name = "Name" %]
+
+    [% user.type WRAPPER property name = "User Type" %]
+
+    [% WRAPPER property name = "E-Mail" %]
+      [% user.email or "[Hidden]" %] <br />
+      Verified on [% user.email_verification_date %]
+    [% END %]
+	
+    [% user.homepage or "[None]" WRAPPER property name = "Homepage" %]
+	
+    [% user.biography or "[None]" WRAPPER property name = "Biography" %]
+	
+    [% PROCESS property name = "Subscriptions" %]
+	
+    [% WRAPPER property name = "Subscribers" %]
+      [% user.subscriber_count %] (<a href="/bad_link">view all</a>)
+    [% END %]
+  </dl>
+  
+ <h3>User Statistics</h3>
+ <dl>
+   [% PROCESS property name = "Member Since" %]
+   [% PROCESS property name = "Accepted Non-autoedits" %]
+   [% PROCESS property name = "Autoedits" %]
+   [% PROCESS property name = "Edits Voted Down" %]
+   [% PROCESS property name = "Other Failed Edits" %]
+ </dl>
+[% END %]
+
+[% END %]