RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1506 from nrpatten/next

Browse Source 
[FIX] input[type=email] in the wrong order and Overlap and Reposition TABS
This commit is contained in:
Sebastian Grewe 2014-01-21 00:07:58 -08:00
commit 9520795e07
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/include/classes/mail.class.php
View File

@ -57,17 +57,17 @@ class Mail extends Base {
**/ **/
public function sendMail($template, $aData) { public function sendMail($template, $aData) {
// Make sure we don't load a cached filed // Make sure we don't load a cached filed
$this->smarty->clearCache(BASEPATH . 'templates/mail/' . $template . '.tpl'); $this->smarty->clearCache(BASEPATH . 'templates/mail/' . $template . '.tpl');
$this->smarty->clearCache(BASEPATH . 'templates/mail/subject.tpl'); $this->smarty->clearCache(BASEPATH . 'templates/mail/subject.tpl');
$this->smarty->assign('WEBSITENAME', $this->setting->getValue('website_name')); $this->smarty->assign('WEBSITENAME', $this->setting->getValue('website_name'));
$this->smarty->assign('SUBJECT', $aData['subject']); $this->smarty->assign('SUBJECT', $aData['subject']);
$this->smarty->assign('DATA', $aData); $this->smarty->assign('DATA', $aData);
$headers = 'From: {$GLOBAL.website.name|default:"Unknown Pool"} <' . $this->setting->getValue('website_email') . ">\n"; $headers .= 'From: ' . $this->setting->getValue('website_name') . '<' . $this->setting->getValue('website_email') . ">\n";
$headers .= "MIME-Version: 1.0\n"; $headers .= "MIME-Version: 1.0\n";
$headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n"; $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 ) if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 )
$headers .= 'Reply-To: ' . $aData['senderName'] . ' <' . $aData['senderEmail'] . ">\n"; $headers .= 'Reply-To: ' . $aData['senderName'] . ' <' . $aData['senderEmail'] . ">\n";
if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), $headers)) if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template .$
return true; return true;
$this->setErrorMessage($this->sqlError('E0031')); $this->setErrorMessage($this->sqlError('E0031'));
return false; return false;

2
public/site_assets/mpos/css/layout.css
View File

@ -684,7 +684,7 @@ margin: -5px 0 5px 0;
text-transform: uppercase; text-transform: uppercase;
} }
fieldset input[type=email], fieldset input[type=text], fieldset input[type=password] { fieldset input[type=text], fieldset input[type=email], fieldset input[type=password] {
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;

3
public/templates/mpos/admin/settings/default.tpl
View File

@ -5,7 +5,7 @@
<input type="hidden" name="do" value="save" /> <input type="hidden" name="do" value="save" />
<header> <header>
<h3 class="tabs_involved">Settings</h3> <h3 class="tabs_involved">Settings</h3>
<ul class="tabs"> <ul style="margin: 10px 20px 0px 0px;" class="tabs">
{foreach item=TAB from=array_keys($SETTINGS)} {foreach item=TAB from=array_keys($SETTINGS)}
<li><a href="#{$TAB}">{$TAB|capitalize}</a></li> <li><a href="#{$TAB}">{$TAB|capitalize}</a></li>
{/foreach} {/foreach}
@ -14,6 +14,7 @@
<div class="tab_container"> <div class="tab_container">
{foreach item=TAB from=array_keys($SETTINGS)} {foreach item=TAB from=array_keys($SETTINGS)}
<div class="tab_content module_content" id="{$TAB}"> <div class="tab_content module_content" id="{$TAB}">
<br />
{section name=setting loop=$SETTINGS.$TAB} {section name=setting loop=$SETTINGS.$TAB}
<fieldset> <fieldset>
<label>{$SETTINGS.$TAB[setting].display}</label> <label>{$SETTINGS.$TAB[setting].display}</label>