From: <jon...@us...> - 2009-04-24 12:07:19
|
Revision: 18197 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18197&view=rev Author: jonnybradley Date: 2009-04-24 12:07:09 +0000 (Fri, 24 Apr 2009) Log Message: ----------- [FIX] Allow multiple webmail modules (no id's) Modified Paths: -------------- trunk/templates/modules/mod-webmail_inbox.tpl trunk/tiki-webmail_ajax.php Property Changed: ---------------- trunk/tiki-webmail_ajax.php Modified: trunk/templates/modules/mod-webmail_inbox.tpl =================================================================== --- trunk/templates/modules/mod-webmail_inbox.tpl 2009-04-24 11:54:26 UTC (rev 18196) +++ trunk/templates/modules/mod-webmail_inbox.tpl 2009-04-24 12:07:09 UTC (rev 18197) @@ -12,54 +12,56 @@ {/if} {tikimodule error=$module_params.error title=$tpl_module_title name="webmail_inbox" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} {if $prefs.feature_webmail eq 'y'} - <form action="javascript:void(null);" onsubmit="return submitWebmail();" id="webmail_form" name="webmail_form"> +<form action="javascript:void(null);" onsubmit="return submitWebmail();" name="webmail_form"> <div class="mod_webmail_heading"> {if $prefs.feature_ajax} <a title="{tr}Refresh{/tr}" {ajax_href template="modules/mod-webmail_inbox.tpl" htmlelement="mod-webmail_inbox$module_position$module_ord"|escape function="doReloadWebmail"}tiki-webmail_ajax.php{/ajax_href}> - {icon _id='arrow_refresh' id='webmail_refresh_icon'} - {icon _id='img/spinner.gif' id='webmail_refresh_busy' style='display:none'} + {icon _id='arrow_refresh' class='webmail_refresh_icon'} + {icon _id='img/spinner.gif' class='webmail_refresh_busy' style='display:none'} </a> - <span id='webmail_refresh_message' style='display:none'></span> + <span class='webmail_refresh_message' style='display:none'></span> {else} <a title="{tr}Refresh (non-ajax){/tr}" href="{$request_uri}refresh_mail=1">{icon _id='arrow_refresh'}</a> {/if} </div> - {if isset($error)}<span class="error">$error</span>{/if} - {if isset($module_params.date_format)} - {assign var=date_format value=$module_params.date_format} - {else} - {assign var=date_format value="`$prefs.short_date_format` `$prefs.short_time_format`"} - {/if} - {section name=ix loop=$list} - {assign var='date_value' value=$list[ix].timestamp|tiki_date_format:$date_format} - {assign var='subject' value=$list[ix].subject} - {assign var='sender' value=$list[ix].sender} - {assign var='class' value="webmail_item"} - {if $list[ix].isRead}{assign var=class value="$class webmail_read"}{/if} - {if $list[ix].isFlagged}{assign var=class value="$class webmail_flagged"}{/if} - {if $list[ix].isReplied}{assign var=class value="$class webmail_replied"}{/if} - <div class="{$class}"> - {if $nonums != 'n'} - <span class="mod_numbers">{$smarty.section.ix.index_next})</span> - {/if} - <a class="linkmodule tips300 webmail_subject" href="tiki-webmail.php?locSection=read&msgid={$list[ix].msgid}" - title="<span class='webmail_tip_title'><strong>{$subject}</strong><br />{tr}From{/tr}: <em>{$sender.name}</em> <tt>&lt;{$sender.email}&gt;</tt></span>|({$date_value})"> - {if $maxlen > 0}{* default value for maxlen param eq 26 *} - {$subject|truncate:$maxlen:"...":true} - {else} - {$subject} + <div class="mod_webmail_list"> + {if isset($error)}<span class="error">{$error}</span>{/if} + {if isset($module_params.date_format)} + {assign var=date_format value=$module_params.date_format} + {else} + {assign var=date_format value="`$prefs.short_date_format` `$prefs.short_time_format`"} + {/if} + {section name=ix loop=$list} + {assign var='date_value' value=$list[ix].timestamp|tiki_date_format:$date_format} + {assign var='subject' value=$list[ix].subject} + {assign var='sender' value=$list[ix].sender} + {assign var='class' value="webmail_item"} + {if $list[ix].isRead}{assign var=class value="$class webmail_read"}{/if} + {if $list[ix].isFlagged}{assign var=class value="$class webmail_flagged"}{/if} + {if $list[ix].isReplied}{assign var=class value="$class webmail_replied"}{/if} + <div class="{$class} {cycle values="odd,even"}"> + {if $nonums != 'n'} + <span class="mod_numbers">{$smarty.section.ix.index_next})</span> {/if} - </a> - {if $module_params.showDescription eq 'y'} - <div class="description"></div> - {/if} - </div> - {sectionelse} - <p>{tr}No mail found.{/tr}</p> - {/section} + <a class="linkmodule tips300 webmail_subject" href="tiki-webmail.php?locSection=read&msgid={$list[ix].msgid}" + title="<span class='webmail_tip_title'><strong>{$subject}</strong><br />{tr}From{/tr}: <em>{$sender.name}</em> <tt>&lt;{$sender.email}&gt;</tt></span>|({$date_value})"> + {if $maxlen > 0}{* default value for maxlen param eq 26 *} + {$subject|truncate:$maxlen:"...":true} + {else} + {$subject} + {/if} + </a> + {if $module_params.showDescription eq 'y'} + <div class="description"></div> + {/if} + </div> + {sectionelse} + <p>{tr}No mail found.{/tr}</p> + {/section} + </div> </form> {else} - Error: {$error} + <span class="error">{$error}</span> {/if} {/tikimodule} {/strip} \ No newline at end of file Modified: trunk/tiki-webmail_ajax.php =================================================================== --- trunk/tiki-webmail_ajax.php 2009-04-24 11:54:26 UTC (rev 18196) +++ trunk/tiki-webmail_ajax.php 2009-04-24 12:07:09 UTC (rev 18197) @@ -1,6 +1,6 @@ <?php -// $Id: $ +// $Id$ // Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // All Rights Reserved. See copyright.txt for details and a complete list of authors. @@ -15,18 +15,22 @@ // set up xajax javascript $module_position = $module_params['module_position']; $module_ord = $module_params['module_ord']; + $divId = "mod-webmail_inbox$module_position$module_ord"; $msg = tr('Contacting mail server'); + $headerlib->add_js( <<<JS function doRefreshWebmail(reload) { - xajax.config.requestURI = "tiki-webmail_ajax.php"; // tell it where to send the request - xajax.config.statusMessages = true; - xajax.config.waitCursor = false; - xajax_refreshWebmail("mod-webmail_inbox$module_position$module_ord", reload); - \$jq('#webmail_refresh_icon').hide(); - \$jq('#webmail_refresh_busy').show(); - \$jq('#webmail_refresh_message').text('$msg'); - \$jq('#webmail_refresh_message').show(); + if (\$jq(".box-webmail_inbox .box-data").css("display") != "none") { + xajax.config.requestURI = "tiki-webmail_ajax.php"; // tell it where to send the request + xajax.config.statusMessages = true; + xajax.config.waitCursor = false; + xajax_refreshWebmail("$divId", reload); + \$jq('#$divId .webmail_refresh_icon').hide(); + \$jq('#$divId .webmail_refresh_busy').show(); + \$jq('#$divId .webmail_refresh_message').text('$msg'); + \$jq('#$divId .webmail_refresh_message').show(); + } if (typeof autoRefresh != 'undefined') { setTimeout("doRefreshWebmail()", autoRefresh); } @@ -35,17 +39,19 @@ doRefreshWebmail(true); } function initWebmail() { - \$jq('#webmail_refresh_busy').hide(); - \$jq('#webmail_refresh_icon').show(); + \$jq('#$divId .webmail_refresh_busy').hide(); + \$jq('#$divId .webmail_refresh_icon').show(); + \$jq('#$divId .mod_webmail_list').show("slow"); if (jqueryTiki.tooltips) { - \$jq('a.tips').cluetip({splitTitle: '|', showTitle: false, width: '150px', cluezIndex: 400}); + //\$jq('a.tips').cluetip({splitTitle: '|', showTitle: false, width: '150px', cluezIndex: 400}); \$jq('a.tips300').cluetip({splitTitle: '|', showTitle: false, width: '300px', cluezIndex: 400}); - \$jq('a.titletips').cluetip({splitTitle: '|', cluezIndex: 400}); + //\$jq('a.titletips').cluetip({splitTitle: '|', cluezIndex: 400}); } } \$jq('document').ready( function() { - \$jq('#webmail_refresh_busy').hide(); - \$jq('#webmail_refresh_message').hide(); + \$jq('#$divId .webmail_refresh_busy').hide(); + \$jq('#$divId .webmail_refresh_message').hide(); + \$jq('#$divId .mod_webmail_list').hide(); }); JS ); @@ -71,12 +77,4 @@ $ajaxlib->registerFunction('refreshWebmail'); $ajaxlib->processRequests(); -//if (jqueryTiki.tooltips) { // apply "cluetips" to all .tips class anchors -//\jq('#$destDiv div').load( function = { -//alert("qwe tips loaded"); -// \$jq('a.tips').cluetip({splitTitle: '|', showTitle: false, width: '150px', cluezIndex: 400}); -// \$jq('a.titletips').cluetip({splitTitle: '|', cluezIndex: 400}); -// }); -//} - ?> \ No newline at end of file Property changes on: trunk/tiki-webmail_ajax.php ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |