webCmdFn layout fix

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5065 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-27 14:36:35 +00:00
parent 7abfe8e618
commit 3c3482dceb
1 changed files with 11 additions and 4 deletions
--- a/fhem/FHEM/33_readingsGroup.pm
+++ b/fhem/FHEM/33_readingsGroup.pm
@@ -452,7 +452,11 @@ readingsGroup_2html($)
              last if(defined($htmlTxt));
            }

-            $txt = $htmlTxt if( $htmlTxt );
+           if( $htmlTxt =~ m/<td colspan='2'>(.*)<\/td>/s ) {
+              $txt = $1;         
+            } elsif( $htmlTxt ) {
+              $txt = $htmlTxt;   
+            }                    
          }
        }

@@ -563,10 +567,13 @@ readingsGroup_2html($)
              last if(defined($htmlTxt));
            }

-            if( $htmlTxt ) {
-              $v = $htmlTxt;
+           if( $htmlTxt =~ m/<td colspan='2'>(.*)<\/td>/s ) {
+              $v = $1;         
              $webCmdFn = 1;
-            }
+            } elsif( $htmlTxt ) {
+              $v = $htmlTxt;   
+              $webCmdFn = 1;
+            }                    
          }
        }
        ($v,$devStateIcon) = readingsGroup_makeLink($v,$devStateIcon,$cmd) if( !$webCmdFn );