summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin/schema_inc.php8
-rw-r--r--icons/pkg_messu.pngbin0 -> 1859 bytes
-rw-r--r--templates/contact.tpl4
-rw-r--r--templates/messu_broadcast.tpl2
-rw-r--r--templates/messu_compose.tpl2
-rw-r--r--templates/messu_mailbox.tpl4
6 files changed, 10 insertions, 10 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 3663e95..a487165 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -26,10 +26,10 @@ $tables = array(
global $gBitInstaller;
foreach( array_keys( $tables ) AS $tableName ) {
- $gBitInstaller->registerSchemaTable( MESSAGES_PKG_NAME, $tableName, $tables[$tableName] );
+ $gBitInstaller->registerSchemaTable( MESSU_PKG_NAME, $tableName, $tables[$tableName] );
}
-$gBitInstaller->registerPackageInfo( MESSAGES_PKG_NAME, array(
+$gBitInstaller->registerPackageInfo( MESSU_PKG_NAME, array(
'description' => "An intra-site messaging system for users.",
'license' => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>',
'version' => '0.1',
@@ -39,7 +39,7 @@ $gBitInstaller->registerPackageInfo( MESSAGES_PKG_NAME, array(
// ### Default User Permissions
-$gBitInstaller->registerUserPermissions( MESSAGES_PKG_NAME, array(
+$gBitInstaller->registerUserPermissions( MESSU_PKG_NAME, array(
array('bit_p_messages', 'Can use the messaging system', 'registered', 'messages'),
) );
@@ -50,6 +50,6 @@ $indices = array (
);
// TODO - SPIDERR - following seems to cause time _decrease_ cause bigint on postgres. need more investigation
// 'tiki_blog_posts_created_idx' => array( 'table' => 'tiki_blog_posts', 'cols' => 'created', 'opts' => NULL ),
-$gBitInstaller->registerSchemaIndexes( MESSAGES_PKG_NAME, $indices );
+$gBitInstaller->registerSchemaIndexes( MESSU_PKG_NAME, $indices );
?>
diff --git a/icons/pkg_messu.png b/icons/pkg_messu.png
new file mode 100644
index 0000000..280fc92
--- /dev/null
+++ b/icons/pkg_messu.png
Binary files differ
diff --git a/templates/contact.tpl b/templates/contact.tpl
index 757a142..aea863b 100644
--- a/templates/contact.tpl
+++ b/templates/contact.tpl
@@ -1,5 +1,5 @@
<a class="pagetitle" href="{$gBitLoc.MESSU_PKG_URL}contact.php">{tr}Contact us{/tr}</a><br /><br />
-{if $gBitSystemPrefs.feature_messages eq 'y' and $bit_p_messages eq 'y'}
+{if $gBitSystem->isFeatureActive( 'feature_messages' ) and $bit_p_messages eq 'y'}
{if $message}
{$message}
{/if}
@@ -21,7 +21,7 @@
</td>
</tr>
<tr>
- <td>{tr}Subject{/tr}:</td><td><input type="text" name="subject" value="" size="80" maxlength="255" /></td>
+ <td>{tr}Subject{/tr}:</td><td><input type="text" name="subject" value="" size="50" maxlength="255" /></td>
</tr>
<tr><td>&nbsp;</td>
<td><textarea rows="20" cols="80" name="body"></textarea></td>
diff --git a/templates/messu_broadcast.tpl b/templates/messu_broadcast.tpl
index 6480966..76501ab 100644
--- a/templates/messu_broadcast.tpl
+++ b/templates/messu_broadcast.tpl
@@ -39,7 +39,7 @@
</td>
</tr>
<tr>
- <td><label for="broadcast-subject">{tr}Subject{/tr}:</label></td><td><input type="text" name="subject" id="broadcast-subject" value="{$subject|escape}" size="80" maxlength="255"/></td>
+ <td><label for="broadcast-subject">{tr}Subject{/tr}:</label></td><td><input type="text" name="subject" id="broadcast-subject" value="{$subject|escape}" size="50" maxlength="255"/></td>
</tr>
<tr>
<td><label for="broadcast-body">{tr}Body{/tr}:</label></td><td align="center"><textarea rows="20" cols="80" name="body">{$body|escape}</textarea></td>
diff --git a/templates/messu_compose.tpl b/templates/messu_compose.tpl
index bd7af2f..29e4304 100644
--- a/templates/messu_compose.tpl
+++ b/templates/messu_compose.tpl
@@ -54,7 +54,7 @@
<div class="row">
{formlabel label="Subject" for="subject"}
{forminput}
- <input type="text" name="subject" id="subject" size="52" value="{$subject|escape}" />
+ <input type="text" name="subject" id="subject" size="50" value="{$subject|escape}" />
{/forminput}
</div>
diff --git a/templates/messu_mailbox.tpl b/templates/messu_mailbox.tpl
index bc38f6a..ba86af4 100644
--- a/templates/messu_mailbox.tpl
+++ b/templates/messu_mailbox.tpl
@@ -17,12 +17,12 @@
<input type="hidden" name="priority" value="{$priority|escape}" />
<a class="floaticon" href="{$gBitLoc.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") }
<table class="data">
<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>
- <th>{smartlink ititle="From" isort=username find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
+ <th>{smartlink ititle="From" isort=$displayName find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
<th>{smartlink ititle="Subject" isort=subject find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
<th>{smartlink ititle="Date" isort=date find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
<th>{tr}Size{/tr}</th>