[mb-commits] r8358 - mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation

Author: keschte
Date: 2006-08-07 19:34:57 +0000 (Mon, 07 Aug 2006)
New Revision: 8358

Modified:
   
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
   
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
Log:
improving the layout of the attr/lang type.


Modified: 
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
===================================================================
--- 
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
       2006-08-07 19:09:42 UTC (rev 8357)
+++ 
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
       2006-08-07 19:34:57 UTC (rev 8358)
@@ -40,25 +40,15 @@
 %              Album->GetAttributeName($_) || "#$_"
 %      } split ',', $new->{Attributes};
 
-%      $type = "Not set" if (not defined $type);
-%      $status = "Not set" if (not defined $status);
+%      $type = "?" if (not defined $type);
+%      $status = "?" if (not defined $status);
 
-       Set new <& /comp/linkdoc, "ReleaseAttribute", "release attributes" &>
-       on <% @$releases == 1 ? "the selected release." : "all ".@$releases." 
releases." %>
-
        <table class="editfields">
                <tr>
-                       <td class="lbl">Type:</td>
-                       <td class="field"><% $type %></td>
+                       <td class="lbl">New:</td>
+                       <td class="field">Type: <% $type %>, Status: <% $status 
%></td>
                </tr>
                <tr>
-                       <td class="lbl">Status:</td>
-                       <td class="field"><% $status %></td>
-               </tr>
-       </table>
-
-       <table class="editfields">
-               <tr>
                        <td class="lbl">Was:</td>
                        <td>
                                <table class="editlisting">
@@ -73,15 +63,13 @@
 %              my ($type, $status) = map {
 %                      Album->GetAttributeName($_) || "#$_"
 %              } split ',', $release->{prev};
-%              $type = "Not set" if not defined($type);
-%              $status = "Not set" if not defined($status);
+%              $type = "?" if not defined($type);
+%              $status = "?" if not defined($status);
 
                                                </td>
                                                <td>
-                                                       [
-                                                       <span class="explain" 
title="Type"><% $type %></span>,
-                                                       <span class="explain" 
title="Status"><% $status %></span>
-                                                       ]
+                                                       (<span class="explain" 
title="Type"><% $type %></span>,
+                                                        <span class="explain" 
title="Status"><% $status %></span>)
                                                </td>
                                        </tr>
 

Modified: 
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
===================================================================
--- 
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
   2006-08-07 19:09:42 UTC (rev 8357)
+++ 
mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
   2006-08-07 19:34:57 UTC (rev 8358)
@@ -37,14 +37,14 @@
        my $self = shift;
        my $releases = $self->{'_new_albums'};
 
-       my $lang = "Not set";
+       my $lang = "?";
        if ($self->{_languageid})
        {
                $lang = MusicBrainz::Server::Language->newFromId(
                                        $self->{DBH}, $self->{_languageid});
                $lang = $lang->GetName;
        }
-       my $script = "Not set";
+       my $script = "?";
        if ($self->{_scriptid})
        {
                $script = MusicBrainz::Server::Script->newFromId(
@@ -54,22 +54,12 @@
 
 </%perl>
 
-       Set new <& /comp/linkdoc, "ReleaseLanguage", "release language/script" 
&>
-       on <% @$releases == 1 ? "the selected release." : "all ".@$releases." 
releases." %>
-
        <table class="editfields">
                <tr>
-                       <td class="lbl">Language:</td>
-                       <td class="field"><% $lang %></td>
+                       <td class="lbl">New:</td>
+                       <td class="field">Language: <% $lang %>, Script: <% 
$script %></td>
                </tr>
                <tr>
-                       <td class="lbl">Script:</td>
-                       <td class="field"><% $script %></td>
-               </tr>
-       </table>
-
-       <table class="editfields">
-               <tr>
                        <td class="lbl">Was:</td>
                        <td>
                                <table class="editlisting">
@@ -81,7 +71,7 @@
                                                <td>
                                                        <& /comp/linkrelease, 
id => $release->{'id'}, name => $release->{'name'}, strong => 0 &>
 
-%              my $lang = "Not set";
+%              my $lang = "?";
 %              if ($release->{prev_lang})
 %              {
 %                      my $l = MusicBrainz::Server::Language->newFromId(
@@ -89,7 +79,7 @@
 %                      $lang = $l->GetName;
 %              }
 
-%              my $script = "Not set";
+%              my $script = "?";
 %              if ($release->{prev_script})
 %              {
 %                      my $s = MusicBrainz::Server::Script->newFromId(
@@ -99,10 +89,8 @@
 
                                                </td>
                                                <td>
-                                                       [
-                                                       <span class="explain" 
title="Language"><% $lang %></span>,
-                                                       <span class="explain" 
title="Script"><% $script %></span>
-                                                       ]
+                                                       (<span class="explain" 
title="Language"><% $lang %></span>,
+                                                        <span class="explain" 
title="Script"><% $script %></span>)
                                                </td>
                                        </tr>