[mb-commits] r10092 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Form lib/MusicBrainz/Server/Form/Artist lib/MusicBrainz/Server/Form/Field lib/MusicBrainz/Server/Form/Model root root/artist root/forms root/search

[root at musicbrainz.org]

Author: acid2
Date: 2008-07-11 21:21:08 +0000 (Fri, 11 Jul 2008)
New Revision: 10092

Added:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/Date.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Model/Artist.pm
   mb_server/branches/TemplateToolkit/root/forms/label.tt
   mb_server/branches/TemplateToolkit/root/search/
   mb_server/branches/TemplateToolkit/root/search/editor.tt
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist/Edit.pm
   mb_server/branches/TemplateToolkit/root/artist/edit.tt
   mb_server/branches/TemplateToolkit/root/forms/input.tt
   mb_server/branches/TemplateToolkit/root/forms/widget.tt
Log:
More work on editing artist - mainly sorted out the yyyy-mm-dd field

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm	2008-07-11 02:16:48 UTC (rev 10091)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm	2008-07-11 21:21:08 UTC (rev 10092)
@@ -74,7 +74,7 @@
 
     use MusicBrainz::Server::Form::Artist::Edit;
 
-    my $form = new MusicBrainz::Server::Form::Artist::Edit;
+    my $form = new MusicBrainz::Server::Form::Artist::Edit($artist->GetId);
     $c->stash->{form} = $form;
 
     if($c->form_posted)
@@ -92,13 +92,6 @@
                                 sortname => $artist->GetSortName );
         }
     }
-    else
-    {
-        # Prefill form with the current artist data
-        $form->field('name')->value($artist->GetName);
-        $form->field('sortname')->value($artist->GetSortName);
-        $form->field('artist_type')->value($artist->GetType);
-    }
 
     $c->stash->{template} = 'artist/edit.tt';
 }

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist/Edit.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist/Edit.pm	2008-07-11 02:16:48 UTC (rev 10091)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist/Edit.pm	2008-07-11 21:21:08 UTC (rev 10092)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use base 'Form::Processor';
+use base 'MusicBrainz::Server::Form::Model::Artist';
 
 use MusicBrainz::Server::Artist;
 
@@ -18,14 +18,8 @@
             artist_type => 'Select'
         },
         optional => {
-            startYear => 'Integer',
-            startMonth => 'Integer',
-            startDay => 'Integer',
-
-            endYear => 'Integer',
-            endMonth => 'Integer',
-            endDay => 'Integer',
-
+            start => '+MusicBrainz::Server::Form::Field::Date',
+            end => '+MusicBrainz::Server::Form::Field::Date',
             editNote => 'TextArea'
         }
     };

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/Date.pm

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Model/Artist.pm

Modified: mb_server/branches/TemplateToolkit/root/artist/edit.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/edit.tt	2008-07-11 02:16:48 UTC (rev 10091)
+++ mb_server/branches/TemplateToolkit/root/artist/edit.tt	2008-07-11 21:21:08 UTC (rev 10092)
@@ -21,8 +21,13 @@
 
 [% WRAPPER "forms/form.tt" %]
   [% INCLUDE "forms/widget.tt" widget=form.field("artist_type") label="Type" %]
+  
   [% INCLUDE "forms/widget.tt" widget=form.field("name") label="Name" %]
   [% INCLUDE "forms/widget.tt" widget=form.field("sortname") label="Sort Name" %]
+
+  [% INCLUDE "forms/widget.tt" widget=form.field("start") label="Start" %]
+  [% INCLUDE "forms/widget.tt" widget=form.field("end") label="End" %]
+ 
   [% INCLUDE "forms/edit-note.tt" %]
   [% INCLUDE "forms/submit.tt" label="Update" %]
 [% END %]

Modified: mb_server/branches/TemplateToolkit/root/forms/input.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/forms/input.tt	2008-07-11 02:16:48 UTC (rev 10091)
+++ mb_server/branches/TemplateToolkit/root/forms/input.tt	2008-07-11 21:21:08 UTC (rev 10092)
@@ -12,6 +12,10 @@
     </option>
   [%- END -%]
   </select>
+[%- ELSIF type == 'date' %]
+  <input size="4" type="text" name="[% name %]_year" id="[% id %]_year" value="[% widget.date.year %]" />
+  <input size="2" type="text" name="[% name %]_month" id="[% id %]_month" value="[% widget.date.month %]" />
+  <input size="2" type="text" name="[% name %]_day" id="[% id %]_day" value="[% widget.date.day %]" />
 [%- ELSIF type == 'checkbox' %]
   <input type="[% type %]" name="[% name %]" id="[% id %]" [% IF value %]checked="checked"[% END %] />
 [%- ELSE -%]

Added: mb_server/branches/TemplateToolkit/root/forms/label.tt

Modified: mb_server/branches/TemplateToolkit/root/forms/widget.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/forms/widget.tt	2008-07-11 02:16:48 UTC (rev 10091)
+++ mb_server/branches/TemplateToolkit/root/forms/widget.tt	2008-07-11 21:21:08 UTC (rev 10092)
@@ -2,19 +2,13 @@
 
 [%- id = "id_${widget.name}" -%]
 
-[%- BLOCK labelHtml -%]
-<label for="[% id %]" class="[% widget.required_text %][% widget.errors.size ? " error" : "" %]">
-  [% label %]
-</label>
-[%- END -%]
-
 [%- IF widget.widget == 'checkbox' -%]
 <p class="labelRight">
   [% INCLUDE "forms/input.tt" %]
-  [% PROCESS labelHtml %]
+  [% INCLUDE "forms/label.tt" %]
 [%- ELSE -%]
   <p>
-    [% PROCESS labelHtml %]
+    [% INCLUDE "forms/label.tt" %]
     [% INCLUDE "forms/input.tt" %]
 [%- END -%]
 </p>

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