Skip to content

Commit

Permalink
A lot of changes ...
Browse files Browse the repository at this point in the history
  • Loading branch information
@MagIO2
MagIO2 committed Apr 8, 2013
1 parent 2a72d13 commit 9fba52f
Show file tree
Hide file tree
Showing 24 changed files with 957 additions and 209 deletions.
3 changes: 2 additions & 1 deletion cgi-bin/PropCommand.py
View file
Expand Up @@ -4,7 +4,7 @@
import cgi
from socket import *

HOST = '192.168.2.4'
HOST = '192.168.2.5'
PORT = 7777
ADDR = (HOST,PORT)
BUFSIZE = 4096
Expand Down Expand Up @@ -33,6 +33,7 @@

jsonData = {
'success' : 'true',
'cmd' : command,
'data' : data
};

Expand Down
105 changes: 93 additions & 12 deletions cgi-bin/getScreenInfo.py
View file
Expand Up @@ -22,7 +22,6 @@
},

'main': {
'success' : 'true',
'name' : 'main',
'layout' : 'Layout_001',
'css' : 'hometrek_0001,ht0001',
Expand All @@ -33,29 +32,37 @@
'onclick' : 'buildScreen( "jsonResponse.contentStatus","mainContent" );/buildScreen( "jsonResponse.contentPower","mainContent" );/buildScreen( "jsonResponse.contentHeat","mainContent" );/buildScreen( "jsonResponse.contentSecurity","mainContent" );/buildScreen( "jsonResponse.contentRemote","mainContent" );/buildScreen( "jsonResponse.contentMusic","mainContent" );',
'defContent' : 'Music',
'contentStatus' : {
'name' : 'screen',
'name' : 'MasterScreen',
'id' : 'StatusScreen',
'layout' : 'Layout_002',
'css' : 'hometrek_0002,ht0002',
'headline' : 'Status',
'hlcolor' : 'trk_hellgrau',
'menu' : 'Power,Heat,Security',
'onclick' : '',
'defContent1' : 'House3D',
'defContent1' : 'Split',
'defContent2' : '',
'contentSplit' : {
'name' : 'SplitScreen',
'layout' : 'Layout_004',
'css' : 'hometrek_0001,ht0001'
},
'contentPower': {
}
},
'contentPower' : {
'name' : 'screen',
'name' : 'MasterScreen',
'id' : 'PowerScreen',
'layout' : 'Layout_002',
'css' : 'hometrek_0002,ht0002',
'headline' : 'Power',
'hlcolor' : 'trk_hellgrau',
'menu' : 'Timer,Times,Devices,Commands,Makros',
'onclick' : 'buildScreen("jsonResponse.contentPower.contentTmr","screenCont2");/buildScreen("jsonResponse.contentPower.contentTm","screenCont2");/buildScreen("jsonResponse.contentPower.contentDev","screenCont2");/buildScreen("jsonResponse.contentPower.contentCmd","screenCont2");/buildScreen("jsonResponse.contentMkr.contentDev","screenCont2");',
'onclick' : 'buildScreen("jsonResponse.contentPower.contentTmr","PwrScreenCont2");/buildScreen("jsonResponse.contentPower.contentTm","PwrScreenCont2");/buildScreen("jsonResponse.contentPower.contentDev","PwrScreenCont2");/buildScreen("jsonResponse.contentPower.contentCmd","PwrScreenCont2");/buildScreen("jsonResponse.contentMkr.contentMkr","PwrScreenCont2");',
'defContent2': 'Tmr',
'contentTmr' : {
'name' : 'Timer',
'id' : 'Timer',
'layout' : 'Layout_003',
'css' : 'hometrek_0003,ht0003',
'headline' : 'Timer',
Expand All @@ -73,76 +80,150 @@
},
'contentTimerList' : {
'name' : 'tmrList',
'id' : 'tmrList',
'layout' : 'TimerList',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Timer List'
},
'contentMakroList' : {
'name' : 'mkrList',
'id' : 'mkrList',
'layout' : 'MakroList',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Makro List'
},
'contentCommandList' : {
'name' : 'cmdList',
'id' : 'cmdList',
'layout' : 'CommandList',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Command List'
}
},
'contentDev' : {
'contentTm' : {
'name' : 'Devices',
'id' : 'Devices',
'layout' : 'Layout_003',
'css' : 'hometrek_0003,ht0003'
},
'contentDev' : {
'name' : 'Devices',
'id' : 'Devices',
'layout' : 'Layout_003',
'css' : 'hometrek_0003,ht0003',
'headline' : 'Devices',
'menu' : 'On,Off',
'onclick' : 'alert("On");/alert("Off");',
'menu_hover' : '#ff9966',
'defContent1' : 'DeviceControl',
'defContent2' : 'DeviceList',
'defContent3' : 'DeviceBla',
'contentDeviceList' : {
'name' : 'dvcList',
'id' : 'dvcList',
'layout' : 'DeviceList',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Device List'
},
'contentDeviceControl' : {
'name' : 'dvcCtrl',
'layout' : 'EmptyPanel',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Device Control'
},
'contentDeviceBla' : {
'name' : 'dvcBla',
'layout' : 'EmptyPanel',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Device Bla'
}
},
'contentCmd' : {
'name' : 'Commands',
'layout' : 'Layout_003',
'css' : 'hometrek_0003,ht0003'
},
'contentDev' : {
'contentMkr' : {
'name' : 'Makros',
'layout' : 'Layout_003',
'css' : 'hometrek_0003,ht0003'
}
},
'contentHeat' : {
'name' : 'screen',
'name' : 'MasterScreen',
'id' : 'HeatScreen',
'layout' : 'Layout_002',
'css' : 'hometrek_0002,ht0002',
'headline' : 'Heat',
'hlcolor' : 'trk_hellgrau',
'menu' : 'Timer,Devices'
},
'contentSecurity' : {
'name' : 'screen',
'name' : 'MasterScreen',
'id' : 'SecurityScreen',
'layout' : 'Layout_002',
'css' : 'hometrek_0002,ht0002',
'headline' : 'Security',
'hlcolor' : 'trk_hellgrau',
'menu' : 'Cams,Sensors'
},
'contentRemote' : {
'name' : 'screen',
'name' : 'MasterScreen',
'id' : 'RemoteScreen',
'layout' : 'Layout_002',
'css' : 'hometrek_0002,ht0002',
'headline' : 'Remote',
'hlcolor' : 'trk_hellgrau',
'menu' : 'Timer,Devices,Makros'
},
'contentMusic' : {
'name' : 'screen',
'name' : 'MasterScreen',
'id' : 'MusicScreen',
'layout' : 'Layout_002',
'css' : 'hometrek_0002,ht0002',
'headline' : 'Music',
'hlcolor' : 'trk_hellgrau',
'menu' : 'Radio,MP3',
'defContent1' : 'Split',
'defContent2' : 'Radio',
'contentSplit' : {
'name' : 'SplitScreen',
'layout' : 'Layout_004',
'css' : 'hometrek_0001,ht0001',
'defContent1' : 'Camera1',
'contentCamera1' : {
'name' : 'Cam1',
'layout' : 'Layout_005',
'css' : 'hometrek_0003,ht0003',
'headline' : 'Camera 1',
'defContent' : 'CamIframe',
'contentCamIframe' : {
'layout' : 'CamIframe',
'source' : 'http://www.vz.hessen.de/res/webcams/ALL/imgeschdrei.jpg',
'old' : 'http://192.168.2.5:8081'
}
},
'defContent2' : 'Camera2',
'contentCamera2' : {
'name' : 'Cam2',
'layout' : 'Layout_005',
'css' : 'hometrek_0005,ht0005',
'headline' : 'Camera 2',
'defContent' : 'CamIframe',
'contentCamIframe' : {
'layout' : 'CamIframe',
'source' : 'http://www.vz.hessen.de/res/webcams/ALL/imgfriedberg.jpg'
}
}
},
'contentRadio' : {
'name' : 'Radio',
'layout' : 'Layout_003',
'css' : 'hometrek_0003,ht0003',
'headline' : 'Radio',
'menu' : 'User 1,User 2,User 3',
'menu_hover' : '#ff9966',
'onclick' : 'alert("radio1");/alert("radio2");/alert("radio3");',
'defContent1' : 'RadioControl',
'defContent2' : 'RadioList',
'defContent3' : 'RadioStatus',
Expand All @@ -156,7 +237,7 @@
'name' : 'rdioCntrl',
'layout' : 'RadioControl',
'css' : 'hometrek_0004,ht0004',
'headline' : 'Radio Control'
'headline' : 'Radio List Control'
},
'contentRadioStatus' : {
'name' : 'rdioStat',
Expand Down
2 changes: 1 addition & 1 deletion cgi-bin/mpdCommand.py
View file
Expand Up @@ -4,7 +4,7 @@
import cgi
import telnetlib

HOST="192.168.2.4"
HOST="192.168.2.5"
PORT=6600

fs = cgi.FieldStorage()
Expand Down
46 changes: 41 additions & 5 deletions htdocs/css/hometrek_0001.css
View file
@@ -1,5 +1,41 @@
.ht0001_back { background-color:#f7c64a; }
.ht0001_menu_back { background-color:#f7c64a; }
.ht0001_menu_text { font-family:lcarsgtj3,Arial; font-size:26px; color:#000000; }
.ht0001_title { font-family:lcarsgtj3,Arial; font-size:30px; color:#cccccc; }
.ht0001_content { background-color:#003300; }
/*
for the whole CSS a post-fix of 2, 3 ... define additional styles and usually build a group
h=height normal,
w=width normal,
sw=spacer width,
mw=menu width,
b=background
rew=round edge width
*/

/* some heights */
.ht0001_h { height:34px; }
.ht0001_h2 { height:16px; }
.ht0001_sh { height:4px; }

/* some widths */
.ht0001_w { width:34px; }
.ht0001_sw { width:4px; }
.ht0001_tsw { width:10px; }
.ht0001_rew { width:50px; }
.ht0001_mw { width:120px; }

/* background colors for the content panels */
.ht0001_b { background-color:#f7c64a; }
.ht0001_content { background-color:#081808; }
.ht0001_content2 { background-color:#080818; }

/* styles for menu text and title */
.ht0001_mt { font-family:lcarsgtj3,Arial; font-size:1.4em; color:#000000; }
.ht0001_title { font-family:lcarsgtj3,Arial; font-size:1.6em; color:#cccccc; }
/* text style for the time */
.ht0001_time { font-family:lcarsgtj3,Arial; font-size:1.3em; color:#9999ff; }

/* these are for the round edges in the top and bottom bar */
.ht0001_round_l { width:34px; height:34px; background-color:#f7c64a; border-width:0px; border-top-left-radius:17px; border-bottom-left-radius:17px; }
.ht0001_round_r { width:34px; height:34px; background-color:#f7c64a; border-width:0px; border-top-right-radius:17px; border-bottom-right-radius:17px; }
.ht0001_round2_l { width:34px; height:16px; background-color:#f7c64a; border-width:0px; border-top-left-radius:8px; border-bottom-left-radius:8px; }
.ht0001_round2_r { width:34px; height:16px; background-color:#f7c64a; border-width:0px; border-top-right-radius:8px; border-bottom-right-radius:8px; }
.ht0001_halfbround_r { width:50px; height:16px; background-color:#f7c64a; border-width:0px; border-bottom-right-radius:16px; }
.ht0001_halftround_l { width:50px; height:34px; background-color:#f7c64a; border-width:0px; border-top-left-radius:34px; }
16 changes: 16 additions & 0 deletions htdocs/css/hometrek_0001_low.css
View file
@@ -0,0 +1,16 @@
.ht0001_height { height:16px; }
.ht0001_back { background-color:#f7c64a; height:16px; }

.ht0001_menu_back { background-color:#f7c64a; height:16px; width:80px; }
.ht0001_menu_text { font-family:lcarsgtj3,Arial; font-size:1.4em; color:#000000; width:80px; }

.ht0001_title { font-family:lcarsgtj3,Arial; font-size:1.6em; color:#cccccc; height:16px; }

.ht0001_content { background-color:#003300; }

.ht0001_box { width:16px; height:16px; }
.ht0001_spacer { width:2px; height:16px; }
.ht0001_round_l { width:16px; height:16px; background-color:#f7c64a; border-width:0px; border-top-left-radius:8px; border-bottom-left-radius:8px; }
.ht0001_round_r { width:16px; height:16px; background-color:#f7c64a; border-width:0px; border-top-right-radius:8px; border-bottom-right-radius:8px; }

.ht0001_time { font-family:lcarsgtj3,Arial; font-size:1.1em; color:#9999ff; }
16 changes: 16 additions & 0 deletions htdocs/css/hometrek_0001_mid.css
View file
@@ -0,0 +1,16 @@
.ht0001_height { height:24px; }
.ht0001_back { background-color:#f7c64a; height:24px; }

.ht0001_menu_back { background-color:#f7c64a; height:24px; width:100px; }
.ht0001_menu_text { font-family:lcarsgtj3,Arial; font-size:1.4em; color:#000000; width:100px; }

.ht0001_title { font-family:lcarsgtj3,Arial; font-size:1.6em; color:#cccccc; height:24px; }

.ht0001_content { background-color:#003300; }

.ht0001_box { width:24px; height:24px; }
.ht0001_spacer { width:3px; height:24px; }
.ht0001_round_l { width:24px; height:24px; background-color:#f7c64a; border-width:0px; border-top-left-radius:12px; border-bottom-left-radius:12px; }
.ht0001_round_r { width:24px; height:24px; background-color:#f7c64a; border-width:0px; border-top-right-radius:12px; border-bottom-right-radius:12px; }

.ht0001_time { font-family:lcarsgtj3,Arial; font-size:1.1em; color:#9999ff; }
46 changes: 41 additions & 5 deletions htdocs/css/hometrek_0002.css
View file
@@ -1,6 +1,42 @@
.ht0002_back { background-color:#9999cc; }
.ht0002_menu_back { background-color:#9999cc; }
.ht0002_menu_text { font-family:lcarsgtj3,Arial; font-size:26px; color:#444444; vertical-align:middle; height:34px; }
.ht0002_title { font-family:lcarsgtj3,Arial; font-size:30px; color:#cccccc; height:34px; }
/*
for the whole CSS a post-fix of 2, 3 ... define additional styles and usually build a group
h=height normal,
w=width normal,
sw=spacer width,
mw=menu width,
b=background,
rew=round edge width
*/

/* some heights */
.ht0002_h { height:34px; }
.ht0002_h2 { height:16px; }
.ht0002_sh { height:4px; }

/* some widths */
.ht0002_w { width:34px; }
.ht0002_sw { width:4px; }
.ht0002_tsw { width:10px; }
.ht0002_rew { width:50px; }
.ht0002_mw { width:120px; }

/* background colors for the content panels */
.ht0002_b { background-color:#9999cc; }
.ht0002_content { background-color:#000000; }
.ht0002_content2 { background-color:#000000; }
.ht0002_content2 { background-color:#000000; }

/* styles for menu text and title */
.ht0002_mt { font-family:lcarsgtj3,Arial; font-size:1.4em; color:#444444; }
.ht0002_title { font-family:lcarsgtj3,Arial; font-size:1.6em; color:#cccccc; }
/* text style for the time */
.ht0002_time { font-family:lcarsgtj3,Arial; font-size:1.1em; color:#9999ff; }

/* these are for the round edges in the top and bottom bar */
.ht0002_round_l { width:34px; height:34px; background-color:#9999cc; border-width:0px; border-top-left-radius:17px; border-bottom-left-radius:17px; }
.ht0002_round_r { width:34px; height:34px; background-color:#9999cc; border-width:0px; border-top-right-radius:17px; border-bottom-right-radius:17px; }
.ht0002_round2_l { width:34px; height:16px; background-color:#9999cc; border-width:0px; border-top-left-radius:8px; border-bottom-left-radius:8px; }
.ht0002_round2_r { width:34px; height:16px; background-color:#9999cc; border-width:0px; border-top-right-radius:8px; border-bottom-right-radius:8px; }
.ht0002_halfbround_r { width:50px; height:16px; background-color:#9999cc; border-width:0px; border-bottom-right-radius:16px; }
.ht0002_halftround_l { width:50px; height:34px; background-color:#9999cc; border-width:0px; border-top-left-radius:34px; }

0 comments on commit 9fba52f

Please sign in to comment.