[mb-commits] branch, beta, updated.

MusicBrainz Git Server <[email protected]>
Newsgroups gmane.comp.audio.musicbrainz.cvs
Message-ID <E1TiQEZ-0003WL-TF@wiley> 
The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2d46c5daaebb70424c0095e16585861afd6ea1b5 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a03a82b4c9b2bc7a5b1a94bd7d54aa7d9db021b7 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c669c70ee228a71d17fa6d9127a76b1151950fb5 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7d593ada121740788ff013e7b3841725cbaf6a9f (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c9dfb462ef1c45b123cf99f293ded72e97ca3b91 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ad501205be4f6bc069697f2237bd846f84ba8151 (commit)

Summary of changes:
 root/components/common-macros.tt |    7 ++++++-
 root/components/rdfa-macros.tt   |    9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

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 2d46c5daaebb70424c0095e16585861afd6ea1b5
Merge: a03a82b ad50120
Author: Frederik "Freso" S. Olesen <[email protected]>
Date:   Tue Dec 11 14:39:20 2012 +0100

    Merge remote-tracking branch 'upstream-github/beta' into mbs-3412-mbs-2966-asterisks
    
    Fixing conflicts prior to upstream beta merging, per ocharles comment at
    http://codereview.musicbrainz.org/r/2459/
    
    Conflicts:
    	root/components/common-macros.tt
    	root/components/rdfa-macros.tt

diff --cc root/components/common-macros.tt
index 36a79b3,7bb1c98..852c747
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@@ -238,9 -283,7 +283,9 @@@ END -%
      hover = html_escape(artist.sort_name);
      IF artist.comment; hover = hover _ ' (' _ html_escape(artist.comment) _ ')'; END;
      '<span class="mp">' IF artist.edits_pending AND action == 'show';
 +    '<span class="name-variation">' IF text != artist.name AND action == 'show';
-     '<a href="' _ link _ '" title="' _ hover _ '">' _ text _ '</a>';
+     '<a href="' _ link _ '" title="' _ hover _ '"><bdi>' _ text _ '</bdi></a>';
 +    '</span>' IF text != artist.name AND action == 'show';
      '</span>' IF artist.edits_pending AND action == 'show';
  END -%]
  
@@@ -273,11 -316,8 +318,11 @@@ END -%
      action = action || 'show';
      link = c.uri_for_action("/recording/$action", [ recording.gid ]);
      text = text == '' ? html_escape(recording.name) : text;
 +    hover = html_escape(recording.name) IF text != recording.name AND action == 'show';
      '<span class="mp">' IF recording.edits_pending AND action == 'show';
 -    '<a href="' _ link _ '"><bdi>' _ text _ '</bdi></a>';
 +    '<span class="name-variation">' IF text != recording.name AND action == 'show';
-     '<a href="' _ link _ '" title="' _ hover _ '" class="' _ class _ '">' _ text _ '</a>';
++    '<a href="' _ link _ '" title="' _ hover _ '" class="' _ class _ '"><bdi>' _ text _ '</bdi></a>';
 +    '</span>' IF text != recording.name AND action == 'show';
      '</span>' IF recording.edits_pending AND action == 'show';
  END -%]
  
diff --cc root/components/rdfa-macros.tt
index a6dd7b6,9a13fd0..42f71e0
--- a/root/components/rdfa-macros.tt
+++ b/root/components/rdfa-macros.tt
@@@ -406,11 -412,9 +412,11 @@@ END -%
      link = c.uri_for_action("/artist/$action", [ artist.gid ]);
      text = text == '' ? html_escape(artist.name) : html_escape(text);
      hover = html_escape(artist.sort_name);
-     IF artist.comment; hover = hover _ ' (' _ artist.comment _ ')'; END;
+     IF artist.comment; hover = hover _ ' (' _ html_escape(artist.comment) _ ')'; END;
      '<span class="mp">' IF artist.edits_pending AND action == 'show';
 +    '<span class="name-variation">' IF text != artist.name AND action == 'show';
      '<a title="' _ hover _ '" rel="foaf:maker" resource="' _ rdfa_artist_curi(artist) _ '" href="' _ link _ '">' _ text _ '</a>';
 +    '</span>' IF text != artist.name AND action == 'show';
      '</span>' IF artist.edits_pending AND action == 'show';
    ELSE;
      link_artist(artist, action, text);
@@@ -592,12 -596,9 +598,12 @@@ END -%
      action = action || 'show';
      link = c.uri_for_action("/recording/$action", [ recording.gid ]);
      text = text == '' ? html_escape(recording.name) : html_escape(text);
 +    hover = html_escape(recording.name) IF text != recording.name AND action == 'show';
      '<span class="mp">' IF recording.edits_pending AND action == 'show';
-     '<span property="dct:title rdfs:label" xml:lang="" content="' _ text _ '"></span>';
 +    '<span class="name-variation">' IF text != recording.name AND action == 'show';
-     '<a rel="mo:publication_of" resource="' _ rdfa_recording_curi(recording) _ '" href="' _ link _ '" title="' _ hover _ '"><span property="dct:title rdfs:label" xml:lang="">' _ text _ '</span></a>';
+     '<span property="dct:title rdfs:label" xml:lang="" lang="" content="' _ text _ '"></span>';
 -    '<a rel="mo:publication_of" resource="' _ rdfa_recording_curi(recording) _ '" href="' _ link _ '"><span property="dct:title rdfs:label" xml:lang="" lang="">' _ text _ '</span></a>';
++    '<a rel="mo:publication_of" resource="' _ rdfa_recording_curi(recording) _ '" href="' _ link _ '" title="' _ hover _ '"><span property="dct:title rdfs:label" xml:lang="" lang="">' _ text _ '</span></a>';
 +    '</span>' IF text != recording.name AND action == 'show';
      '</span>' IF recording.edits_pending AND action == 'show';
    ELSE;
      link_recording(recording, action, text);

commit a03a82b4c9b2bc7a5b1a94bd7d54aa7d9db021b7
Author: Frederik "Freso" S. Olesen <[email protected]>
Date:   Sun Dec 2 14:26:41 2012 +0100

    MBS-2966: Revert adding asterisk for name variations.
    
    The reporter of the ticket proposed to simply add a class to entity
    links with name variations instead of specifically marking them with
    e.g. "*". This revert keeps the class name "name-variation" for these
    links, allowing user script/style authors to manipulate their display
    and/or behaviour to their liking.

diff --git a/root/layout/sidebar.tt b/root/layout/sidebar.tt
index 1a6e428..ea56054 100644
--- a/root/layout/sidebar.tt
+++ b/root/layout/sidebar.tt
@@ -1,6 +1,5 @@
 [% IF !full_width %]
     <div id="sidebar" [% rdfa_about_attr(about) -%]>
         [% content %]
-        <p class="name-variation-ref">[% l('Name variation') %]</p>
     </div>
 [% END %]
diff --git a/root/static/styles/entity.css b/root/static/styles/entity.css
index 7c87b26..5d3208a 100644
--- a/root/static/styles/entity.css
+++ b/root/static/styles/entity.css
@@ -90,17 +90,3 @@ p.subheader span { color: #999; }
 .annotation-diff {
     margin: 1em 0;
 }
-
-.name-variation:after {
-    content: "*";
-    color: #999;
-    position: relative;
-    top: -0.25em
-}
-
-.name-variation-ref:before {
-    content: "*";
-    color: #999;
-    position: relative;
-    top: -0.25em
-}
\ No newline at end of file
diff --git a/root/static/styles/layout.css b/root/static/styles/layout.css
index cdf8ccb..229917a 100644
--- a/root/static/styles/layout.css
+++ b/root/static/styles/layout.css
@@ -516,7 +516,6 @@ tr.diff-changes {
 
 .lastupdate,
 .annotation-details,
-.name-variation-ref,
 .small {
     font-size: 90%;
     color: #777;
@@ -528,10 +527,6 @@ tr.diff-changes {
     margin-left: -5px;
 }
 
-.name-variation-ref {
-    margin-left: -5px;
-}
-
 /* The release information table */
 table.tbl {
     margin-top: 1em;

commit c669c70ee228a71d17fa6d9127a76b1151950fb5
Author: Pavan Chander <[email protected]>
Date:   Sat May 5 22:34:06 2012 -0400

    MBS-3412: Show recording name in tooltip

diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index ce81055..36a79b3 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -273,8 +273,11 @@ END -%]
     action = action || 'show';
     link = c.uri_for_action("/recording/$action", [ recording.gid ]);
     text = text == '' ? html_escape(recording.name) : text;
+    hover = html_escape(recording.name) IF text != recording.name AND action == 'show';
     '<span class="mp">' IF recording.edits_pending AND action == 'show';
-    '<a href="' _ link _ '">' _ text _ '</a>';
+    '<span class="name-variation">' IF text != recording.name AND action == 'show';
+    '<a href="' _ link _ '" title="' _ hover _ '" class="' _ class _ '">' _ text _ '</a>';
+    '</span>' IF text != recording.name AND action == 'show';
     '</span>' IF recording.edits_pending AND action == 'show';
 END -%]
 
diff --git a/root/components/rdfa-macros.tt b/root/components/rdfa-macros.tt
index 758a156..a6dd7b6 100644
--- a/root/components/rdfa-macros.tt
+++ b/root/components/rdfa-macros.tt
@@ -592,9 +592,12 @@ END -%]
     action = action || 'show';
     link = c.uri_for_action("/recording/$action", [ recording.gid ]);
     text = text == '' ? html_escape(recording.name) : html_escape(text);
+    hover = html_escape(recording.name) IF text != recording.name AND action == 'show';
     '<span class="mp">' IF recording.edits_pending AND action == 'show';
     '<span property="dct:title rdfs:label" xml:lang="" content="' _ text _ '"></span>';
-    '<a rel="mo:publication_of" resource="' _ rdfa_recording_curi(recording) _ '" href="' _ link _ '"><span property="dct:title rdfs:label" xml:lang="">' _ text _ '</span></a>';
+    '<span class="name-variation">' IF text != recording.name AND action == 'show';
+    '<a rel="mo:publication_of" resource="' _ rdfa_recording_curi(recording) _ '" href="' _ link _ '" title="' _ hover _ '"><span property="dct:title rdfs:label" xml:lang="">' _ text _ '</span></a>';
+    '</span>' IF text != recording.name AND action == 'show';
     '</span>' IF recording.edits_pending AND action == 'show';
   ELSE;
     link_recording(recording, action, text);

commit 7d593ada121740788ff013e7b3841725cbaf6a9f
Author: Pavan Chander <[email protected]>
Date:   Sat May 5 22:05:13 2012 -0400

    MBS-2966: Document what the asterisk is for
    
    Unfortunately there isn't any way to know if a given page has a name variation or not, so this text is shown on all pages.

diff --git a/root/layout/sidebar.tt b/root/layout/sidebar.tt
index ea56054..1a6e428 100644
--- a/root/layout/sidebar.tt
+++ b/root/layout/sidebar.tt
@@ -1,5 +1,6 @@
 [% IF !full_width %]
     <div id="sidebar" [% rdfa_about_attr(about) -%]>
         [% content %]
+        <p class="name-variation-ref">[% l('Name variation') %]</p>
     </div>
 [% END %]
diff --git a/root/static/styles/entity.css b/root/static/styles/entity.css
index fdea204..7c87b26 100644
--- a/root/static/styles/entity.css
+++ b/root/static/styles/entity.css
@@ -96,4 +96,11 @@ p.subheader span { color: #999; }
     color: #999;
     position: relative;
     top: -0.25em
+}
+
+.name-variation-ref:before {
+    content: "*";
+    color: #999;
+    position: relative;
+    top: -0.25em
 }
\ No newline at end of file
diff --git a/root/static/styles/layout.css b/root/static/styles/layout.css
index 229917a..cdf8ccb 100644
--- a/root/static/styles/layout.css
+++ b/root/static/styles/layout.css
@@ -516,6 +516,7 @@ tr.diff-changes {
 
 .lastupdate,
 .annotation-details,
+.name-variation-ref,
 .small {
     font-size: 90%;
     color: #777;
@@ -527,6 +528,10 @@ tr.diff-changes {
     margin-left: -5px;
 }
 
+.name-variation-ref {
+    margin-left: -5px;
+}
+
 /* The release information table */
 table.tbl {
     margin-top: 1em;

commit c9dfb462ef1c45b123cf99f293ded72e97ca3b91
Author: Pavan Chander <[email protected]>
Date:   Sat May 5 22:03:16 2012 -0400

    MBS-2966: Give artist credits a special mark

diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index 29c61e5..ce81055 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -238,7 +238,9 @@ END -%]
     hover = html_escape(artist.sort_name);
     IF artist.comment; hover = hover _ ' (' _ html_escape(artist.comment) _ ')'; END;
     '<span class="mp">' IF artist.edits_pending AND action == 'show';
+    '<span class="name-variation">' IF text != artist.name AND action == 'show';
     '<a href="' _ link _ '" title="' _ hover _ '">' _ text _ '</a>';
+    '</span>' IF text != artist.name AND action == 'show';
     '</span>' IF artist.edits_pending AND action == 'show';
 END -%]
 
diff --git a/root/components/rdfa-macros.tt b/root/components/rdfa-macros.tt
index ce5cbb8..758a156 100644
--- a/root/components/rdfa-macros.tt
+++ b/root/components/rdfa-macros.tt
@@ -391,7 +391,7 @@ END -%]
 [%- MACRO rdfa_artist_credit(ac, opts) BLOCK -%]
     [%- FOREACH name IN ac.names -%]
         [%- IF name.artist.gid && !opts.plain -%]
-          [%- rdfa_link_maker_artist(name.artist, 'show', name.name) -%]
+            [%- rdfa_link_maker_artist(name.artist, 'show', name.name) -%]
         [%- ELSE -%]
             [%- name.name | html -%]
         [%- END -%]
@@ -408,7 +408,9 @@ END -%]
     hover = html_escape(artist.sort_name);
     IF artist.comment; hover = hover _ ' (' _ artist.comment _ ')'; END;
     '<span class="mp">' IF artist.edits_pending AND action == 'show';
+    '<span class="name-variation">' IF text != artist.name AND action == 'show';
     '<a title="' _ hover _ '" rel="foaf:maker" resource="' _ rdfa_artist_curi(artist) _ '" href="' _ link _ '">' _ text _ '</a>';
+    '</span>' IF text != artist.name AND action == 'show';
     '</span>' IF artist.edits_pending AND action == 'show';
   ELSE;
     link_artist(artist, action, text);
diff --git a/root/static/styles/entity.css b/root/static/styles/entity.css
index 5d3208a..fdea204 100644
--- a/root/static/styles/entity.css
+++ b/root/static/styles/entity.css
@@ -90,3 +90,10 @@ p.subheader span { color: #999; }
 .annotation-diff {
     margin: 1em 0;
 }
+
+.name-variation:after {
+    content: "*";
+    color: #999;
+    position: relative;
+    top: -0.25em
+}
\ No newline at end of file

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.