From 875f17ea85239eb7b65023e7db3d00bb415279b9 Mon Sep 17 00:00:00 2001
From: sebastian <sebastian@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 11 Feb 2010 16:09:58 +0000
Subject: [PATCH] #1794 HTML UI: Confirmation needed on successful file upload
---
.../var/templates/popup/SUBJECTS.confirmRemoveSubj.tpl | 2 +-
.../src/modules/htmlUI/var/templates/popup/deleteItem.tpl | 4 ++--
campcaster/src/modules/htmlUI/var/ui_handler.class.php | 8 +++++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/campcaster/src/modules/htmlUI/var/templates/popup/SUBJECTS.confirmRemoveSubj.tpl b/campcaster/src/modules/htmlUI/var/templates/popup/SUBJECTS.confirmRemoveSubj.tpl
index d7e6750b3..aa5d1d008 100644
--- a/campcaster/src/modules/htmlUI/var/templates/popup/SUBJECTS.confirmRemoveSubj.tpl
+++ b/campcaster/src/modules/htmlUI/var/templates/popup/SUBJECTS.confirmRemoveSubj.tpl
@@ -1,7 +1,7 @@
{include file="popup/header.tpl"}
<center>
-{tra str='Are you sure to remove "$1"?' 1=$_REQUEST.login}
+{tra str='Are you sure you want to delete "$1"?' 1=$_REQUEST.login}
<br><br>
<input type="button" class="button" onClick="window.close()" value="Cancel">
<input type="button" class="button" onClick="location.href='{$UI_HANDLER}?act=SUBJECTS.removeSubj&login={$_REQUEST.login|escape:'url'}'" value="OK">
diff --git a/campcaster/src/modules/htmlUI/var/templates/popup/deleteItem.tpl b/campcaster/src/modules/htmlUI/var/templates/popup/deleteItem.tpl
index 0d1812212..872113191 100644
--- a/campcaster/src/modules/htmlUI/var/templates/popup/deleteItem.tpl
+++ b/campcaster/src/modules/htmlUI/var/templates/popup/deleteItem.tpl
@@ -3,12 +3,12 @@
<center>
{if $filecount}
- {tra str='Are you sure to delete $1 selected files?' 1=$filecount}
+ {tra str='Are you sure you want to delete $1 selected items?' 1=$filecount}
<br><br>
<input type="button" class="button" onClick="window.close()" value="Cancel">
<input type="button" class="button" onClick="location.href='{$UI_HANDLER}?act=delete{$idstr}'" value="OK">
{else}
- {tra str='Are you sure to delete file "$1"?' 1=$filename}
+ {tra str='Are you sure you want to delete "$1"?' 1=$filename}
<br><br>
<input type="button" class="button" onClick="window.close()" value="Cancel">
<input type="button" class="button" onClick="location.href='{$UI_HANDLER}?act=delete&id={$_REQUEST.id}'" value="OK">
diff --git a/campcaster/src/modules/htmlUI/var/ui_handler.class.php b/campcaster/src/modules/htmlUI/var/ui_handler.class.php
index 9cd633a59..14c118343 100644
--- a/campcaster/src/modules/htmlUI/var/ui_handler.class.php
+++ b/campcaster/src/modules/htmlUI/var/ui_handler.class.php
@@ -195,6 +195,7 @@ class uiHandler extends uiBase {
$this->redirUrl = UI_BROWSER."?act=addFileMData&id=".$storedFile->getId();
$this->_retMsg('Audioclip has been uploaded successfully.');
+ $this->_retMsg('Now please complete metadata about the clip.');
return $storedFile->getId();
} // fn uploadFile
@@ -295,6 +296,7 @@ class uiHandler extends uiBase {
$this->redirUrl = UI_BROWSER."?act=addWebstreamMData&id=$r";
$this->_retMsg('Webstream data has been saved.');
+ $this->_retMsg('Now please complete metadata about the clip.');
return $r;
} // fn addWebstream
@@ -314,7 +316,7 @@ class uiHandler extends uiBase {
$this->setMetadataValue($id, UI_MDATA_KEY_DURATION, $extent);
$this->redirUrl = UI_BROWSER.'?act=editItem&id='.$formdata['id'];
- $this->_retMsg('Webstream metadata has been saved.');
+ $this->_retMsg('Webstream metadata has been updated.');
return TRUE;
} // fn editWebstream
@@ -350,7 +352,7 @@ class uiHandler extends uiBase {
}
}
- $this->_retMsg('Audioclip metadata has been saved.');
+ $this->_retMsg('Audioclip metadata has been updated.');
} // fn editMetadata
@@ -648,7 +650,7 @@ class uiHandler extends uiBase {
if (function_exists("getimagesize")) {
$size = @getimagesize($filePath);
if ($size === FALSE) {
- $this->_retMsg('Error while uploading logo: the file uploaded is not an image.');
+ $this->_retMsg('Error while uploading logo: not an supported image format.');
return FALSE;
}
if ( ($size[0] > 128) || ($size[1] > 128) ) {