Commit 2d988ed3fb4463e9cbdddfcd72c795b8198ede86

  • avatar
  • Sergey 'Jin' Bostandzhyan <jin @deve…per.digitalstrom.org>
  • Thu Sep 02 07:19:01 CEST 2010
Added patch to make urls relative

Needed so that the UI works when it is hidden behind lighttpd
targets/dss11/recipes/dss/dss-0.8.0/relative_urls.patch
(329 / 0)
  
1diff -Naur dss-0.8.0.orig/data/webroot/js/dss-setup-interface.js dss-0.8.0/data/webroot/js/dss-setup-interface.js
2--- dss-0.8.0.orig/data/webroot/js/dss-setup-interface.js 2010-07-22 14:44:24.000000000 +0200
3+++ dss-0.8.0/data/webroot/js/dss-setup-interface.js 2010-09-02 06:39:36.000000000 +0200
4@@ -363,21 +363,21 @@
5
6 var menuItem = new Ext.menu.Item({
7 text: _("Rename room"),
8- icon: '/images/page_white_edit.png',
9+ icon: 'images/page_white_edit.png',
10 handler: this.findParentByType('dsszonepanel').editZone.createDelegate(this.findParentByType('dsszonepanel'), index, true)
11 });
12 this.contextMenu.add(menuItem)
13
14 var menuItem = new Ext.menu.Item({
15 text: _("Delete room"),
16- icon: '/images/delete.png',
17+ icon: 'images/delete.png',
18 handler: this.removeZone.createDelegate(this, index, true)
19 });
20 this.contextMenu.add(menuItem)
21
22 var menuItem = new Ext.menu.Item({
23 text: _("Blink"),
24- icon: '/images/blink.png',
25+ icon: 'images/blink.png',
26 handler: this.blinkZone.createDelegate(this, index, true)
27 });
28 this.contextMenu.add(menuItem)
29@@ -1844,7 +1844,7 @@
30
31 var menuItem = new Ext.menu.Item({
32 text: _("Rename device"),
33- icon: '/images/page_white_edit.png',
34+ icon: 'images/page_white_edit.png',
35 handler: this.editDevice.createDelegate(this, rowIndex, true)
36 });
37 this.contextMenu.add(menuItem)
38@@ -1852,7 +1852,7 @@
39 if (presentInSelection === true) {
40 var menuItem = new Ext.menu.Item({
41 text: _("Send diagnostic ping"),
42- icon: '/images/application_osx_terminal.png',
43+ icon: 'images/application_osx_terminal.png',
44 handler: this.pingDevice.createDelegate(this, rowIndex, true)
45 });
46 this.contextMenu.add(menuItem)
47@@ -1864,7 +1864,7 @@
48 if (presentInSelection === true) {
49 var menuItem = new Ext.menu.Item({
50 text: _("Extended diagnostic ping"),
51- icon: '/images/application_osx_terminal.png',
52+ icon: 'images/application_osx_terminal.png',
53 handler: this.extendedPing.createDelegate(this, rowIndex, true)
54 });
55 subMenu.add(menuItem);
56@@ -1872,21 +1872,21 @@
57
58 var menuItem = new Ext.menu.Item({
59 text: _("Extended diagnostic ping results"),
60- icon: '/images/application_osx_terminal.png',
61+ icon: 'images/application_osx_terminal.png',
62 handler: this.showExtendedPingResults.createDelegate(this, rowIndex, true)
63 });
64 subMenu.add(menuItem);
65
66 var menuItem = new Ext.menu.Item({
67 text: _("Abort ping session"),
68- icon: '/images/application_osx_terminal.png',
69+ icon: 'images/application_osx_terminal.png',
70 handler: this.abortRound.createDelegate(this, ["extendedPing", _("Ping")], true)
71 });
72 subMenu.add(menuItem);
73
74 var menuItem = new Ext.menu.Item({
75 text: _("Extended ping"),
76- icon: '/images/application_osx_terminal.png',
77+ icon: 'images/application_osx_terminal.png',
78 menu: subMenu
79 });
80 this.contextMenu.add(menuItem);
81@@ -1895,7 +1895,7 @@
82 if (showRemoveMenuItem === true) {
83 var menuItem = new Ext.menu.Item({
84 text: _("Remove device"),
85- icon: '/images/delete.png',
86+ icon: 'images/delete.png',
87 handler: this.removeDevice.createDelegate(this, rowIndex, true)
88 });
89 this.contextMenu.add(menuItem);
90@@ -1907,7 +1907,7 @@
91 if (presentInSelection === true) {
92 var menuItem = new Ext.menu.Item({
93 text: _("Statistics"),
94- icon: '/images/application_osx_terminal.png',
95+ icon: 'images/application_osx_terminal.png',
96 handler: this.deviceStatistics.createDelegate(this, rowIndex, true)
97 });
98 subMenu.add(menuItem);
99@@ -1915,14 +1915,14 @@
100
101 var menuItem = new Ext.menu.Item({
102 text: _("Abort statistics session"),
103- icon: '/images/application_osx_terminal.png',
104+ icon: 'images/application_osx_terminal.png',
105 handler: this.abortRound.createDelegate(this, ["deviceStatistics", _("Device statistics")], true)
106 });
107 subMenu.add(menuItem);
108
109 var menuItem = new Ext.menu.Item({
110 text: _("Device statistics"),
111- icon: '/images/application_osx_terminal.png',
112+ icon: 'images/application_osx_terminal.png',
113 menu: subMenu
114 });
115 this.contextMenu.add(menuItem);
116@@ -1931,7 +1931,7 @@
117 if (presentInSelection === true) {
118 var menuItem = new Ext.menu.Item({
119 text: _("Blink"),
120- icon: '/images/blink.png',
121+ icon: 'images/blink.png',
122 handler: this.blinkDevice.createDelegate(this, rowIndex, true)
123 });
124 this.contextMenu.add(menuItem);
125@@ -2916,7 +2916,7 @@
126
127 var menuItem = new Ext.menu.Item({
128 text: _("Rename meter"),
129- icon: '/images/page_white_edit.png',
130+ icon: 'images/page_white_edit.png',
131 handler: this.editDevice.createDelegate(this, rowIndex, true)
132 });
133
134@@ -2924,7 +2924,7 @@
135
136 var menuItem = new Ext.menu.Item({
137 text: _("Rescan circuit"),
138- icon: '/images/page_white_edit.png',
139+ icon: 'images/page_white_edit.png',
140 handler: this.rescanCircuit.createDelegate(this, rowIndex, true)
141 });
142 this.contextMenu.add(menuItem);
143@@ -2932,7 +2932,7 @@
144 if (showRemoveMenuItem === true) {
145 var menuItem = new Ext.menu.Item({
146 text: _("Remove meter"),
147- icon: '/images/delete.png',
148+ icon: 'images/delete.png',
149 handler: this.removeMeter.createDelegate(this, rowIndex, true)
150 });
151 this.contextMenu.add(menuItem);
152@@ -2947,7 +2947,7 @@
153 if (record.get('isPresent') === true) {
154 var menuItem = new Ext.menu.Item({
155 text: _("Meter statistics"),
156- icon: '/images/application_osx_terminal.png',
157+ icon: 'images/application_osx_terminal.png',
158 handler: this.dsmStatistics.createDelegate(this, rowIndex, true)
159 });
160 subMenu.add(menuItem);
161@@ -2955,14 +2955,14 @@
162
163 var menuItem = new Ext.menu.Item({
164 text: _("Abort meter statistics session"),
165- icon: '/images/application_osx_terminal.png',
166+ icon: 'images/application_osx_terminal.png',
167 handler: this.abortStatisticsRound.createDelegate(this, rowIndex, true)
168 });
169 subMenu.add(menuItem);
170
171 var menuItem = new Ext.menu.Item({
172 text: _("Statistics"),
173- icon: '/images/application_osx_terminal.png',
174+ icon: 'images/application_osx_terminal.png',
175 menu: subMenu
176 });
177 this.contextMenu.add(menuItem);
178diff -Naur dss-0.8.0.orig/data/webroot/setup.html dss-0.8.0/data/webroot/setup.html
179--- dss-0.8.0.orig/data/webroot/setup.html 2010-07-22 14:43:48.000000000 +0200
180+++ dss-0.8.0/data/webroot/setup.html 2010-09-02 06:37:39.000000000 +0200
181@@ -58,15 +58,15 @@
182 }
183
184 .pingDeviceToolbarIcon {
185- background-image: url(/images/application_osx_terminal.png) !important;
186+ background-image: url(images/application_osx_terminal.png) !important;
187 }
188
189 .removeDeviceToolbarIcon {
190- background-image: url(/images/delete.png) !important;
191+ background-image: url(images/delete.png) !important;
192 }
193
194 .copyToClipboardToolbarIcon {
195- background-image: url(/images/copy.gif) !important;
196+ background-image: url(images/copy.gif) !important;
197 }
198
199 .nonPresentDevice table {
200@@ -75,109 +75,109 @@
201
202 .isOn
203 {
204- background:url(/images/on.png) center no-repeat !important;
205+ background:url(images/on.png) center no-repeat !important;
206 cursor: pointer;
207 }
208
209 .isOff
210 {
211- background:url(/images/off.png) center no-repeat !important;
212+ background:url(images/off.png) center no-repeat !important;
213 cursor: pointer;
214 }
215
216 .isLocked
217 {
218- background:url(/images/lock.png) center no-repeat !important;
219+ background:url(images/lock.png) center no-repeat !important;
220 cursor: pointer;
221 }
222
223 .isUnlocked
224 {
225- background:url(/images/lock_open.png) center no-repeat !important;
226+ background:url(images/lock_open.png) center no-repeat !important;
227 cursor: pointer;
228 }
229
230 .lockDisabled
231 {
232- background:url(/images/lock_grey.png) center no-repeat !important;
233+ background:url(images/lock_grey.png) center no-repeat !important;
234 }
235
236 .isDisabled
237 {
238- background:url(/images/noff.png) center no-repeat !important;
239+ background:url(images/noff.png) center no-repeat !important;
240 }
241
242 .blink
243 {
244- background:url(/images/blink.png) center no-repeat !important;
245+ background:url(images/blink.png) center no-repeat !important;
246 cursor: pointer;
247 }
248
249 .blinkActive
250 {
251- background:url(/images/blink_active.png) center no-repeat !important;
252+ background:url(images/blink_active.png) center no-repeat !important;
253 }
254
255 .functionLight
256 {
257- background:url(/images/brick_yellow.png) center no-repeat !important;
258+ background:url(images/brick_yellow.png) center no-repeat !important;
259 cursor: pointer;
260 }
261
262 .functionLightDisabled
263 {
264- background:url(/images/brick_yellow.png) center no-repeat !important;
265+ background:url(images/brick_yellow.png) center no-repeat !important;
266 }
267
268 .functionLightIcon
269 {
270- background-image:url(/images/brick_yellow.png) !important;
271+ background-image:url(images/brick_yellow.png) !important;
272 }
273
274 .functionShadow
275 {
276- background:url(/images/brick_grey.png) center no-repeat !important;
277+ background:url(images/brick_grey.png) center no-repeat !important;
278 cursor: pointer;
279 }
280
281 .functionShadowDisabled
282 {
283- background:url(/images/brick_grey.png) center no-repeat !important;
284+ background:url(images/brick_grey.png) center no-repeat !important;
285 }
286
287 .functionShadowIcon
288 {
289- background-image:url(/images/brick_grey.png) !important;
290+ background-image:url(images/brick_grey.png) !important;
291 }
292
293 .functionClimate
294 {
295- background:url(/images/brick_blue.png) center no-repeat !important;
296+ background:url(images/brick_blue.png) center no-repeat !important;
297 }
298
299 .functionAudio
300 {
301- background:url(/images/brick_cyan.png) center no-repeat !important;
302+ background:url(images/brick_cyan.png) center no-repeat !important;
303 }
304
305 .functionVideo
306 {
307- background:url(/images/brick_magenta.png) center no-repeat !important;
308+ background:url(images/brick_magenta.png) center no-repeat !important;
309 }
310
311 .functionSecurity
312 {
313- background:url(/images/brick_red.png) center no-repeat !important;
314+ background:url(images/brick_red.png) center no-repeat !important;
315 }
316
317 .functionAccess
318 {
319- background:url(/images/brick_green.png) center no-repeat !important;
320+ background:url(images/brick_green.png) center no-repeat !important;
321 }
322
323 .functionJoker
324 {
325- background:url(/images/brick_darkgrey.png) center no-repeat !important;
326+ background:url(images/brick_darkgrey.png) center no-repeat !important;
327 }
328
329
targets/dss11/recipes/dss/dss_0.8.0.bb
(3 / 2)
  
22
33SRC_URI=" \
44 http://developer.digitalstrom.org/releases/dss-0.8.0.tar.gz;name=archive \
5 http://gitorious.digitalstrom.org/~packi/dss/packis-dss-mainline/commit/a82e095953c7abf815a6e5a8c1ebe86c44662bdd.patch;name=patch1"
5 http://gitorious.digitalstrom.org/~packi/dss/packis-dss-mainline/commit/a82e095953c7abf815a6e5a8c1ebe86c44662bdd.patch;name=patch1 \
6 file://relative_urls.patch"
67
78S="${WORKDIR}/dss-0.8.0"
89
910require dss.inc
1011
11PR = "r1.${INC_PR}"
12PR = "r2.${INC_PR}"
1213
1314SRC_URI[archive.md5sum] = "6033b434149a87012049a7fd625bbb16"
1415SRC_URI[archive.sha256sum] = "9d25e0f61a78b2dc33b015f5971fd8c3bea731a95167795794c3c4cf0098714f"