[Vtigercrm-commits] [vtiger-commits] r11003 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Emails/ modules/Users/language/ modules/Webmails/

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Wed May 23 17:39:33 EDT 2007


Author: richie
Date: Wed May 23 15:39:16 2007
New Revision: 11003

Log:
 Email module UI changed and no of mails displayed in Webmail header and unnecessary things are removed -sri

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/EmailDetails.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
    vtigercrm/branches/5.0.3/modules/Emails/ListView.php
    vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
    vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
    vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php
    vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/AddMailAccount.tpl Wed May 23 15:39:16 2007
@@ -115,14 +115,14 @@
 	   </td>	
            <td class="dvtCellInfo">&nbsp;</td>
        </tr>
-       <tr>
+       <!--<tr>
            <td class="dvtCellLabel" align="right">{$MOD.LBL_INT_MAILER}</td>
            <td class="dvtCellInfo">
 		<input type="radio" name="int_mailer" value="1" {$INT_MAILER_USE} />&nbsp;{$MOD.LBL_INT_MAILER_USE}
 		<input type="radio" name="int_mailer" value="0" {$INT_MAILER_NOUSE} />&nbsp;{$MOD.LBL_INT_MAILER_NOUSE}
 	   </td>	
            <td class="dvtCellInfo">&nbsp;</td>
-       </tr>
+       </tr>-->
        <tr>
            <td class="dvtCellLabel" align="right">{$MOD.LBL_REFRESH_TIMEOUT}</td>
            <td class="dvtCellInfo">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EmailContents.tpl Wed May 23 15:39:16 2007
@@ -10,12 +10,12 @@
  ********************************************************************************/
 -->*}
 <div id="rssScroll">
-	<table class="rssTable" cellspacing="0" cellpadding="0" width=100%>
+	<table cellspacing="0" cellpadding="0" width=100%>
         <tr>
-			<th width="5%"><input type="checkbox"  name="selectall" onClick=toggleSelect(this.checked,"selected_id")></th>
-            <th width="65%">{$LISTHEADER.0}</th>
-            <th width="15%">{$LISTHEADER.1}</th>
-            <th width="15%">{$LISTHEADER.2}</th>
+			<th width="5%" class='tableHeadBg'><input type="checkbox"  name="selectall" onClick=toggleSelect(this.checked,"selected_id")></th>
+            <th width="65%" class='tableHeadBg'>{$LISTHEADER.0}</th>
+            <th width="15%" class='tableHeadBg'>{$LISTHEADER.1}</th>
+            <th width="15%" class='tableHeadBg'>{$LISTHEADER.2}</th>
         </tr>
 		{if $LISTENTITY != NULL}
 			{foreach key=id item=row from=$LISTENTITY}
@@ -29,7 +29,7 @@
 			        </tr>
 			{/foreach}
 		{else}
-			<tr><td align="center"><b>{$MOD.LBL_NO_RECORDS}</b></td></tr>
+			<tr><td>&nbsp;</td><td align="center" nowrap><b>{$MOD.LBL_NO_RECORDS}</b></td></tr>
 		{/if}
     </table>
 </div>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EmailDetails.tpl Wed May 23 15:39:16 2007
@@ -40,11 +40,11 @@
 	</td>
 </tr>
 <tr>
-	<td height="250" bgcolor="#FFFFFF" valign="top" style="padding-top:10px;">
+	<td height="250" bgcolor="#FFFFFF" valign="top" class="MatrixLayer2">
 	{foreach item=row from=$BLOCKS}	
 	{foreach item=elements from=$row}	
 		{if $elements.fldname eq 'subject'}
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<table class="tableHeadBg" width="100%" border="0" cellpadding="0" cellspacing="0">
 	{if $EMAIL_FLAG neq 'WEBMAIL'}
 	<tr><td width="20%" align="right" valign="top"><b>{$MOD.LBL_FROM}</b></td><td width="2%" align="left">&nbsp;</td><td align="left">{$FROM_MAIL}&nbsp;</td></tr>
 	<tr><td width="20%" align="right" valign="top"><b>{$MOD.LBL_TO}</b></td><td width="2%" align="left">&nbsp;</td><td align="left">{$TO_MAIL}&nbsp;</td></tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Emails.tpl Wed May 23 15:39:16 2007
@@ -68,6 +68,7 @@
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Emails.js"></script>
+<link rel="stylesheet" type="text/css" href="themes/{$theme}/webmail.css">
 <div id="mailconfchk" class="small" style="position:absolute;display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><b>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Users&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</b></font></div>
 <!-- Shadow starts here -->
 <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
@@ -118,42 +119,44 @@
 							<!-- Columns -->
 							<tr>
 							<td width="18%" class="big mailSubHeader" ><b>{$MOD.LBL_EMAIL_FOLDERS}</b></td>
+							<td>&nbsp;</td>
 							<td width="82%" class="big mailSubHeader" align="left"><span id="mail_fldrname"><b>{$MOD.LBL_ALLMAILS}</b></span></td>
 							</tr>
 							
 							<tr>
-								<td rowspan="6" class="hdrNameBg" valign="top" bgcolor="#FFFFFF" style="padding:5px; " align="left" >
+								<td rowspan="6" class="MatrixLayer1" valign="top" bgcolor="#FFFFFF" style="padding:5px; " align="left" >
 								<!-- Mailbox Tree -->
 								<!-- Inbox -->
-								<img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" />&nbsp;<b class="txtGreen">{$MOD.LBL_INBOX}</b>
+								<img src="themes/images/folder_.gif" align="absmiddle" />&nbsp;<b class="txtGreen">{$MOD.LBL_INBOX}</b>
 								<ul style="list-style-type:none;margin-left:10px;margin-top:5px;padding:2px">
-									<li><img src="{$IMAGE_PATH}emailInFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/folder.gif" align="absmiddle" />&nbsp;&nbsp;
 										<a href="javascript:;" onClick="ShowFolders(6)" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a>&nbsp;<b></b>
 									</li>
-									<li><img src="{$IMAGE_PATH}emailInFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/mymail.gif" align="absmiddle" />&nbsp;&nbsp;
 									<a href="javascript:;" onClick="gotoWebmail();" class="webMnu">{$MOD.LBL_MY_MAILS}</a>&nbsp;<b></b>
 									</li>
 								</ul>
 								<!-- Sent mail -->
-								<img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" />&nbsp;<b class="txtGreen">{$MOD.LBL_SENT_MAILS}</b>
+								<img src="themes/images/sentmail.gif" align="absmiddle" />&nbsp;<b class="txtGreen">{$MOD.LBL_SENT_MAILS}</b>
 								<ul style="list-style-type:none;margin-left:10px;margin-top:5px;padding:2px">
-									<li><img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/folder1.gif" align="absmiddle" />&nbsp;&nbsp;
 									<a href="javascript:;" onClick="ShowFolders(1)" class="webMnu">{$MOD.LBL_ALLMAILS}</a>&nbsp;<b></b>
-									<li><img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/folder1.gif" align="absmiddle" />&nbsp;&nbsp;
 									<a href="javascript:;" onClick="ShowFolders(2)" class="webMnu">{$MOD.LBL_TO_CONTACTS}</a>&nbsp;<b></b>
 									</li>
-									<li><img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/folder1.gif" align="absmiddle" />&nbsp;&nbsp;
 									<a href="javascript:;" onClick="ShowFolders(3)" class="webMnu">{$MOD.LBL_TO_ACCOUNTS}</a>&nbsp;<b></b>
 									</li>
-									<li><img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/folder1.gif" align="absmiddle" />&nbsp;&nbsp;
 									<a href="javascript:;" onClick="ShowFolders(4)" class="webMnu">{$MOD.LBL_TO_LEADS}</a>&nbsp;
 									</li>
-									<li><img src="{$IMAGE_PATH}emailOutFolder.gif" align="absmiddle" />&nbsp;&nbsp;
+									<li><img src="themes/images/folder1.gif" align="absmiddle" />&nbsp;&nbsp;
 									<a href="javascript:;" onClick="ShowFolders(5)" class="webMnu">{$MOD.LBL_TO_USERS}</a>&nbsp;
 									</li>
 								</ul>
 								</td>
 								<!-- All mails pane -->
+								<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
 								<td class="hdrNameBg">
 									<!-- Command Buttons and Search Email -->
 									<table width="100%"  border="0" cellspacing="0" cellpadding="2">
@@ -180,6 +183,7 @@
 							</tr>
 							<!-- Mail Subject Headers list -->
 							<tr>
+								<td>&nbsp;</td>
 								<td align="left">
 									<div id="email_con">
 									{include file="EmailContents.tpl"}
@@ -188,8 +192,9 @@
 							</tr>
 							
 							<tr>
+								<td>&nbsp;</td>
 								<td valign="top">
-									<div id="EmailDetails" > 
+									<div id="EmailDetails"> 
 									{include file="EmailDetails.tpl"}
 									</div>
 								</td>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListViewAjax.tpl Wed May 23 15:39:16 2007
@@ -1,6 +1,14 @@
 				<!-- Table to display the mails list -  Starts -->
 				<div id="navTemp" style="display:none">
-					<span style="float:left">{$ACCOUNT} &gt; {$MAILBOX}</span> <span style="float:right">{$NAVIGATION}</span>	
+					<span style="float:left">{$ACCOUNT} &gt; {$MAILBOX}
+					{if $NUM_EMAILS neq 0}
+                                                 {if $NUM_EMAILS neq 1}
+                                                        ({$NUM_EMAILS} Messages)
+                                                 {else}
+                                                        ({$NUM_EMAILS} Message)
+                                                 {/if}
+                                         {/if}
+					</span> <span style="float:right">{$NAVIGATION}</span>	
 				</div>
 				<span id="{$MAILBOX}_tempcount" style="display:none" >{$UNREAD_COUNT}</span>
 				<div id="temp_boxlist" style="display:none">

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Wed May 23 15:39:16 2007
@@ -94,13 +94,13 @@
 								<a href="index.php?module=Emails&action=ListView&folderid=5&parenttab=My Home Page" class="small">{$MOD.LBL_TO_USERS}</a>&nbsp;
 							</li>
 						</ul><br />
-						<img src="themes/images/webmail_trash.gif" align="absmiddle" />&nbsp;<b class="txtGreen">{$MOD.LBL_TRASH}</b>
+						<!--<img src="themes/images/webmail_trash.gif" align="absmiddle" />&nbsp;<b class="txtGreen">{$MOD.LBL_TRASH}</b>
 						<ul style="list-style-type:none;">
 							<li>
 								<img src="themes/images/folder.gif" align="absmiddle" />&nbsp;&nbsp;
 								<a href="#" class="small">{$MOD.LBL_JUNK_MAILS}</a>&nbsp;<b></b>
 							</li>
-						</ul>
+						</ul>-->
 
 						</td>
 						</tr>
@@ -110,7 +110,14 @@
 					        <td rowspan=3>
 						 <table border=0 width="100%" cellspacing=0 cellspacing=0 class="MatrixLayer1">
 					 	 <tr>
-							<td width="79%" class="big mailSubHeader"><div id="nav"><span style="float:left">{$ACCOUNT} &gt; {$MAILBOX}</span> <span style="float:right">{$NAVIGATION}</span></div></td>
+							<td width="79%" class="big mailSubHeader"><div id="nav"><span style="float:left">{$ACCOUNT} &gt; {$MAILBOX} {if $NUM_EMAILS neq 0}
+						 {if $NUM_EMAILS neq 1}
+							({$NUM_EMAILS} Messages)
+						 {else}
+							({$NUM_EMAILS} Message)
+						 {/if}
+					 {/if}
+						</span> <span style="float:right">{$NAVIGATION}</span></div></td>
 						 </tr>
 						 <tr>	
 							<td class="hdrNameBg" style="height:30px;">

Modified: vtigercrm/branches/5.0.3/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/ListView.php Wed May 23 15:39:16 2007
@@ -180,6 +180,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("theme", $theme);
 if($_REQUEST['ajax'] != '')
 	$smarty->display("EmailContents.tpl");
 else

Modified: vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/language/en_us.lang.php Wed May 23 15:39:16 2007
@@ -616,7 +616,7 @@
 'LBL_IMAP4'=>'IMAP4',
 'LBL_POP'=>'POP',
 'LBL_IMAP'=>'IMAP',
-'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required<br>Items marked with <font color="red">* *</font> are not fully supported',
+'LBL_MAIL_DISCLAIM'=>'Items marked with <font color="red">*</font> are required',
 'LBL_SSL_OPTIONS'=>'SSL Options',
 'LBL_TLS'=>'TLS',
 'LBL_NO_TLS'=>'No TLS',

Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Wed May 23 15:39:16 2007
@@ -394,25 +394,27 @@
 			if(!isset($_SESSION["folder_image_path"]))
                                 $_SESSION["folder_image_path"] = $image_path;
 			$_SESSION["mailboxes"][$tmpval] = $unread_msgs;
-
-			if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
-			$folders .= '<li style="padding-left:0px;"><img src="themes/images/'.$img.'"align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
-			if($unread_msgs > 0)
-				$folders .= '(<span id="'.$tmpval.'_unread">'.$unread_msgs.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
-			else
-				$folders .='</span></li>';
+			if($tmpval[0] != "."){
+				if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
+				$folders .= '<li style="padding-left:0px;"><img src="themes/images/'.$img.'"align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
+				if($unread_msgs > 0)
+					$folders .= '(<span id="'.$tmpval.'_unread">'.$unread_msgs.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
+				else
+					$folders .='</span></li>';
+			}
 
 		} else {
 			$box = imap_status($MailBox->mbox, "{".$MailBox->imapServerAddress."}".$tmpval, SA_ALL);
 			$_SESSION["mailboxes"][$tmpval] = $box->unseen;
-
-			if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
-			$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
-			$folders .= '<li ><img src="themes/images/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
-			if($box->unseen > 0)
-				$folders .= '(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span>)</span></li>';
-			else
-				$folders .='</span></li>';
+			if($tmpval[0] != ".") {
+				if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
+				$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
+				$folders .= '<li ><img src="themes/images/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
+				if($box->unseen > 0)
+					$folders .= '(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span>)</span></li>';
+				else
+					$folders .='</span></li>';
+			}
 		}
 	}
         $boxes .= '</select>';

Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Wed May 23 15:39:16 2007
@@ -106,12 +106,12 @@
 		$from_list = str_replace(">","",$from);
 		$cc = str_replace("<",":",$hdr->ccaddress);
 		$cc_list = str_replace(">","",$cc);
-		$js_array .= "webmail2[".$val->msgno."] = new Array();";
+		/*$js_array .= "webmail2[".$val->msgno."] = new Array();";
 		$js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($from_list)."';";
 		$js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($to_list)."';";
 		$js_array .= "webmail2[".$val->msgno."]['subject'] = '".addslashes($val->subject)."';";
 		$js_array .= "webmail2[".$val->msgno."]['date'] = '".addslashes($val->date)."';";
-		$js_array .= "webmail2[".$val->msgno."]['cc'] = '".$cc_list."';";
+		$js_array .= "webmail2[".$val->msgno."]['cc'] = '".$cc_list."';";*/
 	}
 }
 $search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM");
@@ -206,31 +206,35 @@
 				$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
 		 */
 			$_SESSION["mailboxes"][$tmpval] = $new_msgs;
-			
-			if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
-			$folders .= '<li style="padding-left:0px;"><img src="themes/images/'.$img.'"align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
-			if($unread_msgs > 0)
-				$folders .= '(<span id="'.$tmpval.'_unread">'.$unread_msgs.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
-			else
-				$folders .='</span></li>';
+			if($tmpval[0] != ".")
+			{
+				if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
+				$folders .= '<li style="padding-left:0px;"><img src="themes/images/'.$img.'"align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
+				if($unread_msgs > 0)
+					$folders .= '(<span id="'.$tmpval.'_unread">'.$unread_msgs.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
+				else
+					$folders .='</span></li>';
+			}
 
 		} else {
 			$box = imap_status($MailBox->mbox, "{".$MailBox->imapServerAddress."}".$tmpval, SA_ALL);
 			$_SESSION["mailboxes"][$tmpval] = $box->unseen;
-
-			if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
-			$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
-			$folders .= '<li ><img src="themes/images/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
-			if($box->unseen > 0)
-				$folders .= '(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span>)</span></li>';
-			else
-				$folders .='</span></li>';
+			if($tmpval[0] != ".")
+			{
+				if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
+				$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
+				$folders .= '<li ><img src="themes/images/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="small">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">';
+				if($box->unseen > 0)
+					$folders .= '(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span>)</span></li>';
+				else
+					$folders .='</span></li>';
+			}
 		}
 	}
         $boxes .= '</select>';
 }
 imap_close($MailBox->mbox);
-echo '<div id="js_arr" style="display:none">'.$js_array.'</div>';
+//echo '<div id="js_arr" style="display:none">'.$js_array.'</div>';
 $smarty = new vtigerCRM_Smarty;
 //$smarty->assign("USERID", $current_user->id);
 $smarty->assign("MOD", $mod_strings);

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Wed May 23 15:39:16 2007
@@ -56,9 +56,9 @@
 
         // Attachment Icons
         if($msg_ob->has_attachments)
-                $flags.='<a href="javascript:;" onclick="displayAttachments('.$num.');"><img src="modules/Webmails/images/stock_attach.png" border="0" width="14px" height="14" title="Attachment"></a>&nbsp;';
+                $flags.='<a href="javascript:;" onclick="displayAttachments('.$num.');"><img src="themes/images/attachments.gif" border="0" width="8px" height="13px" title="Attachment"></a>&nbsp;';
         else
-                $flags.='<img src="themes/images/blank.gif" border="0" width="14px" height="14" alt="">&nbsp;';
+                $flags.='<img src="themes/images/blank.gif" border="0" width="8px" height="14" alt="">&nbsp;';
 
 
 
@@ -77,7 +77,7 @@
 	}
 	else
 	{
-                $flags.='<a href="javascript:;" onclick="OpenComposer(\''.$num.'\',\'reply\');"><img src="themes/images/openmail.jpg" border="0" width="12" height="12" title="Read" ></a>&nbsp;';
+                $flags.='<a href="javascript:;" onclick="OpenComposer(\''.$num.'\',\'reply\');"><img src="themes/images/openmail.gif" border="0" width="12" height="12" title="Read" ></a>&nbsp;';
 	}
 
         // Set IMAP flag





More information about the vtigercrm-commits mailing list