[pLog-svn] r2074 - in plugins/trunk/mailcentre: class/action templates

oscar at devel.plogworld.net oscar at devel.plogworld.net
Tue May 24 18:15:30 GMT 2005


Author: oscar
Date: 2005-05-24 18:15:29 +0000 (Tue, 24 May 2005)
New Revision: 2074

Modified:
   plugins/trunk/mailcentre/class/action/mailcentresendmessage.class.php
   plugins/trunk/mailcentre/templates/sendmail.template
   plugins/trunk/mailcentre/templates/userselector.template
Log:
removed some debug stuff and fixed some javascript issues


Modified: plugins/trunk/mailcentre/class/action/mailcentresendmessage.class.php
===================================================================
--- plugins/trunk/mailcentre/class/action/mailcentresendmessage.class.php	2005-05-24 17:05:36 UTC (rev 2073)
+++ plugins/trunk/mailcentre/class/action/mailcentresendmessage.class.php	2005-05-24 18:15:29 UTC (rev 2074)
@@ -35,8 +35,6 @@
 		      $users = new Users();
 		      $userList = null;
 		      
-		      print("expanding $recipientId...<br/>");
-		      
 		      switch( strtoupper($recipientId)) {
 		          case "[ALL]":
 		              $userList = $users->getAllUsers();

Modified: plugins/trunk/mailcentre/templates/sendmail.template
===================================================================
--- plugins/trunk/mailcentre/templates/sendmail.template	2005-05-24 17:05:36 UTC (rev 2073)
+++ plugins/trunk/mailcentre/templates/sendmail.template	2005-05-24 18:15:29 UTC (rev 2074)
@@ -28,29 +28,32 @@
    {include file="$admintemplatepath/validate.template" field=messageSubject message=$locale->tr("mailcentre_error_empty_subject")}
   </div>
   
-  <div class="field">
+  <div class="field">
+   <a name="to"></a>
    <label for="messageRecipient">{$locale->tr("to")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("mailcentre_to_help")}</div>   
    <input type="text" name="messageRecipient" style="width:50%" value="{$messageRecipient}" {if !$editable}readonly="readonly"{/if} />
-   {if $editable}<a href="javascript:window.open('?op=mailcentreUserSelector&amp;dest=1','UserSelector','scrollbars=yes,resizable=yes,toolbar=no,height=500,width=400');">{$locale->tr("add_recipient")}</a>{/if}
+   {if $editable}<a href="#to" onclick="window.open('?op=mailcentreUserSelector&amp;dest=1','UserSelector','scrollbars=yes,resizable=yes,toolbar=no,height=500,width=400');">{$locale->tr("add_recipient")}</a>{/if}
    {include file="$admintemplatepath/validate.template" field=messageRecipient message=$locale->tr("mailcentre_error_empty_recipient")}
   </div>
   
-  <div class="field">
+  <div class="field">
+   <a name="cc"></a>
    <label for="messageCc">{$locale->tr("cc")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("mailcentre_cc_help")}</div>   
    <input type="text" name="messageCc" style="width:50%" value="{$messageCc}" {if !$editable}readonly="readonly"{/if} />
-   {if $editable}<a href="javascript:window.open('?op=mailcentreUserSelector&amp;dest=2','UserSelector','scrollbars=yes,resizable=yes,toolbar=no,height=500,width=400');">{$locale->tr("add_recipient")}</a>{/if}
+   {if $editable}<a href="#cc" onclick="window.open('?op=mailcentreUserSelector&amp;dest=2','UserSelector','scrollbars=yes,resizable=yes,toolbar=no,height=500,width=400');">{$locale->tr("add_recipient")}</a>{/if}
   </div>
 
-  <div class="field">
+  <div class="field">
+   <a name="bcc"></a>
    <label for="messageBcc">{$locale->tr("bcc")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("mailcentre_bcc_help")}</div>   
    <input type="text" name="messageBcc" style="width:50%" value="{$messageBcc}" {if !$editable}readonly="readonly"{/if} />
-   {if $editable}<a href="javascript:window.open('?op=mailcentreUserSelector&amp;dest=3','UserSelector','scrollbars=yes,resizable=yes,toolbar=no,height=500,width=400');">{$locale->tr("add_recipient")}</a>{/if}
+   {if $editable}<a href="#bcc" onclick="window.open('?op=mailcentreUserSelector&amp;dest=3','UserSelector','scrollbars=yes,resizable=yes,toolbar=no,height=500,width=400');">{$locale->tr("add_recipient")}</a>{/if}
   </div>
   
   

Modified: plugins/trunk/mailcentre/templates/userselector.template
===================================================================
--- plugins/trunk/mailcentre/templates/userselector.template	2005-05-24 17:05:36 UTC (rev 2073)
+++ plugins/trunk/mailcentre/templates/userselector.template	2005-05-24 18:15:29 UTC (rev 2074)
@@ -22,8 +22,6 @@
      field.value+=','+address;
     else
      field.value+=address;
-     
-    return true; 
    }
    {/literal}
   </script>
@@ -119,7 +117,7 @@
                             </a>
                         </td>
                         <td>
-                            <a href="mailto:{$siteuser->getEmail()}">
+                            <a href="javascript:setEmailAddress('{$siteuser->getEmail()}','{$dest}');">
                             {$siteuser->getEmail()}
                             </a>
                         </td>




More information about the pLog-svn mailing list