Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-1644 station logo can now be uploaded properly, there are still browser caching issues.

This commit is contained in:
naomiaro 2010-08-25 13:59:06 -07:00
parent 2dd20a03b3
commit 71a97cdc93
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/htmlUI/var/templates/statusbar.tpl
View File

@ -4,7 +4,7 @@
<tr> <tr>
<td> <td>
<div id="logo"> <div id="logo">
<img src="ui_browser.php-Dateien/logo.png"> <img src="img/logo.png">
</div> </div>
</td> </td>

6
src/modules/htmlUI/var/ui_scheduler.class.php
View File

@ -880,10 +880,10 @@ class uiScheduler extends uiCalendar {
$this->scriptError = null; $this->scriptError = null;
if (!isset($this->Base->STATIONPREFS['schedulerStartupScript']) if (!isset($this->Base->STATIONPREFS['schedulerStartupScript'])
|| empty($this->Base->STATIONPREFS['schedulerStartupScript'])) { || empty($this->Base->STATIONPREFS['schedulerStartupScript'])) {
$this->scriptError = 'Scheduler startup script has not been defined. Please set this value in the "Preferences->System Settings".'; $this->scriptError = 'Scheduler startup script has not been defined. Please set this value in the "Preferences->Station Settings".';
return FALSE; return FALSE;
} elseif (!file_exists($this->Base->STATIONPREFS['schedulerStartupScript'])) { } elseif (!file_exists($this->Base->STATIONPREFS['schedulerStartupScript'])) {
$this->scriptError = sprintf('The scheduler startup script you defined does not exist. You can set this value in "Preferences->System Settings". The current value is "%s"', $this->Base->STATIONPREFS['schedulerStartupScript']); $this->scriptError = sprintf('The scheduler startup script you defined does not exist. You can set this value in "Preferences->Station Settings". The current value is "%s"', $this->Base->STATIONPREFS['schedulerStartupScript']);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -978,7 +978,7 @@ class uiScheduler extends uiCalendar {
exec($cmd, $output); exec($cmd, $output);
if (empty($output)) { if (empty($output)) {
$this->scriptError = 'Scheduler startup script does not appear to be valid. Please check the value you have set in "Preferences->System Settings".'; $this->scriptError = 'Scheduler startup script does not appear to be valid. Please check the value you have set in "Preferences->Station Settings".';
return FALSE; return FALSE;
} }
$message = ""; $message = "";