Changeset 28587

Show
Ignore:
Timestamp:
02.11.2013 23:01:34 (6 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:
2 modified

Legend:

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

    • Property svn:mime-type changed from application/xml to text/plain
    r28433 r28587  
    4747 
    4848 
    49     <script src="{$httpPath}/script/browser-detect.js" type="text/javascript"> 
     49    <script src="{$httpPath}/script2/browser-detect.js" type="text/javascript"> 
    5050    /* space filler needed */ 
    5151    </script> 
     
    5555 
    5656 
    57 <h2>A Musical Web Observatory: </h2> 
     57<h2>A Musical Web Observatory?</h2> 
    5858 
    5959<h3><i><font size="+2">Connecting People with Data, Documents, and Algorithms</font></i></h3> 
    6060 
     61<!-- 
    6162<div style="background-color: #DD3611; color: white; padding: 4pt; margin-bottom: 6pt;"> 
    6263<table> 
     
    139140</table> 
    140141</div> 
    141  
    142 <p class="about">This project is currently work in progress.  The sequence of development so far has been: 
     142--> 
     143 
     144<p class="about">This music DL embodies the following: 
    143145 
    144146<style> 
  • main/trunk/model-sites-dev/multimodal-mdl/collect/selfsim-my-ipod/transform/pages/document.xsl

    • Property svn:mime-type changed from application/xml to text/plain
    r28433 r28587  
    265265          --> 
    266266 
    267           <table> 
     267          <table style="width: 100%;"> 
    268268        <tr> 
    269           <td> 
     269          <td style="width: 200px;"> 
    270270            MusicBrainz song id:  
    271271          </td> 
    272272          <td> 
    273             <a href="http://dbtune.org/musicbrainz/resource/track/{$musicbrainzsongid}" target="#musicbrainz"> 
     273            <a href="http://dbtune.org/musicbrainz/resource/track/{$musicbrainzsongid}" target="#musicbrainz" class="external"> 
    274274              <xsl:copy-of select="$musicbrainzsongid"/> 
    275275            </a> 
     
    282282          </td> 
    283283          <td> 
    284             <a href="http://dbtune.org/musicbrainz/resource/record/{$musicbrainzalbumid}" target="#musicbrainz"> 
     284            <a href="http://dbtune.org/musicbrainz/resource/record/{$musicbrainzalbumid}" target="#musicbrainz" class="external"> 
    285285              <xsl:copy-of select="$musicbrainzalbumid"/> 
    286286            </a> 
     
    293293          </td> 
    294294          <td> 
    295             <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz"> 
     295            <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz" class="external"> 
    296296              <xsl:copy-of select="$musicbrainzartistid"/> 
    297             </a> 
    298           </td> 
    299         </tr> 
    300         <tr> 
    301           <td colspan="2">         
    302             <a href="{$lastfmtrackurl}" target="#lastfm"> 
    303               <xsl:copy-of select="$lastfmtrackurl"/> 
    304297            </a> 
    305298          </td> 
     
    310303          </td> 
    311304          <td> 
    312             <a href="{$echonestsongid}" target="#echonestsongid"> 
     305            <a href="http://developer.echonest.com/api/v4/song/profile?api_key=8WNR9XTGCODO9G4YG&amp;format=xml&amp;id={$echonestsongid}" target="#echonestsongid" class="external"> 
     306 
     307 
     308 
    313309              <xsl:copy-of select="$echonestsongid"/> 
    314310            </a> 
     311          </td> 
     312        </tr> 
     313        <tr> 
     314          <td colspan="2">         
     315            <i> 
     316              <a href="{$lastfmtrackurl}" target="#lastfm" class="external"> 
     317            <xsl:copy-of select="$lastfmtrackurl"/> 
     318              </a> 
     319            </i> 
    315320          </td> 
    316321        </tr> 
     
    479484    </div> 
    480485 
    481     <gsf:script src="{$httpCollection}/script/meandre-workflow/chromagram.js"/> 
    482     <gsf:script src="{$httpCollection}/script/meandre-workflow/js-dynamic-mix.js"/> 
     486    <gsf:script src="{$httpCollection}/script2/meandre-workflow/chromagram.js"/> 
     487    <gsf:script src="{$httpCollection}/script2/meandre-workflow/js-dynamic-mix.js"/> 
    483488     
    484489    <gsf:script> 
     
    521526      <div class="documenttext hide" style="color: white; background-color: rgb(40%,40%,20%); padding: 8px;"> 
    522527 
    523         <textarea id="js-dynamic-code" style="width:100%; height: 520px; font-size: 60%"> 
     528        <textarea id="js-dynamic-code" style="width:100%; height: 520px; font-size: 90%"> 
    524529          <xsl:text disable-output-escaping="yes"> 
    525530 
     
    658663 
    659664    <form style="padding-left: 8px; padding-bottom: 0px;"> 
    660       <span class="vis-heading">On Pause:</span> 
    661       <input type="checkbox" name="similarityMatrix" onclick="plotSimilarityMatrixWhenPaused(this)"/>Show Similarity Matrix 
     665      <div style="float: left;"> 
     666        <span class="vis-heading">On Pause:</span> 
     667        <input type="checkbox" name="similarityMatrix" onclick="plotSimilarityMatrixWhenPaused(this)"/>Show Similarity Matrix 
     668      </div> 
     669      <div style="float: left; padding-left: 140px;"> 
     670        <span class="vis-heading">Accelerated  Processing:</span> 
     671        <input type="checkbox" name="acceleratedProcessingInput" onclick="acceleratedProcessingCheckbox(this)"/>&gt; realtime 
     672        <span id="accProcStatus"></span> 
     673      </div> 
     674 
    662675    </form> 
    663     <hr/> 
     676    <div style="clear: both; padding-top: 4px; padding-bottom: 4px;"><hr/></div> 
    664677 
    665678    </div> 
     
    865878    </gsf:script> 
    866879 
     880<!-- 
    867881 
    868882    <div id="original-turnstyle" style="margin: 6px;"> 
     
    889903    }); 
    890904    </gsf:script> 
    891  
     905--> 
    892906 
    893907  </xsl:template>