Changeset 28588 for main/trunk/model-sites-dev

Timestamp:

2013-11-02T23:02:13+13:00 (10 years ago)

Author:

davidb

Message:

Changes after testing in preparation for SMAM keynote

Location:

main/trunk/model-sites-dev/multimodal-mdl/collect/linkeddata-my-ipod/transform/pages

Files:

• about.xsl (modified) (4 diffs)
• classifier.xsl (added)
• document.xsl (modified) (11 diffs)

main/trunk/model-sites-dev/multimodal-mdl/collect/linkeddata-my-ipod/transform/pages/about.xsl

@@ -124 +124 @@
 
 
-
-
-
-   <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"><xsl:text> </xsl:text></script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"><xsl:text> </xsl:text></script>
 
     <script type="text/javascript" src="https://www.google.com/jsapi"><xsl:text> </xsl:text></script>
@@ -139 +136 @@
       sgvizler.option.namespace.salami = 'http://nema.lis.illinois.edu/salamiEndpoint/';
       
+      sgvizler.option.namespace.dc = 'http://purl.org/dc/elements/1.1/';
       sgvizler.option.namespace.gsembedded = 'http://greenstone.org/gsembedded#'
       sgvizler.option.namespace.greenstonedata = 'http://localhost:3030/greenstone/data/'
@@ -145 +143 @@
     </script>
 
-<div id="sgvzl_example"
+
+<div id="sgvzl_example1"
       data-sgvizler-endpoint="http://localhost:3030/greenstone/query"
 
       data-sgvizler-chart="gPieChart"
-      XXdata-sgvizler-chart="gBarChart"
       data-sgvizler-loglevel="2"
       data-sgvizler-chart-options="title=Songs by ID3.Genre"
-      style="width:100%; height:300px;">
+      style="width:900px; height:400px; margin-left: auto; margin-right: auto">
   <xsl:attribute name="data-sgvizler-query">
      SELECT (?genreTag) (COUNT(?genreTag) AS ?freqCount)
@@ -168 +166 @@
 
 
+
+
+
     </xsl:template>
 

main/trunk/model-sites-dev/multimodal-mdl/collect/linkeddata-my-ipod/transform/pages/document.xsl

@@ -151 +151 @@
       <div class="documenttext">
     <center>
-      <xsl:call-template name="plainoldMetadataBlock" />
+      <xsl:call-template name="plainold-metadata-block" />
     </center>
+
+    <br />
+
+    <center>
+      <xsl:call-template name="discovery-block" />
+    </center>
+
       </div>
 
@@ -191 +198 @@
 
     <xsl:template name="choose-music-artist">
-      
+
       <gsf:choose-metadata>
     <gsf:metadata name="dc.Creator"/>
@@ -199 +206 @@
     <gsf:default>Unknown</gsf:default>
       </gsf:choose-metadata>
+
     </xsl:template>    
 
 
-  <xsl:template name="plainoldMetadataBlock">
+  <xsl:template name="plainold-metadata-block">
     
     <xsl:variable name="httpCollection"><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/></xsl:variable>
     <xsl:variable name="assocFilePath"><gsf:metadata name="assocfilepath" select="root"/></xsl:variable>
+
+      <style>
+    <xsl:text disable-output-escaping="yes">
+      a.external {
+        background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAAAAAElFTkSuQmCC") no-repeat scroll right center rgba(0, 0, 0, 0);
+        padding-right: 13px;
+      }
+    </xsl:text>
+      </style>
     
       <table class="metadata-stripes">
@@ -214 +231 @@
         </td>
         <td>
-          <xsl:call-template name="choose-music-title"/>
+          <a class="external" target="#mbsearch">
+        <xsl:attribute name="href">
+          http://musicbrainz.org/search?query=<xsl:call-template name="choose-music-title"/>&amp;type=recording&amp;limit=5&amp;method=indexed
+        </xsl:attribute>
+        <xsl:call-template name="choose-music-title"/>
+          </a>
         </td>
       </tr>
@@ -252 +274 @@
 
 
-
-
-
-
-
   <!-- *** -->
   <!-- * Discovery -->
@@ -310 +327 @@
       <gsf:metadata name="dc.Identifier.echonestsongid"/>
     </xsl:variable>
-    
+
+    <section itemscope="itemscope">
+
       <table class="metadata-stripes">
     <tbody>
@@ -324 +343 @@
       <tr>
         <td>Album Title</td>
-        <td><gsf:metadata name="dc.Title.albumtitle"/></td>
+        <td>
+        <gsf:metadata name="dc.Title.albumtitle"/>
+        </td>
       </tr>
       
       <tr>
         <td>Artist</td>
-        <td><gsf:metadata name="dc.Creator"/></td>
+        <td>
+          <span itemtype="http://musicbrainz.org/artist" 
+            itemid="http://musicbrainz.org/artist/{$musicbrainzartistid}"
+            itemprop="name">
+        <gsf:metadata name="dc.Creator"/>
+          </span>       
+        </td>
       </tr>
       
       <tr valign="top">
         <td>Artist Summary</td>
-        <td><i><gsf:metadata name="LastFM.LastFMArtistWikiSummary"/></i></td>
+        <td>
+          <i>
+        <gsf:script>
+          var summary = gs.documentMetadata["LastFM_LastFMArtistWikiSummary"];
+          
+          document.write(summary.replace("\n","&lt;br /&gt;"));
+
+        </gsf:script>
+          </i>
+        </td>
       </tr>
       
@@ -381 +417 @@
           -->
 
-          <table>
+          <table style="width: 100%;">
         <tr>
-          <td>
+          <td style="width: 200px;">
             MusicBrainz song id: 
           </td>
           <td>
-            <a href="http://dbtune.org/musicbrainz/resource/track/{$musicbrainzsongid}" target="#musicbrainz">
+
+            <a href="http://musicbrainz.org/track/{$musicbrainzsongid}" target="#musicbrainz" class="external">
               <xsl:copy-of select="$musicbrainzsongid"/>
             </a>
@@ -398 +435 @@
           </td>
           <td>
-            <a href="http://dbtune.org/musicbrainz/resource/record/{$musicbrainzalbumid}" target="#musicbrainz">
+<!--
+            <a href="http://dbtune.org/musicbrainz/resource/record/{$musicbrainzalbumid}" target="#musicbrainz" class="external">
+-->
+            <a href="http://musicbrainz.org/release/{$musicbrainzalbumid}" target="#musicbrainz" class="external">
               <xsl:copy-of select="$musicbrainzalbumid"/>
             </a>
@@ -409 +449 @@
           </td>
           <td>
-            <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz">
+            <a href="http://musicbrainz.org/artist/{$musicbrainzartistid}" target="#musicbrainz" class="external">
               <xsl:copy-of select="$musicbrainzartistid"/>
             </a>
           </td>
         </tr>
+
+
+        <gsf:switch>
+          <gsf:metadata name="$echonestsongid"/>
+          <gsf:when test="exists">
+
+            <tr>
+              <td>
+            EchoNest song id:
+              </td>
+              <td>
+            <a href="http://developer.echonest.com/api/v4/song/profile?api_key=8WNR9XTGCODO9G4YG&amp;format=xml&amp;id={$echonestsongid}" target="#echonestsongid" class="external">
+              <xsl:copy-of select="$echonestsongid"/>
+            </a>
+              </td>
+            </tr>
+          </gsf:when>
+        </gsf:switch>
+
         <tr>
           <td colspan="2">        
-            <a href="{$lastfmtrackurl}" target="#lastfm">
-              <xsl:copy-of select="$lastfmtrackurl"/>
-            </a>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            EchoNest song id:
-          </td>
-          <td>
-            <a href="{$echonestsongid}" target="#echonestsongid">
-              <xsl:copy-of select="$echonestsongid"/>
-            </a>
+            <i>
+              <a href="{$lastfmtrackurl}" target="#lastfm" class="external">
+            <xsl:copy-of select="$lastfmtrackurl"/>
+              </a>
+            </i>
           </td>
         </tr>
@@ -439 +490 @@
     </tbody>
       </table>
+    </section>
   </xsl:template>