FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

98_weekprofile: fix f18 style

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18161 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Risiko 2019-01-06 12:11:26 +00:00
parent f01a645ebf
commit 7449d9d4d7
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 98_weekprofile: fix f18 style
- feature: 98_weekprofile: Force to send complete week profile - feature: 98_weekprofile: Force to send complete week profile
Attr forceCompleteProfile Attr forceCompleteProfile
- feature: 98_weekprofile: delay between sending profile data to the - feature: 98_weekprofile: delay between sending profile data to the

12
fhem/FHEM/98_weekprofile.pm
View File

@ -1292,16 +1292,18 @@ sub weekprofile_SummaryFn()
} }
$html .= "<table>"; $html .= "<table>";
$html .= "<tr><td>"; $html .= "<tr><td><div class=\"devType\">$d</div></td></tr>";
$html .= "<div class=\"devType\" id=\"weekprofile.$d.header\">"; $html .= "<tr><td><table><tr><td>";
$html .= "<table style=\"padding:0\"><tr><td style=\"padding-right:0;padding-bottom:0\"><div id=\"weekprofile.menu.base\">"; $html .= "<div id=\"weekprofile.$d.header\">";
$html .= "<table style=\"padding:0\">";
$html .= "<tr><td style=\"padding-right:0;padding-bottom:0\"><div id=\"weekprofile.menu.base\">";
$html .= $editIcon."&nbsp;".$lnkDetails; $html .= $editIcon."&nbsp;".$lnkDetails;
$html .= "</div></td></tr></table></div></td></tr>"; $html .= "</div></td></tr></table></div>";
$html .= "<tr><td>";
$html .= "<div class=\"fhemWidget\" informId=\"$d\" cmd=\"\" arg=\"$args\" current=\"$curr\" dev=\"$d\">"; # div tag to support inform updates $html .= "<div class=\"fhemWidget\" informId=\"$d\" cmd=\"\" arg=\"$args\" current=\"$curr\" dev=\"$d\">"; # div tag to support inform updates
$html .= "</div>"; $html .= "</div>";
$html .= "</td></tr>"; $html .= "</td></tr>";
$html .= "</table>"; $html .= "</table>";
$html .= "</td></tr></table>";
return $html; return $html;
} }
############################################## ##############################################

12
fhem/www/pgm2/fhemweb_weekprofile.js
View File

@ -226,7 +226,7 @@ function FW_weekprofileSendToDev(devName,bnt)
var selected = []; var selected = [];
if (widget.MASTERDEV) if (widget.MASTERDEV)
selected.push(widget.MASTERDEV); selected.push(widget.MASTERDEV);
FW_weekprofileMultiSelDialog("<span>Device(s):</span>",devicesNames,devicesAlias,selected,1,bnt, FW_weekprofileMultiSelDialog("Device(s):",devicesNames,devicesAlias,selected,1,bnt,
function(sndDevs) { function(sndDevs) {
if (!sndDevs || sndDevs.length==0) if (!sndDevs || sndDevs.length==0)
return; return;
@ -512,7 +512,7 @@ function FW_weekprofileTransDay(devName,day,bnt)
} }
} }
var selected = []; var selected = [];
FW_weekprofileMultiSelDialog("<span>Days(s):</span>",dayNames,dayAlias,selected,0,bnt, FW_weekprofileMultiSelDialog("Days(s):",dayNames,dayAlias,selected,0,bnt,
function(selDays) { function(selDays) {
if (!selDays || selDays.length==0) if (!selDays || selDays.length==0)
return; return;
@ -627,11 +627,11 @@ function FW_weekprofileEditWeek(widget)
} }
} }
tr.append("<td><table><tr>"); tr.append("<td valign=\"bottom\"><table><tr>");
tr = tr.find("tr:last"); tr = tr.find("tr:last");
tr.append("<td><input type=\"button\" value=\""+FW_GetTranslation(widget,'Speichern')+"\" onclick=\"FW_weekprofilePrepAndSendProf('"+widget.DEVICE+"')\">"); tr.append("<td><input style=\"margin:2px\" type=\"button\" value=\""+FW_GetTranslation(widget,'Speichern')+"\" onclick=\"FW_weekprofilePrepAndSendProf('"+widget.DEVICE+"')\">");
tr.append("<td><input type=\"button\" value=\""+FW_GetTranslation(widget,'Abbrechen')+"\" onclick=\"FW_weekprofileEditAbort('"+widget.DEVICE+"')\">"); tr.append("<td><input style=\"margin:2px\" type=\"button\" value=\""+FW_GetTranslation(widget,'Abbrechen')+"\" onclick=\"FW_weekprofileEditAbort('"+widget.DEVICE+"')\">");
} }
function FW_weekprofileSendCallback(devName, data) function FW_weekprofileSendCallback(devName, data)
@ -833,7 +833,7 @@ FW_weekprofileCreate(elName, devName, vArr, currVal, set, params, cmd)
widget.MENU = new Object(); widget.MENU = new Object();
widget.MENU.BASE = $(widget.HEADER).find('div[id*="menu.base"]').get(0); widget.MENU.BASE = $(widget.HEADER).find('div[id*="menu.base"]').get(0);
var menuContent = '<td style="display:inline;padding:0px;margin:0px;"><div id="weekprofile.menu.content"></td>'; var menuContent = '<td style="padding:0px;margin:0px;"><div id="weekprofile.menu.content"></td>';
$(widget.MENU.BASE.parentElement.parentElement).append(menuContent); $(widget.MENU.BASE.parentElement.parentElement).append(menuContent);
widget.MENU.CONTENT = $(widget.HEADER).find('div[id*="menu.content"]').get(0); widget.MENU.CONTENT = $(widget.HEADER).find('div[id*="menu.content"]').get(0);