[mb-commits] r10091 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Form lib/MusicBrainz/Server/Form/Search root/forms root/layout/sidebar

[root at musicbrainz.org]

Author: acid2
Date: 2008-07-11 02:16:48 +0000 (Fri, 11 Jul 2008)
New Revision: 10091

Added:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Search.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/Simple.pm
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm
   mb_server/branches/TemplateToolkit/root/forms/form.tt
   mb_server/branches/TemplateToolkit/root/layout/sidebar/search.tt
Log:
Starting work on the sidebar search module (can only search for editors atm)

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm	2008-07-11 01:34:31 UTC (rev 10090)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm	2008-07-11 02:16:48 UTC (rev 10091)
@@ -17,7 +17,7 @@
 
 =head1 NAME
 
-musicbrainz::Controller::Root - Root Controller for musicbrainz
+MusicBrainz::Server::Controller::Root - Root Controller for musicbrainz
 
 =head1 DESCRIPTION
 
@@ -97,7 +97,8 @@
 
 =head2 default
 
-Handle any pages not matched by a specific controller path. In our case, this means serving a 404 error page.
+Handle any pages not matched by a specific controller path. In our case, this means serving a
+404 error page.
 
 =cut
 
@@ -121,6 +122,12 @@
 {
     my ($self, $c) = @_;
 
+    # Setup the searchs on the sidebar
+    use MusicBrainz::Server::Form::Search::Simple;
+    my $simpleSearch = new MusicBrainz::Server::Form::Search::Simple;
+    $simpleSearch->field('type')->value($c->session->{last_simple_search} || 'artist');
+    $c->stash->{sidebar_search} = $simpleSearch;
+
     $c->stash->{server_details}->{version} = &DBDefs::VERSION;
 }
 

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Search.pm

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/Simple.pm

Modified: mb_server/branches/TemplateToolkit/root/forms/form.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/forms/form.tt	2008-07-11 01:34:31 UTC (rev 10090)
+++ mb_server/branches/TemplateToolkit/root/forms/form.tt	2008-07-11 02:16:48 UTC (rev 10091)
@@ -1,6 +1,6 @@
 [%- DEFAULT method="post" -%]
 <form action="[% action %]" method="[% method %]" [% UNLESS custom %]class="generic"[% END %]>
-  <p>Fields that are <span class="required">bold</span> are required.</p>
+  [% UNLESS quiet %]<p>Fields that are <span class="required">bold</span> are required.</p>[% END %]
   [%- IF errors.size -%]
     <p>Sorry - some errors were present in the data you provided!</p>
     <ul class="error">

Modified: mb_server/branches/TemplateToolkit/root/layout/sidebar/search.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/layout/sidebar/search.tt	2008-07-11 01:34:31 UTC (rev 10090)
+++ mb_server/branches/TemplateToolkit/root/layout/sidebar/search.tt	2008-07-11 02:16:48 UTC (rev 10091)
@@ -1,19 +1,5 @@
-<form method="get" action="/search/textsearch.html" id="id_qs_release_form">
-  <table border="0">
-    <tr>
-      <th><label for="id_type">Type:</label></th>
-      <td>
-	<select name="type" id="id_type">
-	  <option value="release">Release</option>
-	  <option value="artist">Artist</option>
-	  <option value="label">Label</option>
-	  <option value="track">Track</option>
-	</select>
-      </td>
-    </tr>
-    <tr>
-      <th><label for="id_query">Query:</label></th>
-      <td><input id="id_query" name="query" /></td>
-    </tr>
-  </table>
-</form>
+[% WRAPPER "forms/form.tt" action=c.uri_for('/search/simple') quiet=1 %]
+  [% INCLUDE "forms/widget.tt" widget=sidebar_search.field('type') label="Type:" %]
+  [% INCLUDE "forms/widget.tt" widget=sidebar_search.field('query') label="Query:" %]
+  [% INCLUDE "forms/submit.tt" label="Search" %]
+[% END %]