Changeset 9763f87


Ignore:
Timestamp:
08/29/14 09:53:36 (8 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master
Children:
5ce6eea
Parents:
29147c3 (diff), 698f196 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • src-sh/warden/scripts/backend/startjail.sh

    rdab326c r698f196  
    305305fi 
    306306 
     307# Check if this interface is valid 
     308ifconfig $IFACE >/dev/null 2>/dev/null 
     309if [ $? -ne 0 ] ; then 
     310   echo "ERROR: No such network interface $IFACE" 
     311   echo "Please set a correct network interface in /usr/local/etc/warden.conf" 
     312   exit 6 
     313fi 
     314 
    307315MTU=`ifconfig ${IFACE} | head -1 | sed -E 's/.*mtu ([0-9]+)/\1/g'` 
    308316 
  • src-webui/appweb/share/html/include/header.php

    rc280acd r94d9dda  
    2020        <script type="text/javascript" src="/js/jquery.jscroll.min.js"></script> 
    2121        <script type="text/javascript" src="/js/jquery.ba-hashchange.min.js"></script> 
     22        <script type="text/javascript" src="/js/jquery.timer.js"></script> 
    2223        <style> 
    2324        <style> 
  • src-webui/appweb/share/html/include/nav-computer.php

    ra5afab4 r94d9dda  
    3232</div> 
    3333 
    34 <div id="notifer" style="height:35px;width:600px;position:absolute;margin-top:3.80em;margin-left:12.50em;"> 
    35   <iframe scrolling="no" src="pages/notifier.php" height="35" width="565" seamless></iframe><a href="?p=dispatcher" title="View recent actions and results"><img style="vertical-align:top" height=34 width=34 src="images/notifier.png" border=0></a> 
    36 </div> 
     34<script type="text/javascript"> 
     35$(document).ready(function () { 
     36    var interval = 600;   //number of mili seconds between each call 
     37    var refresh = function() { 
     38        $.ajax({ 
     39            url: "/pages/notifier.php", 
     40            cache: false, 
     41            success: function(html) { 
     42                $('#notifier').html(html); 
     43                setTimeout(function() { 
     44                    refresh(); 
     45                }, interval); 
     46            } 
     47        }); 
     48    }; 
     49    refresh(); 
     50}); 
     51</script> 
     52<div id="notifier" style="height:35px;width:600px;position:absolute;margin-top:3.80em;margin-left:12.50em;"></div> 
    3753 
    3854<div id="body" style="height:100%;width:700px;position:absolute;margin-top:6.50em;margin-left:12.50em;"> 
  • src-webui/appweb/share/html/include/nav-phone.php

    re0a0505 r94d9dda  
    2626<body> 
    2727 
    28 <div id="notifer" style="height:35px;width:300px;position:absolute;margin-top:0em;margin-left:50px;"> 
    29   <iframe src="pages/notifier.php" height="35px" width="264" seamless></iframe><a href="?p=dispatcher"><img style="vertical-align:top" height=35 width=35 src="images/notifier.png" border=0></a> 
    30 </div> 
     28<script type="text/javascript"> 
     29$(document).ready(function () { 
     30    var interval = 600;   //number of mili seconds between each call 
     31    var refresh = function() { 
     32        $.ajax({ 
     33            url: "/pages/notifier.php", 
     34            cache: false, 
     35            success: function(html) { 
     36                $('#notifier').html(html); 
     37                setTimeout(function() { 
     38                    refresh(); 
     39                }, interval); 
     40            } 
     41        }); 
     42    }; 
     43    refresh(); 
     44}); 
     45</script> 
     46<div id="notifier"  onclick="location.href='/?p=dispatcher';" style="height:45px;width:350px;position:absolute;margin-top:0em;margin-left:55px;"></div> 
    3147 
    3248<div id="body" style="height:100%;width=100%;float:left;margin-top:6.00em;margin-left:5px;margin-right:5px;"> 
  • src-webui/appweb/share/html/pages/notifier.php

    r054bbe9 r94d9dda  
    1 <html> 
    21<? 
    32  require("../include/functions.php"); 
     
    2625 
    2726      if ( $results[0] == "SUCCESS" ) 
    28         $result = "<img align=absmiddle height=30 width=30 src=\"../images/dialog-ok.png\">".$result; 
     27        $result = "<img align=absmiddle height=40 width=40 src=\"../images/dialog-ok.png\">".$result; 
    2928      else 
    30         $result = "<img align=absmiddle height=30 width=30 src=\"../images/application-exit.png\">".$result; 
     29        $result = "<img align=absmiddle height=40 width=40 src=\"../images/application-exit.png\">".$result; 
    3130    } 
    3231    $output="$result"; 
    3332  } else { 
    34     echo "<META HTTP-EQUIV=\"refresh\" CONTENT=\"6\">"; 
    35     $output="$narray[0]"; 
     33    $output="Idle"; 
    3634  } 
    3735?> 
    38 <body style="background-color:<? echo $bgcolor; ?>;"> 
    39 <? echo "$output"; ?> 
    40 </body> 
    41 </html> 
     36<a href="?p=dispatcher"><? echo "$output"; ?></a> 
  • src-webui/port-files/pkg-plist

    re0a0505 r94d9dda  
    5353share/appweb/html/js/jquery.easytabs.min.js 
    5454share/appweb/html/js/jquery.jscroll.min.js 
     55share/appweb/html/js/jquery.timer.js 
    5556share/appweb/html/js/jquery.min.js 
    5657share/appweb/html/js/main.js 
  • lumina/lumina-config/mainUI.cpp

    r1811e3f r29147c3  
    188188  connect(ui->combo_session_wloc, SIGNAL(currentIndexChanged(int)), this, SLOT(sessionoptchanged()) ); 
    189189  connect(ui->combo_session_wtheme, SIGNAL(currentIndexChanged(int)), this, SLOT(sessionoptchanged()) ); 
     190  connect(ui->check_session_numlock, SIGNAL(stateChanged(int)), this, SLOT(sessionoptchanged()) ); 
     191  connect(ui->check_session_playloginaudio, SIGNAL(stateChanged(int)), this, SLOT(sessionoptchanged()) ); 
     192  connect(ui->check_session_playlogoutaudio, SIGNAL(stateChanged(int)), this, SLOT(sessionoptchanged()) ); 
    190193  connect(ui->spin_session_wkspaces, SIGNAL(valueChanged(int)), this, SLOT(sessionoptchanged()) ); 
    191194  connect(ui->list_session_start, SIGNAL(currentRowChanged(int)), this, SLOT(sessionstartchanged()) ); 
Note: See TracChangeset for help on using the changeset viewer.