Please take our Survey
logo       
<prev   next>

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

[mb-commits] r7944 - in mb_server/trunk/htdocs: . bare comp comp/release_ed: msg#00168

audio.musicbrainz.cvs

Subject: [mb-commits] r7944 - in mb_server/trunk/htdocs: . bare comp comp/release_editor comp/search edit/album edit/albumbatch edit/albumlanguage edit/annotation/artist edit/artist show/puid show/release

Author: keschte
Date: 2006-06-26 16:23:01 +0000 (Mon, 26 Jun 2006)
New Revision: 7944

Modified:
mb_server/trunk/htdocs/bare/cdlookup.html
mb_server/trunk/htdocs/browsevarious.html
mb_server/trunk/htdocs/comp/album
mb_server/trunk/htdocs/comp/albumcollapsed
mb_server/trunk/htdocs/comp/artisttitle
mb_server/trunk/htdocs/comp/google-site-search
mb_server/trunk/htdocs/comp/lookupoptions
mb_server/trunk/htdocs/comp/release_editor/form
mb_server/trunk/htdocs/comp/search/external
mb_server/trunk/htdocs/comp/search/form
mb_server/trunk/htdocs/comp/search/internal
mb_server/trunk/htdocs/comp/textsearch
mb_server/trunk/htdocs/edit/album/editattributes.html
mb_server/trunk/htdocs/edit/albumbatch/done.html
mb_server/trunk/htdocs/edit/albumbatch/merge.html
mb_server/trunk/htdocs/edit/albumbatch/remove.html
mb_server/trunk/htdocs/edit/albumlanguage/edit.html
mb_server/trunk/htdocs/edit/annotation/artist/edit.html
mb_server/trunk/htdocs/edit/artist/add.html
mb_server/trunk/htdocs/show/puid/index.html
mb_server/trunk/htdocs/show/release/index.html
Log:
misc. cleanups (new entity urls), moved site search more to the top of the
search.html page. enabling PUID lookup, fixed some bugs for the cdlookup by
discid/freedbid.


Modified: mb_server/trunk/htdocs/bare/cdlookup.html
===================================================================
--- mb_server/trunk/htdocs/bare/cdlookup.html 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/bare/cdlookup.html 2006-06-26 16:23:01 UTC (rev
7944)
@@ -67,7 +67,9 @@
}

# if neither discid nor toc are provided, abort.
- if (not defined $id and not defined $toc)
+ if (not defined $freedbid and
+ not defined $discid and
+ not defined $toc)
{
return $m->comp("/comp/layout/badarguments",
text => qq!You need to pass a Disc ID
<strong>discid</strong>
@@ -105,18 +107,25 @@
% my $text = "";
% if ($discid)
% {
- $text .= $m->scomp("/comp/linkdoc", "DiscID", "Disc
ID");
- $text .= "$discid";
+ <& /comp/form/feedbackbox, "warning", "",
+ qq! No release found with the given !
+ . $m->scomp("/comp/linkdoc", "DiscID", "Disc
ID")
+ . qq! <code>$discid</code> ! &>

+ Please try again.
+
% }
% else
% {
- $text .= "<strong>FreeDB ID</strong>: $freedbid";

+ <& /comp/form/feedbackbox, "warning", "",
+ qq! No release found with the given
<strong>FreeDB ID
+ </strong> <code>$freedbid</code>.! &>
+
+ Please try again.
+
% }

- <& /comp/form/feedbackbox, "warning", "",
- qq!No release found with the given $text! &>

<%perl>
}

Modified: mb_server/trunk/htdocs/browsevarious.html
===================================================================
--- mb_server/trunk/htdocs/browsevarious.html 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/browsevarious.html 2006-06-26 16:23:01 UTC (rev
7944)
@@ -192,7 +192,7 @@

$m->out(sprintf qq!<td
class="browsenr">%d.</td>!, $i + 1 + ($row++*$rows) + $offset);
$m->out(sprintf qq!<td
class="browsename%s">!, ($_->GetModPending ? " modpending" : ""));
- $m->out(sprintf qq!<a
href="/showalbum.html?albumid=%d" title="%s">%s</a></td>!,
+ $m->out(sprintf qq!<a
href="/show/release/?releaseid=%d" title="%s">%s</a></td>!,
$_->GetId,
$albummeta,
encode_entities($_->GetName));

Modified: mb_server/trunk/htdocs/comp/album
===================================================================
--- mb_server/trunk/htdocs/comp/album 2006-06-26 15:32:22 UTC (rev 7943)
+++ mb_server/trunk/htdocs/comp/album 2006-06-26 16:23:01 UTC (rev 7944)
@@ -61,7 +61,7 @@
{
my ($id, $url);

- $url = "/showartist.html?artistid=" . $artist->GetId();
+ $url = "/show/artist/?artistid=" . $artist->GetId();
$id = $album->GetId();
$ex =~ s/(^|\D)$id(\D|$)/$1$2/g;
$ex =~ s/,,/,/g;

Modified: mb_server/trunk/htdocs/comp/albumcollapsed
===================================================================
--- mb_server/trunk/htdocs/comp/albumcollapsed 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/albumcollapsed 2006-06-26 16:23:01 UTC (rev
7944)
@@ -38,7 +38,7 @@
<%perl>

my $trackcount = $album->GetTrackCount();
- my $link = "/showartist.html?artistid=" . $artist->GetId() . "&ex=";
+ my $link = "/show/artist/?artistid=" . $artist->GetId() . "&ex=";

$ex .= "," . $album->GetId();
$ex =~ s/^,//g;

Modified: mb_server/trunk/htdocs/comp/artisttitle
===================================================================
--- mb_server/trunk/htdocs/comp/artisttitle 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/artisttitle 2006-06-26 16:23:01 UTC (rev
7944)
@@ -81,10 +81,10 @@

$m->out(sprintf qq!<a
href="/show/permlink.html?id=$mbid&amp;type=artist" title="Link to this
artist">Copy link</a>!, uri_escape($name));
$m->out(qq! | <a href="/show/artist/details.html?artistid=$id"
title="Artist Details">Details</a>!);
- $m->out(qq! | <a href="/showaliases.html?artistid=$id"
title="Artist Aliases">Aliases</a>!);
+ $m->out(qq! | <a href="/show/artist/aliases.html?artistid=$id"
title="Artist Aliases">Aliases</a>!);
if ($id != &ModDefs::VARTIST_ID)
{
- $m->out(qq! | <a href="/showartist.html?artistid=$id"
title="Releases of this Artist">Releases</a>!);
+ $m->out(qq! | <a href="/show/artist/?artistid=$id"
title="Releases of this Artist">Releases</a>!);
}
else
{
@@ -92,7 +92,7 @@
}
if ($id != &ModDefs::VARTIST_ID)
{
- $m->out(qq! | <a href="/artistrel.html?artistid=$id"
title="Related Artists">Related&nbsp;artists</a> | !);
+ $m->out(qq! | <a
href="/show/artist/similar.html?artistid=$id" title="Similar
Artists">Similar&nbsp;artists</a> | !);
$m->comp("/comp/googlelink", search => $name, text =>
"Search&nbsp;Google", raw => 1);
}
if ($session{uid})
@@ -129,7 +129,7 @@
if (my @non = $al->FindNonAlbum($id))
{
my $nonid = $non[0]->GetMBId;
- $m->out(qq!| <a
href="/showalbum.html?mbid=$nonid">Non-album tracks</a>!);
+ $m->out(qq!| <a
href="/show/release/?mbid=$nonid">Non-album tracks</a>!);

} else {
$m->out(qq!| <a
href="/edit/track/addnonalbum.html?artistid=$id">Add non-album tracks</a>!);

Modified: mb_server/trunk/htdocs/comp/google-site-search
===================================================================
--- mb_server/trunk/htdocs/comp/google-site-search 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/comp/google-site-search 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -1,45 +1,51 @@
<%args>
+
$text => ""
$site => "musicbrainz.org"
+
</%args>
-% my $google = UserPreference::get("google_domain");

+% my $google = UserPreference::get("google_domain");
+
<form id="GoogleSearchForm" method="get" action="http://<% $google
%>/custom">
- <div>
- <a href="http://<% $google %>/search"><img
- src="http://<% $google %>/logos/Logo_40wht.gif"
- alt="Google" /></a>
- </div>

- <div style="margin-top: 0.5em; text-align: center">
- <input type="text" name="q" size="31" maxlength="255"
value="<% $text %>" />
- </div>
+ <table class="formstyle" style="margin-bottom: 10px">
+ <tr class="top">
+ <td class="labelnopad" rowspan="2">
+ <div style="margin-top: 6px;">
+ Site Search:
+ </div>
+ <div style="font-size: 9px;
font-weight: normal">
+ powered by google&nbsp;
+ </div></td>
+ <td>
+ <input type="text" name="q" size="20"
maxlength="255" value="<% $text %>" />
+ <input type="submit" name="sa"
value="Search" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="radio" name="sitesearch"
value="musicbrainz.org" checked="checked" />
+ All MusicBrainz sites <br />
+ <input type="radio" name="sitesearch"
value="wiki.musicbrainz.org" />
+ MusicBrainz Wiki <br />
+ <input type="radio" name="sitesearch"
value="lists.musicbrainz.org" />
+ MusicBrainz Mailing Lists <br />
+ <input type="radio" name="sitesearch"
value="chatlogs.musicbrainz.org" />
+ MusicBrainz Chat Logs <br />
+ <input type="radio" name="sitesearch"
value="blog.musicbrainz.org" />
+ MusicBrainz Blog <br />

- <div style="margin-top: 0.5em; text-align: center">
- <select name="sitesearch">
- <& /comp/options,
- [
- [ "", "Search the Internet" ],
- [ "musicbrainz.org", "Search all
MusicBrainz web sites" ],
- [ "wiki.musicbrainz.org", "Search the
MusicBrainz Wiki" ],
- [ "lists.musicbrainz.org", "Search the
MusicBrainz mailing lists" ],
- [ "chatlogs.musicbrainz.org", "Search
the MusicBrainz chat logs" ],
- [ "blog.musicbrainz.org", "Search the
MusicBrainz blog" ],
- ],
- $site,
- &>
- </select>
- </div>
+% # See http://www.google.com/services/free.html
+% # -- turned off the customization for
now.
+% # <input type="hidden" name="cof"
value="GIMP:#b78242;T:#000000;LW:604;ALC:#00FFFF;L:http://www.musicbrainz.org/images/google.png;GFNT:#CCCCC;LC:#736DAB;LH:89;BGC:#FFFFFF;AH:center;VLC:#734D8B;GALT:#b78242;AWFID:f7ac0473f1a88aef;";
/>

- <div style="margin-top: 0.5em; margin-bottom: 0.75em;
text-align: center">
- <input type="submit" name="sa" value="Google Search" />
-
-% # See http://www.google.com/services/free.html
- <input type="hidden" name="cof"
value="GIMP:#b78242;T:#000000;LW:604;ALC:#00FFFF;L:http://www.musicbrainz.org/images/google.png;GFNT:#CCCCC;LC:#736DAB;LH:89;BGC:#FFFFFF;AH:center;VLC:#734D8B;GALT:#b78242;AWFID:f7ac0473f1a88aef;";
/>
- <input type="hidden" name="domains"
value="musicbrainz.org;www.musicbrainz.org;wiki.musicbrainz.org;lists.musicbrainz.org;chatlogs.musicbrainz.org;blog.musicbrainz.org"
/>
- <input type="hidden" name="ie" value="utf-8" />
- <input type="hidden" name="oe" value="utf-8" />
- </div>
+ <input type="hidden" name="domains"
value="musicbrainz.org;www.musicbrainz.org;wiki.musicbrainz.org;lists.musicbrainz.org;chatlogs.musicbrainz.org;blog.musicbrainz.org"
/>
+ <input type="hidden" name="ie"
value="utf-8" />
+ <input type="hidden" name="oe"
value="utf-8" />
+ </td>
+ </tr>
+ </table>
</form>

%# vi: set ts=4 sw=4 ft=mason :
\ No newline at end of file

Modified: mb_server/trunk/htdocs/comp/lookupoptions
===================================================================
--- mb_server/trunk/htdocs/comp/lookupoptions 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/lookupoptions 2006-06-26 16:23:01 UTC (rev
7944)
@@ -1,64 +1,122 @@
<%args>
- $artist=>""
- $album=>""
- $artistobj=>undef
- $albumobj=>undef
- $data=>undef
+
+ $artist => ""
+ $album => ""
+ $artistobj => undef
+ $albumobj => undef
+ $data => undef
+
</%args>

<%perl>

-my ($search, $display);
+ my ($search, $display);

-$artist = $artistobj->GetName() if (defined $artistobj &&
$artistobj->GetName() ne '');
-$album = $albumobj->GetName() if (defined $albumobj && $albumobj->GetName() ne
'');
+ $artist = $artistobj->GetName() if (defined $artistobj &&
$artistobj->GetName() ne "");
+ $album = $albumobj->GetName() if (defined $albumobj &&
$albumobj->GetName() ne "");

-$artist = $data->{artist} if (defined $data && $artist eq '');
-$album = $data->{album} if (defined $data && $album eq '');
+ $artist = $data->{artist} if (defined $data && $artist eq '');
+ $album = $data->{album} if (defined $data && $album eq '');

-$search = "$artist $album";
-if ($artist ne '' && $album ne '')
-{
- $display = "$album by $artist";
-}
-else
-{
- $display = "$album $artist";
-}
+ $search = "$artist $album";
+ if ($artist ne '' && $album ne '')
+ {
+ $display = "$album by $artist";
+ }
+ else
+ {
+ $display = "$album $artist";
+ }

</%perl>

-<strong>Can't find what you're looking for?</strong><p/>
-If you can't find what you're looking for, it's possible that <strong>your
search terms didn't match our data</strong>. Try the following:
+ <strong>Can't find what you're looking for?</strong><p/>
+ If you can't find what you're looking for, it's possible that
+ <strong>your search terms didn't match our data</strong>.

-<ul>
- <li><strong>Modify your search terms in the box below</strong> and
search again.<br/>
-Often it helps to remove information such as words that might be misspelled,
remix names, featured artists, etc.<br/>
-Your tags may differ considerably from the data in MusicBrainz, as we edit
data according to our <a
href="http://wiki.musicbrainz.org/OfficialStyleGuideline";>Style Guidelines</a>,
so less specific searches may find what you are looking for. This is especially
true if your tags are inaccurate. There are more searching hints on the <a
href="http://wiki.musicbrainz.org/HowToSearch";>How to Search</a> page on the
wiki.</li>
-% if (defined $artistobj) {
- <li><strong>Look for the album on the <a href="/showartist.html?id=<%
$artistobj->GetId() %>">artist page for <% $artist %></a></strong>. You may
find that the album you're looking for is on the artist's page even if the
search doesn't find it.</li>
-% } else {
- <li><strong>Search for the artist and look for the album on the artist
page</strong>. You may find that the album you're looking for is on the
artist's page even if the search doesn't find it.</li>
-% }
- <li><strong>Search for just the artist, album or track using the quick
search in the sidebar</strong>. The quick search only tries to match one piece
of data, and you're therefore more likely to find what you're looking for.</li>
-</ul>
+ Try the following:

-<strong>What if I still can't find what I'm looking for?</strong><p/>
-If you've tried all of the above and still can't find what you're looking for,
maybe MusicBrainz just doesn't have the information in the database. You can:
-<ul>
- <li><strong><a href="/freedb/freedb.html?search=<% uri_escape($search)
%>">Import a new album from FreeDB</a></strong>. You will need to spend some
time cleaning up the data according to the <a
href="http://wiki.musicbrainz.org/OfficialStyleGuideline";>Style Guidelines</a>,
finding release dates, etc. before it gets inserted into MusicBrainz.
-</li>
-% if (defined $artistobj) {
- <li><strong><a href="/edit/album/add.html?artistid=<% $artistobj->GetId
%>">Add an album manually</a></strong>.</li>
-% } else {
- <li><strong><a
href="http://musicbrainz.org/edit/artist/add.html?initial_name=<% $artist
%>">Add a new artist</a></strong>.</li>
-% }
-% if ($artist ne '' && defined $artistobj) {
- <li>If you can't find the track you're looking for and you are
<em>sure</em> that the track has never been released on any album or single
(including bootlegs), you can <a href="/edit/track/addnonalbum.html?artistid=<%
$artistobj->GetId %>" onclick="document.forms.AddNonAlbumTrack.submit(); return
false">add a non-album track</a> to the artist '<% $artist %>'. Do
<strong>not</strong> use this simply because you can't find which album a track
is on (or haven't looked), or your changes will be voted down.</li>
-% }
-</ul>
+ <ul>
+ <li>
+ <strong>Modify your search terms in the box
below</strong> and search again.<br/>
+ Often it helps to remove information such as words that
might
+ be misspelled, remix names, featured artists, etc.<br/>
+ Your tags may differ considerably from the data in
MusicBrainz,
+ as we edit data according to our <& /comp/linkdoc,
"StyleGuideline",
+ "Style Guidelines" &>, so less specific searches may
find what
+ you are looking for. This is especially true if your
tags are
+ inaccurate.
+ There are more searching hints on the <& /comp/linkdoc,
"HowToSearch",
+ "How to Search" &> page.</li>

-<form method="post" action="/edit/track/addnonalbum.html"
id="AddNonAlbumTrack">
- <input type="hidden" name="artistid" value="<% $artistobj ?
$artistobj->GetId : '' %>"/>
- <input type="hidden" name="trackname" value="<% $data->{track} %>"/>
-</form>
+% if (defined $artistobj)
+% {
+
+ <li>
+ <strong>Look for the release on the artist page of
+ <& /comp/linkartist, artist => $artistobj &></strong>.
You may
+ find that the release you're looking for is on the
artist's page
+ even if the search doesn't find it.</li>
+
+% }
+% else
+% {
+
+ <li>
+ <strong>Search for the artist and look for the release
on the artist
+ page</strong>. You may find that the release you're
looking for is
+ on the artist's page even if the search doesn't find
it.</li>
+% }
+
+ <li>
+ <strong>Search for just the artist, release or track using the
quick
+ search in the sidebar</strong>. The quick search only tries to
+ match one piece of data, and you're therefore more likely to
find
+ what you're looking for.</li>
+ </ul>
+
+ <strong>What if I still can't find what I'm looking for?</strong>
+ If you've tried all of the above and still can't find what you're
looking for,
+ maybe MusicBrainz just doesn't have the information in the database.
You can:
+
+ <ul>
+ <li>
+ <strong><a href="/freedb/freedb.html?search=<%
uri_escape($search) %>">Import
+ a new release from FreeDB</a></strong>. You will need
to spend some time
+ cleaning up the data according to the <& /comp/linkdoc,
"StyleGuideline",
+ "Style Guidelines" &>, finding release dates, etc.
before it gets
+ inserted into MusicBrainz.</li>
+
+% if (defined $artistobj)
+% {
+ <li>
+ <strong><a href="/edit/album/add.html?artistid=<%
$artistobj->GetId %>">Add a
+ release manually</a></strong>.</li>
+
+% }
+% else
+% {
+ <li>
+ <strong><a
href="http://musicbrainz.org/edit/artist/add.html?initial_name=<% $artist %>">
+ Add a new artist</a></strong>.</li>
+% }
+
+% if ($artist ne "" && defined $artistobj)
+% {
+
+ <li>
+ If you can't find the track you're looking for and you
are <em>sure</em>
+ that the track has never been released on any release
or single (including bootlegs),
+ you can <a
href="/edit/track/addnonalbum.html?artistid=<% $artistobj->GetId %>"
+ onclick="document.forms.AddNonAlbumTrack.submit();
return false">add a non-album track</a>
+ to the artist '<% $artist %>'. Do <strong>not</strong>
use this simply because
+ you can't find which release a track is on (or haven't
looked), or your changes
+ will be voted down.</li>
+% }
+
+ </ul>
+
+ <form method="post" action="/edit/track/addnonalbum.html"
id="AddNonAlbumTrack">
+ <input type="hidden" name="artistid" value="<% $artistobj ?
$artistobj->GetId : '' %>" />
+ <input type="hidden" name="trackname" value="<% $data->{track}
%>" />
+ </form>

Modified: mb_server/trunk/htdocs/comp/release_editor/form
===================================================================
--- mb_server/trunk/htdocs/comp/release_editor/form 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/comp/release_editor/form 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -567,9 +567,9 @@
% # MULTIPLETRACKARTISTS: ARTISTNAME FIELD,
% #
-------------------------------------------------------------------------
%
-% my $showartist = $hasmultipletrackartists ? "" : "display:
none";
+% my $artistcss = $hasmultipletrackartists ? "" : "display: none";

- <tr id="track_artist::tr::<% $i %>::" style="<%
$showartist %>" class="trackartist <% $i % 2 == 0 ? "even" : "odd" %>">
+ <tr id="track_artist::tr::<% $i %>::" style="<%
$artistcss %>" class="trackartist <% $i % 2 == 0 ? "even" : "odd" %>">
<td class="label">
<& /comp/form/label, id =>
"id_$artistnamefield", title => "Artist" &>
</td>

Modified: mb_server/trunk/htdocs/comp/search/external
===================================================================
--- mb_server/trunk/htdocs/comp/search/external 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/search/external 2006-06-26 16:23:01 UTC (rev
7944)
@@ -37,17 +37,17 @@
# 'go', 'Presentation with tool bar');

</%perl>
-
+
<table width="100%" cellspacing="0" cellpadding="0">
<tr valign="top">
- <td class="boxeslist" style="width: 50%; padding-right:
20px">
+ <td class="boxeslist" style="width: 50%; padding-right:
20px">
<div class="orangeheader">
<div class="inner"><b>CD shopping
sites</b></div>
</div>
<div class="boxcontent">
- <div class="inner" style="text-align:
center">
-
- <& /comp/search/form, name =>
'www.amazon.com',
+ <div class="inner" style="text-align:
center">
+
+ <& /comp/search/form, name =>
'amazon.com',
nameurl =>
'http://www.amazon.com',
scripturl =>
'http://www.amazon.com/exec/obidos/external-search',
method => 'get',
@@ -55,27 +55,27 @@
searchfield =>
'keyword',
formname =>
'AmazonForm',
&>
- <& /comp/search/form, name =>
'www.barnesandnoble.com',
+ <& /comp/search/form, name =>
'barnesandnoble.com',
nameurl =>
'http://www.barnesandnoble.com',
scripturl =>
'http://music.barnesandnoble.com/search/results.asp',
method => 'get',
hidden => ['qsrch','A'],
searchfield => 'WRD' &>

- <& /comp/search/form, name =>
'www.sonymusicstore.com',
+ <& /comp/search/form, name =>
'sonymusicstore.com',
nameurl =>
'http://www.sonymusicstore.com',
scripturl =>
'http://www.sonymusicstore.com/store/catalog/SearchAction.do',
hidden => ['searchBy',
'Quick'],
method => 'get',
searchfield =>
'keyword' &>

- <& /comp/search/form, name =>
'www.letitbe.com',
+ <& /comp/search/form, name =>
'letitbe.com',
nameurl =>
'http://www.letitbe.com',
scripturl =>
'http://www.letitbe.com/search/',
searchfield =>
'search_string' &>

%# domain registration expired.
-%# <& /comp/search/form, name =>
'www.combomedia.com',
+%# <& /comp/search/form, name =>
'combomedia.com',
%# nameurl =>
'http://www.combomedia.com',
%# scripturl =>
'http://www.affiliatebots.com/cgi-bin/search_music.cgi',
%# method => 'get',
@@ -83,98 +83,98 @@
%# searchfield => 'find' &>
</div>
</div>
-
+
<div class="orangeheader">
<div class="inner"><b>Classical music
sites</b></div>
</div>
<div class="boxcontent">
- <div class="inner" style="text-align:
center">
-
+ <div class="inner" style="text-align:
center">
+
<& /comp/search/form, name =>
'allmusic.com',
nameurl =>
'http://www.allmusic.com',
scripturl =>
'http://www.allmusic.com/cg/amg.dll',
hidden => ['P', 'amg',
'OPT1','55', 'Submit', 'Go'],
searchfield => 'SQL' &>

- <& /comp/search/form, name =>
'www.aria-database.com',
+ <& /comp/search/form, name =>
'aria-database.com',
nameurl =>
'http://www.aria-database.com',
scripturl =>
'http://www.aria-database.com/cgi-bin/aria-search.pl',
hidden => \@site_aria,
searchfield =>
'keyword' &>
-
-%# site needs registration.
-%# <& /comp/search/form, name => 'www.musicnet.org',
+
+%# site needs registration.
+%# <& /comp/search/form, name => 'musicnet.org',
%# method => 'get',
%# nameurl => 'http://www.musicnet.org',
%# scripturl => 'http://www.musicanet.org/cgi-musica/musica.cgi',
%# hidden => \@site_musica,
%# searchfield => 'v0_0' &>

-%# site needs registration.
-%# <& /comp/search/form, name => 'www.gramophone.co.uk',
+%# site needs registration.
+%# <& /comp/search/form, name => 'gramophone.co.uk',
%# nameurl =>
'http://www.gramophone.co.uk',
%# scripturl =>
'http://www.gramofile.co.uk/folio/om_isapi.dll?&infobase=Gramofile.nfo&softpage=All_Frame_Pg42&record=dochitfirst',
%# hidden => ['querytemplate',
'Test'],
%# searchfield => 'E3' &>
</div>
- </div>

+ </div>
</td>
-
+
<td class="boxeslist" style="padding: 0px; margin: 0px">
<div class="orangeheader">
<div class="inner"><b>Lyrics
sites</b></div>
</div>
<div class="boxcontent">
- <div class="inner" style="text-align:
center">
-
- <& /comp/search/form, name =>
'www.lyricfind.com',
+ <div class="inner" style="text-align:
center">
+
+ <& /comp/search/form, name =>
'lyricfind.com',
nameurl =>
'http://www.lyricfind.com',
scripturl =>
'http://www.lyricfind.com/search.php3',
method => 'get',
hidden =>
['ssongtitle','1','ssartist','1'],
searchfield => 'search'
&>
-
-%# crappy advertisement page
-%# <& /comp/search/form, name =>
'www.lyrichound.com',
+
+%# crappy advertisement page
+%# <& /comp/search/form, name =>
'lyrichound.com',
%# nameurl =>
'http://www.lyrichound.com',
%# scripturl =>
'http://www.lyrichound.com/cgiwrap/search.cgi',
%# hidden =>
['boolean','AND'],
%# searchfield => 'terms'
&>

- <& /comp/search/form, name =>
'www.lyricspost.com',
+ <& /comp/search/form, name =>
'lyricspost.com',
nameurl =>
'http://www.lyricspost.com',
scripturl =>
'http://www.lyricspost.com/index.php',
hidden =>
['searchbutton', 'Search'],
searchfield => 'search'
&>
-
- <& /comp/search/form, name =>
'www.lyricsworld.com',
+
+ <& /comp/search/form, name =>
'lyricsworld.com',
nameurl =>
'http://www.lyricsworld.com',
scripturl =>
'http://www.lyricsworld.com/cgi-bin/search',
method => 'get',
hidden => ['m', 'bool'],
searchfield => 'q' &>
-
+
<& /comp/search/form, name =>
'lyrics.astraweb.com',
nameurl =>
'http://lyrics.astraweb.com',
scripturl =>
'http://search.lyrics.astraweb.com/',
method => 'get',
searchfield => 'word' &>
</div>
- </div>

+ </div>

<div class="orangeheader">
<div class="inner"><b>Info
sites</b></div>
</div>
<div class="boxcontent">
- <div class="inner" style="text-align:
center">
-
- <& /comp/search/form, name =>
'www.rollingstone.com',
+ <div class="inner" style="text-align:
center">
+
+ <& /comp/search/form, name =>
'rollingstone.com',
nameurl =>
'http://www.rollingstone.com',
scripturl =>
'http://www.rollingstone.com/search',
method => 'get',
hidden =>
['type','artist','search','Search'],
searchfield => 'query'
&>
-
+
<& /comp/search/form, name =>
'allmusic.com',
nameurl =>
'http://www.allmusic.com',
scripturl =>
'http://www.allmusic.com/cg/amg.dll',
@@ -182,20 +182,20 @@
searchfield => 'SQL' &>

%# redirects to real rhapsody
-%# <& /comp/search/form, name =>
'www.listen.com',
+%# <& /comp/search/form, name =>
'listen.com',
%# nameurl =>
'http://www.listen.com',
%# scripturl =>
'http://www.listen.com/results.jsp',
%# method => 'get',
%# searchfield => 'artist'
&>
-
- <& /comp/search/form, name =>
'www.juno.co.uk',
+
+ <& /comp/search/form, name =>
'juno.co.uk',
nameurl =>
'http://www.juno.co.uk',
method => 'get',
scripturl =>
'http://www.juno.co.uk/search.php',
hidden => ['precision',
'all', 'column', 'all'],
searchfield => 'q' &>
</div>
- </div>

+ </div>
</td>
</tr>
</table>

Modified: mb_server/trunk/htdocs/comp/search/form
===================================================================
--- mb_server/trunk/htdocs/comp/search/form 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/search/form 2006-06-26 16:23:01 UTC (rev
7944)
@@ -8,32 +8,39 @@
$formname => undef
</%args>
<%perl>
-
+
# formname is deprecated in xhtml 1.1
- my $formid = $formname ? ' id="searchbox_'.$formname.'" ' : "";
-
+ my $formid = $formname ? ' id="searchbox_'.$formname.'" ' : "";
+
# parameter must be lowercase
- $method = lc($method);
+ $method = lc($method);

# wrap nameurl into <a> tags, else plain name.
- $nameurl = $nameurl ne "" ? qq!<img src="/images/icon/extlink.gif"
alt="" /> <a href="$nameurl" title="$name">$name</a>! : $name;
+ $nameurl = $nameurl ne "" ? qq!<a href="$nameurl"
title="$name">$name</a>! : $name;

+</%perl>

- $m->out(qq!<form method="$method" action="$scripturl" $formid>!);
- $m->out(qq! <div style="margin-bottom: 10px">!);
- $m->out(qq!<b>$nameurl</b><br/>!);
-</%perl>
- <input type="text" name="<% $searchfield %>" size="20" />
- <input type="submit" value="Search" />
+ <form method="<% $method %>" action="<% $scripturl %>" <% $formid %>>
+ <table class="formstyle" style="margin-bottom: 10px">
+ <tr>
+ <td class="labelnopad"><% $nameurl |n %></td>
+ <td>
+ <input type="text" name="<%
$searchfield %>" size="20" />
+ <input type="submit" value="Lookup" />
+
<%perl>
+
my $hide;
- while ($hide = shift(@hidden))
+ while ($hide = shift(@hidden))
{
my $value = shift(@hidden); ;
$m->out(qq!<input type="hidden" name="$hide" !);
$m->out(qq! value="$value" !) if ($value ne "");
$m->out(" />");
}
+
</%perl>
- </div>
+ </td>
+ </tr>
+ </table>
</form>

Modified: mb_server/trunk/htdocs/comp/search/internal
===================================================================
--- mb_server/trunk/htdocs/comp/search/internal 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/search/internal 2006-06-26 16:23:01 UTC (rev
7944)
@@ -15,36 +15,16 @@
<div class="inner"><b>Search</b></div>
</div>
<div class="boxcontent">
- <div class="inner" style="text-align:
center">
- <& /comp/lucenesearch,
type=>'artist' &>
+ <div class="inner">
+ <& /comp/lucenesearch,
+ type => "artist" &>
<hr />

- <& /comp/search/form,
name=>'Disc ID / FreeDB ID Lookup',
-
scripturl=>'/showalbum.html',
- searchfield=>'discid',
- method=>'get' &>
+ <& /comp/google-site-search &>
<hr />

-%# <& /comp/search/form,
name=>'PUID Lookup',
-%#
scripturl=>'/showpuid.html',
-%# searchfield=>'puid',
-%# method=>'get' &>
-%# <hr />
-
- <& /comp/search/form,
name=>'TRM ID Lookup',
-
scripturl=>'/showtrm.html',
- searchfield=>'trm',
- method=>'get' &>
- <hr />
-
- <& /comp/search/form,
name=>'Moderator Lookup',
-
scripturl=>'/user/view.html',
- searchfield=>'modname',
- method=>'get' &>
- <hr />
-
<div style="text-align: center">
- <a
href="/search/external.html">Search other sites</a>
+ <a
href="/search/external.html">Search other sites &raquo;</a>
</div>
</div>
</div>
@@ -52,7 +32,7 @@

<!-- advanced search -->
<div class="orangeheader">
- <div class="inner"><b>Advanced
Search</b></div>
+ <div class="inner"><b>Advanced Search
(Tag Lookup)</b></div>
</div>
<div class="boxcontent">
<div class="inner" style="text-align:
center">
@@ -63,11 +43,39 @@

<!-- site search -->
<div class="orangeheader">
- <div class="inner"><b>Site
Search</b></div>
+ <div class="inner"><b>Lookup</b></div>
</div>
<div class="boxcontent">
- <div class="inner" style="text-align:
center">
- <& /comp/google-site-search &>
+ <div class="inner">
+
+ <& /comp/search/form, name =>
"Disc ID:",
+ scripturl =>
"/bare/cdlookup.html",
+ searchfield => "discid",
+ method => "get" &>
+ <hr />
+
+ <& /comp/search/form, name =>
"FreeDB ID:",
+ scripturl =>
"/bare/cdlookup.html",
+ searchfield =>
"freedbid",
+ method => "get" &>
+ <hr />
+
+ <& /comp/search/form, name =>
"PUID:",
+ scripturl =>
"/show/puid/",
+ searchfield => "puid",
+ method => "get" &>
+ <hr />
+
+ <& /comp/search/form, name =>
"TRM ID:",
+ scripturl =>
"/show/trm/",
+ searchfield => "trm",
+ method => "get" &>
+ <hr />
+
+ <& /comp/search/form, name =>
"Editor:",
+ scripturl =>
"/show/user/",
+ searchfield =>
"username",
+ method => "get" &>
</div>
</div>
</td>
@@ -97,7 +105,9 @@
</div>
</div>

-% if (&DBDefs::REPLICATION_TYPE != RT_SLAVE) {
+% if (&DBDefs::REPLICATION_TYPE != RT_SLAVE)
+% {
+
<!-- browse releases -->
<div class="orangeheader">
<div
class="inner"><b>Contribute</b></div>
@@ -111,7 +121,9 @@
</div>
</div>

-% if ($session{user} ne "") {
+% if ($session{user} ne "")
+% {
+
<div class="orangeheader">
<div class="inner"><b>Login</b></div>
</div>
@@ -124,14 +136,16 @@
</div>

<div class="orangeheader">
- <div class="inner"><b>Moderate</b></div>
+ <div class="inner"><b>Vote on
Edits</b></div>
</div>
<div class="boxcontent">
<div class="inner" style="text-align:
center">
- <a
href="/mod/search/pre/new.html">Vote/Moderate</a> MusicBrainz.
+ <a
href="/mod/search/pre/new.html">Vote on Edits</a>
</div>
</div>
-% } else {
+% }
+% else
+% {

<div class="orangeheader">
<div class="inner"><b>Login</b></div>

Modified: mb_server/trunk/htdocs/comp/textsearch
===================================================================
--- mb_server/trunk/htdocs/comp/textsearch 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/comp/textsearch 2006-06-26 16:23:01 UTC (rev
7944)
@@ -1,54 +1,58 @@
<%args>
- $default => 'artist'
+
+ $default => "artist"
$limit => 25
- $text => ''
+ $text => ""
+
</%args>
<%perl>
+
$default = lc $default;
my $lucenesearch = '/search/textsearch.html?limit=' . $limit . '&type='
. ($default eq 'album' ? 'release' : $default) . '&query=' . uri_escape($text);
+
</%perl>

<form method="get" action="/search/oldsearch.html" class="formstyle"
id="TextSearchForm">
-<table class="formstyle">
- <tr>
- <td class="labelnopad"><label for="id_search">Search
for:</label></td>
- <td>
- <input type="text" name="search" id="id_search"
value="<% $text %>" size="30" /></td>
- </tr>
- <tr>
- <td class="labelnopad"><label for="id_table">Type:</label></td>
- <td>
- <select name="table" id="id_table">
- <option value="artist" <% ($default eq
'artist') ? 'selected="selected"' : '' |n %>>Artists</option>
- <option value="album" <% ($default eq 'album')
? 'selected="selected"' : '' |n %>>Albums</option>
- <option value="track" <% ($default eq 'track')
? 'selected="selected"' : '' |n %>>Tracks</option>
- </select>
- </td>
- </tr>
- <tr>
- <td class="labelnopad"><label for="id_limit">Limit
to:</label></td>
- <td>
- <select name="limit" id="id_limit">
- <option value="25" <% ($limit eq 25) ?
'selected="selected"' : '' |n %>>Up to 25</option>
- <option value="50" <% ($limit eq 50) ?
'selected="selected"' : '' |n %>>Up to 50</option>
- <option value="100" <% ($limit eq 100) ?
'selected="selected"' : '' |n %>>Up to 100</option>
- <option value="0" <% ($limit eq '0') ?
'selected="selected"' : '' |n %>>All</option>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <input type="submit" value="Direct Search &raquo;"
title="Start search..." />
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- [ <a href="<% $lucenesearch %>" title="Search for the
same query using the Indexed Search...">Indexed search</a> ]
- </td>
- </tr>
-</table>
+ <table class="formstyle">
+ <tr>
+ <td class="labelnopad"><label for="id_search">Search
for:</label></td>
+ <td>
+ <input type="text" name="search" id="id_search"
value="<% $text %>" size="30" /></td>
+ </tr>
+ <tr>
+ <td class="labelnopad"><label
for="id_table">Type:</label></td>
+ <td>
+ <select name="table" id="id_table">
+ <option value="artist" <% ($default eq
'artist') ? 'selected="selected"' : '' |n %>>Artists</option>
+ <option value="album" <% ($default eq
'album') ? 'selected="selected"' : '' |n %>>Albums</option>
+ <option value="track" <% ($default eq
'track') ? 'selected="selected"' : '' |n %>>Tracks</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="labelnopad"><label for="id_limit">Limit
to:</label></td>
+ <td>
+ <select name="limit" id="id_limit">
+ <option value="25" <% ($limit eq 25) ?
'selected="selected"' : '' |n %>>Up to 25</option>
+ <option value="50" <% ($limit eq 50) ?
'selected="selected"' : '' |n %>>Up to 50</option>
+ <option value="100" <% ($limit eq 100)
? 'selected="selected"' : '' |n %>>Up to 100</option>
+ <option value="0" <% ($limit eq '0') ?
'selected="selected"' : '' |n %>>All</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <input type="submit" value="Direct Search
&raquo;" title="Start search..." />
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ [ <a href="<% $lucenesearch %>" title="Search
for the same query using the Indexed Search...">Indexed search</a> ]
+ </td>
+ </tr>
+ </table>
</form>

-%# vi: set ts=4 sw=4 ft=mason :
\ No newline at end of file
+%# vi: set ts=4 sw=4 ft=mason :

Modified: mb_server/trunk/htdocs/edit/album/editattributes.html
===================================================================
--- mb_server/trunk/htdocs/edit/album/editattributes.html 2006-06-26
15:32:22 UTC (rev 7943)
+++ mb_server/trunk/htdocs/edit/album/editattributes.html 2006-06-26
16:23:01 UTC (rev 7944)
@@ -75,7 +75,7 @@
@id == 1
? "/release/" .
$releaseobjs[0]->GetMBId . ".html"
: keys(%artisthash) == 1
- ?
"/showartist.html?artistid=".$releaseobjs[0]->GetArtist
+ ?
"/show/artist/?artistid=".$releaseobjs[0]->GetArtist
: "/search.html";

$m->comp(

Modified: mb_server/trunk/htdocs/edit/albumbatch/done.html
===================================================================
--- mb_server/trunk/htdocs/edit/albumbatch/done.html 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/edit/albumbatch/done.html 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -29,7 +29,9 @@
#
</%perl>
<%args>
+
$reset => 0
+
</%args>
<%perl>

@@ -100,7 +102,7 @@
# if all releases are by one artist, the "add more" link
# points to the artist page, else the general search.
my $more_releases_url = "/search.html";
- $more_releases_url = "/showartist.html?artistid=$artistid" if $artistid;
+ $more_releases_url = "/show/artist/?artistid=$artistid" if $artistid;

</%perl>

@@ -146,9 +148,9 @@
<td>
<form
method="post" action="/edit/albumbatch/merge.html">
<div>
-% for (@releaseids) {
-
<input type="hidden" name="album" value="<% $_ %>" />
-% }
+
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "releaseid",
$_); }
+

<input type="hidden" name="mac" value="0" />

<input type="submit" value="Single Artist &raquo;" <% (@releaseObjs < 2) ?
qq!disabled="disabled"! : "" |n %> />
</div>
@@ -157,9 +159,9 @@
<td>
<form
method="post" action="/edit/albumbatch/merge.html">
<div>
-% for (@releaseids) {
-
<input type="hidden" name="album" value="<% $_ %>" />
-% }
+
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "releaseid",
$_); }
+

<input type="hidden" name="mac" value="1" />

<input type="submit" value="Various Artists &raquo;" <% (@releaseObjs < 2) ?
qq!disabled="disabled"! : "" |n %> />
</div>
@@ -168,17 +170,25 @@
</tr>
</table>

-% if (@releaseObjs < 2) {
+% if (@releaseObjs < 2)
+% {
+
<div style="margin: 5px 0px; border:
1px dotted red; padding: 5px">
-% $m->out(sprintf qq!<form method="get" action="%s">!, ($artistid
? "/showartist.html" : "/search.html"));
+
+% $m->out(sprintf qq!<form method="get" action="%s">!, ($artistid
? "/show/artist/" : "/search.html"));
+
<div>
+
% $m->out(qq!<input type="hidden" name="artistid"
value="$artistid" />!) if ($artistid);
+
<input
type="submit" value="Select More &raquo;" />
You have to
select at least two releases for a merge edit.
</div>
</form>
</div>
+
% }
+
</td>
</tr>

@@ -187,9 +197,9 @@
<td>
<form method="post"
action="/edit/album/move.html">
<div>
-% for (@releaseids) {
- <input type="hidden"
name="album" value="<% $_ %>" />
-% }
+
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "releaseid",
$_); }
+
<input type="submit"
value="Move &raquo;" />
</div>
</form>
@@ -201,9 +211,9 @@
<td>
<form method="post"
action="/edit/albumbatch/remove.html">
<div>
-% for (@releaseids) {
- <input type="hidden"
name="releaseid" value="<% $_ %>" />
-% }
+
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "releaseid",
$_); }
+
<input type="submit"
value="Remove &raquo;" />
</div>
</form>
@@ -215,9 +225,9 @@
<td>
<form method="post"
action="/edit/album/editattributes.html">
<div>
-% for (@releaseids) {
- <input type="hidden"
name="id" value="<% $_ %>" />
-% }
+
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "id", $_); }
+
<input type="hidden"
name="untag" value="1" />
<input type="submit"
value="Edit Attributes &raquo;" />
Apply release
attributes to all selected releases.
@@ -231,9 +241,9 @@
<td>
<form method="post"
action="/edit/albumlanguage/edit.html">
<div>
-% for (@releaseids) {
- <input type="hidden"
name="id" value="<% $_ %>" />
-% }
+
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "id", $_); }
+
<input type="hidden"
name="untag" value="1" />
<input type="submit"
value="Edit Language &raquo;" />
Change the language
and/or script of all selected releases.
@@ -258,7 +268,7 @@
</table>
<& /comp/tableend &>

- <& /comp/layout/editformbegin, title => "With selected Releases,
do...", mp => 1 &>
+ <& /comp/layout/editformbegin, title => "With selected releases,
do...", mp => 1 &>
<table>
<tr>
<td style="padding-right: 40px; white-space:
nowrap">
@@ -271,16 +281,15 @@
<form method="post"
action="/edit/albumbatch/done.html" id="BatchOp">
<div
id="batchop::removereleases">
<input type="hidden"
name="url" value="<% $referer %>" />
- <input type="hidden"
name="reset" value="1" />

-% for my $release (@releaseObjs) {
- <input type="hidden"
name="releaseid<% $release->GetId() %>" value="on" />
-% }
+% for (@releaseids) { $m->comp("/comp/form/hiddenfield", "releaseid".$_,
"on"); }
+
</div>
</form>
</td>
</tr>
</table>
+
<script type="text/javascript"
src="/scripts/collapsereleases.js"></script>
<& /comp/layout/editformend &>

@@ -298,7 +307,7 @@
{
$ar = $m->comp("/comp/loadartist", $mb,
$release->GetArtist);

- $m->out("<div>Artist: ");
+ $m->out(qq!<div style="margin-bottom: 2px">Artist: !);
$m->comp("/comp/linkartist", artist => $ar);
$m->out("</div>");
}

Modified: mb_server/trunk/htdocs/edit/albumbatch/merge.html
===================================================================
--- mb_server/trunk/htdocs/edit/albumbatch/merge.html 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/edit/albumbatch/merge.html 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -28,6 +28,7 @@
#
</%perl>
<%args>
+
@releaseid => ()
@album => ()
$mac => undef
@@ -37,6 +38,7 @@

$submitvalue => ""
$notetext => ""
+
</%args>

<%perl>

Modified: mb_server/trunk/htdocs/edit/albumbatch/remove.html
===================================================================
--- mb_server/trunk/htdocs/edit/albumbatch/remove.html 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/edit/albumbatch/remove.html 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -28,10 +28,11 @@
#
</%perl>
<%args>
+
@releaseid => ()
-
$submitvalue => ""
$notetext => ""
+
</%args>
<%perl>


Modified: mb_server/trunk/htdocs/edit/albumlanguage/edit.html
===================================================================
--- mb_server/trunk/htdocs/edit/albumlanguage/edit.html 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/edit/albumlanguage/edit.html 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -110,7 +110,7 @@
@id == 1
? "/release/" .
$releaseobjs[0]->GetMBId . ".html"
: keys(%artisthash) == 1
- ? "/showartist.html?artistid="
. $releaseobjs[0]->GetArtist
+ ? "/show/artist/?artistid=" .
$releaseobjs[0]->GetArtist
: "/search.html";

$m->comp(

Modified: mb_server/trunk/htdocs/edit/annotation/artist/edit.html
===================================================================
--- mb_server/trunk/htdocs/edit/annotation/artist/edit.html 2006-06-26
15:32:22 UTC (rev 7943)
+++ mb_server/trunk/htdocs/edit/annotation/artist/edit.html 2006-06-26
16:23:01 UTC (rev 7944)
@@ -109,7 +109,7 @@

if ($submit ne "")
{
- my $url = "/showartist.html?artistid=$artistid";
+ my $url = "/show/artist/?artistid=$artistid";

if ($submit =~ m/Cancel/i)
{

Modified: mb_server/trunk/htdocs/edit/artist/add.html
===================================================================
--- mb_server/trunk/htdocs/edit/artist/add.html 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/edit/artist/add.html 2006-06-26 16:23:01 UTC (rev
7944)
@@ -28,6 +28,7 @@
#
</%perl>
<%args>
+
$initial_name => ""
$returnurl => ""

@@ -46,6 +47,7 @@

$submitvalue => ""
$notetext => ""
+
</%args>
<%perl>


Modified: mb_server/trunk/htdocs/show/puid/index.html
===================================================================
--- mb_server/trunk/htdocs/show/puid/index.html 2006-06-26 15:32:22 UTC (rev
7943)
+++ mb_server/trunk/htdocs/show/puid/index.html 2006-06-26 16:23:01 UTC (rev
7944)
@@ -43,7 +43,7 @@
my $mb = $m->comp("/comp/dblogin");
my $artist = Artist->new($mb->{DBH});
my $release = Album->new($mb->{DBH});
- my $gu = PUID->new($mb->{DBH});
+ my $pweed = PUID->new($mb->{DBH});
my $ids;

unless (MusicBrainz::IsGUID($puid))
@@ -53,7 +53,7 @@
else
{
$puid = lc $puid;
- $ids = $gu->GetTrackIdsFromPUID($puid);
+ $ids = $pweed->GetTrackIdsFromPUID($puid);
if (scalar(@$ids) == 0)
{
$showspecial = "This <strong>PUID</strong> was not
found in the database";

Modified: mb_server/trunk/htdocs/show/release/index.html
===================================================================
--- mb_server/trunk/htdocs/show/release/index.html 2006-06-26 15:32:22 UTC
(rev 7943)
+++ mb_server/trunk/htdocs/show/release/index.html 2006-06-26 16:23:01 UTC
(rev 7944)
@@ -46,6 +46,11 @@
</%args>
<%perl>

+ # backwards compability: redirect to cdlookup page if discid is provided
+ use URI::Escape qw( uri_escape );
+ return $m->comp("/comp/redirect", "/bare/cdlookup.html?id=" .
uri_escape($discid))
+ if defined $discid;
+
# check arguments
if ($mbid ne "")
{
@@ -62,11 +67,6 @@
UserStuff::EnsureSessionOpen(), $session{mbt} = 1 if $mbt;
UserStuff::EnsureSessionOpen(), $session{tport} = $tport if $tport;

- # backwards compability: redirect to cdlookup page if discid is provided
- use URI::Escape qw( uri_escape );
- return $m->comp("/comp/redirect", "/bare/cdlookup.html?id=" .
uri_escape($discid))
- if defined $discid;
-
# Instantiate MusicBrainz object, and load release entities
my $mb = $m->comp("/comp/dblogin");
my $release = $m->comp("/comp/loadrelease", $mb, $mbid || $releaseid);
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [mb-commits] r7943 - in mb_server/trunk/htdocs: . scrap, root
Next by Date:  [mb-commits] r7945 - mb_server/trunk/htdocs/edit/trm, root
Previous by Thread:  [mb-commits] r7943 - in mb_server/trunk/htdocs: . scrap, root
Next by Thread:  [mb-commits] r7945 - mb_server/trunk/htdocs/edit/trm, root
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
Recently Viewed:
ide.eclipse.wtp...    bug-tracking.ro...    xfree86.cvs/200...    lisp.wxcl.devel...    file-systems.ar...    kde.devel.kwrit...    jakarta.jetspee...    qnx.openqnx.dev...    drivers.openib/...    ports.xbox.deve...    gis.gdal.devel/...    netbsd.ports.ma...    ubuntu.marketin...    systemtap/2005-...    web.omniweb/200...    mail.qmail.ldap...    hardware.soekri...    os.netbsd.devel...    audio.madman.ge...    tv.freeguide-tv...    cluster.openmos...    education.ezpro...   
Home | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe

Navigation