[Slim-Checkins] r12572 - in /trunk/server/HTML: EN/artistsAsHTML.html EN/cmdwrappers Maestro/browsedb.html Maestro/cmdwrappers_Maestro Maestro/home.html Maestro/ie.css Maestro/pageheader.html Maestro/slimserver.css
mherger at svn.slimdevices.com
mherger at svn.slimdevices.com
Thu Aug 16 03:37:07 PDT 2007
Author: mherger
Date: Thu Aug 16 03:37:06 2007
New Revision: 12572
URL: http://svn.slimdevices.com?rev=12572&view=rev
Log:
Bug: n/a
Description: another snapshot of the new skin
Modified:
trunk/server/HTML/EN/artistsAsHTML.html
trunk/server/HTML/EN/cmdwrappers
trunk/server/HTML/Maestro/browsedb.html
trunk/server/HTML/Maestro/cmdwrappers_Maestro
trunk/server/HTML/Maestro/home.html
trunk/server/HTML/Maestro/ie.css
trunk/server/HTML/Maestro/pageheader.html
trunk/server/HTML/Maestro/slimserver.css
Modified: trunk/server/HTML/EN/artistsAsHTML.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/artistsAsHTML.html?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/EN/artistsAsHTML.html (original)
+++ trunk/server/HTML/EN/artistsAsHTML.html Thu Aug 16 03:37:06 2007
@@ -10,7 +10,7 @@
[% target = notarget ? '' : 'target="browser"' %]
[% contrib = contributorTuple.name | html %]
- [% contributorHTMLFrag = "<a href=\"${webroot}browsedb.html?hierarchy=contributor,album,track&$attrs&artwork=$artwork&level=1&player=$playerURI\" $target>$contrib</a>" %]
+ [% contributorHTMLFrag = "<a href=\"${webroot}browsedb.html?hierarchy=contributor,album,track&$attrs&artwork=$artwork&level=1&player=$playerURI\" $target class=\"browseItemLink\">$contrib</a>" %]
[% contributorsHTML.push(contributorHTMLFrag) %]
Modified: trunk/server/HTML/EN/cmdwrappers
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/cmdwrappers?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/EN/cmdwrappers (original)
+++ trunk/server/HTML/EN/cmdwrappers Thu Aug 16 03:37:06 2007
@@ -243,16 +243,16 @@
[% IF item.currentsong %][% item.noHref=1 %]<b>[% END %]
[% IF item.infohref %]
- <a [% item.infohref %] target="browser">[% ( item.text || item.title ) | html %]</a>
+ <a [% item.infohref %] target="browser" class="browseItemLink">[% ( item.text || item.title ) | html %]</a>
[% ELSIF item.num || item.num == 0 %]
[% UNLESS item.noHref %]<a [% PROCESS songinfoItemHRef %] target="browser">[% END %]
[% item.title | html %][% UNLESS item.noHref %]</a>[% END %]
[%# browse list items %]
[%# no level info means its a music folder item, and check for itemobj to make sure it isn't just a text item %]
[% ELSIF item.item || !item.defined('level') && item.itemobj %]
- <a [% PROCESS songinfoItemHRef %] target="browser">[% item.text | html %]</a>
+ <a [% PROCESS songinfoItemHRef %] target="browser" class="browseItemLink">[% item.text | html %]</a>
[% ELSIF item.songtitle %]
- <a [% PROCESS songinfoItemHRef %] target="browser">[% item.songtitle | html %]</a>
+ <a [% PROCESS songinfoItemHRef %] target="browser" class="browseItemLink">[% item.songtitle | html %]</a>
[% ELSE %]
[% item.text | html %]
[% END %]
@@ -260,7 +260,7 @@
[% IF item.includeArtist && item.itemobj.artist && item.itemobj.artist != item.noArtist; PROCESS artistsAsHTML.html itemobj = item.itemobj; END %]
[% IF item.includeAlbum && item.itemobj.album && item.itemobj.album.title != item.noAlbum && item.itemobj.album.title != "" %][% "FROM" | string %]
- <i><a [% PROCESS albumItemHRef %] target="browser">[% item.itemobj.album.title | html %]</a></i>[% END %]
+ <i><a [% PROCESS albumItemHRef %] target="browser" class="browseItemLink">[% item.itemobj.album.title | html %]</a></i>[% END %]
[% IF item.currentsong %]</b>[% END %]
[% END %]
@@ -271,7 +271,7 @@
><span id='wait[% itemid %]' class="waitlinkbtn" style="display: none;" onClick='hideTree("[% itemid %]")'> </span
><span id='close[% itemid %]' class="closelinkbtn" style="display: none;" onClick='hideTree("[% itemid %]")'> </span>
[%- END %]
- <a [% PROCESS "${item.hreftype}ItemHRef" %]>[% END %][% item.text | html %][% IF item.hierarchy %]</a>[% END -%]
+ <a [% PROCESS "${item.hreftype}ItemHRef" %] class="browseItemLink">[% END %][% item.text | html %][% IF item.hierarchy %]</a>[% END -%]
[% IF item.showYear && item.year -%]<a [% PROCESS yearItemHRef %] target="browser">([% item.year %])</a>[% END -%]
<!-- Include the artist for the album view -->
Modified: trunk/server/HTML/Maestro/browsedb.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/browsedb.html?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/browsedb.html (original)
+++ trunk/server/HTML/Maestro/browsedb.html Thu Aug 16 03:37:06 2007
@@ -5,6 +5,35 @@
[% pagetitle = browseby | string; pageicon = browseby; noSpacer = 1 %]
[% pageHeaderScripts = 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);
+
+ </script>
[% END %]
[% PROCESS pageheader.html %]
Modified: trunk/server/HTML/Maestro/cmdwrappers_Maestro
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/cmdwrappers_Maestro?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/cmdwrappers_Maestro (original)
+++ trunk/server/HTML/Maestro/cmdwrappers_Maestro Thu Aug 16 03:37:06 2007
@@ -5,19 +5,26 @@
[% useAJAX = 1 %]
[% crumbSeparator = ">" %]
+
[% BLOCK cmdlink -%]
<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 dummylink -%]
+ [% BLOCK dummylinkXXX -%]
<img src="[% webroot %]html/images/spacer.gif" width="13" height="13" alt="" title="">
[%- END %]
- [% BLOCK descendlink -%]
+ [% 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=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/home.html (original)
+++ trunk/server/HTML/Maestro/home.html Thu Aug 16 03:37:06 2007
@@ -1,6 +1,4 @@
[% pageHeaderScripts = BLOCK %]
- <script type="text/javascript" src="html/ext/adapter/ext/ext-base.js"></script>
- <script type="text/javascript" src="html/ext/ext-all.js"></script>
<script type="text/javascript">
var MainMenu = function(){
url = new Array();
@@ -26,17 +24,17 @@
}
}
- this.showPanel('mainMenu');
+ this.showPanel('main');
},
doMenu : function(item){
switch (item) {
case 'MY_MUSIC':
- this.showPanel('musicMenu');
+ this.showPanel('music');
break;
case 'RADIO':
- this.showPanel('radioMenu');
+ this.showPanel('radio');
break;
case 'MUSIC_ON_DEMAND':
@@ -49,7 +47,7 @@
default:
if (url[item]) {
- document.location.href = url[item];
+ location.href = url[item];
}
// alert(item);
break;
@@ -57,12 +55,16 @@
},
showPanel : function(panel){
- menuItems = Ext.DomQuery.select('div.homeMenuSection');
- for(var i = 0; i < menuItems.length; i++) {
- el = Ext.get(menuItems[i].id);
- if (el) {
- el.setVisible(panel == menuItems[i].id);
- }
+ items = Ext.DomQuery.select('div.homeMenuSection');
+ for(var i = 0; i < items.length; i++) {
+ if (el = Ext.get(items[i].id))
+ el.setVisible(panel + 'Menu' == items[i].id);
+ }
+
+ items = Ext.DomQuery.select('span.overlappingCrumblist');
+ for(var i = 0; i < items.length; i++) {
+ if (el = Ext.get(items[i].id))
+ el.setVisible(panel + 'Crumblist' == items[i].id);
}
}
}
@@ -72,7 +74,13 @@
</script>
[% END %]
-[% PROCESS pageheader.html %]
+[% pagetitle = BLOCK %][% "HOME" | string %][% END %]
+[% pwd_list = BLOCK %]
+ <span id="musicCrumblist" class="overlappingCrumblist"><a href="#" onclick="MainMenu.showPanel('main');">[% "HOME" | string %]</a> [% crumbSeparator %] <a href="#">[% "MY_MUSIC" | string %]</a></span>
+ <span id="radioCrumblist" class="overlappingCrumblist"><a href="#" onclick="MainMenu.showPanel('main');">[% "HOME" | string %]</a> [% crumbSeparator %] <a href="#">[% "RADIO" | string %]</a></span>
+[% END %]
+
+[% PROCESS pageheader.html noHomeLink=1 %]
[% BLOCK menuItem %]
<div class="homeMenuItem" id="[% token %]">
@@ -105,8 +113,5 @@
[%- END %]
</div>
-<script type="text/javascript">
-
-</script>
[% PROCESS pagefooter.html %]
Modified: trunk/server/HTML/Maestro/ie.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/ie.css?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/ie.css (original)
+++ trunk/server/HTML/Maestro/ie.css Thu Aug 16 03:37:06 2007
@@ -1,4 +1,4 @@
-* html, #browsedbList {
+* html, .scrollingPanel {
overflow-x: hidden;
}
Modified: trunk/server/HTML/Maestro/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/pageheader.html?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/pageheader.html (original)
+++ trunk/server/HTML/Maestro/pageheader.html Thu Aug 16 03:37:06 2007
@@ -3,6 +3,9 @@
<html>
<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 pageHeaderScripts %]
[% pageHeaderScripts %]
@@ -16,7 +19,9 @@
<div class="titlebox">
<div class="titlebox_top"><div></div></div>
<div class="titlebox_content">
- <div>[% "HOME" | string %]</div>
+ <div>
+ [% pagetitle %]
+ </div>
</div>
<div class="titlebox_bottom"><div></div></div>
</div>
Modified: trunk/server/HTML/Maestro/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/slimserver.css?rev=12572&r1=12571&r2=12572&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/slimserver.css (original)
+++ trunk/server/HTML/Maestro/slimserver.css Thu Aug 16 03:37:06 2007
@@ -44,7 +44,6 @@
}
#browsedbList {
- overflow: auto;
margin: 5px;
height: 400px;;
}
@@ -71,14 +70,32 @@
text-decoration: none;
}
-.homeMenuItem a:hover, .homeMenuSection .mouseOver {
+#browsedbListItem a:hover,
+#browsedbList .mouseOver,
+.homeMenuItem a:hover,
+.homeMenuSection .mouseOver {
background: url(/Maestro/html/images/pointer.gif) no-repeat right white;
cursor: pointer;
color: gray;
}
+.mouseOver .browseItemLink {
+ color: gray;
+}
+
/* styles for the basic layout */
+.scrollingPanel {
+ height: 100%;
+ overflow: auto;
+}
+
+.overlappingCrumblist {
+ position: absolute;
+ top=0;
+ left=0;
+}
+
#header {
background: url(/Maestro/html/images/header_background.png) repeat;
}
More information about the checkins
mailing list