Add local configs for wc and commit lingering wwsf change

themes/white/conf/file_volumes.conf

@@ -0,0 +1,12 @@
+#
+# File volumes
+#
+
+workspace = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/workspace,
+	absolutePath = <ca_media_root_dir>/<ca_media_url_root>/workspace,
+	writeable = 1,
+	description = Uploaded files
+}

themes/white/conf/media_volumes.conf

@@ -0,0 +1,109 @@
+#
+# Media volumes
+#
+
+images = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/images,
+	absolutePath = <ca_media_root_dir>/images,
+	writeable = 1,
+	description = Images,
+
+#	accessUsingMirror = my_mirror,
+
+#	mirrors = {
+#		my_mirror = {
+#			method = ftp,
+#			hostname = ftp.mysite.org,
+#			username = my_ftp_login,
+#			password = my_ftp_password,
+#			directory = /usr/home/mysite/public_html/images,
+#			passive = 1,
+#			accessProtocol = http,
+#			accessHostname = www.mysite.org,
+#			accessUrlPath = /images
+#		}
+#                as3_mirror = {
+#                       method = as3,
+#                       access_key_id =	blah,
+#                       secret_access_key = blahblah,
+#                       bucket = mymuseumimages,
+#                       accessProtocol = http,
+#                       accessHostname = mymuseumimages.s3.amazonaws.com,
+#  			accessUrlPath = 
+#		}
+#	}
+}
+
+tilepics = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/tilepics,
+	absolutePath = <ca_media_root_dir>/tilepics,
+	writeable = 1,
+	description = Tilepic format art images
+}
+
+workspace = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/workspace,
+	absolutePath = <ca_media_root_dir>/workspace,
+	writeable = 1,
+	description = workspace previews
+}
+
+flv = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/flv,
+	absolutePath = <ca_media_root_dir>/flv,
+	writeable = 1,
+	description = FLV video
+}
+
+quicktime = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/quicktime,
+	absolutePath = <ca_media_root_dir>/quicktime,
+	writeable = 1,
+	description = QuickTime
+}
+
+windowsmedia = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/windowsmedia,
+	absolutePath = <ca_media_root_dir>/windowsmedia,
+	writeable = 1,
+	description = WindowsMedia
+}
+
+realmedia = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/realmedia,
+	absolutePath = <ca_media_root_dir>/realmedia,
+	writeable = 1,
+	description = RealMedia
+}
+
+swf = {
+	hostname = <site_hostname>,
+	protocol = https,
+	urlPath = <ca_media_url_root>/swf,
+	absolutePath = <ca_media_root_dir>/swf,
+	writeable = 1,
+	description = Flash (SWF)
+}
+
+mp3 = {
+	hostname = <site_hostname>,
+	protocol = <site_protocol>,
+	urlPath = <ca_media_url_root>/mp3,
+	absolutePath = <ca_media_root_dir>/mp3,
+	writeable = 1,
+	description = MP3 audio
+}

themes/wwsf/views/pageFormat/pageHeader.php

@@ -59,22 +59,12 @@
 			$vs_base_url = str_replace("/lang/[A-Za-z_]+", "", $vs_base_url);
 
 			if (is_array($va_ui_locales = $this->request->config->getList('ui_locales')) && (sizeof($va_ui_locales) > 1)) {
-				print caFormTag($this->request, $this->request->getAction(), 'caLocaleSelectorForm', null, 'get', 'multipart/form-data', '_top', array('disableUnsavedChangesWarning' => true));
-
-				$va_locale_options = array();
-				foreach($va_ui_locales as $vs_locale) {
-					$va_parts = explode('_', $vs_locale);
-					$vs_lang_name = Zend_Locale::getTranslation(strtolower($va_parts[0]), 'language', strtolower($va_parts[0]));
-					$va_locale_options[$vs_lang_name] = $vs_locale;
-				}
 				if ($g_ui_locale == de_DE) {
 					print "<a href='".$vs_base_url."/lang/en_US'>English</a>";
 				}
 				if ($g_ui_locale == en_US) {
 					print "<a href='".$vs_base_url."/lang/de_DE'>Deutsch</a>";
 				}
-
-				print "</form>";
 			}
 ?>
 		</div></div><!-- end topbar -->