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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-08-20 16:40:14 +02:00
parent 44655ecdef 787bf75304
commit 17be1e7528
35 changed files with 1772 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminManufacturersController.php
+9 -3
View File
@@ -245,7 +245,9 @@ class AdminManufacturersControllerCore extends AdminController
'name' => 'short_description',
'lang' => true,
'class' => 'rte',
'hint' => $this->l('Invalid characters:').' <>;=#{}'
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'rows' => 2,
'cols' => 10
),
array(
'type' => 'textarea',
@@ -253,7 +255,9 @@ class AdminManufacturersControllerCore extends AdminController
'name' => 'description',
'lang' => true,
'class' => 'rte',
'hint' => $this->l('Invalid characters:').' <>;=#{}'
'hint' => $this->l('Invalid characters:').' <>;=#{}',
'rows' => 2,
'cols' => 10
),
array(
'type' => 'file',
@@ -483,7 +487,9 @@ class AdminManufacturersControllerCore extends AdminController
'label' => $this->l('Other:'),
'name' => 'other',
'required' => false,
'hint' => $this->l('Forbidden characters:').' <>;=#{}'
'hint' => $this->l('Forbidden characters:').' <>;=#{}',
'rows' => 2,
'cols' => 10
);
$form['submit'] = array(
'title' => $this->l('Save '),
controllers/admin/AdminProductsController.php
+7 -5
View File
@@ -3273,8 +3273,9 @@ class AdminProductsControllerCore extends AdminController
}
}
$content .= '
</tbody>
</table>';
</tbody>
</table>
</fieldset>';
$content .= '
<script type="text/javascript">
@@ -3301,7 +3302,7 @@ class AdminProductsControllerCore extends AdminController
// Reindex array starting from 0
$specific_price_priorities = array_values($specific_price_priorities);
$content .= '
$content .= '<fieldset>
<h3>'.$this->l('Priority management').'</h3>
<div class="alert alert-info">
'.$this->l('Sometimes one customer can fit into multiple price rules. Priorities allow you to define which rule applies to the customer.').'
@@ -3348,6 +3349,7 @@ class AdminProductsControllerCore extends AdminController
</p>
</div>
</div>
</fieldset>
';
return $content;
}
@@ -3758,7 +3760,7 @@ class AdminProductsControllerCore extends AdminController
$this->addRowAction('default');
$this->addRowAction('delete');
$color_by_default = '#BDE5F8';
$default_class = 'highlighted';
$this->fields_list = array(
'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left'),
@@ -3821,7 +3823,7 @@ class AdminProductsControllerCore extends AdminController
if ($product_attribute['default_on'])
{
$comb_array[$id_product_attribute]['name'] = 'is_default';
$comb_array[$id_product_attribute]['color'] = $color_by_default;
$comb_array[$id_product_attribute]['class'] = $default_class;
}
}
}