synch recent changes from R1 to HEAD

3 files changed, 78 insertions, 2 deletions

diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
new file mode 100644
index 0000000..43facd5
--- /dev/null
+++ b/templates/header_inc.tpl
@@ -0,0 +1,9 @@
+{if $unreadMsgs and $gBitUser->mUserPrefs.message_alert eq 'y'}
+	<script type="text/javascript">
+		var redirect = confirm( '{tr}You have {$unreadMsgs} message(s) waiting for you in your personal message box. Click OK to view your messages.{/tr}' );
+		if( redirect == true && !getCookie( 'message_alert_sent' ) ) {ldelim}
+			setCookie( 'message_alert_sent', true, 600 );
+			window.location="{$smarty.const.MESSU_PKG_URL}message_box.php";
+		{rdelim}
+	</script>
+{/if}
diff --git a/templates/messu_mailbox.tpl b/templates/messu_mailbox.tpl
index ab2ac0d..53e1370 100644
--- a/templates/messu_mailbox.tpl
+++ b/templates/messu_mailbox.tpl
@@ -16,9 +16,11 @@
 			<input type="hidden" name="flagval" value="{$flagval|escape}" />
 			<input type="hidden" name="priority" value="{$priority|escape}" />
 
-			<a class="floaticon" href="{$smarty.const.MESSU_PKG_URL}compose.php">{biticon ipackage=messu iname=send_mail iexplain="{tr}Compose Message{/tr}"}</a>
-{assign var=displayName value=$gBitSystem->getPreference("display_name","real_name") }
+			<a href="{$smarty.const.MESSU_PKG_URL}compose.php">{biticon ipackage=messu iname=send_mail iexplain="Compose Message" iforce=icon_text}</a>
+
+			{assign var=displayName value=$gBitSystem->getPreference("display_name","real_name") }
 			<table class="data">
+				<caption>{tr}Messages{/tr}</caption>
 				<tr>
 					<th style="width:1%">&nbsp;</th>
 					<th style="width:1%">{smartlink ititle="Flagged" isort=is_flagged ibiticon="messu/flagged" find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
diff --git a/templates/messu_preferences_inc.tpl b/templates/messu_preferences_inc.tpl
new file mode 100644
index 0000000..ccd60df
--- /dev/null
+++ b/templates/messu_preferences_inc.tpl
@@ -0,0 +1,65 @@
+{strip}
+{form legend="User Messages"}
+	<div class="row">
+		{formlabel label="Personal Messages" for=""}
+		{forminput}
+			<a href="{$smarty.const.MESSU_PKG_URL}message_box.php">
+				{tr}You have <strong>{$unreadMsgs|default:no} unread</strong> {if $unreadMsgs eq '1'}message{else}messages{/if}{/tr}
+			</a>
+		{/forminput}
+	</div>
+
+	<div class="row">
+		{formlabel label="Messages per page" for="mess_maxRecords"}
+		{forminput}
+			<select name="mess_maxRecords" id="mess_maxRecords">
+				<option value="2" {if $userPrefs.mess_maxRecords eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
+				<option value="5" {if $userPrefs.mess_maxRecords eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
+				<option value="10" {if $userPrefs.mess_maxRecords eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
+				<option value="20" {if $userPrefs.mess_maxRecords eq 20}selected="selected"{/if}>{tr}20{/tr}</option>
+				<option value="30" {if $userPrefs.mess_maxRecords eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
+				<option value="40" {if $userPrefs.mess_maxRecords eq 40}selected="selected"{/if}>{tr}40{/tr}</option>
+				<option value="50" {if $userPrefs.mess_maxRecords eq 50}selected="selected"{/if}>{tr}50{/tr}</option>
+			</select>
+			{formhelp note=""}
+		{/forminput}
+	</div>
+
+	<div class="row">
+		{formlabel label="Allow messages from other users" for="allowMsgs"}
+		{forminput}
+			<input type="checkbox" name="allowMsgs" id="allowMsgs" {if $userPrefs.allowMsgs eq 'y'}checked="checked"{/if} />
+			{formhelp note=""}
+		{/forminput}
+	</div>
+
+	{* the header_inc.tpl file needs some better js for this to work - xing
+	<div class="row">
+		{formlabel label="Message Alert" for="message_alert"}
+		{forminput}
+			<input type="checkbox" name="message_alert" id="message_alert" {if $userPrefs.message_alert eq 'y'}checked="checked"{/if} />
+			{formhelp note="Whenever you have new messages, a popup will apear and take you directly to your message box."}
+		{/forminput}
+	</div>
+	*}
+
+	<div class="row">
+		{formlabel label="Send an email" for="minPrio"}
+		{forminput}
+			<select name="minPrio" id="minPrio">
+				<option value="1" {if $userPrefs.minPrio eq 1}selected="selected"{/if}>{tr}at least priority:{/tr} 1</option>
+				<option value="2" {if $userPrefs.minPrio eq 2}selected="selected"{/if}>{tr}at least priority:{/tr} 2</option>
+				<option value="3" {if $userPrefs.minPrio eq 3}selected="selected"{/if}>{tr}at least priority:{/tr} 3</option>
+				<option value="4" {if $userPrefs.minPrio eq 4}selected="selected"{/if}>{tr}at least priority:{/tr} 4</option>
+				<option value="5" {if $userPrefs.minPrio eq 5}selected="selected"{/if}>{tr}at least priority:{/tr} 5</option>
+				<option value="6" {if $userPrefs.minPrio eq 6}selected="selected"{/if}>{tr}never send message{/tr}</option>
+			</select>
+			{formhelp note="Here you can indicate when an email should be sent to you when you recieve a personal message."}
+		{/forminput}
+	</div>
+
+	<div class="row submit">
+		<input type="submit" name="messprefs" value="{tr}Change preferences{/tr}" />
+	</div>
+{/form}
+{/strip}