mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Fixing merge with dev
This commit is contained in:
Silversthorn
parent
cc4ea2daa4
commit
39bb17cb54
@ -142,41 +142,25 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div id="accordion-1">
|
<label for="Role-1"> {{ translate('serverWizard', 'addRole', data['lang'])
|
||||||
<div class="card">
|
}}
|
||||||
<div class="card-header p-2" id="Role-1">
|
<small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
||||||
<p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1"
|
data['lang']) }}</small></label>
|
||||||
aria-expanded="true" aria-controls="collapseRole-1">
|
<select data-container="body"
|
||||||
<i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
|
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
||||||
}}
|
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
||||||
<small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
class="selectpicker form-control form-control-lg select-css roles_select"
|
||||||
data['lang']) }}</small>
|
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
||||||
</p>
|
name="server_roles" multiple>
|
||||||
</div>
|
{% for r in data['roles'] %}
|
||||||
<div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
|
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
||||||
<div class="card-body scroll">
|
{{ r['role_name'].capitalize()
|
||||||
<div class="form-group">
|
}}
|
||||||
<select data-container="body"
|
</option>
|
||||||
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
{% end %}
|
||||||
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
</select>
|
||||||
class="selectpicker form-control form-control-lg select-css roles_select"
|
|
||||||
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
|
||||||
name="server_roles" multiple>
|
|
||||||
{% for r in data['roles'] %}
|
|
||||||
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
|
||||||
{{ r['role_name'].capitalize()
|
|
||||||
}}
|
|
||||||
</option>
|
|
||||||
{% end %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'buildServer',
|
<button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'buildServer',
|
||||||
data['lang']) }}</button>
|
data['lang']) }}</button>
|
||||||
@ -275,37 +259,23 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div id="accordion-2">
|
<label for="Role-2"> {{ translate('serverWizard', 'addRole', data['lang'])
|
||||||
<div class="card">
|
}}
|
||||||
<div class="card-header p-2" id="Role-2">
|
<small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
||||||
<p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
|
data['lang']) }}</small></label>
|
||||||
aria-controls="collapseRole-2">
|
<select data-container="body"
|
||||||
<i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
|
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
||||||
<small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
||||||
data['lang']) }}</small>
|
class="selectpicker form-control form-control-lg select-css roles_select"
|
||||||
</p>
|
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
||||||
</div>
|
name="server_roles" multiple>
|
||||||
<div id="collapseRole-2" class="collapse" aria-labelledby="Role-2" data-parent="">
|
{% for r in data['roles'] %}
|
||||||
<div class="card-body scroll">
|
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
||||||
<div class="form-group">
|
{{ r['role_name'].capitalize()
|
||||||
<select data-container="body"
|
}}
|
||||||
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
</option>
|
||||||
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
{% end %}
|
||||||
class="selectpicker form-control form-control-lg select-css roles_select"
|
</select>
|
||||||
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
|
||||||
name="server_roles" multiple>
|
|
||||||
{% for r in data['roles'] %}
|
|
||||||
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
|
||||||
{{ r['role_name'].capitalize()
|
|
||||||
}}
|
|
||||||
</option>
|
|
||||||
{% end %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -403,37 +373,23 @@
|
|||||||
|
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div id="accordion-3">
|
<label for="Role-3"> {{ translate('serverWizard', 'addRole', data['lang'])
|
||||||
<div class="card">
|
}}
|
||||||
<div class="card-header p-2" id="Role-3">
|
<small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
||||||
<p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
|
data['lang']) }}</small></label>
|
||||||
aria-controls="collapseRole-3">
|
<select data-container="body"
|
||||||
<i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
|
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
||||||
}} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
||||||
data['lang']) }}</small>
|
class="selectpicker form-control form-control-lg select-css roles_select"
|
||||||
</p>
|
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
||||||
</div>
|
name="server_roles" multiple>
|
||||||
<div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
|
{% for r in data['roles'] %}
|
||||||
<div class="card-body scroll">
|
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
||||||
<div class="form-group">
|
{{ r['role_name'].capitalize()
|
||||||
<select data-container="body"
|
}}
|
||||||
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
</option>
|
||||||
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
{% end %}
|
||||||
class="selectpicker form-control form-control-lg select-css roles_select"
|
</select>
|
||||||
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
|
||||||
name="server_roles" multiple>
|
|
||||||
{% for r in data['roles'] %}
|
|
||||||
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
|
||||||
{{ r['role_name'].capitalize()
|
|
||||||
}}
|
|
||||||
</option>
|
|
||||||
{% end %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
|
<div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
|
||||||
@ -547,38 +503,23 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div id="accordion-3">
|
<label for="Role-3"> {{ translate('serverWizard', 'addRole', data['lang'])
|
||||||
<div class="card">
|
}}
|
||||||
<div class="card-header p-2" id="Role-3">
|
<small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
||||||
<p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
|
data['lang']) }}</small></label>
|
||||||
aria-controls="collapseRole-3">
|
<select data-container="body"
|
||||||
<i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
|
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
||||||
data['lang'])
|
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
||||||
}} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
|
class="selectpicker form-control form-control-lg select-css roles_select"
|
||||||
data['lang']) }}</small>
|
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
||||||
</p>
|
name="server_roles" multiple>
|
||||||
</div>
|
{% for r in data['roles'] %}
|
||||||
<div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
|
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
||||||
<div class="card-body scroll">
|
{{ r['role_name'].capitalize()
|
||||||
<div class="form-group">
|
}}
|
||||||
<select data-container="body"
|
</option>
|
||||||
data-none-selected-text="{{ translate('serverWizard', 'noneRoles', data['lang']) }}"
|
{% end %}
|
||||||
data-none-results-text="{{ translate('serverWizard', 'noRole', data['lang']) }} {0}"
|
</select>
|
||||||
class="selectpicker form-control form-control-lg select-css roles_select"
|
|
||||||
data-styleBase="form-control" data-style="form-control" data-live-search="true"
|
|
||||||
name="server_roles" multiple>
|
|
||||||
{% for r in data['roles'] %}
|
|
||||||
<option class="roles" type="checkbox" value="{{ r['role_id'] }}">
|
|
||||||
{{ r['role_name'].capitalize()
|
|
||||||
}}
|
|
||||||
</option>
|
|
||||||
{% end %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
|
<div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
|
||||||
<div class="modal-dialog" role="document">
|
<div class="modal-dialog" role="document">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user