[Slim-Checkins] r12554 - in /trunk/server/HTML/Maestro: ./ html/ html/images/
mherger at svn.slimdevices.com
mherger at svn.slimdevices.com
Tue Aug 14 08:08:27 PDT 2007
Author: mherger
Date: Tue Aug 14 08:08:27 2007
New Revision: 12554
URL: http://svn.slimdevices.com?rev=12554&view=rev
Log:
Bug: n/a
Description: commit early, commit often... a first snapshot of the new Maestro skin
Added:
trunk/server/HTML/Maestro/
trunk/server/HTML/Maestro/browsedb.html
trunk/server/HTML/Maestro/cmdwrappers_Jive
trunk/server/HTML/Maestro/home.html
trunk/server/HTML/Maestro/html/
trunk/server/HTML/Maestro/html/images/
trunk/server/HTML/Maestro/html/images/b_add.png (with props)
trunk/server/HTML/Maestro/html/images/b_play.png (with props)
trunk/server/HTML/Maestro/html/images/pointer.gif (with props)
trunk/server/HTML/Maestro/html/index.js
trunk/server/HTML/Maestro/ie.css
trunk/server/HTML/Maestro/index.html
trunk/server/HTML/Maestro/pagefooter.html
trunk/server/HTML/Maestro/pageheader.html
trunk/server/HTML/Maestro/skinconfig.yml
trunk/server/HTML/Maestro/slim-ext.css
trunk/server/HTML/Maestro/slimserver.css
Added: trunk/server/HTML/Maestro/browsedb.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/browsedb.html?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/browsedb.html (added)
+++ trunk/server/HTML/Maestro/browsedb.html Tue Aug 14 08:08:27 2007
@@ -1,0 +1,27 @@
+[% IF song_count; pageHeaderInfo = BLOCK %]
+ <div>[% album_count %] [% "WITH" | string %] [% song_count %] [% "BY" | string %] [% artist_count %].</div>
+[% END; END %]
+
+[% pagetitle = browseby | string; pageicon = browseby; noSpacer = 1 %]
+
+[% pageHeaderScripts = BLOCK %]
+[% END %]
+
+[% PROCESS pageheader.html %]
+
+<div id="browsedbHeader">
+ [% IF artwork != 1 -%]
+ [% IF hasPagebar %][% "ITEMS" | string %] [% pageinfo.startitem + 1 %] [% "TO" | string %] [% pageinfo.enditem + 1 %] [% "OF" | string %] [% pageinfo.totalitems %][% END %]
+ [% END -%]
+ [% IF warn -%]<p>[% PROCESS scanwarning %] [%- END %]
+
+ [% IF hasPagebar -%][% PROCESS pagebar %][%- END %]
+</div>
+
+[%- WRAPPER contentcontainer %]
+ [% FOREACH item = browse_items -%]
+ [%- PROCESS browsedbitems_list.html -%]
+ [%- END %]
+[% END -%]
+
+[% PROCESS pagefooter.html %]
Added: trunk/server/HTML/Maestro/cmdwrappers_Jive
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/cmdwrappers_Jive?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/cmdwrappers_Jive (added)
+++ trunk/server/HTML/Maestro/cmdwrappers_Jive Tue Aug 14 08:08:27 2007
@@ -1,0 +1,22 @@
+[%- FILTER null %]
+
+ [% controlGraphics = 1 %]
+ [% browserTarget = "browser" %]
+ [% useAJAX = 1 %]
+
+ [% 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 dummylink -%]
+ <img src="[% webroot %]html/images/spacer.gif" width="13" height="13" alt="" title="">
+ [%- END %]
+
+ [% BLOCK descendlink -%]
+ [% PROCESS cmdlink
+ cmdtitle = "NEXT"
+ cmdimage = "b_next"
+ noTarget = 1 %]
+ [%- END %]
+
+[% END -%]
Added: trunk/server/HTML/Maestro/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/home.html?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/home.html (added)
+++ trunk/server/HTML/Maestro/home.html Tue Aug 14 08:08:27 2007
@@ -1,0 +1,112 @@
+[% 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();
+
+ return {
+ init : function(){
+ menuItems = Ext.DomQuery.select('div.homeMenuItem');
+ for(var i = 0; i < menuItems.length; i++) {
+ el = Ext.get(menuItems[i].id);
+ if (el) {
+ el.addClassOnOver('mouseOver');
+ el.on('click', function(e, item){
+ this.doMenu(item.id);
+ }, this);
+
+ // fill array with URLs, if available
+ [%- FOREACH category = additionalLinks %]
+ [%- category = category.key %]
+ [%- FOREACH link = additionalLinks.$category %]
+ url['[% link.key %]'] = '[% link.value | html %]player=[% playerURI %]';
+ [%- END %]
+ [%- END %]
+ }
+ }
+
+ this.showPanel('mainMenu');
+ },
+
+ doMenu : function(item){
+ switch (item) {
+ case 'MY_MUSIC':
+ this.showPanel('musicMenu');
+ break;
+
+ case 'RADIO':
+ this.showPanel('radioMenu');
+ break;
+
+ case 'MUSIC_ON_DEMAND':
+ alert('...soon to come');
+ break;
+
+ case 'OTHER_SERVICES':
+ alert('...soon to come');
+ break;
+
+ default:
+ if (url[item]) {
+ document.location.href = url[item];
+ }
+// alert(item);
+ break;
+ }
+ },
+
+ 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);
+ }
+ }
+ }
+ }
+ }();
+
+ Ext.EventManager.onDocumentReady(MainMenu.init, MainMenu, true);
+
+ </script>
+[% END %]
+[% PROCESS pageheader.html %]
+
+[% BLOCK menuItem %]
+ <div class="homeMenuItem" id="[% token %]">
+ [% token | string %]
+ </div>
+[% END %]
+
+<div class="homeMenuSection" id="mainMenu">
+ [% PROCESS menuItem token="FAVORITES" %]
+ [% PROCESS menuItem token="MY_MUSIC" %]
+ [% PROCESS menuItem token="RADIO" %]
+ [% PROCESS menuItem token="MUSIC_ON_DEMAND" %]
+ [% PROCESS menuItem token="OTHER_SERVICES" %]
+</div>
+
+<div class="homeMenuSection" id="musicMenu">
+ [%- FOREACH link = additionalLinks.browse %]
+ [% IF link.key != 'FAVORITES' %]
+ [% PROCESS menuItem token=link.key %]
+ [%- END %]
+ [%- END %]
+</div>
+
+
+<div class="homeMenuSection" id="radioMenu">
+ [%- FOREACH link = additionalLinks.radio %]
+ [% IF link.key != 'FAVORITES' %]
+ [% PROCESS menuItem token=link.key %]
+ [%- END %]
+ [%- END %]
+</div>
+
+<script type="text/javascript">
+
+</script>
+
+[% PROCESS pagefooter.html %]
Added: trunk/server/HTML/Maestro/html/images/b_add.png
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/images/b_add.png?rev=12554&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/server/HTML/Maestro/html/images/b_add.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/server/HTML/Maestro/html/images/b_add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/server/HTML/Maestro/html/images/b_play.png
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/images/b_play.png?rev=12554&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/server/HTML/Maestro/html/images/b_play.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/server/HTML/Maestro/html/images/b_play.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/server/HTML/Maestro/html/images/pointer.gif
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/images/pointer.gif?rev=12554&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/server/HTML/Maestro/html/images/pointer.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/server/HTML/Maestro/html/index.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/index.js?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/html/index.js (added)
+++ trunk/server/HTML/Maestro/html/index.js Tue Aug 14 08:08:27 2007
@@ -1,0 +1,52 @@
+Main = function(){
+ return {
+ init : function(){
+ var layout = new Ext.BorderLayout('mainbody', {
+ north: {
+ split:false,
+ initialSize: 45
+ },
+ south: {
+ split:false,
+ initialSize: 38
+ },
+ center: {
+ autoScroll: false
+ }
+ });
+
+ layout.beginUpdate();
+ layout.add('north', new Ext.ContentPanel('header', {fitToFrame:true, fitContainer:true}));
+ layout.add('south', new Ext.ContentPanel('footer', {fitToFrame:true, fitContainer:true}));
+ layout.add('center', new Ext.ContentPanel('main', {fitToFrame:true, fitContainer:true}));
+
+ Ext.EventManager.onWindowResize(this.onResize, layout);
+ Ext.EventManager.onDocumentReady(this.onResize, layout, true);
+
+ layout.endUpdate();
+ },
+
+ // resize panels, folder selectors etc.
+ onResize : function(){
+ dimensions = Ext.fly(document.body).getViewSize();
+ Ext.get('mainbody').setHeight(dimensions.height-35);
+
+ colWidth = Math.floor((dimensions.width - 168) / 2);
+ colHeight = dimensions.height-210;
+
+ left = Ext.get('leftcontent');
+ left.setWidth(colWidth);
+ left.setHeight(colHeight);
+
+ right = Ext.get('rightcontent');
+ right.setWidth(colWidth);
+ right.setHeight(colHeight);
+
+ Ext.get('leftpanel').setHeight(colHeight + 10);
+ Ext.get('rightpanel').setHeight(colHeight + 10);
+
+ this.layout();
+ }
+ };
+}();
+Ext.EventManager.onDocumentReady(Main.init, Main, true);
Added: trunk/server/HTML/Maestro/ie.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/ie.css?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/ie.css (added)
+++ trunk/server/HTML/Maestro/ie.css Tue Aug 14 08:08:27 2007
@@ -1,0 +1,7 @@
+#browsedbList {
+ overflow-x: hidden;
+}
+
+.browsedbControls {
+ right: 25px;
+}
Added: trunk/server/HTML/Maestro/index.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/index.html?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/index.html (added)
+++ trunk/server/HTML/Maestro/index.html Tue Aug 14 08:08:27 2007
@@ -1,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <title>[% "SLIMSERVER" | string %]</title>
+
+ <link rel="stylesheet" type="text/css" href="/html/ext/resources/css/ext-all.css" />
+ <link rel="stylesheet" type="text/css" href="[% webroot %]slim-ext.css" />
+ <link rel="stylesheet" type="text/css" href="[% webroot %]slimserver.css" />
+ <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 strings = new Array();
+ </script>
+
+ <style>
+ html, body {
+ background: white;
+ }
+
+ body {
+ margin: 20px;
+ }
+
+ #leftpanel, #rightpanel {
+ width: 50%;
+ }
+
+ #spacer {
+ width: 0px;
+ }
+
+ #leftcontent, #rightcontent {
+ border: 0;
+ scroll
+ }
+ </style>
+
+ <script type="text/javascript" src="[% webroot %]html/index.js"></script>
+ </head>
+
+ <body>
+ <div id="mainbody">
+
+ <div id="header">
+ <div id="header_logo"><img src="/html/wizard/header_left.png"></div>
+ <div id="header_content"> </div>
+ </div>
+
+ <div id="main">
+
+ <table width="100%">
+ <tr>
+ <td>
+ <div class="inner">
+ <div class="inner_top"><div></div></div>
+ <div id="leftpanel" class="inner_content">
+ <iframe src="[% webroot %]home.html?player=[% playerURI %]" name="browser" id="leftcontent" frameborder="0" scrolling="no"></iframe>
+ </div>
+ <div class="inner_bottom"><div></div></div>
+ </div>
+ </td>
+
+ <td id="spacer"></td>
+
+ <td>
+ <div class="inner">
+ <div class="inner_top"><div></div></div>
+ <div id="rightpanel" class="inner_content">
+ <iframe src="[% webroot %]status.html?player=[% playerURI %]" name="status" id="rightcontent" frameborder="0" scrolling="no"></iframe>
+ </div>
+ <div class="inner_bottom"><div></div></div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ </div>
+
+ <div id="footer">
+ <img src="/html/wizard/footer_left.png" id="footer_logo">
+ <div id="footer_content">
+ </div>
+ </div>
+
+ </div>
+ </body>
+</html>
Added: trunk/server/HTML/Maestro/pagefooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/pagefooter.html?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/pagefooter.html (added)
+++ trunk/server/HTML/Maestro/pagefooter.html Tue Aug 14 08:08:27 2007
@@ -1,0 +1,3 @@
+ </div>
+ </body>
+</html>
Added: trunk/server/HTML/Maestro/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/pageheader.html?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/pageheader.html (added)
+++ trunk/server/HTML/Maestro/pageheader.html Tue Aug 14 08:08:27 2007
@@ -1,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ [% PROCESS standardheader.html %]
+
+ [% IF pageHeaderScripts %]
+ [% pageHeaderScripts %]
+ [% END %]
+
+ <!--[if gte IE 6]>
+ <link href="[% webroot %]ie.css" type="text/css" rel="stylesheet">
+ <![endif]-->
+ </head>
+ <body>
+ <div class="titlebox">
+ <div class="titlebox_top"><div></div></div>
+ <div class="titlebox_content">
+ <div>[% "HOME" | string %]</div>
+ </div>
+ <div class="titlebox_bottom"><div></div></div>
+ </div>
+
+ <div class="content">
Added: trunk/server/HTML/Maestro/skinconfig.yml
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/skinconfig.yml?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/skinconfig.yml (added)
+++ trunk/server/HTML/Maestro/skinconfig.yml Tue Aug 14 08:08:27 2007
@@ -1,0 +1,3 @@
+---
+preprocess:
+ - cmdwrappers_Jive
Added: trunk/server/HTML/Maestro/slim-ext.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/slim-ext.css?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/slim-ext.css (added)
+++ trunk/server/HTML/Maestro/slim-ext.css Tue Aug 14 08:08:27 2007
@@ -1,0 +1,61 @@
+.x-tree-node-leaf .x-tree-node-alwayscollapsed {
+ background-image:url(/html/ext/resources/images/default/tree/folder.gif);
+}
+
+.x-layout-panel-body {
+ background: #23415e;
+}
+
+.x-layout-panel {
+ border: 0px none;
+}
+
+.x-btn {
+ display: inline;
+}
+
+.x-btn-text, .x-btn button {
+ color: #d1d1d1;
+ font-weight: bold;
+}
+
+.x-btn-left{
+ width:3px;
+ height:22px;
+ background:url(/html/wizard/btn-sprite.png) no-repeat 0 0;
+}
+
+.x-btn-right{
+ width:3px;
+ height:22px;
+ background:url(/html/wizard/btn-sprite.png) no-repeat 0 -22px;
+}
+
+.x-btn-center{
+ background:url(/html/wizard/btn-sprite.png) repeat-x 0 -44px;
+ vertical-align: middle;
+ text-align:center;
+ padding:0 5px;
+ cursor:pointer;
+ white-space:nowrap;
+}
+
+.x-btn-over .x-btn-left{
+ background-position:0 0px;
+}
+
+.x-btn-over .x-btn-right{
+ background-position:0 -22px;
+}
+
+.x-btn-over .x-btn-center{
+ background-position:0 -44px;
+}
+
+.x-btn-click .x-btn-center, .x-btn-menu-active .x-btn-center{
+ background-position:0 -44px;
+}
+
+.x-btn-menu-arrow-wrap .x-btn-center button {
+ height:22px;
+}
Added: trunk/server/HTML/Maestro/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/slimserver.css?rev=12554&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/slimserver.css (added)
+++ trunk/server/HTML/Maestro/slimserver.css Tue Aug 14 08:08:27 2007
@@ -1,0 +1,190 @@
+html, body {
+ padding: 0;
+ margin: 0;
+ border: 0 none;
+ overflow: hidden;
+ height: 100%;
+ color: white;
+ background: url(/html/wizard/inner_background.gif) repeat;
+ font-size: 12px;
+ font-family: sans-serif;
+}
+
+a { color: white; }
+img { border: 0; }
+
+
+/* browse pages */
+.browsedbListItem {
+ position: relative;
+ padding: 6px;
+ padding-right: 80px;
+}
+
+.browsedbControls {
+ position: absolute;
+ top: 0px;
+ padding-top: 6px;
+ right: 10px;
+}
+
+.browsedbRightControls {
+ position: absolute;
+ top: 0px;
+ padding-top: 6px;
+ right: 10px;
+}
+
+.browsedbLeftControls {
+ padding-top: 6px;
+}
+
+#browsedbHeader {
+ margin: 10px;
+}
+
+#browsedbList {
+ overflow: auto;
+ margin: 5px;
+ height: 400px;;
+}
+
+
+/* Home menu */
+.homeMenuSection {
+ position: absolute;
+ width: 100%;
+ margin-top: 20px;
+ margin-left: 5px;
+ margin-right: 5px;
+}
+
+.homeMenuItem {
+ position: relative;
+ margin: 0;
+ margin-right: 10px;
+ padding: 5px;
+ font-size: 120%;
+}
+
+.homeMenuItem a {
+ text-decoration: none;
+}
+
+.homeMenuItem a:hover, .homeMenuSection .mouseOver {
+ background: url(html/images/pointer.gif) no-repeat right white;
+ color: gray;
+}
+
+
+/* styles for the basic layout */
+#header {
+ background: url(/html/wizard/header_background.png) repeat;
+}
+
+#header_content {
+ height: 40px;
+ margin-left: 230px;
+ padding-top: 11px;
+ background: url(/html/wizard/header_right.png) no-repeat top right;
+ color: white;
+ font-size: 14px;
+}
+
+#header_logo {
+ left: 0px;
+ position: absolute;
+}
+
+#footer{
+ background: url(/html/wizard/header_background.png) repeat;
+}
+
+#footer_content {
+ height: 38px;
+ background: url(/html/wizard/footer_right.png) no-repeat bottom right;
+}
+
+#footer_logo {
+ left: 0px;
+ vertical-align: bottom;
+ position: absolute;
+}
+
+.inner {
+ background: url(/html/wizard/inner_background.gif) repeat;
+ margin: 20px;
+}
+
+.inner_content {
+ background: url(/html/wizard/inner_background.gif) repeat;
+ margin: 10px;
+ height: 330px;
+}
+.inner_top div {
+ height: 10px;
+ background: url(/html/wizard/inner_top_left.gif) no-repeat top left;
+}
+
+.inner_top {
+ height: 10px;
+ background: url(/html/wizard/inner_top_right.gif) no-repeat top right;
+}
+
+.inner_bottom div {
+ height: 10px;
+ background: url(/html/wizard/inner_bottom_left.gif) no-repeat bottom left;
+}
+
+.inner_bottom {
+ height: 10px;
+ background: url(/html/wizard/inner_bottom_right.gif) no-repeat bottom right;
+}
+
+.titlebox {
+ background: url(/html/wizard/title_background.gif) repeat;
+ margin-left: 5px;
+ margin-right: 5px;
+}
+
+.titlebox_content {
+ background: url(/html/wizard/title_background.gif) repeat;
+ margin-left: 10px;
+ height: 15px;
+ font-size: 120%;
+ font-weight: bold;
+}
+.titlebox_top div {
+ height: 10px;
+ background: url(/html/wizard/title_top_left.gif) no-repeat top left;
+}
+
+.titlebox_top {
+ height: 10px;
+ background: url(/html/wizard/title_top_right.gif) no-repeat top right;
+}
+
+.titlebox_bottom div {
+ height: 10px;
+ background: url(/html/wizard/title_bottom_left.gif) no-repeat bottom left;
+}
+
+.titlebox_bottom {
+ height: 10px;
+ background: url(/html/wizard/title_bottom_right.gif) no-repeat bottom right;
+}
+
+#mainbody {
+ position: relative;
+ width: 100%;
+ height: 500px;
+}
+
+#main {
+ overflow: hidden;
+ background: #23415e;
+}
+
+.content {
+ width: 100%;
+}
More information about the checkins
mailing list