antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Marion Muszynski 2016-11-02 12:11:44 +01:00
commit ede0f691a8
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/custom_admin.css
View File

@ -20,6 +20,12 @@ hr {
color: #565485; color: #565485;
background: rgba(86,84,133,0.9); background: rgba(86,84,133,0.9);
} }
.bg-purple{
background: rgba(86,84,133,0.9);
}
.bg-purple-lite{
background: rgba(86,84,133,0.3);
}
.table { .table {
border: 1px solid #565485; border: 1px solid #565485;
} }
@ -73,6 +79,11 @@ input[type="file"], textarea, select {
.button:focus{ .button:focus{
background-color: rgba(86,84,133,0.6); background-color: rgba(86,84,133,0.6);
} }
.button[disabled=disabled],
input.button[disabled=disabled]:hover{
color: #EEE;
background-color: rgba(86,84,133,0.3);
}
/*** Philea ***/ /*** Philea ***/
.div_report { .div_report {

2
modules/ant_support/AdminQuestions.php
View File

@ -169,7 +169,7 @@ class AdminQuestions extends AdminTab
$question->status = Tools::getValue('status', 0); $question->status = Tools::getValue('status', 0);
$question->id_section = Tools::getValue('id_section', 0); $question->id_section = Tools::getValue('id_section', 0);
$question->versions = array(); $question->versions = array();
foreach(Language::getLanguages(false) as $language) { foreach(Language::getLanguages(false) as $language) {
if($title = Tools::getValue('title_'.$language['id_lang'])) { if($title = Tools::getValue('title_'.$language['id_lang'])) {
$question->title[$language['id_lang']] = $title; $question->title[$language['id_lang']] = $title;

4
modules/ant_support/AdminSections.php
View File

@ -14,7 +14,7 @@ class AdminSections extends AdminTab
public function __construct() public function __construct()
{ {
global $cookie; global $cookie;
$this->table = 'support_section'; $this->table = 'support_section';
$this->className = 'Section'; $this->className = 'Section';
$this->lang = true; $this->lang = true;
@ -166,7 +166,7 @@ class AdminSections extends AdminTab
$section = new Section(); $section = new Section();
$section->status = Tools::getValue('status', 0); $section->status = Tools::getValue('status', 0);
$section->versions = array(); $section->versions = array();
foreach(Language::getLanguages(false) as $language) { foreach(Language::getLanguages(false) as $language) {
if($title = Tools::getValue('title_'.$language['id_lang'])) { if($title = Tools::getValue('title_'.$language['id_lang'])) {
$section->title[$language['id_lang']] = $title; $section->title[$language['id_lang']] = $title;

1
modules/ant_support/AdminSupport.php
View File

@ -51,6 +51,7 @@ class AdminSupport extends AdminTab
url_ajax_admin_support = "'.__PS_BASE_URI__.'modules/ant_support/ajax_admin_support.php?&token='.Tools::getAdminTokenLite('AdminSupport').'"; url_ajax_admin_support = "'.__PS_BASE_URI__.'modules/ant_support/ajax_admin_support.php?&token='.Tools::getAdminTokenLite('AdminSupport').'";
</script>'; </script>';
echo '<style type="text/css"> echo '<style type="text/css">
@import "'.__PS_BASE_URI__.'css/custom_admin.css";
.green { .green {
background : #dffad3; background : #dffad3;
} }

1
themes/site/my-account.tpl
View File

@ -43,5 +43,6 @@
<li><a href="{$base_dir_ssl}modules/paymentinfo/manage.php" title="{l s='Manage Payments infos'}">{l s='Manage Payments infos'}</a></li> <li><a href="{$base_dir_ssl}modules/paymentinfo/manage.php" title="{l s='Manage Payments infos'}">{l s='Manage Payments infos'}</a></li>
{$HOOK_CUSTOMER_ACCOUNT} {$HOOK_CUSTOMER_ACCOUNT}
<li><a href="{$base_dir_ssl}modules/ant_support/help.php" title="{l s='Help'}">{l s='Help'}</a></li>
</ul> </ul>
{*<p class="footer_links"><a href="{$base_dir}" title="{l s='Home'}" class="button">{l s='Home'}</a></p>*} {*<p class="footer_links"><a href="{$base_dir}" title="{l s='Home'}" class="button">{l s='Home'}</a></p>*}