Remove js working with group fields from style files

This commit is contained in:
Dmitriy Simushev 2014-10-10 11:59:23 +00:00
parent e8b35a6971
commit c86d7569f3
3 changed files with 10 additions and 12 deletions

View File

@ -18,15 +18,15 @@
(function($) { (function($) {
function updateParentGroup() { function updateParentGroup() {
if ($("#parentgroup").val() == '') { if ($("#parent-group").val() == '') {
$("#extrafields").show(); $("#extra-fields").show();
} else { } else {
$("#extrafields").hide(); $("#extra-fields").hide();
} }
} }
$(function() { $(function() {
$("#parentgroup").change(function() { $("#parent-group").change(function() {
updateParentGroup(); updateParentGroup();
}); });
updateParentGroup(); updateParentGroup();

View File

@ -96,6 +96,8 @@ class SettingsController extends AbstractController
$page = array_merge($page, prepare_menu($operator)); $page = array_merge($page, prepare_menu($operator));
$page['tabs'] = $this->buildTabs($request); $page['tabs'] = $this->buildTabs($request);
$this->getAssetManager()->attachJs('js/compiled/group.js');
return $this->render('group_edit', $page); return $this->render('group_edit', $page);
} }

View File

@ -1,10 +1,6 @@
{{#extends "_layout"}} {{#extends "_layout"}}
{{#override "menu"}}{{> _menu}}{{/override}} {{#override "menu"}}{{> _menu}}{{/override}}
{{#override "head"}}
<script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/group.js"}}"></script>
{{/override}}
{{#override "content"}} {{#override "content"}}
{{#if grid}} {{#if grid}}
{{l10n "On this page you can edit group details."}} {{l10n "On this page you can edit group details."}}
@ -89,19 +85,19 @@
</div> </div>
<div class="field"> <div class="field">
<label for="parentgroup" class="flabel">{{l10n "Parent group"}}</label> <label for="parent-group" class="flabel">{{l10n "Parent group"}}</label>
<div class="fvalue"> <div class="fvalue">
<select name="parentgroup" id="parentgroup"> <select name="parentgroup" id="parent-group">
{{#each availableParentGroups}} {{#each availableParentGroups}}
<option value="{{groupid}}"{{#ifEqual groupid ../formparentgroup}} selected="selected"{{/ifEqual}}>{{#repeat level}}&nbsp;&nbsp;{{/repeat}}{{vclocalname}}</option> <option value="{{groupid}}"{{#ifEqual groupid ../formparentgroup}} selected="selected"{{/ifEqual}}>{{#repeat level}}&nbsp;&nbsp;{{/repeat}}{{vclocalname}}</option>
{{/each}} {{/each}}
</select> </select>
</div> </div>
<label for="parentgroup" class="fdescr"> &mdash; {{l10n "Groups can be organized in a hierarchical structure"}}</label> <label for="parent-group" class="fdescr"> &mdash; {{l10n "Groups can be organized in a hierarchical structure"}}</label>
<br clear="all"/> <br clear="all"/>
</div> </div>
<div id="extrafields"> <div id="extra-fields">
<div class="fheader">{{l10n "The fields that located below are extra fields. These fields are only available for the top level groups and override corresponding system settings if specified."}}</div> <div class="fheader">{{l10n "The fields that located below are extra fields. These fields are only available for the top level groups and override corresponding system settings if specified."}}</div>
<div class="field"> <div class="field">