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

Timestamp:

2013-11-02T23:01:34+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/selfsim-my-ipod/transform/pages

Files:

• about.xsl (modified) (3 diffs, 1 prop)
• document.xsl (modified) (9 diffs, 1 prop)

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

@@ -47 +47 @@
 
 
-    <script src="{$httpPath}/script/browser-detect.js" type="text/javascript">
+    <script src="{$httpPath}/script2/browser-detect.js" type="text/javascript">
     /* space filler needed */
     </script>
@@ -55 +55 @@
 
 
-<h2>A Musical Web Observatory: </h2>
+<h2>A Musical Web Observatory?</h2>
 
 <h3><i><font size="+2">Connecting People with Data, Documents, and Algorithms</font></i></h3>
 
+<!--
 <div style="background-color: #DD3611; color: white; padding: 4pt; margin-bottom: 6pt;">
 <table>
@@ -139 +140 @@
 </table>
 </div>
-
-<p class="about">This project is currently work in progress.  The sequence of development so far has been:
+-->
+
+<p class="about">This music DL embodies the following:
 
 <style>

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

@@ -265 +265 @@
           -->
 
-          <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://dbtune.org/musicbrainz/resource/track/{$musicbrainzsongid}" target="#musicbrainz" class="external">
               <xsl:copy-of select="$musicbrainzsongid"/>
             </a>
@@ -282 +282 @@
           </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">
               <xsl:copy-of select="$musicbrainzalbumid"/>
             </a>
@@ -293 +293 @@
           </td>
           <td>
-            <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz">
+            <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz" class="external">
               <xsl:copy-of select="$musicbrainzartistid"/>
-            </a>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">        
-            <a href="{$lastfmtrackurl}" target="#lastfm">
-              <xsl:copy-of select="$lastfmtrackurl"/>
             </a>
           </td>
@@ -310 +303 @@
           </td>
           <td>
-            <a href="{$echonestsongid}" target="#echonestsongid">
+            <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>
+        <tr>
+          <td colspan="2">        
+            <i>
+              <a href="{$lastfmtrackurl}" target="#lastfm" class="external">
+            <xsl:copy-of select="$lastfmtrackurl"/>
+              </a>
+            </i>
           </td>
         </tr>
@@ -479 +484 @@
     </div>
 
-    <gsf:script src="{$httpCollection}/script/meandre-workflow/chromagram.js"/>
-    <gsf:script src="{$httpCollection}/script/meandre-workflow/js-dynamic-mix.js"/>
+    <gsf:script src="{$httpCollection}/script2/meandre-workflow/chromagram.js"/>
+    <gsf:script src="{$httpCollection}/script2/meandre-workflow/js-dynamic-mix.js"/>
     
     <gsf:script>
@@ -521 +526 @@
       <div class="documenttext hide" style="color: white; background-color: rgb(40%,40%,20%); padding: 8px;">
 
-        <textarea id="js-dynamic-code" style="width:100%; height: 520px; font-size: 60%">
+        <textarea id="js-dynamic-code" style="width:100%; height: 520px; font-size: 90%">
           <xsl:text disable-output-escaping="yes">
 
@@ -658 +663 @@
 
     <form style="padding-left: 8px; padding-bottom: 0px;">
-      <span class="vis-heading">On Pause:</span>
-      <input type="checkbox" name="similarityMatrix" onclick="plotSimilarityMatrixWhenPaused(this)"/>Show Similarity Matrix
+      <div style="float: left;">
+        <span class="vis-heading">On Pause:</span>
+        <input type="checkbox" name="similarityMatrix" onclick="plotSimilarityMatrixWhenPaused(this)"/>Show Similarity Matrix
+      </div>
+      <div style="float: left; padding-left: 140px;">
+        <span class="vis-heading">Accelerated  Processing:</span>
+        <input type="checkbox" name="acceleratedProcessingInput" onclick="acceleratedProcessingCheckbox(this)"/>&gt; realtime
+        <span id="accProcStatus"></span>
+      </div>
+
     </form>
-    <hr/>
+    <div style="clear: both; padding-top: 4px; padding-bottom: 4px;"><hr/></div>
 
     </div>
@@ -865 +878 @@
     </gsf:script>
 
+<!--
 
     <div id="original-turnstyle" style="margin: 6px;">
@@ -889 +903 @@
     });
     </gsf:script>
-
+-->
 
   </xsl:template>