[Vtigercrm-commits] [vtiger-commits] r6568 - in /vtigercrm/trunk: ./ Smarty/templates/ include/ListView/ include/js/ include/utils/ modules/Users/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Sat May 27 20:23:44 EDT 2006
Author: don
Date: Sat May 27 18:23:27 2006
New Revision: 6568
Log:
Alphabetical search integrated and issues in Popup has been fixed
Modified:
vtigercrm/trunk/Popup.php
vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
vtigercrm/trunk/Smarty/templates/Emails.tpl
vtigercrm/trunk/Smarty/templates/Popup.tpl
vtigercrm/trunk/Smarty/templates/PopupContents.tpl
vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
vtigercrm/trunk/Smarty/templates/UserEditView.tpl
vtigercrm/trunk/include/ListView/ListView.php
vtigercrm/trunk/include/js/Inventory.js
vtigercrm/trunk/include/utils/ListViewUtils.php
vtigercrm/trunk/modules/Users/Popup_picker.html
vtigercrm/trunk/modules/Users/Popup_picker_emails.html
Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Sat May 27 18:23:27 2006
@@ -150,319 +150,22 @@
$smarty->assign("SINGLE_MOD",'PriceBook');
if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+ if(isset($_REQUEST['fldname']) && $_REQUEST['fldname'] !='')
+ {
+ $smarty->assign("FIELDNAME",$_REQUEST['fldname']);
+ $url_string .="&fldname=".$_REQUEST['fldname'];
+ }
+ if(isset($_REQUEST['productid']) && $_REQUEST['productid'] !='')
+ {
+ $smarty->assign("PRODUCTID",$_REQUEST['productid']);
+ $url_string .="&productid=".$_REQUEST['productid'];
+ }
$alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","","");
break;
}
-/*
-if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
-{
- $url_string .="&query=true";
- if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only'];
- if (isset($_REQUEST['assigned_user_id'])) $assigned_user_id = $_REQUEST['assigned_user_id'];
-
-
- $where_clauses = Array();
- if($currentModule == 'Contacts')
- {
- if (isset($_REQUEST['firstname'])) $firstname = $_REQUEST['firstname'];
- if (isset($_REQUEST['lastname'])) $lastname = $_REQUEST['lastname'];
- if (isset($_REQUEST['title'])) $title = $_REQUEST['title'];
-
- if(isset($lastname) && $lastname != "") {
- array_push($where_clauses, "contactdetails.lastname like ".$adb->quote($lastname.'%')."");
- $url_string .= "&lastname=".$lastname;
- }
- if(isset($firstname) && $firstname != "") {
- array_push($where_clauses, "contactdetails.firstname like ".$adb->quote($firstname.'%')."");
- $url_string .= "&firstname=".$firstname;
- }
- if(isset($title) && $title != "") {
- array_push($where_clauses, "contactdetails.title like ".$adb->quote("%".$title.'%')."");
- $url_string .= "&title=".$title;
- }
- if(isset($current_user_only) && $current_user_only != "") {
- array_push($where_clauses, "crmentity.smownerid='$current_user->id'");
- $url_string .= "¤t_user_only=on";
- }
-
- }
- if($currentModule == 'Accounts')
- {
- if (isset($_REQUEST['name'])) $name = $_REQUEST['name'];
- if (isset($_REQUEST['website'])) $website = $_REQUEST['website'];
- if (isset($_REQUEST['phone'])) $phone = $_REQUEST['phone'];
- if (isset($_REQUEST['address_city'])) $address_city = $_REQUEST['address_city'];
-
- if(isset($name) && $name != ""){
- array_push($where_clauses, "account.accountname like ".$adb->quote($name."%"));
- $url_string .= "&name=".$name;
- }
- if(isset($website) && $website != "") array_push($where_clauses, "account.website like ".$adb->quote("%".$website."%"));
- if(isset($phone) && $phone != "") array_push($where_clauses, "(account.phone like ".$adb->quote("%".$phone."%")." OR account.otherphone like ".$adb->quote("%".$phone."%")." OR account.fax like ".$adb->quote("%".$phone."%").")");
- if(isset($address_city) && $address_city != ""){
- array_push($where_clauses, "(accountbillads.city like ".$adb->quote("%".$address_city."%")." OR accountshipads.city like ".$adb->quote($address_city."%").")");
- $url_string .= "&address_city=".$address_city;
- }
- if(isset($ownership) && $ownership != "") array_push($where_clauses, "account.ownership like ".$adb->quote($ownership."%"));
- if(isset($current_user_only) && $current_user_only != ""){
- array_push($where_clauses, "crmentity.smownerid='$current_user->id'");
- $url_string .= "¤t_user_only=".$current_user_only;
- }
- }
- if($currentModule == 'Leads')
- {
- if (isset($_REQUEST['first_name'])) $first_name = $_REQUEST['first_name'];
- if (isset($_REQUEST['last_name'])) $last_name = $_REQUEST['last_name'];
- if (isset($_REQUEST['company'])) $company = $_REQUEST['company'];
- if(isset($last_name) && $last_name != ""){
- array_push($where_clauses, "leaddetails.lastname like '$last_name%'");
- $url_string .= "&last_name=".$last_name;
- }
- if(isset($first_name) && $first_name != ""){
- array_push($where_clauses, "leaddetails.firstname like '%$first_name%'");
- $url_string .= "&first_name=".$first_name;
- }
- if(isset($company) && $company != ""){
- array_push($where_clauses, "leaddetails.company like '%$company%'");
- $url_string .= "&company=".$company;
- }
- if(isset($current_user_only) && $current_user_only != ""){
- array_push($where_clauses, "crmentity.smownerid='$current_user->id'");
- $url_string .= "¤t_user_only=".$current_user_only;
- }
- if(isset($assigned_user_id) && $assigned_user_id != "") array_push($where_clauses, "crmentity.smownerid = '$assigned_user_id'");
-
- }
- if($currentModule == 'Potentials')
- {
- if (isset($_REQUEST['name'])) $name = $_REQUEST['name'];
- if (isset($_REQUEST['account_name'])) $accountname = $_REQUEST['account_name'];
-
- if(isset($name) && $name != "") {
- array_push($where_clauses, "potential.potentialname like ".$adb->quote($name.'%')."");
- $url_string .= "&name=".$name;
- }
- if(isset($accountname) && $accountname != "") {
- array_push($where_clauses, "account.accountname like ".$adb->quote('%'.$accountname.'%')."");
- $url_string .= "&account_name=".$accountname;
- }
- if(isset($current_user_only) && $current_user_only != "") {
- array_push($where_clauses, "crmentity.smcreator='$current_user->id'");
- $url_string .= "¤t_user_only=".$current_user_only;
- }
- if(isset($assigned_user_id) && $assigned_user_id != "")
- array_push($where_clauses, "crmentity.smownerid = '$assigned_user_id'");
- }
- if($currentModule == 'Quotes')
- {
- if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject'];
- if (isset($_REQUEST['potentialname'])) $potentialname = $_REQUEST['potentialname'];
- if (isset($_REQUEST['quotestage'])) $quotestage = $_REQUEST['quotestage'];
- if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname'];
- if(isset($subject) && $subject != "")
- {
- array_push($where_clauses, "quotes.subject like ".$adb->quote($subject."%"));
- $url_string .= "&subject=".$subject;
- }
- if(isset($accountname) && $accountname != "")
- {
- array_push($where_clauses, "account.accountname like ".$adb->quote("%".$accountname."%"));
- $url_string .= "&accountname=".$accountname;
- }
-
- if(isset($quotestage) && $quotestage != "")
- {
- array_push($where_clauses, "quotes.quotestage like ".$adb->quote("%".$quotestage."%"));
- $url_string .= ""estage=".$quotestage;
- }
-
-
- }
- if($currentModule == 'Invoice')
- {
- if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject'];
- if (isset($_REQUEST['salesorder'])) $salesorder = $_REQUEST['salesorder'];
-
- if ($order_by !='') $smarty->assign("ORDER_BY", $order_by);
- if ($sorder !='') $smarty->assign("SORDER", $sorder);
- if (isset($subject) && $subject !='')
- {
- $search_query .= " and invoice.subject like '".$subject."%'";
- $url_string .= "&subject=".$subject;
- $smarty->assign("SUBJECT", $subject);
- }
-
- if (isset($salesorder) && $salesorder !='')
- {
- $search_query .= " and salesorder.subject like '%".$salesorder."%'";
- $url_string .= "&salesorder=".$salesorder;
- $smarty->assign("SALESORDER", $salesorder);
- }
-
- }
- if($currentModule == 'Products')
- {
- if (isset($_REQUEST['productname'])) $productname = $_REQUEST['productname'];
- if (isset($_REQUEST['productcode'])) $productcode = $_REQUEST['productcode'];
- if (isset($_REQUEST['unitprice'])) $unitprice = $_REQUEST['unitprice'];
-
- if ($order_by !='') $smarty->assign("ORDER_BY", $order_by);
- if ($sorder !='') $smarty->assign("SORDER", $sorder);
-
-
- if (isset($productname) && $productname !='')
- {
- $search_query .= " and productname like '".$productname."%'";
- $url_string .= "&productname=".$productname;
- $smarty->assign("PRODUCT_NAME", $productname);
- }
-
- if (isset($productcode) && $productcode !='')
- {
- $search_query .= " and productcode like '%".$productcode."%'";
- $url_string .= "&productcode=".$productcode;
- $smarty->assign("PRODUCT_CODE", $productcode);
- }
- if (isset($unitprice) && $unitprice !='')
- {
- $search_query .= " and unit_price like '%".$unitprice."%'";
- $url_string .= "&unitprice=".$unitprice;
- $smarty->assign("UNITPRICE", $unitprice);
- }
-
-
- }
- if($currentModule == 'PurchaseOrder')
- {
- if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject'];
- if (isset($_REQUEST['vendorname'])) $vendorname = $_REQUEST['vendorname'];
- if (isset($_REQUEST['trackingno'])) $trackingno = $_REQUEST['trackingno'];
-
- if ($order_by !='') $smarty->assign("ORDER_BY", $order_by);
- if ($sorder !='') $smarty->assign("SORDER", $sorder);
-
- $where_clauses = Array();
- if(isset($subject) && $subject != '')
- {
- array_push($where_clauses, "purchaseorder.subject like ".$adb->quote($subject."%"));
- $url_string .= "&subject=".$subject;
-
- }
- if(isset($vendorname) && $vendorname != "")
- {
- array_push($where_clauses, "vendor.vendorname like ".$adb->quote("%".$vendorname."%"));
- $url_string .= "&vendorname=".$vendorname;
- }
- if(isset($trackingno) && $trackingno != "")
- {
- array_push($where_clauses, "purchaseorder.tracking_no like ".$adb->quote("%".$trackingno."%"));
- $url_string .= "&trackingno=".$trackingno;
- }
- }
- if($currentModule == 'SalesOrder')
- {
- if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject'];
- if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname'];
- if (isset($_REQUEST['quotename'])) $quotename = $_REQUEST['quotename'];
-
- if ($order_by !='') $smarty->assign("ORDER_BY", $order_by);
- if ($sorder !='') $smarty->assign("SORDER", $sorder);
-
- $where_clauses = Array();
-
- if (isset($subject) && $subject !='')
- {
- array_push($where_clauses, "salesorder.subject like ".$adb->quote($subject.'%'));
- $url_string .= "&subject=".$subject;
- }
-
- if (isset($accountname) && $accountname !='')
- {
- array_push($where_clauses, "account.accountname like ".$adb->quote($accountname.'%'));
- $url_string .= "&accountname=".$accountname;
- }
-
- if (isset($quotename) && $quotename !='')
- {
- array_push($where_clauses, "quotes.subject like ".$adb->quote($quotename.'%'));
- $url_string .= ""ename=".$quotename;
- }
-
- }
- if($currentModule == 'Vendors')
- {
- if (isset($_REQUEST['vendorname'])) $vendorname = $_REQUEST['vendorname'];
- if (isset($_REQUEST['companyname'])) $companyname = $_REQUEST['companyname'];
- if (isset($_REQUEST['category'])) $category = $_REQUEST['category'];
- $sql="select * from field where tablename='vendorcf' order by fieldlabel";
- $result=$adb->query($sql);
- for($i=0;$i<$adb->num_rows($result);$i++)
- {
- $column[$i]=$adb->query_result($result,$i,'columnname');
- $fieldlabel[$i]=$adb->query_result($result,$i,'fieldlabel');
- $uitype[$i]=$adb->query_result($result,$i,'uitype');
-
- if (isset($_REQUEST[$column[$i]])) $customfield[$i] = $_REQUEST[$column[$i]];
-
- if(isset($customfield[$i]) && $customfield[$i] != '')
- {
- if($uitype[$i] == 56)
- $str=" vendorcf.".$column[$i]." = 1";
- else
- $str="vendorcf.".$column[$i]." like '$customfield[$i]%'";
- array_push($where_clauses, $str);
- // $search_query .= ' and '.$str;
- $url_string .="&".$column[$i]."=".$customfield[$i];
- }
- }
- if (isset($vendorname) && $vendorname !='')
- {
- array_push($where_clauses, "vendorname like ".$adb->quote($vendorname.'%'));
- //$search_query .= " and productname like '".$productname."%'";
- $url_string .= "&vendorname=".$vendorname;
- }
-
- if (isset($companyname) && $companyname !='')
- {
- array_push($where_clauses, "company_name like ".$adb->quote($companyname.'%'));
- //$search_query .= " and productcode like '".$productcode."%'";
- $url_string .= "&companyname=".$companyname;
- }
-
- if (isset($category) && $category !='')
- {
- array_push($where_clauses, "category like ".$adb->quote($category.'%'));
- //$search_query .= " and productcode like '".$productcode."%'";
- $url_string .= "&category=".$category;
- }
-
- }
-
- $where = "";
- foreach($where_clauses as $clause)
- {
- if($where != "")
- $where .= " and ";
- $where .= $clause;
- }
- if (!empty($assigned_user_id)) {
- if (!empty($where)) {
- $where .= " AND ";
- }
- $where .= "crmentity.smownerid IN(";
- foreach ($assigned_user_id as $key => $val) {
- $where .= "".$adb->quote($val)."";
- $where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
- }
- }
-
- $log->info("Here is the where clause for the list view: $where");
-
-}
-*/
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -500,7 +203,6 @@
{
$query .= ' ORDER BY '.$order_by.' '.$sorder;
}
-
$list_result = $adb->query($query);
//Retreiving the no of rows
$noofrows = $adb->num_rows($list_result);
@@ -517,7 +219,6 @@
}
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
-
// Setting the record count string
if ($navigation_array['start'] == 1)
{
@@ -548,13 +249,16 @@
$end_rec = $noofrows;
}
}
-$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
+if($navigation_array['start'] != 0)
+ $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
//Retreive the List View Table Header
$focus->list_mode="search";
$focus->popup_type=$popuptype;
$url_string .='&popuptype='.$popuptype;
+if(isset($_REQUEST['select']) && $_REQUEST['select'] == 'enable')
+ $url_string .='&select=enable';
$listview_header_search=getSearchListHeaderValues($focus,"$currentModule",$url_string,$sorder,$order_by);
$smarty->assign("SEARCHLISTHEADER", $listview_header_search);
Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Sat May 27 18:23:27 2006
@@ -65,7 +65,7 @@
</select>
<span class="lvtCol" style="padding: 3px;">
- <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=set_return_emails","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=set_return_emails","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>
</span><span class="lvtCol" style="padding: 3px;"><input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.hidden_toid.value='';this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</span>
</td>
Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Sat May 27 18:23:27 2006
@@ -180,7 +180,7 @@
{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input readonly name="account_name" style="border:1px solid #bababa;" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype={$popuptype}&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input readonly name="account_name" style="border:1px solid #bababa;" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype={$popuptype}&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 50}
@@ -188,14 +188,14 @@
<font color="red">*</font>{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input readonly name="account_name" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input readonly name="account_name" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 73}
<td width="20%" class="dvtCellLabel" align=right>
<font color="red">*</font>{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input readonly name="account_name" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific_account_address&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input readonly name="account_name" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific_account_address&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 75 || $uitype eq 81}
@@ -208,7 +208,7 @@
{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype={$pop_type}&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype={$pop_type}&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>
{if $uitype eq 75}
<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
{/if}
@@ -218,7 +218,7 @@
{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 80}
@@ -226,7 +226,7 @@
{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 78}
@@ -234,7 +234,7 @@
{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 76}
@@ -242,7 +242,7 @@
{$fldlabel}
</td>
<td width="30%" align=left class="dvtCellInfo">
- <input name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 17}
@@ -350,7 +350,7 @@
<td width="30%" align=left class="dvtCellInfo">
<input name="{$fldname}" type="hidden" value="{$secondvalue}">
<input name="parent_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}">
- <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 357}
@@ -363,7 +363,7 @@
<option value="{$labelval}" {$selectval}>{$labelval}</option>
{/foreach}
</select>
- <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
<tr style="height:25px">
<td width="20%" class="dvtCellLabel" align=right>CC: </td>
@@ -382,7 +382,7 @@
</td>
<td width="30%" align=left class="dvtCellInfo">
<input name="{$fldname}" type="hidden" value="{$secondvalue}">
- <input name="product_name" readonly type="text" value="{$fldvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ <input name="product_name" readonly type="text" value="{$fldvalue}"> <img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'> <input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</td>
{elseif $uitype eq 55}
Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Emails.tpl Sat May 27 18:23:27 2006
@@ -99,10 +99,6 @@
<td colspan="3" style="vertical-align:middle;">
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
- <td width="10%" >
- <img src="{$IMAGE_PATH}check_mail.gif" align="absmiddle" />
- <a href="#" class="webMnu" >{$MOD.LBL_CHK_MAIL}</a>
- </td>
<td width="10%">
<img src="{$IMAGE_PATH}compose.gif" align="absmiddle" />
<a href="javascript:;" onClick="OpenCompose('','create');" class="webMnu">{$MOD.LBL_COMPOSE}</a>
Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Sat May 27 18:23:27 2006
@@ -12,7 +12,7 @@
-->*}
-<link rel="stylesheet" type="text/css" href="{$THEME_PATH}style.css"/>
+<link rel="stylesheet" type="text/css" href="{$THEME_PATH}style.css">
<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
<script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
@@ -22,7 +22,7 @@
opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Contacts&entityid="+entity_id+"&parid="+recordid;
{rdelim}
</script>
-
+<body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
<tr>
<td background="{$IMAGE_PATH}popupHdr.jpg" height="70" style="padding-left:20px;">
@@ -42,11 +42,14 @@
<select name ="search_field" class="txtBox">
{html_options options=$SEARCHLISTHEADER }
</select>
- <input type="hidden" name="searchtype" value="BasicSearch">
- <input type="hidden" name="module" value="{$MODULE}">
- <input type="hidden" name="action" value="Popup">
+ <input type="hidden" name="searchtype" value="BasicSearch">
+ <input type="hidden" name="module" value="{$MODULE}">
+ <input type="hidden" name="action" value="Popup">
<input type="hidden" name="query" value="true">
- <input type="hidden" name="search_cnt">
+ <input type="hidden" name="select_enable" id="select_enable" value="{$SELECT}">
+ <input type="hidden" name="curr_row" value="{$CURR_ROW}">
+ <input type="hidden" name="fldname_pb" value="{$FIELDNAME}">
+ <input type="hidden" name="productid_pb" value="{$PRODUCTID}">
</td>
<td width="20%" class="dvtCellLabel">
@@ -67,41 +70,60 @@
</td>
</tr>
</table>
+
<div id="ListViewContents">
{include file="PopupContents.tpl"}
</div>
+</body>
<script>
function callSearch(searchtype)
{ldelim}
-
- search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
- search_type_val=document.basicSearch.searchtype.value;
- search_txt_val=document.basicSearch.search_text.value;
-
- var ajaxObj = new Ajax(ajaxSaveResponse);
- var urlstring = '';
- elements=document.basicSearch;
- for(ii = 0 ; ii < elements.length; ii++)
- {ldelim}
- if(elements[ii].name != 'action')
- urlstring = urlstring+''+elements[ii].name+'='+elements[ii].value+'&';
- else
- urlstring = urlstring+'file=Popup&';
- {rdelim}
- var no_rows = document.basicSearch.search_cnt.value;
- for(jj = 0 ; jj < no_rows; jj++)
- {ldelim}
- var sfld_name = getObj("Fields"+jj);
- var scndn_name= getObj("Condition"+jj);
- var srchvalue_name = getObj("Srch_value"+jj);
- urlstring = urlstring+'Fields'+jj+'='+sfld_name[sfld_name.selectedIndex].value+'&';
- urlstring = urlstring+'Condition'+jj+'='+scndn_name[scndn_name.selectedIndex].value+'&';
- urlstring = urlstring+'Srch_value'+jj+'='+srchvalue_name.value+'&';
+ for(i=1;i<=26;i++)
+ {ldelim}
+ var data_td_id = 'alpha_'+ eval(i);
+ getObj(data_td_id).className = 'searchAlph';
+ {rdelim}
+ search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
+ search_txt_val=document.basicSearch.search_text.value;
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring = '';
+ if(searchtype == 'Basic')
+ {ldelim}
+ urlstring = 'search_field='+search_fld_val+'&searchtype=BasicSearch&search_text='+search_txt_val;
{rdelim}
popuptype = document.getElementById('popup_type').value;
- urlstring = urlstring +'action={$MODULE}Ajax&ajax=true&popuptype='+popuptype;
+ urlstring += '&popuptype='+popuptype;
+ urlstring = urlstring +'&query=true&file=Popup&module={$MODULE}&action={$MODULE}Ajax&ajax=true';
+ urlstring +=gethiddenelements();
ajaxObj.process("index.php?",urlstring);
+{rdelim}
+function alphabetic(module,url,dataid)
+{ldelim}
+ for(i=1;i<=26;i++)
+ {ldelim}
+ var data_td_id = 'alpha_'+ eval(i);
+ getObj(data_td_id).className = 'searchAlph';
+ {rdelim}
+ getObj(dataid).className = 'searchAlphselected';
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module="+module+"&action="+module+"Ajax&file=Popup&ajax=true&"+url;
+ urlstring +=gethiddenelements();
+ ajaxObj.process("index.php?",urlstring);
{rdelim}
+function gethiddenelements()
+{ldelim}
+ var urlstring=''
+ if(getObj('select_enable').value != '')
+ urlstring +='&select=enable';
+ if(getObj('curr_row').value != '')
+ urlstring +='&curr_row='+getObj('curr_row').value;
+ if(getObj('fldname_pb').value != '')
+ urlstring +='&fldname='+getObj('fldname_pb').value;
+ if(getObj('productid_pb').value != '')
+ urlstring +='&productid='+getObj('productid_pb').value;
+ return urlstring;
+{rdelim}
+
function ajaxSaveResponse(response)
{ldelim}
document.getElementById("ListViewContents").innerHTML= response.responseText;
@@ -109,8 +131,9 @@
function getListViewEntries_js(module,url)
{ldelim}
var ajaxObj = new Ajax(ajaxSaveResponse);
- popuptype = document.getElementById('popup_type').value;
+ popuptype = document.getElementById('popup_type').value;
var urlstring ="module="+module+"&action="+module+"Ajax&popuptype="+popuptype+"&file=Popup&ajax=true&"+url;
+ urlstring +=gethiddenelements();
ajaxObj.process("index.php?",urlstring);
{rdelim}
</script>
Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Sat May 27 18:23:27 2006
@@ -1,9 +1,16 @@
+
+<form name="selectall" method="POST">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
- <tr><td style="padding-right:10px;" align="right">{$RECORD_COUNTS}</td></tr>
+ <tr>
+ {if $SELECT eq 'enable'}
+ <td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add Contacts" onclick="if(SelectAll()) window.close();"/></td>
+ {else}
+ <td> </td>
+ {/if}
+ <td style="padding-right:10px;" align="right">{$RECORD_COUNTS}</td></tr>
<tr>
- <td style="padding:10px;">
+ <td style="padding:10px;" colspan=2>
- <form name="selectall" method="POST">
<input name="module" type="hidden" value="{$RETURN_MODULE}">
<input name="action" type="hidden" value="{$RETURN_ACTION}">
<input name="pmodule" type="hidden" value="{$MODULE}">
@@ -11,13 +18,13 @@
<input name="entityid" type="hidden" value="">
<input name="popup_type" id="popup_type" type="hidden" value="{$POPUP_TYPE}">
<input name="idlist" type="hidden" value="">
- {if $SELECT eq 'enable'}
- <td><input class="small" type="button" value="Add Contacts" onclick="if(SelectAll()) window.close();"/></td>
- {/if}
-
+ <div style="overflow:auto;height:334px;">
<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
<tbody>
<tr>
+ {if $SELECT eq 'enable'}
+ <td class="lvtCol" width="3%"><input type="checkbox" name="select_all" value="" onClick=toggleSelect(this.checked,"selected_id")></td>
+ {/if}
{foreach item=header from=$LISTHEADER}
<td class="lvtCol">{$header}</td>
{/foreach}
@@ -25,7 +32,7 @@
{foreach key=entity_id item=entity from=$LISTENTITY}
<tr bgcolor=white onMouseOver="this.className='lvtColDataHover'" onMouseOut="this.className='lvtColData'" >
{if $SELECT eq 'enable'}
- <td><input type="checkbox" NAME="selected_id" value= '{$entity_id}' onClick=toggleSelectAll(this.name,"selectall")></td>
+ <td><input type="checkbox" name="selected_id" value="{$entity_id}" onClick=toggleSelectAll(this.name,"select_all")></td>
{/if}
{foreach item=data from=$entity}
<td>{$data}</td>
@@ -34,17 +41,19 @@
{/foreach}
</tbody>
</table>
- </form>
+ <div>
</td>
</tr>
<tr>
- <td align="center" style="padding:10px;" background="{$IMAGE_PATH}report_bottom.gif">
+ <td align="center" colspan=2 style="padding:10px;" background="{$IMAGE_PATH}report_bottom.gif">
<table width="100%" align="center">
<tr>
{$NAVIGATION}
+ <td width="35%"> </td>
</tr>
</table>
</td>
</tr>
</table>
+</form>
Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Sat May 27 18:23:27 2006
@@ -92,10 +92,10 @@
<input title="New Lead" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="Add new Lead"></td>
{elseif $header eq 'Contacts' }
{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
- <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");' type="button" name="button"></td>
+ <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button" name="button"></td>
{elseif $MODULE eq 'Emails'}
<input title="Bulk Mail" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="Bulk Mails" type="submit">
- <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");' type="button" name="button"></td>
+ <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button" name="button"></td>
{else}
<input title="New Contact" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="Add new Contact"></td>
{/if}
@@ -141,10 +141,10 @@
<input title="New Email" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="Add new Email"></td>
{elseif $header eq 'Users'}
{if $MODULE eq 'Activities'}
- <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="Select User" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=600,height=400,resizable=1,scrollbars=1")';>
+ <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="Select User" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
{elseif $MODULE eq 'Emails'}
<input title="Bulk Mail" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="Bulk Mails" type="submit">
- <input title="Change" accesskey="" tabindex="2" class="small" value="Select User" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");' type="button"> </td>
+ <input title="Change" accesskey="" tabindex="2" class="small" value="Select User" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button"> </td>
{/if}
{elseif $header eq 'History'}
</td>
Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Sat May 27 18:23:27 2006
@@ -226,7 +226,7 @@
</tr>
<tr>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
- <td class="dvtCellInfo" width="20%"><input readonly name='reports_to_name' class="small" type="text" value='{$REPORTS_TO_NAME}'><input name='reports_to_id' type="hidden" value='{$REPORTS_TO_ID}'> <input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");'></td>
+ <td class="dvtCellInfo" width="20%"><input readonly name='reports_to_name' class="small" type="text" value='{$REPORTS_TO_NAME}'><input name='reports_to_id' type="hidden" value='{$REPORTS_TO_ID}'> <input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'></td>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
<td class="dvtCellInfo"><input type="text" name="phone_other" value='{$PHONE_OTHER}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
</tr>
Modified: vtigercrm/trunk/include/ListView/ListView.php
==============================================================================
--- vtigercrm/trunk/include/ListView/ListView.php (original)
+++ vtigercrm/trunk/include/ListView/ListView.php Sat May 27 18:23:27 2006
@@ -483,6 +483,10 @@
$log->debug("Entering processListNavigation(".$xtemplateSection.",". $html_varName.",". $current_offset.",". $next_offset.",". $previous_offset.",". $row_count.") method ...");
global $current_user;
global $allow_exports;
+ global $theme;
+ $theme_path="themes/".$theme."/";
+ $image_path=$theme_path."images/";
+
$start_record = $current_offset + 1;
if($row_count == 0)
$start_record = 0;
@@ -521,20 +525,20 @@
$this->log->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
if(0 == $current_offset){
- $start_link = $this->local_app_strings['LNK_LIST_START'];
- $previous_link = $this->local_app_strings['LNK_LIST_PREVIOUS'];
+ $start_link = '<img src="'.$image_path.'start_disabled.gif" border="0" align="absmiddle"> ';
+ $previous_link = '<img src="'.$image_path.'previous_disabled.gif" border="0" align="absmiddle"> ';
}else{
- $start_link = "<a href=\"$start_URL\" class=\"listFormHeaderLinks\">".$this->local_app_strings['LNK_LIST_START']."</a>";
- $previous_link = "<a href=\"$previous_URL\" class=\"listFormHeaderLinks\">".$this->local_app_strings['LNK_LIST_PREVIOUS']."</a>";
+ $start_link = "<a href=\"$start_URL\"><img src='".$image_path."start.gif' border='0' align='absmiddle'></a>";
+ $previous_link = "<a href=\"$previous_URL\"><img src='".$image_path."previous.gif' border='0' align='absmiddle'></a>";
}
if($last_offset <= $current_offset){
- $end_link = $this->local_app_strings['LNK_LIST_END'];
- $next_link = $this->local_app_strings['LNK_LIST_NEXT'];
+ $next_link = '<img src="'.$image_path.'next_disabled.gif" border="0" align="absmiddle"> ';
+ $end_link = '<img src="'.$image_path.'end_disabled.gif" border="0" align="absmiddle"> ';
}
else{
- $end_link = "<a href=\"$end_URL\" class=\"listFormHeaderLinks\">".$this->local_app_strings['LNK_LIST_END']."</a>";
- $next_link = "<a href=\"$next_URL\" class=\"listFormHeaderLinks\">".$this->local_app_strings['LNK_LIST_NEXT']."</a>";
+ $end_link = "<a href=\"$end_URL\"><img src='".$image_path."end.gif' border='0' align='absmiddle'> </a>";
+ $next_link = "<a href=\"$next_URL\"><img src='".$image_path."next.gif' border='0' align='absmiddle'></a>";
}
global $current_module;
$this->log->info("Offset (next, current, prev)($next_offset, $current_offset, $previous_offset)");
@@ -543,10 +547,10 @@
$this->xTemplate->assign("START_RECORD", $start_record);
$this->xTemplate->assign("END_RECORD", $end_record-1);
$this->xTemplate->assign("ROW_COUNT", $row_count);
- if ($start_link !== "") $this->xTemplate->assign("START_LINK", "[ ".$start_link." ]");
- if ($end_link !== "")$this->xTemplate->assign("END_LINK", "[ ".$end_link." ]");
- if ($next_link !== "") $this->xTemplate->assign("NEXT_LINK", "[ ".$next_link." ]");
- if ($previous_link !== "") $this->xTemplate->assign("PREVIOUS_LINK", "[ ".$previous_link." ]");
+ if ($start_link !== "") $this->xTemplate->assign("START_LINK", $start_link);
+ if ($end_link !== "")$this->xTemplate->assign("END_LINK", $end_link);
+ if ($next_link !== "") $this->xTemplate->assign("NEXT_LINK", $next_link);
+ if ($previous_link !== "") $this->xTemplate->assign("PREVIOUS_LINK", $previous_link);
$_SESSION['export_where'] = $this->query_where;
Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Sat May 27 18:23:27 2006
@@ -56,13 +56,13 @@
if(module == 'PurchaseOrder')
popuptype = 'inventory_prod_po';
- window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=600,height=400,resizable=1,scrollbars=1,status=1,top=150,left=200");
+ window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=640,height=565,resizable=0,scrollbars=0,status=1,top=150,left=200");
}
function priceBookPickList(currObj) {
var trObj=currObj.parentNode.parentNode
var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length))
- window.open("index.php?module=PriceBooks&action=Popup&html=Popup_picker&form=EditView&popuptype=inventory_pb&fldname=txtListPrice"+rowId+"&productid="+getObj("hdnProductId"+rowId).value,"priceBookWin","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");
+ window.open("index.php?module=PriceBooks&action=Popup&html=Popup_picker&form=EditView&popuptype=inventory_pb&fldname=txtListPrice"+rowId+"&productid="+getObj("hdnProductId"+rowId).value,"priceBookWin","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");
}
Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Sat May 27 18:23:27 2006
@@ -821,96 +821,99 @@
$ui_col_array[$field_name]=$tempArr;
}
//end
- for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++)
- {
-
- //Getting the entityid
- $entity_id = $adb->query_result($list_result,$i-1,"crmid");
- $list_header=Array();
-
- foreach($focus->search_fields as $name=>$tableinfo)
- {
- $fieldname = $focus->search_fields_name[$name];
-
- if($is_admin==false)
+ if($navigation_array['end_val'] > 0)
+ {
+ for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++)
+ {
+
+ //Getting the entityid
+ $entity_id = $adb->query_result($list_result,$i-1,"crmid");
+ $list_header=Array();
+
+ foreach($focus->search_fields as $name=>$tableinfo)
{
- $profileList = getCurrentUserProfileList();
- $query = "SELECT profile2field.*
- FROM field
- INNER JOIN profile2field
+ $fieldname = $focus->search_fields_name[$name];
+
+ if($is_admin==false)
+ {
+ $profileList = getCurrentUserProfileList();
+ $query = "SELECT profile2field.*
+ FROM field
+ INNER JOIN profile2field
ON profile2field.fieldid = field.fieldid
- INNER JOIN def_org_field
+ INNER JOIN def_org_field
ON def_org_field.fieldid = field.fieldid
- WHERE field.tabid = ".$tabid."
- AND profile2field.visible = 0
- AND def_org_field.visible = 0
- AND profile2field.profileid IN ".$profileList."
- AND field.fieldname = '".$fieldname."'";
-
- $result = $adb->query($query);
- }
-
- if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1)
- {
- if($fieldname == '')
- {
- $table_name = '';
- $column_name = '';
- foreach($tableinfo as $tablename=>$colname)
+ WHERE field.tabid = ".$tabid."
+ AND profile2field.visible = 0
+ AND def_org_field.visible = 0
+ AND profile2field.profileid IN ".$profileList."
+ AND field.fieldname = '".$fieldname."'";
+
+ $result = $adb->query($query);
+ }
+
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1)
+ {
+ if($fieldname == '')
{
- $table_name=$tablename;
- $column_name = $colname;
- }
- $value = $adb->query_result($list_result,$i-1,$colname);
- }
- else
- {
- if(($module == 'Calls' || $module == 'Tasks' || $module == 'Meetings' || $module == 'Emails') && (($name=='Related to') || ($name=='Contact Name')))
- {
- if ($name=='Related to')
- $value=getRelatedTo($module,$list_result,$i-1);
- if($name=='Contact Name')
+ $table_name = '';
+ $column_name = '';
+ foreach($tableinfo as $tablename=>$colname)
{
- $first_name = $adb->query_result($list_result,$i-1,"firstname");
- $last_name = $adb->query_result($list_result,$i-1,"lastname");
- $contact_id = $adb->query_result($list_result,$i-1,"contactid");
- $contact_name = "";
- $value="";
- if($last_name != 'NULL')
- $contact_name .= $last_name;
- if($first_name != 'NULL')
- $contact_name .= " ".$first_name;
- if(($contact_name != "") && ($contact_id !='NULL'))
- $value = "<a href='index.php?module=Contacts&action=DetailView&record=".$contact_id."'>".$contact_name."</a>";
+ $table_name=$tablename;
+ $column_name = $colname;
}
- }
- elseif(($module == 'Faq' || $module == 'Notes') && $name=='Related to')
- {
- $value=getRelatedToEntity($module,$list_result,$i-1);
- }
- elseif($name=='Account Name' && ($module == 'Potentials' || $module == 'SalesOrder' || $module == 'Quotes'))
- {
- $account_id = $adb->query_result($list_result,$i-1,"accountid");
- $account_name = getAccountName($account_id);
- $value = $account_name;
- }
- elseif($name=='Quote Name' && $module == 'SalesOrder')
- {
- $quote_id = $adb->query_result($list_result,$i-1,"quoteid");
- $quotename = getQuoteName($quote_id);
- $value = $quotename;
+ $value = $adb->query_result($list_result,$i-1,$colname);
}
else
{
- $list_result_count = $i-1;
- $value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type);
+ if(($module == 'Calls' || $module == 'Tasks' || $module == 'Meetings' || $module == 'Emails') && (($name=='Related to') || ($name=='Contact Name')))
+ {
+ if ($name=='Related to')
+ $value=getRelatedTo($module,$list_result,$i-1);
+ if($name=='Contact Name')
+ {
+ $first_name = $adb->query_result($list_result,$i-1,"firstname");
+ $last_name = $adb->query_result($list_result,$i-1,"lastname");
+ $contact_id = $adb->query_result($list_result,$i-1,"contactid");
+ $contact_name = "";
+ $value="";
+ if($last_name != 'NULL')
+ $contact_name .= $last_name;
+ if($first_name != 'NULL')
+ $contact_name .= " ".$first_name;
+ if(($contact_name != "") && ($contact_id !='NULL'))
+ $value = "<a href='index.php?module=Contacts&action=DetailView&record=".$contact_id."'>".$contact_name."</a>";
+ }
+ }
+ elseif(($module == 'Faq' || $module == 'Notes') && $name=='Related to')
+ {
+ $value=getRelatedToEntity($module,$list_result,$i-1);
+ }
+ elseif($name=='Account Name' && ($module == 'Potentials' || $module == 'SalesOrder' || $module == 'Quotes'))
+ {
+ $account_id = $adb->query_result($list_result,$i-1,"accountid");
+ $account_name = getAccountName($account_id);
+ $value = $account_name;
+ }
+ elseif($name=='Quote Name' && $module == 'SalesOrder')
+ {
+ $quote_id = $adb->query_result($list_result,$i-1,"quoteid");
+ $quotename = getQuoteName($quote_id);
+ $value = $quotename;
+ }
+ else
+ {
+ $list_result_count = $i-1;
+ $value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"search",$focus->popup_type);
+ }
+
}
-
+ $list_header[]=$value;
}
- $list_header[]=$value;
- }
- }
- $list_block[$entity_id]=$list_header;
+ }
+ $list_block[$entity_id]=$list_header;
+ }
}
$log->debug("Exiting getSearchListViewEntries method ...");
return $list_block;
Modified: vtigercrm/trunk/modules/Users/Popup_picker.html
==============================================================================
--- vtigercrm/trunk/modules/Users/Popup_picker.html (original)
+++ vtigercrm/trunk/modules/Users/Popup_picker.html Sat May 27 18:23:27 2006
@@ -42,7 +42,7 @@
<table width="100%" cellpadding="5" cellspacing="0" style="border-top:1px dashed #CCCCCC;border-bottom:1px dashed #CCCCCC;">
<tr>
<td width="20%" class="dvtCellLabel"><img src="{IMAGE_PATH}/basicSearchLens.gif"></td>
- <td class="dvtCellLabel" valign=top noWrap> {MOD.LBL_USER_NAME} </td>
+ <td class="dvtCellLabel" noWrap> {MOD.LBL_USER_NAME} </td>
<td class="dvtCellLabel"><input type=text size="10" tabindex='2' name="user_name" class=dataField value="{LAST_SEARCH.USER_NAME}" /></td>
<td class="dvtCellLabel" noWrap> {MOD.LBL_LAST_NAME} </td>
<td class="dvtCellLabel"><input type=text size="10" tabindex='1' name="last_name" class=dataField value="{LAST_SEARCH.LAST_NAME}" /></td>
@@ -64,13 +64,13 @@
<tr>
<td style="padding:10px;">
<!-- END: list_nav_row -->
-
- <table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
- <tbody>
- <tr>
- <td class="lvtCol" NOWRAP> <a href="{ORDER_BY}first_name" class="listFormHeaderLinks">{MOD.LBL_LIST_NAME}{first_name_arrow}</a></td>
- <td class="lvtCol" NOWRAP> <a href="{ORDER_BY}user_name" class="listFormHeaderLinks" >{MOD.LBL_LIST_USER_NAME}{user_name_arrow}</a></td>
- </tr>
+ <div style="overflow:auto;height:334px;">
+ <table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
+ <tbody>
+ <tr>
+ <td class="lvtCol" NOWRAP> <a href="{ORDER_BY}first_name" class="listFormHeaderLinks">{MOD.LBL_LIST_NAME}{first_name_arrow}</a></td>
+ <td class="lvtCol" NOWRAP> <a href="{ORDER_BY}user_name" class="listFormHeaderLinks" >{MOD.LBL_LIST_USER_NAME}{user_name_arrow}</a></td>
+ </tr>
<!-- BEGIN: row -->
<tr bgcolor=white onMouseOver="this.className='lvtColDataHover'" onMouseOut="this.className='lvtColData'">
@@ -79,13 +79,15 @@
</tr>
<!-- END: row -->
-</tbody>
-</table>
+ </tbody>
+ </table>
+ </div>
</td>
</tr>
<tr>
<td align="center" style="padding:10px;" background="{IMAGE_PATH}/report_bottom.gif">
+ {START_LINK} {PREVIOUS_LINK} {NEXT_LINK} {END_LINK}
</td>
</tr>
</table>
Modified: vtigercrm/trunk/modules/Users/Popup_picker_emails.html
==============================================================================
--- vtigercrm/trunk/modules/Users/Popup_picker_emails.html (original)
+++ vtigercrm/trunk/modules/Users/Popup_picker_emails.html Sat May 27 18:23:27 2006
@@ -64,7 +64,7 @@
<tr>
<td style="padding:10px;">
<!-- END: list_nav_row -->
-
+ <div style="overflow:auto;height:334px;">
<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
<tbody>
<tr>
@@ -81,11 +81,13 @@
</tbody>
</table>
+</div>
</td>
</tr>
<tr>
<td align="center" style="padding:10px;" background="{IMAGE_PATH}/report_bottom.gif">
+ {START_LINK} {PREVIOUS_LINK} {NEXT_LINK} {END_LINK}
</td>
</tr>
</table>
More information about the vtigercrm-commits
mailing list