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

// Groups review

Browse Source
This commit is contained in:
Damien Metzger committed 2013-11-05 16:30:34 +01:00
1 parent 0bd6b940d2
commit 161c701ecf
3 files changed
+14 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+5 -6
View File
@@ -27,11 +27,11 @@
{block name="label"} {block name="label"}
{if $input['type'] == 'modules'} {if $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
<label class="control-label col-lg-3">{l s='Authorized modules:'}</label> <label class="control-label col-lg-3">{l s='Authorized modules:'}</label>
</div> </div>
{elseif $input['type'] == 'group_discount_category'} {elseif $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
{$smarty.block.parent} {$smarty.block.parent}
</div> </div>
{else} {else}
@@ -39,10 +39,9 @@
{/if} {/if}
{/block} {/block}
{block name="field"} {block name="field"}
{if $input['type'] == 'group_discount_category'} {if $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#group_discount_category").fancybox({ $("#group_discount_category").fancybox({
@@ -143,7 +142,7 @@
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
</div>
<div style="display:none" id="group_discount_category_fancybox"> <div style="display:none" id="group_discount_category_fancybox">
<div class="panel form-horizontal"> <div class="panel form-horizontal">
<div class="col-lg-12"> <div class="col-lg-12">
@@ -168,7 +167,7 @@
</div> </div>
</div> </div>
{elseif $input['type'] == 'modules'} {elseif $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('#authorized-modules').find('[value="0"]').click(function() { $('#authorized-modules').find('[value="0"]').click(function() {
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+8 -4
View File
@@ -26,7 +26,8 @@
{extends file="helpers/view/view.tpl"} {extends file="helpers/view/view.tpl"}
{block name="override_tpl"} {block name="override_tpl"}
<div class="col-lg-6"> <div class="row">
<div class="col-lg-6">
<div class="panel"> <div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3> <h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2> <h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
@@ -49,8 +50,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<div class="panel"> <div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3> <h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions} {if !$categorieReductions}
@@ -74,10 +75,13 @@
</table> </table>
{/if} {/if}
</div> </div>
</div>
</div> </div>
<div class="col-lg-12"> <div class="row">
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2> <h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p> <p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList} {$customerList}
</div>
</div> </div>
{/block} {/block}
controllers/admin/AdminGroupsController.php
+1 -1
View File
@@ -310,7 +310,7 @@ class AdminGroupsControllerCore extends AdminController
), ),
array( array(
'type' => 'modules', 'type' => 'modules',
'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')), 'label' => $this->l('Modules Authorization'),
'name' => 'auth_modules', 'name' => 'auth_modules',
'values' => $this->formatModuleListAuth($group->id) 'values' => $this->formatModuleListAuth($group->id)
) )