FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

95_Dashboard: fixed style issue with colorpicker - fixed issue with editing groups in the dashboard configuration dialog

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9018 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
talkabout 2015-08-03 18:02:25 +00:00
parent 3ad0e157c9
commit 35d0361b0a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# 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: 95_Dashboard: fixed style issue with colorpicker in ios6touchpad style
fixed issue with editing groups in the dashboard configuration dialog
- feature: 30_pilight_dimmer.pm: SetExtensions (on-for-timer, etc.) - feature: 30_pilight_dimmer.pm: SetExtensions (on-for-timer, etc.)
- feature: 30_pilight_switch.pm: SetExtensions (on-for-timer, etc.) - feature: 30_pilight_switch.pm: SetExtensions (on-for-timer, etc.)
- feature: 30_pilight_raw.pm: send raw codes to pilight - feature: 30_pilight_raw.pm: send raw codes to pilight

4
fhem/FHEM/95_Dashboard.pm
View File

@ -473,7 +473,9 @@ sub Dashboard_SummaryFN($$$$)
$ret .= " <tr colspan=\"2\"><td><div id=\"tabID\"></div></td></tr>\n"; $ret .= " <tr colspan=\"2\"><td><div id=\"tabID\"></div></td></tr>\n";
$ret .= " <tr><td>Tabtitle:</td><td colspan=\"2\"><input id=\"tabTitle\" type=\"text\" size=\"25\"></td></tr>"; $ret .= " <tr><td>Tabtitle:</td><td colspan=\"2\"><input id=\"tabTitle\" type=\"text\" size=\"25\"></td></tr>";
$ret .= " <tr><td>Tabicon:</td><td><input id=\"tabIcon\" type=\"text\" size=\"10\"></td><td><input id=\"tabIconColor\" type=\"text\" size=\"7\"></td></tr>"; $ret .= " <tr><td>Tabicon:</td><td><input id=\"tabIcon\" type=\"text\" size=\"10\"></td><td><input id=\"tabIconColor\" type=\"text\" size=\"7\"></td></tr>";
$ret .= " <tr><td>Groups:</td><td colspan=\"2\"><input id=\"tabGroups\" type=\"text\" size=\"25\" onfocus=\"FW_multipleSelect(this)\" allvals=\"multiple,$dashboard_groupListfhem\" readonly=\"readonly\"></td></tr>"; # the method FW_multipleSelect seems not to be available any more in fhem
#$ret .= " <tr><td>Groups:</td><td colspan=\"2\"><input id=\"tabGroups\" type=\"text\" size=\"25\" onfocus=\"FW_multipleSelect(this)\" allvals=\"multiple,$dashboard_groupListfhem\" readonly=\"readonly\"></td></tr>";
$ret .= " <tr><td>Groups:</td><td colspan=\"2\"><input id=\"tabGroups\" type=\"text\" size=\"25\"></td></tr>";
$ret .= " <tr><td></td><td colspan=\"2\"><input type=\"checkbox\" id=\"tabActiveTab\" value=\"\"><label for=\"tabActiveTab\">This Tab is currently selected</label></td></tr>"; $ret .= " <tr><td></td><td colspan=\"2\"><input type=\"checkbox\" id=\"tabActiveTab\" value=\"\"><label for=\"tabActiveTab\">This Tab is currently selected</label></td></tr>";
$ret .= " </table>\n"; $ret .= " </table>\n";
$ret .= " </div>\n"; $ret .= " </div>\n";

9
fhem/www/pgm2/ios6dashboard.css
View File

@ -311,16 +311,17 @@ padding: 5px;
/* Colorpicker /* Colorpicker
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.evo-pop {-index: 10000; .evo-pop.ui-widget-content {-index: 10000;
width: 225px; width: 225px;
padding: 3px 3px 0; padding: 3px 3px 0;
background-color:#fefefe; background-color:#fefefe !important;
border: 1px #999999 solid; border: 1px #999999 solid;
transform: translate(-100px,0px);
} }
.evo-pop-ie {z-index: 10000; .evo-pop-ie.ui-widget-content {z-index: 10000;
width: 225px; width: 225px;
padding: 3px; padding: 3px;
background-color:#fefefe; background-color:#fefefe !important;
border: 1px #999999 solid; border: 1px #999999 solid;
} }