Show
Ignore:
Timestamp:
11/05/08 11:32:02 (5 years ago)
Author:
mickecarlsson
Message:

Merged revisions 7222 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7222 | mickecarlsson | 2008-11-04 20:59:44 +0100 (Tue, 04 Nov 2008) | 1 line


Closes #3368 fixes various errors in css, html and javascript

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.5

    • Property svnmerge-integrated changed from /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174 to /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7222
  • modules/branches/2.5/dashboard/dashboard.css

    r4721 r7225  
    3535.infobox h3 { 
    3636  color: white; 
    37   margin-bottom:2
     37  margin-bottom:2px
    3838  margin-top:3px; 
    3939} 
  • modules/branches/2.5/dashboard/page.index.php

    r6990 r7225  
    281281  global $sysinfo; 
    282282  global $astinfo; 
    283   $out = "<h3>"._("Uptime")."</h3></br>"; 
    284   $out .= '<table>'; 
     283  $out = "<h3>"._("Uptime")."</h3><br />"; 
     284  $out .= '<table summary="system information table">'; 
    285285  /* 
    286286  $out .= '<tr><th>Distro:</th><td>'.$sysinfo->distro().'</td></tr>'; 
     
    405405      $domid = "notify_item_".str_replace(' ','_',$item['module']).'_'.str_replace(' ','_',$item['id']); 
    406406       
     407      $out .= "\n"; 
    407408      $out .= '<li id="'.$domid.'" '; 
    408409      if (isset($notify_classes[$item['level']])) { 
     
    410411      } 
    411412      $out .= '><div>'; 
    412  
    413       $out .= '<h4 class="syslog_text">'; 
     413       
     414      $out .= '<div class="syslog_text">'; 
     415      $out .= '<h4>'; 
    414416      $out .= '<span><img src="images/'.$notify_classes[$item['level']].'.png" alt="'.$notify_descriptions[$item['level']].'" title="'.$notify_descriptions[$item['level']].'" width="16" height="16" border="0" />&nbsp;'; 
    415417      $out .= $item['display_text'].'</span>'; 
     418      $out .= '</h4>'; 
     419      $out .= "\n"; 
    416420      $out .= '<div class="notification_buttons">'; 
    417421      if (isset($item['candelete']) && $item['candelete']) { 
     
    426430      } 
    427431      $out .= '</div>'; 
    428       $out .= '</h4>'; 
    429        
     432      $out .= '</div>'; 
     433      $out .= "\n"; 
    430434      $out .= '<div class="syslog_detail">'; 
    431435      $out .= nl2br($item['extended_text']); 
     
    499503  ?> 
    500504   
    501   <script language="javascript"> 
     505  <script type="text/javascript"> 
    502506  $(document).ready(function(){ 
    503507    $.ajaxTimeout( 20000 ); 
     
    510514  function makeSyslogClickable() { 
    511515    $('#syslog h4 span').click(function() { 
    512       $(this).parent().next('div').slideToggle('fast'); 
     516      $(this).parent().parent().next('div').slideToggle('fast'); 
    513517    }); 
    514518  }