[Slim-Checkins] r12573 - in /trunk/server/HTML/Maestro: browsedb.html cmdwrappers_Maestro home.html pageheader.html xmlbrowser.html
mherger at svn.slimdevices.com
mherger at svn.slimdevices.com
Thu Aug 16 04:45:13 PDT 2007
Author: mherger
Date: Thu Aug 16 04:45:13 2007
New Revision: 12573
URL: http://svn.slimdevices.com?rev=12573&view=rev
Log:
Bug: n/a
Description: make plugins work again
Added:
trunk/server/HTML/Maestro/xmlbrowser.html
Modified:
trunk/server/HTML/Maestro/browsedb.html
trunk/server/HTML/Maestro/cmdwrappers_Maestro
trunk/server/HTML/Maestro/home.html
trunk/server/HTML/Maestro/pageheader.html
Modified: trunk/server/HTML/Maestro/browsedb.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/browsedb.html?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/browsedb.html (original)
+++ trunk/server/HTML/Maestro/browsedb.html Thu Aug 16 04:45:13 2007
@@ -4,35 +4,9 @@
[% pagetitle = browseby | string; pageicon = browseby; noSpacer = 1 %]
-[% pageHeaderScripts = BLOCK %]
+[% maestroScripts = BLOCK %]
<script type="text/javascript">
- var Browse = function(){
- return {
- init : function(){
- Ext.select('div.browsedbListItem').on('mouseover', function(ev) {
- if (ev.target.tagName != 'DIV')
- return;
-
- // remove highlighting from the other DIVs
- items = Ext.DomQuery.select('div.mouseOver');
- for(var i = 0; i < items.length; i++) {
- el = Ext.get(items[i].id);
- if (el) {
- el.removeClass('mouseOver');
- }
- }
-
- Ext.get(ev.target).addClass('mouseOver');
- });
- },
-
- doAction : function(item){
- }
- }
- }();
-
- Ext.EventManager.onDocumentReady(Browse.init, Browse, true);
-
+ Ext.EventManager.onDocumentReady(Tools.addBrowseListClass, Tools, true);
</script>
[% END %]
Modified: trunk/server/HTML/Maestro/cmdwrappers_Maestro
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/cmdwrappers_Maestro?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/cmdwrappers_Maestro (original)
+++ trunk/server/HTML/Maestro/cmdwrappers_Maestro Thu Aug 16 04:45:13 2007
@@ -2,7 +2,7 @@
[% controlGraphics = 1 %]
[% browserTarget = "browser" %]
- [% useAJAX = 1 %]
+ [% useAJAX = 0 %]
[% crumbSeparator = ">" %]
@@ -10,21 +10,6 @@
<a [% content %] [% UNLESS noTarget %]target="status"[% END %]><img src="[% webroot %]html/images/[% cmdimage %].png" width=13 height=13 alt="[% cmdtitle | string | ucfirst %]" title="[% cmdtitle | string | ucfirst %]"></a>
[%- END %]
- [% BLOCK cmdlinkXX -%]
- <img src="[% webroot %]html/images/[% cmdimage %].png" width=13 height=13 alt="[% cmdtitle | string | ucfirst %]" title="[% cmdtitle | string | ucfirst %]">
- [%- END %]
-
- [% BLOCK dummylinkXXX -%]
- <img src="[% webroot %]html/images/spacer.gif" width="13" height="13" alt="" title="">
- [%- END %]
-
- [% BLOCK descendlinkXX -%]
- [% PROCESS cmdlink
- cmdtitle = "NEXT"
- cmdimage = "b_next"
- noTarget = 1 %]
- [%- END %]
-
[% END -%]
Modified: trunk/server/HTML/Maestro/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/home.html?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/home.html (original)
+++ trunk/server/HTML/Maestro/home.html Thu Aug 16 04:45:13 2007
@@ -1,4 +1,4 @@
-[% pageHeaderScripts = BLOCK %]
+[% maestroScripts = BLOCK %]
<script type="text/javascript">
var MainMenu = function(){
url = new Array();
@@ -18,7 +18,7 @@
[%- FOREACH category = additionalLinks %]
[%- category = category.key %]
[%- FOREACH link = additionalLinks.$category %]
- url['[% link.key %]'] = '[% link.value | html %]player=[% playerURI %]';
+ url['[% link.key %]:[% category %]'] = '[% link.value | html %]player=[% playerURI %]';
[%- END %]
[%- END %]
}
@@ -83,14 +83,14 @@
[% PROCESS pageheader.html noHomeLink=1 %]
[% BLOCK menuItem %]
- <div class="homeMenuItem" id="[% token %]">
+ <div class="homeMenuItem" id="[% token %][% IF category %]:[% category %][% END %]">
[% token | string %]
</div>
[% END %]
<div class="homeMenuSection" id="mainMenu">
- [% PROCESS menuItem token="FAVORITES" %]
- [% PROCESS menuItem token="MY_MUSIC" %]
+ [% PROCESS menuItem token="FAVORITES" category='browse' %]
+ [% category=''; PROCESS menuItem token="MY_MUSIC" %]
[% PROCESS menuItem token="RADIO" %]
[% PROCESS menuItem token="MUSIC_ON_DEMAND" %]
[% PROCESS menuItem token="OTHER_SERVICES" %]
@@ -99,7 +99,7 @@
<div class="homeMenuSection" id="musicMenu">
[%- FOREACH link = additionalLinks.browse %]
[% IF link.key != 'FAVORITES' %]
- [% PROCESS menuItem token=link.key %]
+ [% PROCESS menuItem token=link.key category='browse' %]
[%- END %]
[%- END %]
</div>
@@ -108,7 +108,7 @@
<div class="homeMenuSection" id="radioMenu">
[%- FOREACH link = additionalLinks.radio %]
[% IF link.key != 'FAVORITES' %]
- [% PROCESS menuItem token=link.key %]
+ [% PROCESS menuItem token=link.key category='radio' %]
[%- END %]
[%- END %]
</div>
Modified: trunk/server/HTML/Maestro/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/pageheader.html?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/pageheader.html (original)
+++ trunk/server/HTML/Maestro/pageheader.html Thu Aug 16 04:45:13 2007
@@ -4,11 +4,35 @@
<head>
[% PROCESS standardheader.html %]
- <script type="text/javascript" src="html/ext/adapter/ext/ext-base.js"></script>
- <script type="text/javascript" src="html/ext/ext-all.js"></script>
+ [% IF maestroScripts %]
+ <script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js"></script>
+ <script type="text/javascript" src="/html/ext/ext-all.js"></script>
- [% IF pageHeaderScripts %]
- [% pageHeaderScripts %]
+ <script type="text/javascript">
+ var Tools = function(){
+ return {
+ addBrowseListClass : function(){
+ Ext.select('div.browsedbListItem').on('mouseover', function(ev) {
+ if (ev.target.tagName != 'DIV')
+ return;
+
+ // remove highlighting from the other DIVs
+ items = Ext.DomQuery.select('div.mouseOver');
+ for(var i = 0; i < items.length; i++) {
+ el = Ext.get(items[i].id);
+ if (el) {
+ el.removeClass('mouseOver');
+ }
+ }
+
+ Ext.get(ev.target).addClass('mouseOver');
+ });
+ }
+ }
+ }();
+ </script>
+
+ [% maestroScripts %]
[% END %]
<!--[if gte IE 6]>
Added: trunk/server/HTML/Maestro/xmlbrowser.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/xmlbrowser.html?rev=12573&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/xmlbrowser.html (added)
+++ trunk/server/HTML/Maestro/xmlbrowser.html Thu Aug 16 04:45:13 2007
@@ -1,0 +1,206 @@
+[% maestroScripts = BLOCK %]
+ <script type="text/javascript">
+ Ext.EventManager.onDocumentReady(Tools.addBrowseListClass, Tools, true);
+ </script>
+[% END %]
+
+[% IF query %]
+ [%# Add the search query to each link if available %]
+ [% searchquery = 'query=' _ query _ '&' %]
+[% END %]
+
+[% FILTER null %]
+[% pageicon = 'RADIO'; noSpacer = NOT streaminfo; %]
+[% pwd_list = [];
+ FOREACH crumb IN crumb;
+ crumbItem = BLOCK %]
+ <a href="index.html?[% searchquery %]player=[% playerURI %]&index=[% crumb.index %]">[% crumb.name %]</a>
+ [% END %]
+ [% pwd_list.push(crumbItem) %]
+ [% END %]
+[% END # filter -%]
+
+[% IF NOT ajaxUpdate %][% PROCESS pageheader.html %]<div id="mainbody">[% END %]
+
+[% IF msg %][% WRAPPER contentcontainer %]
+ <b>[% msg %]</b>
+[% END %][% END %]
+
+[% IF streaminfo %]
+ [% IF streaminfo.item.enclosure || streaminfo.item.url %]
+ <div id="songInfoHeader">
+ [% WRAPPER playlink %]href="index.html?[% searchquery %]action=play&index=[% streaminfo.index %]&player=[% player | uri %]"[% END %] [% "PLAY_THIS_SONG" | string %]<br />
+ [% WRAPPER addlink %]href="index.html?[% searchquery %]action=add&index=[% streaminfo.index %]&player=[% player | uri %]"[% END %] [% "ADD_THIS_SONG_TO_PLAYLIST" | string %]
+ </div>
+ [% END %]
+
+<div class="songInfo">
+
+ [% IF streaminfo.item.image %]
+ <ul>
+ <img src="[% streaminfo.item.image %]" />
+ </ul>
+ [% END %]
+
+ <ul>
+ <li><div class="songInfoTitle">[% "TITLE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% (streaminfo.item.name || streaminfo.item.title) | html %]</div>
+ </li>
+
+ [% IF streaminfo.item.subtitle %]
+ <li><div class="songInfoTitle">[% "XML_SUBTITLE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.subtitle | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.pubdate %]
+ <li><div class="songInfoTitle">[% "XML_DATE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.pubdate | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.url %]
+ <li><div class="songInfoTitle">[% "URL" | string; "COLON" | string %]</div>
+ <div class="songInfoText"><a href="[% streaminfo.item.url | html %]" target="_blank">[% streaminfo.item.url | html %]</a></div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.description %]
+ <li><div class="songInfoTitle">[% "DESCRIPTION" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.description | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.summary %]
+ <li><div class="songInfoTitle">[% "XML_SUMMARY" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.summary | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.link %]
+ <li><div class="songInfoTitle">[% "XML_LINK" | string; "COLON" | string %]</div>
+ <div class="songInfoText"><a href="[% streaminfo.item.link | html %]" target="_blank">[% streaminfo.item.link | html %]</a></div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.enclosure %]
+ <li><div class="songInfoTitle">[% "XML_ENCLOSURE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">
+ <a href="[% streaminfo.item.enclosure.url | html %]" target="_blank">[% streaminfo.item.enclosure.url | html %]</a><br />
+ [% FILTER format('%.2f'); streaminfo.item.enclosure.length / 1048576; END %] MB
+ </div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.duration %]
+ <li><div class="songInfoTitle">[% "LENGTH" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.duration | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.explicit %]
+ <li><div class="songInfoTitle">[% "XML_EXPLICIT" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.explicit | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.bitrate %]
+ <li><div class="songInfoTitle">[% "BITRATE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.bitrate | html %] [% "KBPS" | string %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.listeners %]
+ <li><div class="songInfoTitle">[% "NUMBER_OF_LISTENERS" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.listeners | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.current_track %]
+ <li><div class="songInfoTitle">[% "NOW_PLAYING" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.current_track | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.genre %]
+ <li><div class="songInfoTitle">[% "GENRE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.genre | html %]</div>
+ </li>
+ [% END %]
+
+ [% IF streaminfo.item.source %]
+ <li><div class="songInfoTitle">[% "SOURCE" | string; "COLON" | string %]</div>
+ <div class="songInfoText">[% streaminfo.item.source | html %]</div>
+ </li>
+ [% END %]
+ </ul>
+</div>
+[% END %]
+
+[% IF search %]
+ <form id="searchForm" name="searchForm" method="GET">
+ <input type="text" id="query" name="query" size="40" value="[% query %]"/>
+ <input name="submit" type="submit" class="stdclick" value="[% "SEARCH" | string %]"><p>
+ <input type="hidden" value="[% player %]" name="player">
+ </form>
+[% END %]
+
+[%- odd = 1 %]
+[%- IF items -%]
+ <div id="browsedbHeader">
+ [% IF hasPagebar %]
+ [% "ITEMS" | string %] [% pageinfo.startitem + 1 %] [% "TO" | string %] [% pageinfo.enditem + 1 %] [% "OF" | string %] [% pageinfo.totalitems %]
+ [% PROCESS pagebar %]
+ [% END %]
+ </div>
+
+ [% BLOCK favoritescontrol %]<span id="controls[% index _ (start + loop.index) %]" [% IF useAJAX %]style="display: none;"[% END %]>
+ [% IF item.favorites == 1 %]
+ [% WRAPPER favaddlink noTarget=1 %]
+ href="index.html?action=favadd&index=[% index _ (start + loop.index) %]&start=[% pageinfo.startitem %]&player=[% player | uri %]"
+ [% END %]
+ [% ELSIF item.favorites == 2 %]
+ [% WRAPPER favdellink noTarget=1 %]
+ href="index.html?action=favdel&index=[% index _ (start + loop.index) %]&start=[% pageinfo.startitem %]&player=[% player | uri %]"
+ [% END %]
+ [% END %]</span>
+ [% END %]
+
+ [%- WRAPPER contentcontainer %]
+ [% IF itemsHaveAudio %]
+ [%- BLOCK allcontrol -%]
+ [% WRAPPER playlink %]href="index.html?[% searchquery %]action=playall&index=[% currentIndex %]&player=[% player | uri %]"[% END %]
+ [% WRAPPER addlink %]href="index.html?[% searchquery %]action=addall&index=[% currentIndex %]&player=[% player | uri %]"[% END %]
+ [%- END %]
+ [%- WRAPPER contentitem leftcontrols = 'allcontrol' %]
+ [% "ALL_SONGS" | string %]
+ [%- END %]
+ [%- odd = (not odd) %]
+ [% END %]
+
+ [%- FOREACH item = items %]
+ [%- BLOCK gencontrol -%]
+ [% IF item.type == 'audio' || item.type == 'playlist' || item.enclosure %]
+ [% WRAPPER playlink %]href="index.html?[% searchquery %]action=play[% IF item.type == 'playlist' %]all[% END %]&index=[% index _ (start + loop.index) %]&player=[% player | uri %]"[% END %]
+ [% WRAPPER addlink %]href="index.html?[% searchquery %]action=add[% IF item.type == 'playlist' %]all[% END %]&index=[% index _ (start + loop.index) %]&player=[% player | uri %]"[% END %]
+ [% ELSE %]
+ [% PROCESS dummylink %]
+ [% PROCESS dummylink %]
+ [% END %]
+ [%- END %]
+ [%- WRAPPER contentitem leftcontrols = 'gencontrol' rightcontrols = 'favoritescontrol' %]
+ <a href="index.html?[% searchquery %]index=[% index _ (start + loop.index) %]&player=[% player | uri %]" class="browseItemLink">[% item.name || item.title %]</a>
+ [%- END %]
+ [% IF useAJAX %]</span>[% END %]
+ [%- odd = (not odd) %]
+ [%- END %]
+
+ [%- END %]
+ [% IF hasPagebar %]
+ [% "ITEMS" | string %] [% pageinfo.startitem + 1 %] [% "TO" | string %] [% pageinfo.enditem + 1 %] [% "OF" | string %] [% pageinfo.totalitems %]
+ [% PROCESS pagebar %]
+ [% END %]
+[%- END %]
+
+[% IF NOT ajaxUpdate %]</div>[% PROCESS pagefooter.html %][% END %]
+
More information about the checkins
mailing list