r10150 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Form/Search root/search root/search/error

[root-97]

Author: acid2
Date: 2008-07-23 13:33:32 +0000 (Wed, 23 Jul 2008)
New Revision: 10150

Added:
   mb_server/branches/TemplateToolkit/root/search/form.tt
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/External.pm
   mb_server/branches/TemplateToolkit/root/search/error/wrapper.tt
   mb_server/branches/TemplateToolkit/root/search/external.tt
Log:
Think I forgot this in my last commit

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/External.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/External.pm 2008-07-23 04:54:28 UTC (rev 10149)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Search/External.pm 2008-07-23 13:33:32 UTC (rev 10150)
@@ -22,12 +22,12 @@
 
 sub options_type {
     return [
-        'annotation' => 'Annotations',
         'artist'     => 'Artists',
-        'freedb'     => 'FreeDB',
         'label'      => 'Labels',
         'release'    => 'Releases',
         'track'      => 'Tracks',
+        'annotation' => 'Annotations',
+        'freedb'     => 'FreeDB',
     ];
 }
 

Modified: mb_server/branches/TemplateToolkit/root/search/error/wrapper.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/search/error/wrapper.tt 2008-07-23 04:54:28 UTC (rev 10149)
+++ mb_server/branches/TemplateToolkit/root/search/error/wrapper.tt 2008-07-23 13:33:32 UTC (rev 10150)
@@ -10,4 +10,7 @@
 </p>
 
 [% END %]
+
+[% INCLUDE "search/form.tt" %]
+
 [% END %]

Modified: mb_server/branches/TemplateToolkit/root/search/external.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/search/external.tt 2008-07-23 04:54:28 UTC (rev 10149)
+++ mb_server/branches/TemplateToolkit/root/search/external.tt 2008-07-23 13:33:32 UTC (rev 10150)
@@ -4,29 +4,6 @@
   [% results %]
 [% END IF results%]
 
-[% WRAPPER "components/box.tt" header="Search" %]
-  <div class="searchform">
-    [% WRAPPER "forms/form.tt" action=c.uri_for('/search/external') %]
-      [% INCLUDE "forms/widget.tt" widget=form.field('query') label="Search for:" %]
-      [% INCLUDE "forms/widget.tt" widget=form.field('type')  label="Type:" %]
-      [% INCLUDE "forms/widget.tt" widget=form.field('limit') label="Limit to:" %]
-      [% INCLUDE "forms/widget.tt" widget=form.field('enable_advanced') label="Use advanced query syntax:" %]
+[% INCLUDE "search/form.tt" %]
 
-      [% INCLUDE "forms/submit.tt" label="Search" %]
-    [% END %]
-  </div>
-
-  <div class="searchinfo">
-    <strong>Please Note:</strong>
-
-    <ul>
-      <li>
-        Search indexes are currently updated once a day at 1800 GMT (10am PST).
-        If you require up to the minute correct search, please use the
-        <a href="[% c.uri_for('/search/internal') %]">old search</a>.
-      </li>
-    </ul>
-  </div>
 [% END %]
-
-[% END %]

Added: mb_server/branches/TemplateToolkit/root/search/form.tt


_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits