[mb-commits] branch, beta, updated. Merge remote-tracking branch 'origin/mbs-5612' into beta MBS-5612, revert the...
MusicBrainz Git Server <[email protected]>
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TfW8g-0002l7-3F@wiley> |
The branch, beta has been updated
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=94405863cc36411c046122b1de1092e15c04d675 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=22f8cf8747fb8ff48ca1a6d509abe10718e4c0b5 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=62072ccf6e197ff6fd5378b801a837bc805021df (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0b9d0e4a2abd3494c06bd0a289e491023fe3bb6b (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=762720ddafae7e6a2711d7b890b785341fa6a122 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=066e21b2f70d7364a9df0e95b3aed8bdda11f021 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e40b130608ddbae615ff9cb8480e7b194a2385b7 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e92e38417665eac1b426e887448cfac2e02862aa (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d9fddf73e66a64268bcdc3124451490df41c57c6 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=71f5978d61bfdedb68660ef7ac8e72eaed07cf24 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d816f942c0e6431c7d00df3244a3781bcc4ebe37 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=57fc67be2656da1e7363f1bd752c7199c8f3eedb (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cb03b1687bf5d43fc91c5a7bdfd0796c738a9189 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=381e8fcc85a3d1703310f4f3a26b37b041261f87 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bad8d1fb74c80c512193b4fb0d77c7e4a252efa4 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ddc8c46151b44cef69a5a1e32b92527374fb5be2 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=67164c7bc404df02c43a805eae6076750db5c631 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=843059f6f66cf4a49649a8749152ec65a43e6ed4 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0fc0b5a7bfb5f946a9dea2c8516eb290a16675b3 (commit)
discards http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f2d2165298ff641290cc93835f64297824f4729b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c74933d025bc9053d60e511f96d8103ca63dd865 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a8dfdd5326635708048b797f652934649aae5e46 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d94b32096b5a968a3e18e96fb4ec4da053192a83 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9cb38bdf3dcc102d4dddabb410a723ed18beccfc (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6f7048674a085f68fd138000d51cfd0671e604be (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=91df07123a4fb3defb108e87496bfd404cf06346 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=02c209cf0a968f87a8b01ee328230cd06eebd229 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=459e9f782985c23af0c4cce6a2ee2b684746f8b7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=02ffb9b76832efec42bd8466e4452833769b1c12 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=309f3bb3530e44d921d7d889949ee16cd07fa02d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=adf0509920e857415d49ea0de00a8a485693792a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=28de439a67929b20de63d43fd4b0f16e59e72fc6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4c045ec040d48feb10b7dac787b801f95bd3f723 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=520ea4e1df2d98c953538ee3f3c36ed02807dda2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e11a6d3f1443b2e8d1abbdc72654c40b2c32f2f5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=826276b1c5c507ffa431376cbced133596aad5ef (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8edb24d218fb93ed32a14c6e20242ee3e5f54967 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ab038263b1cb29548c17898726e720ef3ea1f1a9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ee45a9a92a42f3bd82ea422e87ee34364a5cf103 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1f631ccd1aedabb234d7a187660d2a5fe352fe6d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0262cef4bb44d7e2315cc4a02fe5bce5b7e2f73c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=57ff8d4ac0cc1d1f14843485bd5de1beff21243b (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (94405863cc36411c046122b1de1092e15c04d675)
\
N -- N -- N (c74933d025bc9053d60e511f96d8103ca63dd865)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Summary of changes:
lib/MusicBrainz/Server/Controller/Release.pm | 47 +----
lib/MusicBrainz/Server/Controller/WS/js.pm | 20 --
lib/MusicBrainz/Server/Data/CoverArtArchive.pm | 17 +-
lib/MusicBrainz/Server/Data/CoverArtType.pm | 16 +--
lib/MusicBrainz/Server/Test/HTML5.pm | 2 +-
root/alias/delete.tt | 12 +
root/alias/edit_form.tt | 6 +
root/artist/add_alias.tt | 10 +-
root/artist/delete_alias.tt | 20 +--
root/artist/edit_alias.tt | 10 +-
root/cdtoc/attach_filter_release.tt | 2 +-
root/components/aliases.tt | 5 +
root/components/forms.tt | 2 +-
root/label/add_alias.tt | 10 +-
root/label/delete_alias.tt | 19 +--
root/label/edit_alias.tt | 10 +-
root/layout.tt | 2 +-
root/release/add_cover_art.tt | 129 +++---------
root/static/edit.js.manifest | 1 -
root/static/images/diagonals-purple.png | Bin 295 -> 0 bytes
root/static/images/newimagesgohere-125.png | Bin 2833 -> 0 bytes
root/static/images/src/newimagesgohere.html | 21 --
root/static/lib/filesize.js/README.md | 21 --
root/static/lib/filesize.js/debug/filesize.js | 97 ---------
root/static/lib/filesize.js/package.json | 18 --
root/static/lib/filesize.js/production/filesize.js | 42 ----
root/static/lib/libraries.txt | 8 -
root/static/scripts/common/MB/utility.js | 42 ----
root/static/scripts/edit/MB/CoverArt.js | 223 +-------------------
root/static/styles/forms.css | 43 ----
root/work/add_alias.tt | 10 +-
root/work/delete_alias.tt | 19 +--
root/work/edit_alias.tt | 10 +-
33 files changed, 90 insertions(+), 804 deletions(-)
delete mode 100644 root/static/images/diagonals-purple.png
delete mode 100644 root/static/images/newimagesgohere-125.png
delete mode 100644 root/static/images/src/newimagesgohere.html
delete mode 100644 root/static/lib/filesize.js/README.md
delete mode 100644 root/static/lib/filesize.js/debug/filesize.js
delete mode 100644 root/static/lib/filesize.js/package.json
delete mode 100644 root/static/lib/filesize.js/production/filesize.js
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c74933d025bc9053d60e511f96d8103ca63dd865
Merge: a8dfdd5 62d5846
Author: warp <[email protected]>
Date: Mon Dec 3 14:32:18 2012 +0100
Merge remote-tracking branch 'origin/mbs-5612' into beta
* origin/mbs-5612:
MBS-5612, revert the changes to load_for_release_groups in the previous commit, the previous sort behaviour was correct.
MBS-5612, Sort releases correctly when picking release group cover art.
commit a8dfdd5326635708048b797f652934649aae5e46
Merge: d94b320 e1f732d
Author: warp <[email protected]>
Date: Mon Dec 3 14:32:16 2012 +0100
Merge remote-tracking branch 'origin/mbs-5610' into beta
* origin/mbs-5610:
MBS-5610, always display "Set cover art" link, remove "Remove release group" link.
MBS-5610, Move "Set cover art" link to the correct section.
commit d94b32096b5a968a3e18e96fb4ec4da053192a83
Merge: 9cb38bd dce7b60
Author: warp <[email protected]>
Date: Mon Dec 3 14:32:13 2012 +0100
Merge remote-tracking branch 'origin/mbs-5616' into beta
* origin/mbs-5616:
MBS-5616, move "set cover art" from label to h1.
commit 9cb38bdf3dcc102d4dddabb410a723ed18beccfc
Merge: 6f70486 6027b15
Author: warp <[email protected]>
Date: Mon Dec 3 14:31:48 2012 +0100
Merge remote-tracking branch 'origin/mbs-3308' into beta
* origin/mbs-3308:
MBS-3308, always display "Open edits" link.
commit 6f7048674a085f68fd138000d51cfd0671e604be
Merge: 91df071 4aa6715
Author: warp <[email protected]>
Date: Mon Dec 3 14:31:37 2012 +0100
Merge remote-tracking branch 'origin/mbs-5607' into beta
* origin/mbs-5607:
MBS-5607, don't crash when serializing a release group without a primary type for json /ws/2.
commit 91df07123a4fb3defb108e87496bfd404cf06346
Merge: 02c209c 86cb4ad
Author: warp <[email protected]>
Date: Mon Dec 3 14:31:27 2012 +0100
Merge remote-tracking branch 'origin/mbs-3840' into beta
* origin/mbs-3840:
MBS-3840, Add glue to make /ws/2/annotation searches available.
commit 02c209cf0a968f87a8b01ee328230cd06eebd229
Merge: 459e9f7 8cc2e76
Author: warp <[email protected]>
Date: Mon Dec 3 14:31:14 2012 +0100
Merge remote-tracking branch 'ianmcorvidae/mbs-5622-https-recaptcha' into beta
* ianmcorvidae/mbs-5622-https-recaptcha: (28 commits)
MBS-5622: pass $c->req->secure to Captcha::reCAPTCHA->get_html to ensure correct API endpoint is used
Update translatios from transifex.
MBS-4108: actually sort the list *at all*
MBS-4108: reverse sort in order to correctly preference same-language wikipedia links
Update .pot files and run fixup script on .po files checked-in
Update translations from transifex.
MBS-5581: create a .po fixup script for the HTML5 changes
MBS-5618: properly URI-escape utf8 for wikipedia extracts
Fix remaining brokenness in tests on hobbes
Fix up lurking 'DBDefs::'
MBS-5260: Don't set expires header on development servers
MBS-3072, work language should be included in the /ws/2 json output.
MBS-3072, "length" should not be omitted from the /ws/2 json output when empty.
MBS-3072, "life-span" should not be omitted from the /ws/2 json output when empty.
OTHER-17: Add a LATEST file whose contents are the latest update + \n
MBS-5260: assorted stylistic cleanups recommended by ocharles
MBS-5260: fix a lurking bug with i18n; country codes sometimes need to be dropped to find the correct .po file
MBS-5272: at ruaok's request, don't prefer ftp.mb
MBS-5260: make translated .js files depend on .po file state too
MBS-5260: switch to template_signature and using file_signatures
...
commit 459e9f782985c23af0c4cce6a2ee2b684746f8b7
Merge: 02ffb9b b049143
Author: warp <[email protected]>
Date: Mon Dec 3 14:31:07 2012 +0100
Merge remote-tracking branch 'ianmcorvidae/mbs-4108-wikipedia-abstract' into beta
* ianmcorvidae/mbs-4108-wikipedia-abstract:
MBS-4108: add tests
MBS-4108: change to uri_for_action and action_for; keep the URI generation in the role, though
MBS-4108: condense and abstract Data::WikipediaExtract extensively
MBS-4108: remove __PACKAGE__->meta->make_immutable since it doesn't work
MBS-4108: clean up Controller::Role::WikipediaExtract
MBS-4108: remove duplicate country-code trimming
MBS-4108: where the cache is cold, load wikipedia extracts asynchronously
MBS-4108: update copyright notices
MBS-4108: Show Wikipedia extracts on entity pages
commit 02ffb9b76832efec42bd8466e4452833769b1c12
Merge: 309f3bb 7c0210b
Author: warp <[email protected]>
Date: Mon Dec 3 14:30:59 2012 +0100
Merge remote-tracking branch 'ianmcorvidae/mbs-5477-fix' into beta
* ianmcorvidae/mbs-5477-fix:
MBS-5477: remove use of iso_code_for_display, conflicting tickets in last release
commit 309f3bb3530e44d921d7d889949ee16cd07fa02d
Merge: adf0509 8edb24d
Author: warp <[email protected]>
Date: Mon Dec 3 14:30:22 2012 +0100
Merge remote-tracking branch 'navap/mbs-4228-alias-description' into beta
* navap/mbs-4228-alias-description:
Remove middle-man add and edit templates
Use same description when adding and editing aliases
MBS-4228: Update alias description (again)
Refactor alias templates
MBS-4228: Add description of what an alias is
commit adf0509920e857415d49ea0de00a8a485693792a
Merge: 28de439 e11a6d3
Author: warp <[email protected]>
Date: Mon Dec 3 14:30:12 2012 +0100
Merge remote-tracking branch 'navap/mbs-5548-escape-git-commit' into beta
* navap/mbs-5548-escape-git-commit:
MBS-5548: Escape git last commit msg
commit 28de439a67929b20de63d43fd4b0f16e59e72fc6
Merge: 4c045ec 826276b
Author: warp <[email protected]>
Date: Mon Dec 3 14:29:59 2012 +0100
Merge remote-tracking branch 'navap/mbs-5576' into beta
* navap/mbs-5576:
Remove unneeded column
MBS-5576: Fix colspan
commit 4c045ec040d48feb10b7dac787b801f95bd3f723
Merge: 520ea4e ce8267f
Author: warp <[email protected]>
Date: Mon Dec 3 14:27:16 2012 +0100
Merge remote-tracking branch 'origin/mbs-4568' into beta
* origin/mbs-4568:
MBS-4568, remove <bdi> from a html attribute, where it is not valid html.
Revert "Revert "Add <bdi> around a bunch of strings coming from the db (MBS-4568)""
commit 520ea4e1df2d98c953538ee3f3c36ed02807dda2
Merge: 667064e b948fd9
Author: warp <[email protected]>
Date: Mon Dec 3 14:27:11 2012 +0100
Merge remote-tracking branch 'origin/mbs-5317' into beta
* origin/mbs-5317:
MBS-5317, Get the decoded content from LWP instead of decoding it ourselves.
MBS-5317, support fmt=json for searches
commit e11a6d3f1443b2e8d1abbdc72654c40b2c32f2f5
Author: Pavan Chander <[email protected]>
Date: Tue Nov 20 15:51:48 2012 -0500
MBS-5548: Escape git last commit msg
diff --git a/root/layout.tt b/root/layout.tt
index 13e5b93..f579fbb 100644
--- a/root/layout.tt
+++ b/root/layout.tt
@@ -71,7 +71,7 @@
<div class="git-branch">
[%- l('Running: <span class="tooltip" title="{msg}">{branch} ({sha})</span>',
{ branch => server_details.git.branch,
- msg => server_details.git.msg,
+ msg => html_escape(server_details.git.msg),
sha => server_details.git.sha}) -%]
</div>
[%- END -%]
commit 826276b1c5c507ffa431376cbced133596aad5ef
Author: Pavan Chander <[email protected]>
Date: Sun Nov 18 11:21:34 2012 -0500
Remove unneeded column
diff --git a/root/cdtoc/attach_list.tt b/root/cdtoc/attach_list.tt
index b6d478e..53ab1f8 100644
--- a/root/cdtoc/attach_list.tt
+++ b/root/cdtoc/attach_list.tt
@@ -34,7 +34,7 @@
</label>
<small>(<a class="toggle" style="cursor:pointer;">[% l('show tracklist') %]</a>)</small>
</td>
- <td colspan="7"></td>
+ <td colspan="6"></td>
</tr>
<tr class="tracklist" style="display:none">
<td></td>
commit 8edb24d218fb93ed32a14c6e20242ee3e5f54967
Author: Pavan Chander <[email protected]>
Date: Wed Nov 14 23:58:02 2012 -0500
Remove middle-man add and edit templates
diff --git a/root/alias/add.tt b/root/alias/add.tt
deleted file mode 100644
index e5bf2d1..0000000
--- a/root/alias/add.tt
+++ /dev/null
@@ -1 +0,0 @@
-[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/alias/edit.tt b/root/alias/edit.tt
deleted file mode 100644
index e5bf2d1..0000000
--- a/root/alias/edit.tt
+++ /dev/null
@@ -1 +0,0 @@
-[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/artist/add_alias.tt b/root/artist/add_alias.tt
index c270509..e2b79b7 100644
--- a/root/artist/add_alias.tt
+++ b/root/artist/add_alias.tt
@@ -11,5 +11,5 @@
[%- WRAPPER 'artist/layout.tt' title=l('Add Artist Alias') full_width=1 -%]
<h2>[% l('Add artist alias') %]</h2>
- [%- INCLUDE 'alias/add.tt' %]
+ [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id=3 -%]
[%- END -%]
diff --git a/root/artist/edit_alias.tt b/root/artist/edit_alias.tt
index f991825..60ed2dc 100644
--- a/root/artist/edit_alias.tt
+++ b/root/artist/edit_alias.tt
@@ -11,5 +11,5 @@
[%- WRAPPER 'artist/layout.tt' title=l('Edit Artist Alias') full_width=1 -%]
<h2>[% l('Edit artist alias') %]</h2>
- [%- INCLUDE 'alias/edit.tt' %]
+ [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id=3 -%]
[%- END -%]
diff --git a/root/label/add_alias.tt b/root/label/add_alias.tt
index f8fd51d..723eb53 100644
--- a/root/label/add_alias.tt
+++ b/root/label/add_alias.tt
@@ -11,5 +11,5 @@
[%- WRAPPER 'label/layout.tt' title=l('Add Label Alias') full_width=1 -%]
<h2>[% l('Add label alias') %]</h2>
- [%- INCLUDE 'alias/add.tt' %]
+ [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id=2 -%]
[%- END -%]
diff --git a/root/label/edit_alias.tt b/root/label/edit_alias.tt
index 8c429e0..afac807 100644
--- a/root/label/edit_alias.tt
+++ b/root/label/edit_alias.tt
@@ -11,5 +11,5 @@
[%- WRAPPER 'label/layout.tt' title=l('Edit Label Alias') full_width=1 -%]
<h2>[% l('Edit label alias') %]</h2>
- [%- INCLUDE 'alias/edit.tt' %]
+ [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id=2 -%]
[%- END -%]
diff --git a/root/work/add_alias.tt b/root/work/add_alias.tt
index 3e6701e..7f6a7a1 100644
--- a/root/work/add_alias.tt
+++ b/root/work/add_alias.tt
@@ -11,5 +11,5 @@
[%- WRAPPER 'work/layout.tt' title=l('Add Work Alias') full_width=1 -%]
<h2>[% l('Add work alias') %]</h2>
- [%- INCLUDE 'alias/add.tt' %]
+ [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id=2 -%]
[%- END -%]
diff --git a/root/work/edit_alias.tt b/root/work/edit_alias.tt
index a025cd3..52ddeac 100644
--- a/root/work/edit_alias.tt
+++ b/root/work/edit_alias.tt
@@ -11,5 +11,5 @@
[%- WRAPPER 'work/layout.tt' title=l('Edit Work Alias') full_width=1 -%]
<h2>[% l('Edit work alias') %]</h2>
- [%- INCLUDE 'alias/edit.tt' %]
+ [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id=2 -%]
[%- END -%]
commit ab038263b1cb29548c17898726e720ef3ea1f1a9
Author: Pavan Chander <[email protected]>
Date: Wed Nov 14 23:05:41 2012 -0500
MBS-5576: Fix colspan
diff --git a/root/cdtoc/attach_filter_release.tt b/root/cdtoc/attach_filter_release.tt
index d6f3bbe..7a6a87c 100644
--- a/root/cdtoc/attach_filter_release.tt
+++ b/root/cdtoc/attach_filter_release.tt
@@ -63,7 +63,7 @@ $(document).ready (function () {
[% release=result.entity %]
[%- IF release.release_group.gid != current_rg -%]
[% current_rg = release.release_group.gid %]
- <tr class="subh"><th colspan=[% IF c.session.tport; '8'; ELSE; '7'; END %]>[% l('Release Group: {release_group_link}', { release_group_link => link_entity(release.release_group) }) %]</th></tr>
+ <tr class="subh"><th colspan=[% IF c.session.tport; '9'; ELSE; '8'; END %]>[% l('Release Group: {release_group_link}', { release_group_link => link_entity(release.release_group) }) %]</th></tr>
[%- END -%]
[% zebra = zebra + 1 %]
[% INCLUDE 'cdtoc/attach_list.tt' show_artists=1 %]
diff --git a/root/cdtoc/attach_list.tt b/root/cdtoc/attach_list.tt
index 53ab1f8..b6d478e 100644
--- a/root/cdtoc/attach_list.tt
+++ b/root/cdtoc/attach_list.tt
@@ -34,7 +34,7 @@
</label>
<small>(<a class="toggle" style="cursor:pointer;">[% l('show tracklist') %]</a>)</small>
</td>
- <td colspan="6"></td>
+ <td colspan="7"></td>
</tr>
<tr class="tracklist" style="display:none">
<td></td>
commit ee45a9a92a42f3bd82ea422e87ee34364a5cf103
Author: Pavan Chander <[email protected]>
Date: Fri Oct 5 23:16:17 2012 -0400
Use same description when adding and editing aliases
diff --git a/root/alias/add.tt b/root/alias/add.tt
index 8cf1998..e5bf2d1 100644
--- a/root/alias/add.tt
+++ b/root/alias/add.tt
@@ -1,6 +1 @@
-<p>
- [%- l('An alias is an alternate name for an entity. They typically contain contain
- common mispellings or variations of the name and are also used to improve search results.
- View the {doc|alias documentation} for more details.', { doc => doc_link('Aliases') }) -%]
-</p>
[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/alias/edit.tt b/root/alias/edit.tt
index ac358cd..e5bf2d1 100644
--- a/root/alias/edit.tt
+++ b/root/alias/edit.tt
@@ -1,2 +1 @@
-<p>[% l('View the {doc|alias documentation} for help with aliases.', { doc => doc_link('Alias') }) %]</p>
[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/alias/edit_form.tt b/root/alias/edit_form.tt
index 13e81c5..2dbf55c 100644
--- a/root/alias/edit_form.tt
+++ b/root/alias/edit_form.tt
@@ -1,3 +1,9 @@
+<p>
+ [%- l('An alias is an alternate name for an entity. They typically contain contain
+ common mispellings or variations of the name and are also used to improve search results.
+ View the {doc|alias documentation} for more details.', { doc => doc_link('Aliases') }) -%]
+</p>
+
<form action="[% c.req.uri %]" method="post" class="edit-alias">
[% USE r = FormRenderer(form) %]
<div class="half-width">
commit 1f631ccd1aedabb234d7a187660d2a5fe352fe6d
Author: Pavan Chander <[email protected]>
Date: Wed Sep 26 22:27:45 2012 -0400
MBS-4228: Update alias description (again)
diff --git a/root/alias/add.tt b/root/alias/add.tt
index eb8762d..8cf1998 100644
--- a/root/alias/add.tt
+++ b/root/alias/add.tt
@@ -1,6 +1,6 @@
<p>
- [% l('An alias is an alternate "name" that is used as a search hint.
- They usually contain common mispellings or local variations of the official name.
- View the {doc|alias documentation} for more details.', { doc => doc_link('Alias') }) %]
+ [%- l('An alias is an alternate name for an entity. They typically contain contain
+ common mispellings or variations of the name and are also used to improve search results.
+ View the {doc|alias documentation} for more details.', { doc => doc_link('Aliases') }) -%]
</p>
[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/components/aliases.tt b/root/components/aliases.tt
index 46c2c07..7f5c6e6 100644
--- a/root/components/aliases.tt
+++ b/root/components/aliases.tt
@@ -1,9 +1,8 @@
<h2>[% l("Aliases") %]</h2>
<p>
- [%- l('An alias is an alternate "name" that is used as a search hint.
- They usually contain common mispellings or local variations of the official name.
- View the {doc|alias documentation} for more details.', { doc => doc_link('Aliases') })
- -%]
+ [%- l('An alias is an alternate name for an entity. They typically contain contain
+ common mispellings or variations of the name and are also used to improve search results.
+ View the {doc|alias documentation} for more details.', { doc => doc_link('Aliases') }) -%]
</p>
[%- IF aliases.size > 0 -%]
<table class="tbl">
commit 0262cef4bb44d7e2315cc4a02fe5bce5b7e2f73c
Author: Pavan Chander <[email protected]>
Date: Wed Sep 26 13:07:55 2012 -0400
Refactor alias templates
- Consolidate the add/edit/delete templates into alias/*
- Use the create_guideline sparingly and only when needed
diff --git a/root/alias/add.tt b/root/alias/add.tt
new file mode 100644
index 0000000..eb8762d
--- /dev/null
+++ b/root/alias/add.tt
@@ -0,0 +1,6 @@
+<p>
+ [% l('An alias is an alternate "name" that is used as a search hint.
+ They usually contain common mispellings or local variations of the official name.
+ View the {doc|alias documentation} for more details.', { doc => doc_link('Alias') }) %]
+</p>
+[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/alias/delete.tt b/root/alias/delete.tt
index 8886084..1fd05ae 100644
--- a/root/alias/delete.tt
+++ b/root/alias/delete.tt
@@ -1,3 +1,15 @@
+<p>[% l('Are you sure you want to remove the alias <em>{alias}</em>?', { alias => html_escape(alias.name) }) %]</p>
+
+[% WRAPPER 'layout/guidelines.tt' %]
+ [% create_guideline(l("Please review the {doc|alias documentation}
+ before entering this edit.",
+ { doc => doc_link('Alias') })) %]
+ [% create_guideline(l("If you added this alias by mistake, please follow the
+ instructions on {cancel|how to cancel pending edits}
+ instead of removing this alias.",
+ { cancel => doc_link('How_To_Cancel_Edits') })) %]
+[% END %]
+
<form action="[% c.req.uri %]" method="post">
[% INCLUDE 'forms/edit-note.tt' %]
[% enter_edit() %]
diff --git a/root/alias/edit.tt b/root/alias/edit.tt
new file mode 100644
index 0000000..ac358cd
--- /dev/null
+++ b/root/alias/edit.tt
@@ -0,0 +1,2 @@
+<p>[% l('View the {doc|alias documentation} for help with aliases.', { doc => doc_link('Alias') }) %]</p>
+[%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
diff --git a/root/artist/add_alias.tt b/root/artist/add_alias.tt
index c76cb61..c270509 100644
--- a/root/artist/add_alias.tt
+++ b/root/artist/add_alias.tt
@@ -11,13 +11,5 @@
[%- WRAPPER 'artist/layout.tt' title=l('Add Artist Alias') full_width=1 -%]
<h2>[% l('Add artist alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l('MusicBrainz uses artist aliases mainly as variant names
- or search hints.')) %]
- [% create_guideline(l('If you see a misspelled alias here, it most likely is
- listed on purpose, and should not be renamed or removed.
- Please see {aa|artist aliases} for more details.',
- { aa => doc_link('Artist_Alias') })) %]
- [% END %]
- [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3%]
+ [%- INCLUDE 'alias/add.tt' %]
[%- END -%]
diff --git a/root/artist/delete_alias.tt b/root/artist/delete_alias.tt
index 9d55302..e4c358d 100644
--- a/root/artist/delete_alias.tt
+++ b/root/artist/delete_alias.tt
@@ -1,22 +1,4 @@
[%- WRAPPER 'artist/layout.tt' title=l('Remove Artist Alias') full_width=1 -%]
- <h2>[% l('Remove Alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l("Please review the documentation about {aliases|artist aliases},
- before entering this edit.",
- { aliases => doc_link('Artist_Alias') })) %]
- [% create_guideline(l("Are you sure you want to remove the alias {alias}, which
- points to the artist {artist}?",
- { alias => html_escape(alias.name),
- artist => link_entity(artist) })) %]
- [% create_guideline(l("If you added this alias by mistake, please follow the
- instructions about {cancel|how to cancel pending edits}, to
- cancel the pending add alias edit. Removing pending edits,
- rather than entering new edits helps reduce the amount of
- open edits in the system.",
- { cancel => doc_link('How_To_Cancel_Edits') })) %]
- [% create_guideline(l("Cancelling a pending edit will take effect within an hour,
- while removing an artist alias has to be voted on according to
- the voting process.")) %]
- [% END %]
+ <h2>[% l('Remove artist alias') %]</h2>
[% INCLUDE 'alias/delete.tt' %]
[%- END -%]
diff --git a/root/artist/edit_alias.tt b/root/artist/edit_alias.tt
index b3d6cb1..f991825 100644
--- a/root/artist/edit_alias.tt
+++ b/root/artist/edit_alias.tt
@@ -11,13 +11,5 @@
[%- WRAPPER 'artist/layout.tt' title=l('Edit Artist Alias') full_width=1 -%]
<h2>[% l('Edit artist alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l('MusicBrainz uses artist aliases mainly as variant names
- or search hints.')) %]
- [% create_guideline(l('If you see a misspelled alias here, it most likely is
- listed on purpose, and should not be renamed or removed.
- Please see {aa|artist aliases} for more details.',
- { aa => doc_link('Artist_Alias') })) %]
- [% END %]
- [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 3 %]
+ [%- INCLUDE 'alias/edit.tt' %]
[%- END -%]
diff --git a/root/label/add_alias.tt b/root/label/add_alias.tt
index 52a2238..f8fd51d 100644
--- a/root/label/add_alias.tt
+++ b/root/label/add_alias.tt
@@ -11,13 +11,5 @@
[%- WRAPPER 'label/layout.tt' title=l('Add Label Alias') full_width=1 -%]
<h2>[% l('Add label alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l('MusicBrainz uses label aliases mainly as variant names
- or search hints.')) %]
- [% create_guideline(l('If you see a misspelled alias here, it most likely is
- listed on purpose, and should not be renamed or removed.
- Please see {aa|label aliases} for more details.',
- { aa => doc_link('Label_Alias') })) %]
- [% END %]
- [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 2 %]
+ [%- INCLUDE 'alias/add.tt' %]
[%- END -%]
diff --git a/root/label/delete_alias.tt b/root/label/delete_alias.tt
index ee0d82b..159f1e3 100644
--- a/root/label/delete_alias.tt
+++ b/root/label/delete_alias.tt
@@ -1,21 +1,4 @@
[%- WRAPPER 'label/layout.tt' title=l('Remove Label Alias') full_width=1 -%]
- <h2>[% l('Remove Alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l("Please review the documentation about {aliases|label aliases},
- before entering this edit.",
- { aliases => doc_link('Label_Alias') })) %]
- [% create_guideline(l("Are you sure you want to remove the alias {alias}, which
- points to the label {label}?",
- { alias => alias.name, label => link_entity(label) })) %]
- [% create_guideline(l("If you added this alias by mistake, please follow the
- instructions about {cancel|how to cancel pending edits}, to
- cancel the pending add alias edit. Removing pending edits,
- rather than entering new edits helps reduce the amount of
- open edits in the system.",
- { cancel => doc_link('How_To_Cancel_Edits') })) %]
- [% create_guideline(l("Cancelling a pending edit will take effect within an hour,
- while removing an artist alias has to be voted on according to
- the voting process.")) %]
- [% END %]
+ <h2>[% l('Remove label alias') %]</h2>
[% INCLUDE 'alias/delete.tt' %]
[%- END -%]
diff --git a/root/label/edit_alias.tt b/root/label/edit_alias.tt
index 9d96edd..8c429e0 100644
--- a/root/label/edit_alias.tt
+++ b/root/label/edit_alias.tt
@@ -11,13 +11,5 @@
[%- WRAPPER 'label/layout.tt' title=l('Edit Label Alias') full_width=1 -%]
<h2>[% l('Edit label alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l('MusicBrainz uses label aliases mainly as variant names
- or search hints.')) %]
- [% create_guideline(l('If you see a misspelled alias here, it most likely is
- listed on purpose, and should not be renamed or removed.
- Please see {aa|label aliases} for more details.',
- { aa => doc_link('Label_Alias') })) %]
- [% END %]
- [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 2 %]
+ [%- INCLUDE 'alias/edit.tt' %]
[%- END -%]
diff --git a/root/work/add_alias.tt b/root/work/add_alias.tt
index 1b91ba8..3e6701e 100644
--- a/root/work/add_alias.tt
+++ b/root/work/add_alias.tt
@@ -11,13 +11,5 @@
[%- WRAPPER 'work/layout.tt' title=l('Add Work Alias') full_width=1 -%]
<h2>[% l('Add work alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l('MusicBrainz uses work aliases mainly as variant names
- or search hints.')) %]
- [% create_guideline(l('If you see a misspelled alias here, it most likely is
- listed on purpose, and should not be renamed or removed.
- Please see {aa|work aliases} for more details.',
- { aa => doc_link('Work_Alias') })) %]
- [% END %]
- [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 2 %]
+ [%- INCLUDE 'alias/add.tt' %]
[%- END -%]
diff --git a/root/work/delete_alias.tt b/root/work/delete_alias.tt
index e04da0d..037db78 100644
--- a/root/work/delete_alias.tt
+++ b/root/work/delete_alias.tt
@@ -1,21 +1,4 @@
[%- WRAPPER 'work/layout.tt' title=l('Remove Work Alias') full_width=1 -%]
- <h2>[% l('Remove Alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l("Please review the documentation about {aliases|work aliases},
- before entering this edit.",
- { aliases => doc_link('Work_Alias') })) %]
- [% create_guideline(l("Are you sure you want to remove the alias {alias}, which
- points to the work {work}?",
- { alias => alias.name, work => link_entity(work) })) %]
- [% create_guideline(l("If you added this alias by mistake, please follow the
- instructions about {cancel|how to cancel pending edits}, to
- cancel the pending add alias edit. Removing pending edits,
- rather than entering new edits helps reduce the amount of
- open edits in the system.",
- { cancel => doc_link('How_To_Cancel_Edits') })) %]
- [% create_guideline(l("Cancelling a pending edit will take effect within an hour,
- while removing an work alias has to be voted on according to
- the voting process.")) %]
- [% END %]
+ <h2>[% l('Remove work alias') %]</h2>
[% INCLUDE 'alias/delete.tt' %]
[%- END -%]
diff --git a/root/work/edit_alias.tt b/root/work/edit_alias.tt
index 372f560..a025cd3 100644
--- a/root/work/edit_alias.tt
+++ b/root/work/edit_alias.tt
@@ -11,13 +11,5 @@
[%- WRAPPER 'work/layout.tt' title=l('Edit Work Alias') full_width=1 -%]
<h2>[% l('Edit work alias') %]</h2>
- [% WRAPPER 'layout/guidelines.tt' %]
- [% create_guideline(l('MusicBrainz uses work aliases mainly as variant names
- or search hints.')) %]
- [% create_guideline(l('If you see a misspelled alias here, it most likely is
- listed on purpose, and should not be renamed or removed.
- Please see {aa|work aliases} for more details.',
- { aa => doc_link('Work_Alias') })) %]
- [% END %]
- [%- INCLUDE 'alias/edit_form.tt' search_hint_type_id = 2 %]
+ [%- INCLUDE 'alias/edit.tt' %]
[%- END -%]
commit 57ff8d4ac0cc1d1f14843485bd5de1beff21243b
Author: Pavan Chander <[email protected]>
Date: Sat Jul 7 17:52:55 2012 -0400
MBS-4228: Add description of what an alias is
diff --git a/root/components/aliases.tt b/root/components/aliases.tt
index 02de8a9..46c2c07 100644
--- a/root/components/aliases.tt
+++ b/root/components/aliases.tt
@@ -1,4 +1,10 @@
<h2>[% l("Aliases") %]</h2>
+<p>
+ [%- l('An alias is an alternate "name" that is used as a search hint.
+ They usually contain common mispellings or local variations of the official name.
+ View the {doc|alias documentation} for more details.', { doc => doc_link('Aliases') })
+ -%]
+</p>
[%- IF aliases.size > 0 -%]
<table class="tbl">
<thead>
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server