Changeset 7222
- Timestamp:
- 11/04/08 13:59:44 (3 years ago)
- Files:
-
- freepbx/branches/2.5/amp_conf/htdocs/admin/common/mainstyle.css (modified) (1 diff)
- freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php (modified) (4 diffs)
- freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx.php (modified) (5 diffs)
- freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_admin.php (modified) (2 diffs)
- freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_reload.php (modified) (3 diffs)
- modules/branches/2.6/dashboard/dashboard.css (modified) (1 diff)
- modules/branches/2.6/dashboard/page.index.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.5/amp_conf/htdocs/admin/common/mainstyle.css
r7061 r7222 231 231 width: 180px; 232 232 font-size:12px; 233 background-color: none;233 background-color: transparent; 234 234 } 235 235 #login_message a:link { freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php
r7139 r7222 393 393 $extext = _("The following commands failed with the listed error"); 394 394 foreach ($error_arr as $item) { 395 $extext .= "<br >".$item[0]." (".$item[1].")";395 $extext .= "<br />".$item[0]." (".$item[1].")"; 396 396 } 397 397 $nt->add_error('cron_manager', 'EXECFAIL', $text, $extext, '', true, true); … … 1417 1417 $results = $db->$type($sql,$fetchmode); 1418 1418 if(DB::IsError($results)) { 1419 die_freepbx($results->getDebugInfo() . "SQL - <br > $sql" );1419 die_freepbx($results->getDebugInfo() . "SQL - <br /> $sql" ); 1420 1420 } 1421 1421 return $results; … … 2029 2029 $selectHtml .= '<select name="'.$cat_identifier.$i.'" onfocus="document.getElementById(\''.$radioid.'\').checked = true; this.form.goto'.$i.'.value=\''.$cat.'\';">'; 2030 2030 $selectHtml .= $options; 2031 $selectHtml .= "</select><br >\n";2031 $selectHtml .= "</select><br />\n"; 2032 2032 2033 2033 if ($checked) $foundone = true; … … 2311 2311 $cnt = count($diff_modules); 2312 2312 if ($cnt) { 2313 $extext = _("The following new modules are available for download. Click delete icon on the right to remove this notice.")."<br >";2313 $extext = _("The following new modules are available for download. Click delete icon on the right to remove this notice.")."<br />"; 2314 2314 foreach ($diff_modules as $mod) { 2315 $extext .= $mod['rawname']." (".$mod['version'].")<br >";2315 $extext .= $mod['rawname']." (".$mod['version'].")<br />"; 2316 2316 } 2317 2317 $notifications->add_notice('freepbx', 'NEWMODS', sprintf(_('%s New modules are available'),$cnt), $extext, '', $reset_value, true); freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx.php
r6844 r7222 40 40 41 41 ?><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 42 <!-- should also validate ok with DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd" --> 42 43 <html> 43 44 44 45 <head> 45 46 <title><?php echo _($title) ?></title> 46 <meta http-equiv="Content-Type" content="text/html" >47 <link href="common/mainstyle.css" rel="stylesheet" type="text/css" >47 <meta http-equiv="Content-Type" content="text/html" /> 48 <link href="common/mainstyle.css" rel="stylesheet" type="text/css" /> 48 49 <?php if (isset($use_nav_background) && $use_nav_background) { ?> 49 50 <style type="text/css"> … … 55 56 </style> 56 57 <?php } ?> 57 <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="favicon.ico" >58 <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="favicon.ico" /> 58 59 <!--[if IE]> 59 <link href="common/ie.css" rel="stylesheet" type="text/css" >60 <link href="common/ie.css" rel="stylesheet" type="text/css" /> 60 61 <![endif]--> 61 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >62 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> 62 63 <?php 63 64 // check if in the amp configuration the user has set that … … 69 70 ($amp_conf["ALTERNATIVE_CSS"] == "yes") || 70 71 ($amp_conf["ALTERNATIVE_CSS"] == "true")) 71 echo "\t<link href=\"common/mainstyle-alternative.css\" rel=\"stylesheet\" type=\"text/css\" >";72 echo "\t<link href=\"common/mainstyle-alternative.css\" rel=\"stylesheet\" type=\"text/css\" />"; 72 73 } 73 74 74 75 if (isset($module_name)) { 75 76 if (is_file('modules/'.$module_name.'/'.$module_name.'.css')) { 76 echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&module='.$module_name.'&file='.$module_name.'.css" rel="stylesheet" type="text/css" >'."\n";77 echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&module='.$module_name.'&file='.$module_name.'.css" rel="stylesheet" type="text/css" />'."\n"; 77 78 } 78 79 if (isset($module_page) && ($module_page != $module_name) && is_file('modules/'.$module_name.'/'.$module_page.'.css')) { 79 echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&module='.$module_name.'&file='.$module_page.'.css" rel="stylesheet" type="text/css" >'."\n";80 echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&module='.$module_name.'&file='.$module_page.'.css" rel="stylesheet" type="text/css" />'."\n"; 80 81 } 81 82 if (is_file('modules/'.$module_name.'/'.$module_name.'.js')) { … … 157 158 $help_args = "?freepbx_version=".urlencode($version); 158 159 if (isset($_REQUEST['display'])) { 159 $help_args .= "& freepbx_menuitem=".urlencode($_REQUEST['display']);160 $help_args .= "&freepbx_menuitem=".urlencode($_REQUEST['display']); 160 161 } 161 162 … … 170 171 print_sub_tool( _("Recordings"), "../recordings/index.php" ,0, NULL, "ari" ); 171 172 print_sub_tool( _("Help"), "http://www.freepbx.org/freepbx-help-system$help_args" ,0, NULL, "help" ); 172 echo "<li class=\"last\"><a > </a></li>";173 echo "<li class=\"last\"><a> </a></li>"; 173 174 echo "\t\t</ul>\n"; 174 175 freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_admin.php
r7210 r7222 60 60 } 61 61 } 62 echo "<li class=\"last\"><a><span> 62 echo "<li class=\"last\"><a><span> </span></a></li>"; 63 63 echo "</ul>\n"; 64 64 … … 189 189 <?php 190 190 echo '<a target="_blank" href="http://www.freepbx.org"><img id="footer_logo" src="images/freepbx_small.png" alt="FreePBX®"/></a>'; 191 echo '<h3>'.'Freedom to Connect<sup>® </sup>'.'</h3>';191 echo '<h3>'.'Freedom to Connect<sup>®</sup>'.'</h3>'; 192 192 echo "\t\t".sprintf(_('%s is a registered trademark of %s'), 193 193 '<a href="http://www.freepbx.org" target="_blank">'._('FreePBX').'</a>', freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_reload.php
r4993 r7222 3 3 /* 4 4 $.blockUI($('#reloadBox')[0], { width: '400px' }); 5 $(document.body).append( '<div style="width:100%; height:100%; background:#ccc; opacity:50%;"></div>');5 $(document.body).append("<div style=\"width:100%; height:100%; background:#ccc; opacity:50%;\"><\/div>"); 6 6 */ 7 7 … … 64 64 } else { 65 65 // there was a problem 66 var responsetext = '<h3>' + data.message + '</h3><div class="moreinfo">';66 var responsetext = '<h3>' + data.message + "<\/h3>" + '<div class="moreinfo">'; 67 67 68 responsetext += '<p><pre>' + data.retrieve_conf + '</pre></p>';68 responsetext += '<p><pre>' + data.retrieve_conf + "<\/pre><\/p>"; 69 69 70 70 if (data.num_errors) { 71 responsetext += '<p>' + data.num_errors + ' <?php echo _(' error(s) occured, you should view the notification log on the dashboard or main screen to check for more details.'); ?> </p>';71 responsetext += '<p>' + data.num_errors + ' <?php echo _(' error(s) occured, you should view the notification log on the dashboard or main screen to check for more details.'); ?> ' + "<\/p>"; 72 72 } 73 73 74 responsetext += '</div>'+75 '<div class="buttons"><a id="reload_response_close_btn" href="#" onclick="freepbx_stop_reload();"><img src="images/cancel.png" height="16" width="16" border="0" alt="<?php echo _('Close'); ?>" /> <?php echo _('Close'); ?> </a>'+76 ' <a id="reload_retry_btn" href="#" onclick="run_reload();"><img src="images/arrow_rotate_clockwise.png" height="16" width="16" border="0" alt="<?php echo _('Retry'); ?>" /> <?php echo _('Retry'); ?> </a> </div>';74 responsetext += "<\/div>" + 75 '<div class="buttons"><a id="reload_response_close_btn" href="#" onclick="freepbx_stop_reload();"><img src="images/cancel.png" height="16" width="16" border="0" alt="<?php echo _('Close'); ?>" /> <?php echo _('Close'); ?>' + "<\/a>" + 76 ' <a id="reload_retry_btn" href="#" onclick="run_reload();"><img src="images/arrow_rotate_clockwise.png" height="16" width="16" border="0" alt="<?php echo _('Retry'); ?>" /> <?php echo _('Retry'); ?>' + "<\/a> <\/div>"; 77 77 78 78 $('#reload_response').html(responsetext); … … 86 86 error: function(reqObj, status) { 87 87 $('#reload_response').html( 88 '<p><?php echo _('Error: Did not receive valid response from server'); ?> </p>'+89 '<div class="buttons"><a id="reload_response_close_btn" href="#" onclick="freepbx_stop_reload();"><img src="images/cancel.png" height="16" width="16" border="0" alt="<?php echo _('Close'); ?>" /> <?php echo _('Close'); ?> </a></div>'88 '<p><?php echo _('Error: Did not receive valid response from server'); ?>' + "<\/p>" + 89 '<div class="buttons"><a id="reload_response_close_btn" href="#" onclick="freepbx_stop_reload();"><img src="images/cancel.png" height="16" width="16" border="0" alt="<?php echo _('Close'); ?>" /> <?php echo _('Close'); ?>' + "<\/a><\/div>" 90 90 ); 91 91 $("#reload_reloading").slideUp(150, function() { modules/branches/2.6/dashboard/dashboard.css
r4721 r7222 35 35 .infobox h3 { 36 36 color: white; 37 margin-bottom:2 ;37 margin-bottom:2px; 38 38 margin-top:3px; 39 39 } modules/branches/2.6/dashboard/page.index.php
r6990 r7222 281 281 global $sysinfo; 282 282 global $astinfo; 283 $out = "<h3>"._("Uptime")."</h3>< /br>";284 $out .= '<table >';283 $out = "<h3>"._("Uptime")."</h3><br />"; 284 $out .= '<table summary="system information table">'; 285 285 /* 286 286 $out .= '<tr><th>Distro:</th><td>'.$sysinfo->distro().'</td></tr>'; … … 405 405 $domid = "notify_item_".str_replace(' ','_',$item['module']).'_'.str_replace(' ','_',$item['id']); 406 406 407 $out .= "\n"; 407 408 $out .= '<li id="'.$domid.'" '; 408 409 if (isset($notify_classes[$item['level']])) { … … 410 411 } 411 412 $out .= '><div>'; 412 413 $out .= '<h4 class="syslog_text">'; 413 414 $out .= '<div class="syslog_text">'; 415 $out .= '<h4>'; 414 416 $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" /> '; 415 417 $out .= $item['display_text'].'</span>'; 418 $out .= '</h4>'; 419 $out .= "\n"; 416 420 $out .= '<div class="notification_buttons">'; 417 421 if (isset($item['candelete']) && $item['candelete']) { … … 426 430 } 427 431 $out .= '</div>'; 428 $out .= '</ h4>';429 432 $out .= '</div>'; 433 $out .= "\n"; 430 434 $out .= '<div class="syslog_detail">'; 431 435 $out .= nl2br($item['extended_text']); … … 499 503 ?> 500 504 501 <script language="javascript">505 <script type="text/javascript"> 502 506 $(document).ready(function(){ 503 507 $.ajaxTimeout( 20000 ); … … 510 514 function makeSyslogClickable() { 511 515 $('#syslog h4 span').click(function() { 512 $(this).parent(). next('div').slideToggle('fast');516 $(this).parent().parent().next('div').slideToggle('fast'); 513 517 }); 514 518 }
