*** empty log message ***

livesupport/modules/htmlUI/var/html/help.html

@@ -81,16 +81,16 @@ DIV.blockquote
 <div class="container_elements">
 <img src="img/logo_livesupport.gif" border="0" />
 
-<h1>Quick Start - LiveSupport 0.9.1 preview</h1>
+<h1>Quick Start - LiveSupport 1.0 release candidate</h1>
-<div class="copyright">LiveSupport 0.9.1 build 2005-05-07 &copy;2005 <a href="http://www.mdlf.org" target="_blank">MDLF</a> - maintained and distributed under GNU/GPL by <a href="http://www.campware.org" target="_blank">CAMPWARE</a></div>
+<div class="copyright">LiveSupport 1.0 rc &copy;2005 <a href="http://www.mdlf.org" target="_blank">MDLF</a> - maintained and distributed under GNU/GPL by <a href="http://www.campware.org" target="_blank">CAMPWARE</a></div>
   <h2>Navigation</h2>
 
 <div class=blockquote>
 
-    <h3>Contextmenues</h3>
+    <h3>Context menus</h3>
 
   The LiveSupport
-    web client uses contextmenues extensively throughout the program. For e.g. by clicking
+    web client uses context menus extensively throughout the program. For example, by clicking
     on the ScratchPad, you can perform a number of operations on your file, including
     adding it to a playlist and removing it from the ScratchPad.
   &nbsp;
@@ -115,7 +115,7 @@ DIV.blockquote
 </div>
 
 <h2>Playlists</h2>
-  <p >Playlists are the core of how LiveSupport 0.9 works. You add sound
+  <p >Playlists are the core of how LiveSupport works. You add sound
     files to a playlist, and then schedule that playlist to be played at a date
     and time of your choosing. Playlists are edited in the Playlist Editor. You
     can include an unlimited number of playlists inside playlists; for example,

livesupport/modules/htmlUI/var/html/ui_handler.php

@@ -81,7 +81,6 @@ switch($_REQUEST['act']){
         $uiHandler->removePerm($_REQUEST["permid"], $_REQUEST["oid"]);
     break;
 
-    ## SUBJECTS
     case "SUBJECTS.addSubj":
         $uiHandler->SUBJECTS->addSubj($_REQUEST);
     break;
@@ -268,6 +267,11 @@ switch($_REQUEST['act']){
         $uiHandler->SCHEDULER->setReload();
     break;
 
+    case "SCHEDULER.startDaemon":
+         $uiHandler->SCHEDULER->startDaemon();
+         $uiHandler->SCHEDULER->setReload();
+    break;
+
     default:
         if ($uiHandler->userid) $uiHandler->_retMsg("Unknown method: $1", $_REQUEST["act"]);
         $uiHandler->redirUrl = UI_BROWSER;

livesupport/modules/htmlUI/var/templates/menu.tpl

@@ -29,6 +29,7 @@
                         <li><a href="{$UI_BROWSER}?act=changeStationPrefs"      >##Station Settings##</a></li>
                         <li><a href="{$UI_BROWSER}?act=SUBJECTS"                >##User/Groups##</a></li>
                         <li><a href="{$UI_BROWSER}?act=fileList&id={$START.fid}">##File List##</a></li>
+                        <li><a href="javascript: hpopup('{$UI_HANDLER}?act=SCHEDULER.startDaemon')">##Start Scheduler##</a></li>
                     </ul>
                 </li>
                 {/if}

livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeAllTransitions.tpl

@@ -0,0 +1,56 @@
+{include file="popup/header.tpl"}
+
+<table height="100%" width="100%">
+    <tr>
+        <td style="border: 0">
+            <center>
+                <table width="100%" height="100%">
+                    <tr><td style="border: 0">
+                        {include file="sub/dynForm_plain.tpl}
+                    </td></tr>
+                </table>
+            </center>
+        </td>
+    </tr>
+</table>
+
+<script type="text/javascript">
+{literal}
+function pl_switchUp()
+{
+    if (Number(document.forms['PL_changeTransition'].elements['duration'].value) < 5000) {
+        document.forms['PL_changeTransition'].elements['duration'].value  = Number(document.forms['PL_changeTransition'].elements['duration'].value) + 100;
+    } else {
+        alert('Maximun reached');
+    }
+}
+
+function pl_switchDown()
+{
+    if (Number(document.forms['PL_changeTransition'].elements['duration'].value) > 99) {
+        document.forms['PL_changeTransition'].elements['duration'].value = Number(document.forms['PL_changeTransition'].elements['duration'].value) - 100;
+    }
+    /* else {
+        if (document.forms['PL_changeTransition'].elements['type'][0].checked) document.forms['PL_changeTransition'].elements['type'][1].checked = true;
+        else document.forms['PL_changeTransition'].elements['type'][0].checked = true;
+    }  */
+}
+
+var pl_loop;
+
+function pl_start(direction)
+{
+    pl_loop = setInterval("pl_switch"+ direction + "()", 100);
+}
+
+function pl_stop()
+{
+    clearInterval(pl_loop);
+}
+
+{/literal}
+</script>
+
+</body>
+</html>
+

livesupport/modules/htmlUI/var/ui_conf.php

@@ -1,10 +1,12 @@
 <?php
+define('UI_SCHEDULER_DAEMON_CMD',       'make -C /var/www/livesupport/products/scheduler/ run >/tmp/scheduler.log 2>&1 &');
+define('UI_SCHEDULER_DAEMON_NAME',      'scheduler');
+
 define('UI_VERBOSE',                    FALSE);
 define('UI_WARNING',                    TRUE);
 define('UI_ERROR',                      TRUE);
 
 define('UI_DEFAULT_LANGID',             'en_GB');
-#define('UI_TIMEZONE',                  ' +100');
 define('UI_TIMEZONEOFFSET',             date('Z'));
 
 

livesupport/modules/htmlUI/var/ui_scheduler.class.php

@@ -41,6 +41,22 @@ class uiScheduler extends uiCalendar
     }
 
 
+    function startDaemon()
+    {
+        exec(UI_SCHEDULER_DAEMON_CMD);
+        sleep(5);
+        exec('ps -A', $output);
+        foreach ($output as $l) {
+            if (preg_match("/ ".UI_SCHEDULER_DAEMON_NAME."$/", $l)) {
+                $this->Base->_retMsg('Scheduler started sucessfully.');
+                return TRUE;
+            }
+        }
+        $this->Base->_retMsg('Scheduler did not start.');
+        return FALSE;
+    }
+
+
     function set($arr)
     {
         extract($arr);