diff --git a/livesupport/modules/htmlUI/var/html/help.html b/livesupport/modules/htmlUI/var/html/help.html index d727b508b..1da824716 100644 --- a/livesupport/modules/htmlUI/var/html/help.html +++ b/livesupport/modules/htmlUI/var/html/help.html @@ -81,16 +81,16 @@ DIV.blockquote
-

Quick Start - LiveSupport 0.9.1 preview

- +

Quick Start - LiveSupport 1.0 release candidate

+

Navigation

-

Contextmenues

+

Context menus

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.   @@ -115,7 +115,7 @@ DIV.blockquote

Playlists

-

Playlists are the core of how LiveSupport 0.9 works. You add sound +

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, diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 275eec96c..a1c66abeb 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/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; diff --git a/livesupport/modules/htmlUI/var/templates/menu.tpl b/livesupport/modules/htmlUI/var/templates/menu.tpl index 63d388b37..5dd9e6761 100755 --- a/livesupport/modules/htmlUI/var/templates/menu.tpl +++ b/livesupport/modules/htmlUI/var/templates/menu.tpl @@ -29,6 +29,7 @@

  • ##Station Settings##
  • ##User/Groups##
  • ##File List##
  • +
  • ##Start Scheduler##
  • {/if} diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeAllTransitions.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeAllTransitions.tpl new file mode 100755 index 000000000..b569f4228 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeAllTransitions.tpl @@ -0,0 +1,56 @@ +{include file="popup/header.tpl"} + + + + + +
    +
    + + +
    + {include file="sub/dynForm_plain.tpl} +
    +
    +
    + + + + + + diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php index cdbc2a8db..f225b67b5 100755 --- a/livesupport/modules/htmlUI/var/ui_conf.php +++ b/livesupport/modules/htmlUI/var/ui_conf.php @@ -1,10 +1,12 @@ /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')); diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index 220d8be97..8c5a18920 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/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);