From 71a97cdc93617b2d87ffeb5c63dabc657e28861f Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Wed, 25 Aug 2010 13:59:06 -0700
Subject: [PATCH] CC-1644 station logo can now be uploaded properly, there are
 still browser caching issues.

---
 src/modules/htmlUI/var/templates/statusbar.tpl | 2 +-
 src/modules/htmlUI/var/ui_scheduler.class.php  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/htmlUI/var/templates/statusbar.tpl b/src/modules/htmlUI/var/templates/statusbar.tpl
index 4267c6f7d..c1f00e982 100644
--- a/src/modules/htmlUI/var/templates/statusbar.tpl
+++ b/src/modules/htmlUI/var/templates/statusbar.tpl
@@ -4,7 +4,7 @@
     <tr>
 		<td>
             <div id="logo">
-              <img src="ui_browser.php-Dateien/logo.png">
+              <img src="img/logo.png">
             </div>
 		</td>
 		
diff --git a/src/modules/htmlUI/var/ui_scheduler.class.php b/src/modules/htmlUI/var/ui_scheduler.class.php
index b91f9dd11..af82639d7 100644
--- a/src/modules/htmlUI/var/ui_scheduler.class.php
+++ b/src/modules/htmlUI/var/ui_scheduler.class.php
@@ -880,10 +880,10 @@ class uiScheduler extends uiCalendar {
     	$this->scriptError = null;
         if (!isset($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;
         } 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 TRUE;
@@ -978,7 +978,7 @@ class uiScheduler extends uiCalendar {
         exec($cmd, $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;
         }
         $message = "";