Merge pull request #5 from cbrauers/master

Webapp: Switched to consistently relative paths
This commit is contained in:
kaikreuzer 2014-03-28 18:44:12 +01:00
Родитель 1c252f05c3 3a5e695fd8
Коммит a22b2208af
11 изменённых файлов: 15 добавлений и 15 удалений

Просмотреть файл

@ -1 +1 @@
<a href="javascript:void(0)" onclick="ChangeState('../CMD?%item%=%cmd%')" class="iButton iB%type%" style="%labelstyle%">%label%</a>
<a href="javascript:void(0)" onclick="ChangeState('CMD?%item%=%cmd%')" class="iButton iB%type%" style="%labelstyle%">%label%</a>

Просмотреть файл

@ -1 +1 @@
<li>%buttons%<img src="/images/%icon%.png" width=29 height=29 class="iFull" /><label style="%labelstyle%">%label%</label></li>
<li>%buttons%<img src="images/%icon%.png" width=29 height=29 class="iFull" /><label style="%labelstyle%">%label%</label></li>

Просмотреть файл

@ -1,3 +1,3 @@
<li><img src="/images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="repeatedRequest('../CMD?%item%=DECREASE', %frequency%, 1)" onmousedown="repeatedRequest('../CMD?%item%=DECREASE', %frequency%, 1)" onmouseup="stopRepeatedRequest('../CMD?%item%=OFF')" />
<img src="/images/colorwheel.png" width=29 height=29 border=0 onclick="colorItem='%item%';document.getElementById('waColorpicker').title='%purelabel%';document.getElementById('colorPickerInput').value='%state%';$.minicolors.refresh();document.location.href='#_Colorpicker'" />
<img src="images/_up.png" ontouchstart="repeatedRequest('../CMD?%item%=INCREASE', %frequency%, 1)" onmousedown="repeatedRequest('../CMD?%item%=INCREASE', %frequency%, 1)" onmouseup="stopRepeatedRequest('../CMD?%item%=ON')" /></span style="%labelstyle%">%label%</li>
<li><img src="images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="repeatedRequest('CMD?%item%=DECREASE', %frequency%, 1)" onmousedown="repeatedRequest('CMD?%item%=DECREASE', %frequency%, 1)" onmouseup="stopRepeatedRequest('CMD?%item%=OFF')" />
<img src="images/colorwheel.png" width=29 height=29 border=0 onclick="colorItem='%item%';document.getElementById('waColorpicker').title='%purelabel%';document.getElementById('colorPickerInput').value='%state%';$.minicolors.refresh();document.location.href='#_Colorpicker'" />
<img src="images/_up.png" ontouchstart="repeatedRequest('CMD?%item%=INCREASE', %frequency%, 1)" onmousedown="repeatedRequest('CMD?%item%=INCREASE', %frequency%, 1)" onmouseup="stopRepeatedRequest('CMD?%item%=ON')" /></span style="%labelstyle%">%label%</li>

Просмотреть файл

@ -52,7 +52,7 @@
});
WA.AddEventListener("load", function() {
setTimeout("WA.Request('../%servletname%?sitemap=%sitemap%&poll=true', null, -1, true, null)", 1500);
setTimeout("WA.Request('%servletname%?sitemap=%sitemap%&poll=true', null, -1, true, null)", 1500);
});
function ChangeState(request) {
@ -126,7 +126,7 @@
}
function AsyncLoad(widgetId) {
WA.Request("../%servletname%?sitemap=%sitemap%&w=" + widgetId, null, -1, true, null);
WA.Request("%servletname%?sitemap=%sitemap%&w=" + widgetId, null, -1, true, null);
}
// script code for the color picker widget
@ -138,7 +138,7 @@
if(now-lastColorChange>300) {
var input = document.getElementById('colorPickerInput');
var cmd = $.minicolors.hsbString($(input));
WA.Request("/CMD?" + colorItem + "=" + cmd, null, null);
WA.Request("CMD?" + colorItem + "=" + cmd, null, null);
lastColorChange = now;
}
}

Просмотреть файл

@ -1,2 +1,2 @@
<li><img src="/images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="buttonPressed('../CMD?%item%=DOWN')" onMouseDown="buttonPressed('../CMD?%item%=DOWN')" onMouseUp="buttonReleased('../CMD?%item%=DOWN', '../CMD?%item%=STOP')" /><img src="images/_stop.png" onclick="ChangeState('../CMD?%item%=STOP')" /><img src="images/_up.png" ontouchstart="buttonPressed('../CMD?%item%=UP')" onMouseDown="buttonPressed('../CMD?%item%=UP')" onMouseUp="buttonReleased('../CMD?%item%=UP', '../CMD?%item%=STOP')" /></span style="%labelstyle%">%label%</li>
<li><img src="images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="buttonPressed('CMD?%item%=DOWN')" onMouseDown="buttonPressed('CMD?%item%=DOWN')" onMouseUp="buttonReleased('CMD?%item%=DOWN', 'CMD?%item%=STOP')" /><img src="images/_stop.png" onclick="ChangeState('CMD?%item%=STOP')" /><img src="images/_up.png" ontouchstart="buttonPressed('CMD?%item%=UP')" onMouseDown="buttonPressed('CMD?%item%=UP')" onMouseUp="buttonReleased('CMD?%item%=UP', 'CMD?%item%=STOP')" /></span style="%labelstyle%">%label%</li>

Просмотреть файл

@ -1 +1 @@
<li style="%labelstyle%" class="iRadio" value="autoback"><img src="/images/%icon%.png" width=29 height=29 class="iFull" />%label_header%%rows%</li>
<li style="%labelstyle%" class="iRadio" value="autoback"><img src="images/%icon%.png" width=29 height=29 class="iFull" />%label_header%%rows%</li>

Просмотреть файл

@ -1 +1 @@
<label><input type="radio" name="%item%" value="%cmd%" %checked% onClick="ChangeState('../CMD?%item%=%cmd%')" />%label%</label>
<label><input type="radio" name="%item%" value="%cmd%" %checked% onClick="ChangeState('CMD?%item%=%cmd%')" />%label%</label>

Просмотреть файл

@ -1,2 +1,2 @@
<li style="%labelstyle%"><img src="/images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="ChangeState('../CMD?%item%=%newlowerstate%')" onmousedown="ChangeState('../CMD?%item%=%newlowerstate%')" /><img src="images/_up.png" ontouchstart="ChangeState('../CMD?%item%=%newhigherstate%')" onmousedown="ChangeState('../CMD?%item%=%newhigherstate%')" /></span>%label%</li>
<li style="%labelstyle%"><img src="images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="ChangeState('CMD?%item%=%newlowerstate%')" onmousedown="ChangeState('CMD?%item%=%newlowerstate%')" /><img src="images/_up.png" ontouchstart="ChangeState('CMD?%item%=%newhigherstate%')" onmousedown="ChangeState('CMD?%item%=%newhigherstate%')" /></span>%label%</li>

Просмотреть файл

@ -1,2 +1,2 @@
<li style="%labelstyle%"><img src="/images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="repeatedRequest('../CMD?%item%=DECREASE', %frequency%, %switch%)" onmousedown="repeatedRequest('../CMD?%item%=DECREASE', %frequency%, %switch%)" onmouseup="stopRepeatedRequest('../CMD?%item%=OFF')" /><img src="images/_up.png" ontouchstart="repeatedRequest('../CMD?%item%=INCREASE', %frequency%, %switch%)" onmousedown="repeatedRequest('../CMD?%item%=INCREASE', %frequency%, %switch%)" onmouseup="stopRepeatedRequest('../CMD?%item%=ON')" /></span>%label%</li>
<li style="%labelstyle%"><img src="images/%icon%.png" width=29 height=29 class="iFull" /><span class="options"><img src="images/_down.png" ontouchstart="repeatedRequest('CMD?%item%=DECREASE', %frequency%, %switch%)" onmousedown="repeatedRequest('CMD?%item%=DECREASE', %frequency%, %switch%)" onmouseup="stopRepeatedRequest('CMD?%item%=OFF')" /><img src="images/_up.png" ontouchstart="repeatedRequest('CMD?%item%=INCREASE', %frequency%, %switch%)" onmousedown="repeatedRequest('CMD?%item%=INCREASE', %frequency%, %switch%)" onmouseup="stopRepeatedRequest('CMD?%item%=ON')" /></span>%label%</li>

Просмотреть файл

@ -1 +1 @@
<li><input type="checkbox" id="%item%" class="iToggle" title="I|O" %checked% onclick="ChangeState('../CMD?%item%=TOGGLE')"/><img src="/images/%icon%.png" width=29 height=29 class="iFull" /><label style="%labelstyle%">%label%</label></li>
<li><input type="checkbox" id="%item%" class="iToggle" title="I|O" %checked% onclick="ChangeState('CMD?%item%=TOGGLE')"/><img src="images/%icon%.png" width=29 height=29 class="iFull" /><label style="%labelstyle%">%label%</label></li>

Просмотреть файл

@ -1 +1 @@
<li style="%labelstyle%"><img src="/images/%icon%.png" width=29 height=29 />%label%</li>
<li style="%labelstyle%"><img src="images/%icon%.png" width=29 height=29 />%label%</li>