diff --git a/fhem/CHANGED b/fhem/CHANGED index c1e20e91e..370e9f933 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,6 +1,9 @@ # 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. - SVN + - feature: Dashboard: Custom CSS Attribute. Max. 7 Tabs. + - bugfix: Dashboard: Change Groupcontent sorting. Fix Bug that affect + new Groups. - feature: 10_EnOcean: UTE protocol implemented - feature: 00_TCM: new command teach - bugfix: SYSMOM: uninitialized value warning on FritzBox diff --git a/fhem/FHEM/95_Dashboard.pm b/fhem/FHEM/95_Dashboard.pm index 878010cae..ec0842311 100644 --- a/fhem/FHEM/95_Dashboard.pm +++ b/fhem/FHEM/95_Dashboard.pm @@ -38,16 +38,19 @@ # separate Dashboards per FHEMWEB Instance. # 2.05: bugfix, changes in dashboard.js, groups can show Icons (group:icon@color,group:icon@color ...). "Back"-Button in Fullsize-Mode. # Dashboard near top in Fullsize-Mode. dashboard_activetab store the active Tab, not the last active tab. +# 2.06: Attribute dashboard_colheight removed. Change Groupcontent sorting in compliance by alias and sortby. +# Custom CSS over new Attribute dashboard_customcss. Fix Bug that affect new groups. # # Known Bugs/Todos: # BUG: Nicht alle Inhalte aller Tabs laden, bei Plots dauert die bedienung des Dashboards zu lange. -> elemente hidden? -# xTODO: dashboard_activetab wieder zur ursprungsfunktion # BUG: Variabler abstand wird nicht gesichert -# TODO: personalisiertes CSS angeben und bestehende CSS zu überschreiben -> User-config # BUG: dashboard_webfrontendfilter doesn't Work Antwort #469 -# TODO: More Tabs -# TODO: sortby -# TODO: sort by alias, eg sort by device name +# BUG: Überlappen Gruppen andere? +# xTODO: More Tabs +# xTODO: personalisiertes CSS angeben und bestehende CSS zu überschreiben -> User-config +# xTODO: sortby +# xTODO: sort by alias, eg sort by device name +# # Log 1, "[DASHBOARD simple debug] '".$g."' "; ######################################################################################## # @@ -93,7 +96,7 @@ my $fwjquery = "jquery.min.js"; my $fwjqueryui = "jquery-ui.min.js"; my $dashboardname = "Dashboard"; # Link Text my $dashboardhiddenroom = "DashboardRoom"; # Hiddenroom -my $dashboardversion = "2.05"; +my $dashboardversion = "2.06"; # ------------------------------------------------------------------------------------------- sub Dashboard_Initialize ($) { @@ -113,8 +116,8 @@ sub Dashboard_Initialize ($) { "dashboard_showhelper:0,1 ". "dashboard_showtooglebuttons:0,1 ". #new attribute vers. 2.00 - "dashboard_tabcount:1,2,3,4,5 ". - "dashboard_activetab:1,2,3,4,5 ". + "dashboard_tabcount:1,2,3,4,5,6,7 ". + "dashboard_activetab:1,2,3,4,5,6,7 ". "dashboard_tab1name ". "dashboard_tab2name ". "dashboard_tab3name ". @@ -145,9 +148,18 @@ sub Dashboard_Initialize ($) { "dashboard_tab5icon ". #new attribute vers. 2.04 "dashboard_webfrontendfilter ". + #new attribute vers. 2.06 + "dashboard_customcss ". + "dashboard_tab6name ". + "dashboard_tab7name ". + "dashboard_tab6groups ". + "dashboard_tab7groups ". + "dashboard_tab6sorting ". + "dashboard_tab7sorting ". + "dashboard_tab6icon ". + "dashboard_tab7icon ". #obsolete - erase in future releases - "dashboard_colheight ". # obsolet -> erase in future releases "dashboard_sorting ". # obsolet -> erase in future releases "dashboard_colwidth ". # obsolet -> erase in future releases "dashboard_showbuttonbar:dont-use-this-attribute ". # obsolet -> erase in future releases @@ -184,7 +196,8 @@ sub DashboardAsHtml($) my $showtabs = AttrVal($defs{$d}{NAME}, "dashboard_showtabs", "tabs-and-buttonbar-at-the-top"); my $showtooglebuttons = AttrVal($defs{$d}{NAME}, "dashboard_showtooglebuttons", 1); my $showfullsize = AttrVal($defs{$d}{NAME}, "dashboard_showfullsize", 0); - my $webfrontendfilter = AttrVal($defs{$d}{NAME}, "dashboard_webfrontendfilter", "*"); + my $webfrontendfilter = AttrVal($defs{$d}{NAME}, "dashboard_webfrontendfilter", "*"); + my $customcss = AttrVal($defs{$d}{NAME}, "dashboard_customcss", "none"); my $row = AttrVal($defs{$d}{NAME}, "dashboard_row", "center"); my $debug = AttrVal($defs{$d}{NAME}, "dashboard_debug", "0"); @@ -197,22 +210,30 @@ sub DashboardAsHtml($) AttrVal($defs{$d}{NAME}, "dashboard_tab2name", "Dashboard-Tab 2"), AttrVal($defs{$d}{NAME}, "dashboard_tab3name", "Dashboard-Tab 3"), AttrVal($defs{$d}{NAME}, "dashboard_tab4name", "Dashboard-Tab 4"), - AttrVal($defs{$d}{NAME}, "dashboard_tab5name", "Dashboard-Tab 5")); + AttrVal($defs{$d}{NAME}, "dashboard_tab5name", "Dashboard-Tab 5"), + AttrVal($defs{$d}{NAME}, "dashboard_tab6name", "Dashboard-Tab 6"), + AttrVal($defs{$d}{NAME}, "dashboard_tab7name", "Dashboard-Tab 7")); my @tabgroups = (AttrVal($defs{$d}{NAME}, "dashboard_tab1groups", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab2groups", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab3groups", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab4groups", ""), - AttrVal($defs{$d}{NAME}, "dashboard_tab5groups", "")); + AttrVal($defs{$d}{NAME}, "dashboard_tab5groups", ""), + AttrVal($defs{$d}{NAME}, "dashboard_tab6groups", ""), + AttrVal($defs{$d}{NAME}, "dashboard_tab7groups", "")); my @tabsortings = (AttrVal($defs{$d}{NAME}, "dashboard_tab1sorting", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab2sorting", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab3sorting", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab4sorting", ""), - AttrVal($defs{$d}{NAME}, "dashboard_tab5sorting", "")); + AttrVal($defs{$d}{NAME}, "dashboard_tab5sorting", ""), + AttrVal($defs{$d}{NAME}, "dashboard_tab6sorting", ""), + AttrVal($defs{$d}{NAME}, "dashboard_tab7sorting", "")); my @tabicons = (AttrVal($defs{$d}{NAME}, "dashboard_tab1icon", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab2icon", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab3icon", ""), AttrVal($defs{$d}{NAME}, "dashboard_tab4icon", ""), - AttrVal($defs{$d}{NAME}, "dashboard_tab5icon", "")); + AttrVal($defs{$d}{NAME}, "dashboard_tab5icon", ""), + AttrVal($defs{$d}{NAME}, "dashboard_tab6icon", ""), + AttrVal($defs{$d}{NAME}, "dashboard_tab7icon", "")); ############################################################################################# @@ -275,7 +296,7 @@ sub DashboardAsHtml($) $ret .= "\n"; $ret .= "\n"; $ret .= "
\n"; - $ret .= "\n"; + $ret .= "\n"; $ret .= "\n"; $ret .= "
\n"; @@ -298,11 +319,12 @@ sub DashboardAsHtml($) ############################################################################################## for (my $t=0;$t<$tabcount;$t++){ - my @tabgroup = split(",", $tabgroups[$t]); #Set temp. position for groups without an stored position + my @tabgroup = split(",", $tabgroups[$t]); #Set temp. position for groups without an stored position for (my $i=0;$i<@tabgroup;$i++){ my @stabgroup = split(":", trim($tabgroup[$i])); - if (index($tabsortings[$t],trim($stabgroup[$i])) < 0) { $tabsortings[$t] = $tabsortings[$t]."t".$t."c".GetMaxColumnId($row,$colcount).",".trim($stabgroup[$i]).",true,0,0:"; } + if (index($tabsortings[$t],trim($stabgroup[0])) < 0) { $tabsortings[$t] = $tabsortings[$t]."t".$t."c".GetMaxColumnId($row,$colcount).",".trim($stabgroup[0]).",true,0,0:"; } } + %group = BuildGroupList($tabgroups[$t]); $ret .= "
\n"; $ret .= "
    \n"; @@ -392,37 +414,37 @@ sub BuildButtonBar($$$){ } sub BuildGroupWidgets($$$$$) { - my ($tab,$column,$id,$dbgroups, $dbsorting) = @_; - my $ret = ""; + my ($tab,$column,$id,$dbgroups, $dbsorting) = @_; + my $ret = ""; - my $counter = 0; - my @storedsorting = split(":", $dbsorting); - - my @dbgroup = split(",", $dbgroups); - my $widgetheader = ""; + my $counter = 0; + my @storedsorting = split(":", $dbsorting); + my @dbgroup = split(",", $dbgroups); + my $widgetheader = ""; foreach my $singlesorting (@storedsorting) { - my @groupdata = split(",", $singlesorting); - - if (index($dbsorting, "t".$tab."c".$column.",".$groupdata[1]) >= 0 && index($dbgroups, $groupdata[1]) >= 0 && $groupdata[1] ne "" ) { #group is set to tab - - $widgetheader = $groupdata[1]; - foreach my $strdbgroup (@dbgroup) { - my @groupicon = split(":", trim($strdbgroup)); - if ($groupicon[0] eq $groupdata[1]) { - if ($#groupicon > 0) { $widgetheader = FW_makeImage($groupicon[1],$groupicon[1],"dashboard_tabicon") . " ".$groupdata[1]; } - } - } + my @groupdata = split(",", $singlesorting); + if (scalar(@groupdata) > 1) { + if (index($dbsorting, "t".$tab."c".$column.",".$groupdata[1]) >= 0 && index($dbgroups, $groupdata[1]) >= 0 && $groupdata[1] ne "" ) { #group is set to tab - $ret .= "
    \n"; - $ret .= "
    \n"; - $ret .= "
    ".$widgetheader."
    \n"; - $ret .= "
    \n"; - $ret .= BuildGroup($groupdata[1]); - $ret .= "
    \n"; - $ret .= "
    \n"; - $ret .= "
    \n"; - $counter++; + $widgetheader = $groupdata[1]; + foreach my $strdbgroup (@dbgroup) { + my @groupicon = split(":", trim($strdbgroup)); + if ($groupicon[0] eq $groupdata[1]) { + if ($#groupicon > 0) { $widgetheader = FW_makeImage($groupicon[1],$groupicon[1],"dashboard_tabicon") . " ".$groupdata[1]; } + } + } + + $ret .= "
    \n"; + $ret .= "
    \n"; + $ret .= "
    ".$widgetheader."
    \n"; + $ret .= "
    \n"; + $ret .= BuildGroup($groupdata[1]); + $ret .= "
    \n"; + $ret .= "
    \n"; + $ret .= "
    \n"; + $counter++; + } } } return $ret; @@ -458,7 +480,9 @@ sub BuildGroup($) next if ($g ne $currentgroup); $ret .= ""; - foreach my $d (sort keys %{$group{$g}}) { + #foreach my $d (sort keys %{$group{$g}}) { + + foreach my $d (sort { lc(AttrVal($a,"sortby",AttrVal($a,"alias",$a))) cmp lc(AttrVal($b,"sortby",AttrVal($b,"alias",$b))) } keys %{$group{$g}}) { $ret .= sprintf("", ($row&1)?"odd":"even"); my $type = $defs{$d}{TYPE}; @@ -606,12 +630,6 @@ sub CheckDashboardAttributUssage($) { # replaces old disused attributes and thei { FW_fC("deleteattr ".$d." dashboard_colwidth"); } $detailnote = $detailnote." [dashboard_colwidth -> dashboard_rowcentercolwidth]"; } - my $colheight = AttrVal($defs{$d}{NAME}, "dashboard_colheight", ""); - if ($colheight ne "") { - { FW_fC("attr ".$d." dashboard_rowcenterheight ".$colheight); } - { FW_fC("deleteattr ".$d." dashboard_colheight"); } - $detailnote = $detailnote." [dashboard_colheight -> dashboard_rowcenterheight]"; - } my $sorting = AttrVal($defs{$d}{NAME}, "dashboard_sorting", ""); if ($sorting ne "") { #convert old sorting in new my @sortings = split(":", $sorting); @@ -814,6 +832,16 @@ sub Dashboard_attr($$$) { Title of Tab 5. Default: Dashboard-Tab 5
    + +
  • dashboard_tab6name
    + Title of Tab 6. + Default: Dashboard-Tab 6 +

    • + +
  • dashboard_tab7name
    + Title of Tab 7. + Default: Dashboard-Tab 7 +

  • dashboard_webfrontendfilter
    If this attribute not set, or value is * the dashboard is displayed on all configured FHEMWEB instances.
    @@ -849,7 +877,15 @@ sub Dashboard_attr($$$) {
  • dashboard_tab5sorting
    Contains the position of each group in Tab 5. Value is written by the "Set" button. It is not recommended to take manual changes.

    • - + +
  • dashboard_tab6sorting
    + Contains the position of each group in Tab 6. Value is written by the "Set" button. It is not recommended to take manual changes. +

    • + +
  • dashboard_tab7sorting
    + Contains the position of each group in Tab 7. Value is written by the "Set" button. It is not recommended to take manual changes. +

    • +
  • dashboard_row
    To select which rows are displayed. top only; center only; bottom only; top and center; center and bottom; top,center and bottom.
    Default: center @@ -865,11 +901,6 @@ sub Dashboard_attr($$$) { dashboard_rowcentercolwidth
    Default: 320

    • - -
  • dashboard_colheight
    - This attribute is no longer used and will be removed at a later date. It was replaced with
    - dashboard_rowcenterheight -

  • dashboard_rowcenterheight
    Height of the center row in which the groups may be positioned.
    @@ -901,29 +932,41 @@ sub Dashboard_attr($$$) { Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow

    • -
  • dashboard_tab1groups
    +
  • 2
    Comma-separated list of the names of the groups to be displayed in Tab 2.
    Each group can be given an icon for this purpose the group name, the following must be completed ":<icon>@<color>"
    Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow

    • -
  • dashboard_tab1groups
    +
  • dashboard_tab3groups
    Comma-separated list of the names of the groups to be displayed in Tab 3.
    Each group can be given an icon for this purpose the group name, the following must be completed ":<icon>@<color>"
    Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow

    • -
  • dashboard_tab1groups
    +
  • dashboard_tab4groups
    Comma-separated list of the names of the groups to be displayed in Tab 4.
    Each group can be given an icon for this purpose the group name, the following must be completed ":<icon>@<color>"
    Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow

    • -
  • dashboard_tab1groups
    +
  • dashboard_tab5groups
    Comma-separated list of the names of the groups to be displayed in Tab 5.
    Each group can be given an icon for this purpose the group name, the following must be completed ":<icon>@<color>"
    Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow

    • + +
  • dashboard_tab6groups
    + Comma-separated list of the names of the groups to be displayed in Tab 6.
    + Each group can be given an icon for this purpose the group name, the following must be completed ":<icon>@<color>"
    + Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow +

    • + +
  • dashboard_tab7groups
    + Comma-separated list of the names of the groups to be displayed in Tab 7.
    + Each group can be given an icon for this purpose the group name, the following must be completed ":<icon>@<color>"
    + Example: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow +

  • dashboard_tab1icon
    Set the icon for a Tab. There must exist an icon with the name ico.png in the modpath directory. If the image is referencing an SVG icon, then you can use the @colorname suffix to color the image. @@ -944,6 +987,14 @@ sub Dashboard_attr($$$) {
  • dashboard_tab5icon
    Set the icon for a Tab. There must exist an icon with the name ico.png in the modpath directory. If the image is referencing an SVG icon, then you can use the @colorname suffix to color the image.

    • + +
  • dashboard_tab6icon
    + Set the icon for a Tab. There must exist an icon with the name ico.png in the modpath directory. If the image is referencing an SVG icon, then you can use the @colorname suffix to color the image. +

    • + +
  • dashboard_tab7icon
    + Set the icon for a Tab. There must exist an icon with the name ico.png in the modpath directory. If the image is referencing an SVG icon, then you can use the @colorname suffix to color the image. +

  • dashboard_lockstate
    When set to "unlock" you can edit the Dashboard. When set to "lock" no change can be made.
    @@ -1063,6 +1114,16 @@ sub Dashboard_attr($$$) {
  • dashboard_tab5name
    Titel des 5. Tab. Standard: Dashboard-Tab 5 +

    • + +
  • dashboard_tab6name
    + Titel des 6. Tab. + Standard: Dashboard-Tab 6 +

    • + +
  • dashboard_tab7name
    + Titel des 7. Tab. + Standard: Dashboard-Tab 7

  • dashboard_webfrontendfilter
    @@ -1098,6 +1159,14 @@ sub Dashboard_attr($$$) {
  • dashboard_tab5sorting
    Enthält die Poistionierung jeder Gruppe im Tab 5. Der Wert wird mit der Schaltfläche "Set" geschrieben. Es wird nicht empfohlen dieses Attribut manuelle zu ändern +

    • + +
  • dashboard_tab6sorting
    + Enthält die Poistionierung jeder Gruppe im Tab 6. Der Wert wird mit der Schaltfläche "Set" geschrieben. Es wird nicht empfohlen dieses Attribut manuelle zu ändern +

    • + +
  • dashboard_tab7sorting
    + Enthält die Poistionierung jeder Gruppe im Tab 7. Der Wert wird mit der Schaltfläche "Set" geschrieben. Es wird nicht empfohlen dieses Attribut manuelle zu ändern

  • dashboard_row
    @@ -1115,11 +1184,6 @@ sub Dashboard_attr($$$) { dashboard_rowcentercolwidth
    Standard: 320

    • - -
  • dashboard_colheight
    - Dieses Attribut ist nicht mehr zu verwenden und wird zu einem späteren Zeitpunkt entfernt. Es wurde ersetzt durch
    - dashboard_rowcenterheight -

  • dashboard_rowcenterheight
    Höhe der mittleren Zeile, in der die Gruppen angeordnet werden.
    @@ -1174,6 +1238,18 @@ sub Dashboard_attr($$$) { Jede Gruppe kann zusätzlich ein Icon anzeigen, dazu muss der Gruppen name um ":<icon>@<farbe>"ergänzt werden
    Beispiel: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow

    • + +
  • dashboard_tab6groups
    + Durch Komma getrennte Liste mit den Namen der Gruppen, die im Tab 6 angezeigt werden. Falsche Gruppennamen werden hervorgehoben.
    + Jede Gruppe kann zusätzlich ein Icon anzeigen, dazu muss der Gruppen name um ":<icon>@<farbe>"ergänzt werden
    + Beispiel: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow +

    • + +
  • dashboard_tab7groups
    + Durch Komma getrennte Liste mit den Namen der Gruppen, die im Tab 7 angezeigt werden. Falsche Gruppennamen werden hervorgehoben.
    + Jede Gruppe kann zusätzlich ein Icon anzeigen, dazu muss der Gruppen name um ":<icon>@<farbe>"ergänzt werden
    + Beispiel: Light:Icon_Fisch@blue,AVIcon_Fisch@red,Single Lights:Icon_Fisch@yellow +

  • dashboard_tab1icon
    Zeigt am Tab ein Icon an. Es muss sich dabei um ein exisitereindes Icon mit modpath Verzeichnis handeln. Handelt es sich um ein SVG Icon kann der Suffix @colorname für die Farbe des Icons angegeben werden. @@ -1194,6 +1270,14 @@ sub Dashboard_attr($$$) {
  • dashboard_tab5icon
    Zeigt am Tab ein Icon an. Es muss sich dabei um ein exisitereindes Icon mit modpath Verzeichnis handeln. Handelt es sich um ein SVG Icon kann der Suffix @colorname für die Farbe des Icons angegeben werden.

    • + +
  • dashboard_tab6icon
    + Zeigt am Tab ein Icon an. Es muss sich dabei um ein exisitereindes Icon mit modpath Verzeichnis handeln. Handelt es sich um ein SVG Icon kann der Suffix @colorname für die Farbe des Icons angegeben werden. +

    • + +
  • dashboard_tab7icon
    + Zeigt am Tab ein Icon an. Es muss sich dabei um ein exisitereindes Icon mit modpath Verzeichnis handeln. Handelt es sich um ein SVG Icon kann der Suffix @colorname für die Farbe des Icons angegeben werden. +

  • dashboard_lockstate
    Bei Dashboard Einstellung "unlock" kann dieses bearbeitet werden. Bei der Einstellung "lock" können keine Änderung vorgenommen werden.
    diff --git a/fhem/www/pgm2/dashboard.js b/fhem/www/pgm2/dashboard.js index b4fa4fb62..396e3de06 100644 --- a/fhem/www/pgm2/dashboard.js +++ b/fhem/www/pgm2/dashboard.js @@ -338,6 +338,7 @@ $(document).ready( function () { } }); + if (params[14] != "none" ) {$('').appendTo($('head')); } }); diff --git a/fhem/www/pgm2/dashboard_ios7.css b/fhem/www/pgm2/dashboard_ios7.css index fddf46dd4..4aac51d06 100644 --- a/fhem/www/pgm2/dashboard_ios7.css +++ b/fhem/www/pgm2/dashboard_ios7.css @@ -1,9 +1,9 @@ -Code: [Auswählen] /* Author: svenson08 edit by fhainz */ -.dashboard_buttonbar { padding: 6px 6px 6px 0; margin: 0 .5em 0 0; float: left;} +.dashboard_buttonbar { padding: 6px 6px 6px 0; margin: 0 .5em 0 0; float: left; } .dashboard_buttonbar_top, .dashboard_buttonbar_bottom { } .dashboard_button { float: left; background-color: #fff; font-size: 0.8em; background-repeat:no-repeat; - background-position: 4px 2px; border: 1px solid #808080; padding: 0.2em 0.7em 0.2em 0.4em; } + background-position: 4px 2px; border: 1px solid #808080; padding: 0.2em 0.7em 0.2em 0.4em; margin-top:7px; } +.dashboard_button:last-child { margin-right: 6px; } #dashboard_button_set { color: black; cursor: default; } #dashboard_button_set.dashboard_button_changed { color: #147bff; cursor: pointer; } @@ -23,11 +23,11 @@ a,li { outline: none; } float: left; background-image: url(../images/default/dashboardicons.png); } .dashboard_button_iconplus { margin: 0.1em 0.4em; float: right; background-position: -65px -16px; } .dashboard_button_iconminus { margin: 0.1em 0.4em; float: right; background-position: -52px -16px; } -.dashboard_button_iconset { background-position: -26px -16px; } -.dashboard_button_iconlock { background-position: -0px -16px; } -.dashboard_button_iconunlock { background-position: -13px -16px; } -.dashboard_button_icondetail { background-position: -39px -16px; } -.dashboard_button_iconback { margin: 0.1em 0.4em; float: right; background-position: -91px -16px; } +.dashboard_button_iconset { margin:0 2px; background-position: -26px -16px; } +.dashboard_button_iconlock { margin:0 2px; background-position: -0px -16px; } +.dashboard_button_iconunlock { margin:0 2px; background-position: -13px -16px; } +.dashboard_button_icondetail { margin:0 2px; background-position: -39px -16px; } +.dashboard_button_iconback { margin:1px 1px 0 5px; float: right; background-position: -91px -16px; } .ui-resizable { position: relative; } .ui-resizable-handle { position: absolute; font-size: 0.1px; }