diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-10-02 09:30:12 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-10-02 09:30:12 -0400 |
| commit | 1bde731214856aa3c5fba3547b69e9488d7653cc (patch) | |
| tree | b232460d9b5308f75b57c04164887c92e0ac6de2 /src/usr | |
| parent | 488e38f5fb523e0ac7cdc3eab200702a10402d09 (diff) | |
| download | pfsense-1bde731214856aa3c5fba3547b69e9488d7653cc.zip pfsense-1bde731214856aa3c5fba3547b69e9488d7653cc.tar.gz | |
Fixed #5233
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/guiconfig.inc | 2 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/ntp_status.widget.php | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 32d8ffa..e31d6c4 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -397,7 +397,6 @@ function print_info_box_np_undo($msg, $name = "apply", $value = "Apply changes", </table> <script type="text/javascript"> //<![CDATA[ - NiftyCheck(); Rounded("div#redbox","all","#FFF","{$nifty_redbox}","smooth"); Rounded("td#blackbox","all","#FFF","{$nifty_blackbox}","smooth"); //]]> @@ -888,7 +887,6 @@ function display_widget_tabs(& $tab_array) { echo "<script type=\"text/javascript\">"; echo "\n//<![CDATA[\n"; - echo "NiftyCheck();\n"; echo "Rounded(\"div.{$tabclass}-tabactive\",\"top\",\"#CCCCCC\",\"#EEEEEE\",\"smooth\");\n"; echo "Rounded(\"div.{$tabclass}-tabdeactive\",\"top\",\"#CCCCCC\",\"#777777\",\"smooth\");\n"; echo "//]]>\n"; diff --git a/src/usr/local/www/widgets/widgets/ntp_status.widget.php b/src/usr/local/www/widgets/widgets/ntp_status.widget.php index 48d3755..faee6a0 100644 --- a/src/usr/local/www/widgets/widgets/ntp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/ntp_status.widget.php @@ -41,6 +41,18 @@ require_once("functions.inc"); require_once("/usr/local/www/widgets/include/ntp_status.inc"); +function getServerDateItems($inDate) { + return date('Y,n,j,G,',$inDate).intval(date('i',$inDate)).','.intval(date('s',$inDate)); + // year (4-digit),month,day,hours (0-23),minutes,seconds + // use intval to strip leading zero from minutes and seconds + // so JavaScript won't try to interpret them in octal + // (use intval instead of ltrim, which translates '00' to '') +} + +function clockTimeString($inDate, $showSeconds) { + return date($showSeconds ? 'G:i:s' : 'g:i',$inDate).' '; +} + if ($_REQUEST['updateme']) { //this block displays only on ajax refresh if (isset($config['system']['ipv6allow'])) { |
