dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// change message customer tread

Browse Source
This commit is contained in:
vKham
2012-01-02 16:55:07 +00:00
parent 1d987c8a5e
commit ba1d254104
8 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+3 -2
View File
@@ -25,9 +25,10 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
.double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px} .double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
/*BUTTON*/ /*BUTTON*/
.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; .button{
background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent; background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;} border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
.button[disabled=disabled]{color:#8C8C8C} .button[disabled=disabled]{color:#8C8C8C}
.button.bt-icon { display:inline-block; margin-bottom:7px;} .button.bt-icon { display:inline-block; margin-bottom:7px;}
admin-dev/themes/default/template/customer_threads/message.tpl
+51 -28
View File
@@ -45,43 +45,60 @@
{/if} {/if}
</legend> </legend>
<div style="font-size:11px"> <div class="infoCustomer">
{if !empty($message.id_customer) && empty($message.employee_name)} {if !empty($message.id_customer) && empty($message.employee_name)}
<b>{l s='Customer ID:'}</b> <dl>
<a href="index.php?tab=AdminCustomers&id_customer={$message.id_customer}&viewcustomer&token={getAdminToken tab='AdminCustomers'}" title="{l s='View customer'}"> <dt>{l s='Customer ID:'}&#32;:</dd>
<dd><a href="index.php?tab=AdminCustomers&id_customer={$message.id_customer}&viewcustomer&token={getAdminToken tab='AdminCustomers'}" title="{l s='View customer'}">
{$message.id_customer} <img src="../img/admin/search.gif" alt="{l s='view'}" /> {$message.id_customer} <img src="../img/admin/search.gif" alt="{l s='view'}" />
</a><br /> </a>
</dd>
</dl>
{/if} {/if}
<dl>
<dt>{l s='Sent on:'}&#32;:</dt>
<dd>{$message.date_add}</dd>
</dl>
<b>{l s='Sent on:'}</b> {$message.date_add}<br />
{if empty($message.employee_name)} {if empty($message.employee_name)}
<b>{l s='Browser:'}</b> {$message.user_agent}<br /> <dl>
<dt>{l s='Browser:'}&#32;:</dt>
<dd>{$message.user_agent}</dd>
</dl>
{/if} {/if}
{if !empty($message.file_name) && $file_name} {if !empty($message.file_name) && $file_name}
<b>{l s='File attachment'}</b> <dl>
<a href="index.php?tab=AdminCustomerThreads&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread&token={getAdminToken tab='AdminCustomerThreads'}&filename={$message.file_name}" <dt>{l s='File attachment'}&#32;:</dt>
<dd><a href="index.php?tab=AdminCustomerThreads&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread&token={getAdminToken tab='AdminCustomerThreads'}&filename={$message.file_name}"
title="{l s='View file'}"> title="{l s='View file'}">
<img src="../img/admin/search.gif" alt="{l s='view'}" /> <img src="../img/admin/search.gif" alt="{l s='view'}" />
</a><br /> </a>
</dd>
</dl>
{/if} {/if}
{if !empty($message.id_order) && empty($message.employee_name)} {if !empty($message.id_order) && empty($message.employee_name)}
<b>{l s='Order #'}</b> <dl>
<a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}"> <dt>{l s='Order #'}&#32;:</dt>
<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='view'}" /> {$message.id_order} <img src="../img/admin/search.gif" alt="{l s='view'}" />
</a><br /> </a></dd>
</dl>
{/if} {/if}
{if !empty($message.id_product) && empty($message.employee_name)} {if !empty($message.id_product) && empty($message.employee_name)}
<b>{l s='Product #'}</b> <dl>
<a href="index.php?tab=AdminOrders&id_order={$id_order_product}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}"> <dt>{l s='Product #'}&#32;:</dt>
<dd><a href="index.php?tab=AdminOrders&id_order={$id_order_product}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='view'}" /> {$message.id_product} <img src="../img/admin/search.gif" alt="{l s='view'}" />
</a><br /> </a></dd>
</dl>
{/if} {/if}
<br />
<form action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post">
<form action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post">
<b>{l s='Subject:'}</b> <b>{l s='Subject:'}</b>
<input type="hidden" name="id_customer_message" value="{$message.id_customer_message}" /> <input type="hidden" name="id_customer_message" value="{$message.id_customer_message}" />
<select name="id_contact" onchange="this.form.submit();"> <select name="id_contact" onchange="this.form.submit();">
@@ -93,9 +110,10 @@
</select> </select>
</form> </form>
{else} {else}
<div style="font-size:11px"> <div class="infoEmployee">
{if $id_employee} {if $id_employee}
<a href="{$current}&token={getAdminToken tab='AdminCustomerThreads'}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread">'. <a href="{$current}&token={getAdminToken tab='AdminCustomerThreads'}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread">'.
{l s='View this thread'} {l s='View this thread'}
@@ -124,11 +142,18 @@
<br /><b>{l s='Subject:'}</b> {$message.subject} <br /><b>{l s='Subject:'}</b> {$message.subject}
{/if} {/if}
<br /><br /> <dl>
<b>{l s='Thread ID:'}</b> {$message.id_customer_thread}<br /> <dt>{l s='Thread ID:'}&#32;:</dt>
<b>{l s='Message ID:'}</b> {$message.id_customer_message}<br /> <dd>{$message.id_customer_thread}</dd>
<b>{l s='Message:'}</b><br /> </dl>
{$message.message} <dl>
<dt>{l s='Message ID:'}&#32;:</dt>
<dd>{$message.id_customer_message}</dd>
</dl>
<dl>
<dt>{l s='Message:'}&#32;:</dt>
<dd>{$message.message}</dd>
</dl>
</div> </div>
@@ -136,12 +161,10 @@
{if empty($message.employee_name)} {if empty($message.employee_name)}
<p style="text-align:right"> <button class="button" style="font-size:12px;"
<button style="font-family: Verdana; font-size: 11px; font-weight:bold; height: 65px; width: 120px;"
onclick="$('#reply_to_{$message.id_customer_message}').show(500); $(this).hide();"> onclick="$('#reply_to_{$message.id_customer_message}').show(500); $(this).hide();">
<img src="../img/admin/contact.gif" alt="" style="margin-bottom: 5px;" /><br />{l s='Reply to this message'} <img src="../img/admin/contact.gif" alt=""/>{l s='Reply to this message'}
</button> </button>
</p>
{/if} {/if}
admin-dev/themes/default/template/customer_threads/view.tpl
+1 -1
View File
@@ -40,7 +40,7 @@
</div> </div>
<p> <p>
<img src="../img/admin/msg-forward.png" alt="" style="vertical-align: middle;" /> <img src="../img/admin/email_go.png" alt="" style="vertical-align: middle;" />
{l s='Forward this discussion to an employee:'} {l s='Forward this discussion to an employee:'}
<select name="id_employee_forward" style="vertical-align: middle;"> <select name="id_employee_forward" style="vertical-align: middle;">
<option value="-1">{l s='-- Choose --'}</option> <option value="-1">{l s='-- Choose --'}</option>
admin-dev/themes/default/template/customers/view.tpl
+3 -3
View File
@@ -67,7 +67,7 @@
{$customer->firstname} {$customer->lastname} {$customer->firstname} {$customer->lastname}
</span> </span>
<img src="{$gender_image}" style="margin-bottom: 5px" /><br /> <img src="{$gender_image}" style="margin-bottom: 5px" /><br />
<a href="mailto:{$customer->email}" style="text-decoration: underline; color: blue">{$customer->email}</a> <a href="mailto:{$customer->email}" style="text-decoration: underline; color:#268CCD;">{$customer->email}</a>
<br /><br /> <br /><br />
{l s='ID:'} {$customer->id|string_format:"%06d"}<br /> {l s='ID:'} {$customer->id|string_format:"%06d"}<br />
{l s='Registration date:'} {$registration_date}<br /> {l s='Registration date:'} {$registration_date}<br />
@@ -115,7 +115,7 @@
<form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note"> <form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note">
<textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br /> <textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br />
<input type="submit" id="submitCustomerNote" class="button" value="{l s=' Save '}" style="float:left;margin-top:5px" disabled="disabled" /> <input type="submit" id="submitCustomerNote" class="button" value="{l s=' Save '}" style="float:left;margin-top:5px" disabled="disabled" />
<span id="note_feedback" style="margin:10px 0 0 10px"></span> <span id="note_feedback" style="position:relative; top:10px; left:10px;"></span>
</form> </form>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
@@ -223,7 +223,7 @@
{assign var=count_ko value=count($orders_ko)} {assign var=count_ko value=count($orders_ko)}
{if $count_ko} {if $count_ko}
<div> <div>
<h3 style="color:red;font-weight:700">{l s='Invalid orders:'} {$count_ko}</h3> <h3 style="color:red;font-weight:normal;">{l s='Invalid orders:'} {$count_ko}</h3>
<table cellspacing="0" cellpadding="0" class="table" style="width:100%;"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup> <colgroup>
<col width="10px"></col> <col width="10px"></col>
admin-dev/themes/default/template/performance/form.tpl
+1 -1
View File
@@ -70,7 +70,7 @@
{if $key == 'memcachedServers'} {if $key == 'memcachedServers'}
<div id="memcachedServers"> <div id="memcachedServers">
<div class="margin-form"> <div class="margin-form">
<a id="addMemcachedServer" href="#" ><img src="../img/admin/add.gif" />{l s='Add server'}</a> <a id="addMemcachedServer" class="button" href="#" ><img src="../img/admin/add.gif" />{l s='Add server'}</a>
</div> </div>
<div id="formMemcachedServer" style="margin-top: 10px; display:none;"> <div id="formMemcachedServer" style="margin-top: 10px; display:none;">
<form action="{$current}&token={$token}" method="post"> <form action="{$current}&token={$token}" method="post">
controllers/admin/AdminFeaturesController.php
+1 -2
View File
@@ -117,8 +117,7 @@ class AdminFeaturesControllerCore extends AdminController
'width' => 25 'width' => 25
), ),
'value' => array( 'value' => array(
'title' => $this->l('Value'), 'title' => $this->l('Value')
'width' => 100
) )
); );
css/admin.css
+7
View File
@@ -2188,3 +2188,10 @@ font-weight:normal;
padding-left:15px; padding-left:15px;
} }
/*infoCustomer*/
.infoCustomer {}
.infoCustomer dl { margin: 7px 0;}
.infoCustomer dl dt {font-weight:bold; float:left; padding-right:5px;}
.infoCustomer dl dd { margin:0; padding:0;}
img/admin/email_go.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB