From 7449d9d4d7e72f0eb61cb0e45ac261b79cbb60ca Mon Sep 17 00:00:00 2001
From: Risiko <>
Date: Sun, 6 Jan 2019 12:11:26 +0000
Subject: [PATCH] 98_weekprofile: fix f18 style

git-svn-id: https://svn.fhem.de/fhem/trunk@18161 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                         |  1 +
 fhem/FHEM/98_weekprofile.pm          | 12 +++++++-----
 fhem/www/pgm2/fhemweb_weekprofile.js | 12 ++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 54829362a..08e77310f 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # 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.
+  - bugfix:  98_weekprofile: fix f18 style
   - feature: 98_weekprofile: Force to send complete week profile
                              Attr forceCompleteProfile
   - feature: 98_weekprofile: delay between sending profile data to the
diff --git a/fhem/FHEM/98_weekprofile.pm b/fhem/FHEM/98_weekprofile.pm
index 33095d6e6..63d89ced1 100644
--- a/fhem/FHEM/98_weekprofile.pm
+++ b/fhem/FHEM/98_weekprofile.pm
@@ -1292,16 +1292,18 @@ sub weekprofile_SummaryFn()
   }
   
   $html .= "<table>";
-  $html .= "<tr><td>";
-  $html .= "<div class=\"devType\" id=\"weekprofile.$d.header\">";
-  $html .= "<table style=\"padding:0\"><tr><td style=\"padding-right:0;padding-bottom:0\"><div id=\"weekprofile.menu.base\">";
+  $html .= "<tr><td><div class=\"devType\">$d</div></td></tr>";
+  $html .= "<tr><td><table><tr><td>";
+  $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 .= "</div></td></tr></table></div></td></tr>";
-  $html .= "<tr><td>";
+  $html .= "</div></td></tr></table></div>";
   $html .= "<div class=\"fhemWidget\" informId=\"$d\" cmd=\"\" arg=\"$args\" current=\"$curr\" dev=\"$d\">"; # div tag to support inform updates
   $html .= "</div>";
   $html .= "</td></tr>";
   $html .= "</table>";
+  $html .= "</td></tr></table>";
   return $html;
 }
 ############################################## 
diff --git a/fhem/www/pgm2/fhemweb_weekprofile.js b/fhem/www/pgm2/fhemweb_weekprofile.js
index 394d31c4d..8d6bdd2c0 100644
--- a/fhem/www/pgm2/fhemweb_weekprofile.js
+++ b/fhem/www/pgm2/fhemweb_weekprofile.js
@@ -226,7 +226,7 @@ function FW_weekprofileSendToDev(devName,bnt)
       var selected = [];
       if (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) {
           if (!sndDevs || sndDevs.length==0)
             return;
@@ -512,7 +512,7 @@ function FW_weekprofileTransDay(devName,day,bnt)
     }
   }
   var selected = [];  
-  FW_weekprofileMultiSelDialog("<span>Days(s):</span>",dayNames,dayAlias,selected,0,bnt, 
+  FW_weekprofileMultiSelDialog("Days(s):",dayNames,dayAlias,selected,0,bnt, 
       function(selDays) {
         if (!selDays || selDays.length==0)
           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.append("<td><input 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,'Speichern')+"\" onclick=\"FW_weekprofilePrepAndSendProf('"+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)
@@ -833,7 +833,7 @@ FW_weekprofileCreate(elName, devName, vArr, currVal, set, params, cmd)
   widget.MENU = new Object();
   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.CONTENT = $(widget.HEADER).find('div[id*="menu.content"]').get(0);