diff options
| author | Marvin Borner | 2018-05-23 22:23:28 +0200 |
|---|---|---|
| committer | Marvin Borner | 2018-05-23 22:23:28 +0200 |
| commit | b66a61addb6c8e66cb26fcf74b532d68891267e4 (patch) | |
| tree | 05e9449ff25bdc98f68105f41923ccb9f6ef5095 /main/app/sprinkles/admin/templates | |
| parent | 1d4ef435177a5f9b6d1a289800d933e49be0c550 (diff) | |
Refactored code, many fixes and improvements in chat backend+frontend
Diffstat (limited to 'main/app/sprinkles/admin/templates')
34 files changed, 1007 insertions, 884 deletions
diff --git a/main/app/sprinkles/admin/templates/forms/group.html.twig b/main/app/sprinkles/admin/templates/forms/group.html.twig index 36d6632..fade5ab 100644 --- a/main/app/sprinkles/admin/templates/forms/group.html.twig +++ b/main/app/sprinkles/admin/templates/forms/group.html.twig @@ -1,69 +1,80 @@ -<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}"> +<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}"> {% include "forms/csrf.html.twig" %} <div class="js-form-alerts"> </div> <div class="row"> {% block group_form %} {% if 'name' not in form.fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label>{{translate("GROUP.NAME")}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> - <input type="text" class="form-control" name="name" autocomplete="off" value="{{group.name}}" placeholder="{{translate("GROUP.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}> + <div class="col-sm-12"> + <div class="form-group"> + <label>{{ translate("GROUP.NAME") }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> + <input type="text" class="form-control" name="name" autocomplete="off" + value="{{ group.name }}" placeholder="{{ translate("GROUP.NAME_EXPLAIN") }}" + {% if 'name' in form.fields.disabled %}disabled{% endif %}> + </div> </div> </div> - </div> {% endif %} {% if 'slug' not in form.fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label>{{translate("SLUG")}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span> - <input type="text" class="form-control" name="slug" autocomplete="off" value="{{group.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly> - {% if 'slug' not in form.fields.disabled %} - <span class="input-group-btn" data-toggle="buttons"> + <div class="col-sm-12"> + <div class="form-group"> + <label>{{ translate("SLUG") }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span> + <input type="text" class="form-control" name="slug" autocomplete="off" + value="{{ group.slug }}" placeholder="{{ translate("SLUG") }}" + {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly> + {% if 'slug' not in form.fields.disabled %} + <span class="input-group-btn" data-toggle="buttons"> <label class="btn btn-primary"> - <input type="checkbox" id="form-group-slug-override" autocomplete="off"> {{translate("OVERRIDE")}} + <input type="checkbox" id="form-group-slug-override" + autocomplete="off"> {{ translate("OVERRIDE") }} </label> </span> - {% endif %} + {% endif %} + </div> </div> </div> - </div> {% endif %} {% if 'icon' not in fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label>{{translate("GROUP.ICON")}}</label> - <div class="input-group"> - <span class="input-group-addon icon-preview"><i class="{{group.icon}} fa-fw"></i></span> - <input type="text" class="form-control" name="icon" autocomplete="off" value="{{group.icon}}" placeholder="{{translate("GROUP.ICON_EXPLAIN")}}" {% if 'icon' in form.fields.disabled %}disabled{% endif %}> + <div class="col-sm-12"> + <div class="form-group"> + <label>{{ translate("GROUP.ICON") }}</label> + <div class="input-group"> + <span class="input-group-addon icon-preview"><i class="{{ group.icon }} fa-fw"></i></span> + <input type="text" class="form-control" name="icon" autocomplete="off" + value="{{ group.icon }}" placeholder="{{ translate("GROUP.ICON_EXPLAIN") }}" + {% if 'icon' in form.fields.disabled %}disabled{% endif %}> + </div> </div> </div> - </div> {% endif %} {% if 'description' not in fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label for="input_description">{{translate("DESCRIPTION")}}</label> - <textarea id="input_description" class="form-control" type="text" name="description" {% if 'description' in form.fields.disabled %}disabled{% endif %} rows=6>{{group.description}}</textarea> + <div class="col-sm-12"> + <div class="form-group"> + <label for="input_description">{{ translate("DESCRIPTION") }}</label> + <textarea id="input_description" class="form-control" type="text" name="description" + {% if 'description' in form.fields.disabled %}disabled{% endif %} + rows=6>{{ group.description }}</textarea> + </div> </div> - </div> {% endif %} {% endblock %} - </div><br> + </div> + <br> <div class="row"> <div class="col-xs-6 col-sm-4"> - <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button> + <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button> </div> <div class="col-xs-4 col-sm-3 pull-right"> - <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate("CANCEL")}}</button> + <button type="button" class="btn btn-block btn-lg btn-link" + data-dismiss="modal">{{ translate("CANCEL") }}</button> </div> </div> </form> <!-- Include validation rules --> <script> -{% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> diff --git a/main/app/sprinkles/admin/templates/forms/role.html.twig b/main/app/sprinkles/admin/templates/forms/role.html.twig index 46a4477..7759783 100644 --- a/main/app/sprinkles/admin/templates/forms/role.html.twig +++ b/main/app/sprinkles/admin/templates/forms/role.html.twig @@ -1,56 +1,65 @@ -<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}"> +<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}"> {% include "forms/csrf.html.twig" %} <div class="js-form-alerts"> </div> <div class="row"> {% if 'name' not in form.fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label>{{translate("ROLE.NAME")}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> - <input type="text" class="form-control" name="name" autocomplete="off" value="{{role.name}}" placeholder="{{translate("ROLE.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}> + <div class="col-sm-12"> + <div class="form-group"> + <label>{{ translate("ROLE.NAME") }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> + <input type="text" class="form-control" name="name" autocomplete="off" value="{{ role.name }}" + placeholder="{{ translate("ROLE.NAME_EXPLAIN") }}" + {% if 'name' in form.fields.disabled %}disabled{% endif %}> + </div> </div> </div> - </div> {% endif %} {% if 'slug' not in form.fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label>{{translate("SLUG")}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span> - <input type="text" class="form-control" name="slug" autocomplete="off" value="{{role.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly> - {% if 'slug' not in form.fields.disabled %} - <span class="input-group-btn" data-toggle="buttons"> + <div class="col-sm-12"> + <div class="form-group"> + <label>{{ translate("SLUG") }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span> + <input type="text" class="form-control" name="slug" autocomplete="off" value="{{ role.slug }}" + placeholder="{{ translate("SLUG") }}" + {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly> + {% if 'slug' not in form.fields.disabled %} + <span class="input-group-btn" data-toggle="buttons"> <label class="btn btn-primary"> - <input type="checkbox" id="form-role-slug-override" autocomplete="off"> {{translate("OVERRIDE")}} + <input type="checkbox" id="form-role-slug-override" + autocomplete="off"> {{ translate("OVERRIDE") }} </label> </span> - {% endif %} + {% endif %} + </div> </div> </div> - </div> {% endif %} {% if 'description' not in fields.hidden %} - <div class="col-sm-12"> - <div class="form-group"> - <label for="input_description">{{translate("DESCRIPTION")}}</label> - <textarea id="input_description" class="form-control" type="text" name="description" {% if 'description' in form.fields.disabled %}disabled{% endif %} rows=6>{{role.description}}</textarea> + <div class="col-sm-12"> + <div class="form-group"> + <label for="input_description">{{ translate("DESCRIPTION") }}</label> + <textarea id="input_description" class="form-control" type="text" name="description" + {% if 'description' in form.fields.disabled %}disabled{% endif %} + rows=6>{{ role.description }}</textarea> + </div> </div> - </div> {% endif %} - </div><br> + </div> + <br> <div class="row"> <div class="col-xs-8 col-sm-4"> - <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button> + <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button> </div> <div class="col-xs-4 col-sm-4 pull-right"> - <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate("CANCEL")}}</button> + <button type="button" class="btn btn-block btn-lg btn-link" + data-dismiss="modal">{{ translate("CANCEL") }}</button> </div> </div> </form> <!-- Include validation rules --> <script> -{% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> diff --git a/main/app/sprinkles/admin/templates/forms/user.html.twig b/main/app/sprinkles/admin/templates/forms/user.html.twig index 3ee7fc9..e42cc6d 100644 --- a/main/app/sprinkles/admin/templates/forms/user.html.twig +++ b/main/app/sprinkles/admin/templates/forms/user.html.twig @@ -1,125 +1,142 @@ -<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}"> +<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}"> {% include "forms/csrf.html.twig" %} <div class="js-form-alerts"> </div> <div class="row"> {% block user_form %} {% if 'user_name' not in form.fields.hidden %} - <div class="col-sm-6"> - <div class="form-group"> - <label>{{translate('USERNAME')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> - <input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}> + <div class="col-sm-6"> + <div class="form-group"> + <label>{{ translate('USERNAME') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> + <input type="text" class="form-control" name="user_name" autocomplete="off" + value="{{ user.user_name }}" placeholder="{{ translate('USERNAME') }}" + {% if 'user_name' in form.fields.disabled %}disabled{% endif %}> + </div> </div> </div> - </div> {% endif %} {% if 'group' not in form.fields.hidden %} - <div class="col-sm-6"> - <div class="form-group"> - <label for="input-group">{{translate('GROUP')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-users fa-fw"></i></span> - {% if 'group' in form.fields.disabled %} - <input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled> - {% else %} - <select id="input-group" class="form-control js-select2" name="group_id"> - {% for group in groups %} - <option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option> - {% endfor %} - </select> - {% endif %} + <div class="col-sm-6"> + <div class="form-group"> + <label for="input-group">{{ translate('GROUP') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-users fa-fw"></i></span> + {% if 'group' in form.fields.disabled %} + <input type="text" class="form-control" name="theme" value="{{ user.group.name }}" + disabled> + {% else %} + <select id="input-group" class="form-control js-select2" name="group_id"> + {% for group in groups %} + <option value="{{ group.id }}" + {% if (group.id == user.group_id) %}selected{% endif %}>{{ group.name }}</option> + {% endfor %} + </select> + {% endif %} + </div> </div> </div> - </div> {% endif %} {% if 'name' not in form.fields.hidden %} - <div class="col-sm-6"> - <div class="form-group"> - <label>{{translate('FIRST_NAME')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> - <input type="text" class="form-control" name="first_name" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}> + <div class="col-sm-6"> + <div class="form-group"> + <label>{{ translate('FIRST_NAME') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> + <input type="text" class="form-control" name="first_name" autocomplete="off" + value="{{ user.first_name }}" placeholder="{{ translate('FIRST_NAME') }}" + {% if 'name' in form.fields.disabled %}disabled{% endif %}> + </div> </div> </div> - </div> - <div class="col-sm-6"> - <div class="form-group"> - <label>{{translate('LAST_NAME')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> - <input type="text" class="form-control" name="last_name" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}> + <div class="col-sm-6"> + <div class="form-group"> + <label>{{ translate('LAST_NAME') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span> + <input type="text" class="form-control" name="last_name" autocomplete="off" + value="{{ user.last_name }}" placeholder="{{ translate('LAST_NAME') }}" + {% if 'name' in form.fields.disabled %}disabled{% endif %}> + </div> </div> </div> - </div> {% endif %} {% if 'email' not in form.fields.hidden %} - <div class="col-sm-6"> - <div class="form-group"> - <label>{{translate('EMAIL')}}</label> - <div class="input-group js-copy-container"> - <span class="input-group-addon"><i class="fa fa-envelope fa-fw"></i></span> - <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}> - {% if 'email' in form.fields.disabled %} - <span class="input-group-btn"> - <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fa fa-clipboard"></i></button> + <div class="col-sm-6"> + <div class="form-group"> + <label>{{ translate('EMAIL') }}</label> + <div class="input-group js-copy-container"> + <span class="input-group-addon"><i class="fa fa-envelope fa-fw"></i></span> + <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" + value="{{ user.email }}" placeholder="{{ translate('EMAIL') }}" + {% if 'email' in form.fields.disabled %}disabled{% endif %}> + {% if 'email' in form.fields.disabled %} + <span class="input-group-btn"> + <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i + class="fa fa-clipboard"></i></button> </span> - {% endif %} + {% endif %} + </div> </div> </div> - </div> {% endif %} {% if 'theme' not in form.fields.hidden %} - <div class="col-sm-6"> - <div class="form-group"> - <label for="input-theme">{{translate('THEME')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-puzzle-piece fa-fw"></i></span> - {% if 'theme' in form.fields.disabled %} - <input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled> - {% else %} - <select id="input-theme" class="form-control js-select2" name="theme"> - {% for option, label in theme %} - <option value="{{option}}" {% if (option == user.theme) %}selected{% endif %}>{{label}}</option> - {% endfor %} - </select> - {% endif %} + <div class="col-sm-6"> + <div class="form-group"> + <label for="input-theme">{{ translate('THEME') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-puzzle-piece fa-fw"></i></span> + {% if 'theme' in form.fields.disabled %} + <input type="text" class="form-control" name="theme" value="{{ themes[user.theme] }}" + disabled> + {% else %} + <select id="input-theme" class="form-control js-select2" name="theme"> + {% for option, label in theme %} + <option value="{{ option }}" + {% if (option == user.theme) %}selected{% endif %}>{{ label }}</option> + {% endfor %} + </select> + {% endif %} + </div> </div> </div> - </div> {% endif %} {% if 'locale' not in form.fields.hidden %} - <div class="col-sm-6"> - <div class="form-group"> - <label for="input-locale">{{translate('LOCALE')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-language fa-fw"></i></span> - {% if 'locale' in form.fields.disabled %} - <input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled> - {% else %} - <select id="input-locale" class="form-control js-select2" name="locale"> - {% for option, label in locales %} - <option value="{{option}}" {% if (option == user.locale) %}selected{% endif %}>{{label}}</option> - {% endfor %} - </select> - {% endif %} + <div class="col-sm-6"> + <div class="form-group"> + <label for="input-locale">{{ translate('LOCALE') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-language fa-fw"></i></span> + {% if 'locale' in form.fields.disabled %} + <input type="text" class="form-control" name="theme" value="{{ locales[user.locale] }}" + disabled> + {% else %} + <select id="input-locale" class="form-control js-select2" name="locale"> + {% for option, label in locales %} + <option value="{{ option }}" + {% if (option == user.locale) %}selected{% endif %}>{{ label }}</option> + {% endfor %} + </select> + {% endif %} + </div> </div> </div> - </div> {% endif %} {% endblock %} - </div><br> + </div> + <br> <div class="row"> <div class="col-xs-8 col-sm-4"> - <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button> + <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button> </div> <div class="col-xs-4 col-sm-3 pull-right"> - <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button> + <button type="button" class="btn btn-block btn-lg btn-link" + data-dismiss="modal">{{ translate('CANCEL') }}</button> </div> </div> </form> <!-- Include validation rules --> <script> -{% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> diff --git a/main/app/sprinkles/admin/templates/mail/password-create.html.twig b/main/app/sprinkles/admin/templates/mail/password-create.html.twig index 854eb77..f3a36d8 100644 --- a/main/app/sprinkles/admin/templates/mail/password-create.html.twig +++ b/main/app/sprinkles/admin/templates/mail/password-create.html.twig @@ -1,19 +1,23 @@ {% block subject %} - {{site.title}} - please set a password for your new account + {{ site.title }} - please set a password for your new account {% endblock %} {% block body %} -<p> - Dear {{user.first_name}}, -</p> -<p> - Someone has created an account for you with {{site.title}} ({{site.uri.public}}). Your username is <b>{{user.user_name}}</b>. -</p> -<p> - To access your account, you must first create a password by visiting: <a href="{{site.uri.public}}/account/set-password/confirm?token={{token}}">{{site.uri.public}}/account/set-password/confirm?token={{token}}</a>. This link has been generated especially for you, and will expire in {{create_password_expiration}}. Do not share it with anyone! -</p> -<p> - With regards,<br> - The {{site.title}} Team -</p> + <p> + Dear {{ user.first_name }}, + </p> + <p> + Someone has created an account for you with {{ site.title }} ({{ site.uri.public }}). Your username is + <b>{{ user.user_name }}</b>. + </p> + <p> + To access your account, you must first create a password by visiting: <a + href="{{ site.uri.public }}/account/set-password/confirm?token={{ token }}">{{ site.uri.public }} + /account/set-password/confirm?token={{ token }}</a>. This link has been generated especially for you, and + will expire in {{ create_password_expiration }}. Do not share it with anyone! + </p> + <p> + With regards,<br> + The {{ site.title }} Team + </p> {% endblock %}
\ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig index e5457d3..bf3ccca 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-clear-cache.html.twig @@ -1,17 +1,21 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("CACHE.CLEAR")}}{% endblock %} +{% block modal_title %}{{ translate("CACHE.CLEAR") }}{% endblock %} {% block modal_body %} -<form class="js-form" method="post" action="{{site.uri.public}}/{{form.action}}"> - {% include "forms/csrf.html.twig" %} - <div class="js-form-alerts"> - </div> - <h4>{{translate("CACHE.CLEAR_CONFIRM")}}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small></h4> - <br> - <div class="btn-group-action"> - <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("CACHE.CLEAR_CONFIRM_YES")}}</button> - <button type="button" class="btn btn-default btn-lg btn-block" data-dismiss="modal">{{translate("CANCEL")}}</button> - </div> -</form> + <form class="js-form" method="post" action="{{ site.uri.public }}/{{ form.action }}"> + {% include "forms/csrf.html.twig" %} + <div class="js-form-alerts"> + </div> + <h4>{{ translate("CACHE.CLEAR_CONFIRM") }}<br> + <small>{{ translate("DELETE_CANNOT_UNDONE") }}</small> + </h4> + <br> + <div class="btn-group-action"> + <button type="submit" + class="btn btn-danger btn-lg btn-block">{{ translate("CACHE.CLEAR_CONFIRM_YES") }}</button> + <button type="button" class="btn btn-default btn-lg btn-block" + data-dismiss="modal">{{ translate("CANCEL") }}</button> + </div> + </form> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig index 7889a1e..e53bf6e 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-delete-group.html.twig @@ -1,17 +1,20 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("GROUP.DELETE")}}{% endblock %} +{% block modal_title %}{{ translate("GROUP.DELETE") }}{% endblock %} {% block modal_body %} -<form class="js-form" method="delete" action="{{site.uri.public}}/{{form.action}}"> - {% include "forms/csrf.html.twig" %} - <div class="js-form-alerts"> - </div> - <h4>{{translate("GROUP.DELETE_CONFIRM", {name: group.name})}}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small></h4> - <br> - <div class="btn-group-action"> - <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("GROUP.DELETE_YES")}}</button> - <button type="button" class="btn btn-default btn-lg btn-block" data-dismiss="modal">{{translate("CANCEL")}}</button> - </div> -</form> + <form class="js-form" method="delete" action="{{ site.uri.public }}/{{ form.action }}"> + {% include "forms/csrf.html.twig" %} + <div class="js-form-alerts"> + </div> + <h4>{{ translate("GROUP.DELETE_CONFIRM", {name: group.name}) }}<br> + <small>{{ translate("DELETE_CANNOT_UNDONE") }}</small> + </h4> + <br> + <div class="btn-group-action"> + <button type="submit" class="btn btn-danger btn-lg btn-block">{{ translate("GROUP.DELETE_YES") }}</button> + <button type="button" class="btn btn-default btn-lg btn-block" + data-dismiss="modal">{{ translate("CANCEL") }}</button> + </div> + </form> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig index 618039b..ae528f9 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-delete-role.html.twig @@ -1,17 +1,20 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("ROLE.DELETE")}}{% endblock %} +{% block modal_title %}{{ translate("ROLE.DELETE") }}{% endblock %} {% block modal_body %} -<form class="js-form" method="delete" action="{{site.uri.public}}/{{form.action}}"> - {% include "forms/csrf.html.twig" %} - <div class="js-form-alerts"> - </div> - <h4>{{translate("ROLE.DELETE_CONFIRM", {name: role.name})}}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small></h4> - <br> - <div class="btn-group-action"> - <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ROLE.DELETE_YES")}}</button> - <button type="button" class="btn btn-default btn-lg btn-block" data-dismiss="modal">{{translate("CANCEL")}}</button> - </div> -</form> + <form class="js-form" method="delete" action="{{ site.uri.public }}/{{ form.action }}"> + {% include "forms/csrf.html.twig" %} + <div class="js-form-alerts"> + </div> + <h4>{{ translate("ROLE.DELETE_CONFIRM", {name: role.name}) }}<br> + <small>{{ translate("DELETE_CANNOT_UNDONE") }}</small> + </h4> + <br> + <div class="btn-group-action"> + <button type="submit" class="btn btn-danger btn-lg btn-block">{{ translate("ROLE.DELETE_YES") }}</button> + <button type="button" class="btn btn-default btn-lg btn-block" + data-dismiss="modal">{{ translate("CANCEL") }}</button> + </div> + </form> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig b/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig index ce86301..17fe859 100644 --- a/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig +++ b/main/app/sprinkles/admin/templates/modals/confirm-delete-user.html.twig @@ -1,17 +1,20 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("USER.DELETE")}}{% endblock %} +{% block modal_title %}{{ translate("USER.DELETE") }}{% endblock %} {% block modal_body %} -<form class="js-form" method="delete" action="{{site.uri.public}}/{{form.action}}"> - {% include "forms/csrf.html.twig" %} - <div class="js-form-alerts"> - </div> - <h4>{{translate("USER.DELETE_CONFIRM", {name: user.user_name})}}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small></h4> - <br> - <div class="btn-group-action"> - <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("USER.DELETE_YES")}}</button> - <button type="button" class="btn btn-default btn-lg btn-block" data-dismiss="modal">{{translate("CANCEL")}}</button> - </div> -</form> + <form class="js-form" method="delete" action="{{ site.uri.public }}/{{ form.action }}"> + {% include "forms/csrf.html.twig" %} + <div class="js-form-alerts"> + </div> + <h4>{{ translate("USER.DELETE_CONFIRM", {name: user.user_name}) }}<br> + <small>{{ translate("DELETE_CANNOT_UNDONE") }}</small> + </h4> + <br> + <div class="btn-group-action"> + <button type="submit" class="btn btn-danger btn-lg btn-block">{{ translate("USER.DELETE_YES") }}</button> + <button type="button" class="btn btn-default btn-lg btn-block" + data-dismiss="modal">{{ translate("CANCEL") }}</button> + </div> + </form> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/group.html.twig b/main/app/sprinkles/admin/templates/modals/group.html.twig index be2d98c..a716b4f 100644 --- a/main/app/sprinkles/admin/templates/modals/group.html.twig +++ b/main/app/sprinkles/admin/templates/modals/group.html.twig @@ -1,6 +1,6 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate('GROUP')}}{% endblock %} +{% block modal_title %}{{ translate('GROUP') }}{% endblock %} {% block modal_body %} {% include "forms/group.html.twig" %} diff --git a/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig b/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig index 3914d2e..f8b7ef5 100644 --- a/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig +++ b/main/app/sprinkles/admin/templates/modals/role-manage-permissions.html.twig @@ -1,52 +1,54 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("PERMISSION.MANAGE")}}{% endblock %} +{% block modal_title %}{{ translate("PERMISSION.MANAGE") }}{% endblock %} {% block modal_size %}modal-lg{% endblock %} {% block modal_body %} -<form class="js-form" method="PUT" action="{{site.uri.public}}/api/roles/r/{{role.slug}}/permissions"> - {% include "forms/csrf.html.twig" %} - <div class="js-form-alerts"> - </div> - <div class="js-form-permissions"> - <table class="table table-striped"> - <thead> - <tr> - <th>{{translate("NAME")}}</th> - <th>{{translate("DESCRIPTION")}}</th> - <th>{{translate("PERMISSION.HOOK_CONDITION")}}</th> - <th>{{translate("REMOVE")}}</th> - </tr> - </thead> - <tbody> - </tbody> - </table> - <div class="padding-bottom"> - <label>{{translate("PERMISSION.ASSIGN_NEW")}}:</label> - <select class="form-control js-select-new" type="text"> - <option></option> - </select> + <form class="js-form" method="PUT" action="{{ site.uri.public }}/api/roles/r/{{ role.slug }}/permissions"> + {% include "forms/csrf.html.twig" %} + <div class="js-form-alerts"> </div> - </div> - <br> - <div class="row"> - <div class="col-xs-12 col-sm-6"> - <button type="submit" class="btn btn-block btn-lg btn-success">{{translate("PERMISSION.UPDATE")}}</button> + <div class="js-form-permissions"> + <table class="table table-striped"> + <thead> + <tr> + <th>{{ translate("NAME") }}</th> + <th>{{ translate("DESCRIPTION") }}</th> + <th>{{ translate("PERMISSION.HOOK_CONDITION") }}</th> + <th>{{ translate("REMOVE") }}</th> + </tr> + </thead> + <tbody> + </tbody> + </table> + <div class="padding-bottom"> + <label>{{ translate("PERMISSION.ASSIGN_NEW") }}:</label> + <select class="form-control js-select-new" type="text"> + <option></option> + </select> + </div> </div> - <div class="col-xs-12 col-sm-3 pull-right"> - <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button> + <br> + <div class="row"> + <div class="col-xs-12 col-sm-6"> + <button type="submit" + class="btn btn-block btn-lg btn-success">{{ translate("PERMISSION.UPDATE") }}</button> + </div> + <div class="col-xs-12 col-sm-3 pull-right"> + <button type="button" class="btn btn-block btn-lg btn-link" + data-dismiss="modal">{{ translate('CANCEL') }}</button> + </div> </div> - </div> -</form> + </form> -{# This contains a series of <script> blocks, each of which is a client-side Handlebars template. - # Note that these are NOT Twig templates, although the syntax is similar. We wrap them in the `verbatim` tag, - # so that Twig will output them directly into the DOM instead of trying to treat them like Twig templates. - # - # These templates require handlebars-helpers.js, moment.js -#} -{% verbatim %} + {# This contains a series of <script> blocks, each of which is a client-side Handlebars template. + # Note that these are NOT Twig templates, although the syntax is similar. We wrap them in the `verbatim` tag, + # so that Twig will output them directly into the DOM instead of trying to treat them like Twig templates. + # + # These templates require handlebars-helpers.js, moment.js + #} + {% verbatim %} <script id="role-permissions-select-option" type="text/x-handlebars-template"> <div> <strong> @@ -87,8 +89,8 @@ </script> {% endverbatim %} -<!-- Include validation rules --> -<script> - {% include "pages/partials/page.js.twig" %} -</script> + <!-- Include validation rules --> + <script> + {% include "pages/partials/page.js.twig" %} + </script> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/role.html.twig b/main/app/sprinkles/admin/templates/modals/role.html.twig index 6346461..6ae924e 100644 --- a/main/app/sprinkles/admin/templates/modals/role.html.twig +++ b/main/app/sprinkles/admin/templates/modals/role.html.twig @@ -1,6 +1,6 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate('ROLE')}}{% endblock %} +{% block modal_title %}{{ translate('ROLE') }}{% endblock %} {% block modal_body %} {% include "forms/role.html.twig" %} diff --git a/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig b/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig index b41c60b..3c0fe18 100644 --- a/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig +++ b/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig @@ -1,49 +1,50 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("ROLE.MANAGE")}}{% endblock %} +{% block modal_title %}{{ translate("ROLE.MANAGE") }}{% endblock %} {% block modal_body %} -<form class="js-form" method="PUT" action="{{site.uri.public}}/api/users/u/{{user.user_name}}/roles"> - {% include "forms/csrf.html.twig" %} - <div class="js-form-alerts"> - </div> - <div class="js-form-roles"> - <table class="table table-striped"> - <thead> - <tr> - <th>{{translate("NAME")}}</th> - <th>{{translate("DESCRIPTION")}}</th> - <th>{{translate("REMOVE")}}</th> - </tr> - </thead> - <tbody> - </tbody> - </table> - <div class="padding-bottom"> - <label>{{translate("ROLE.ASSIGN_NEW")}}:</label> - <select class="form-control js-select-new" type="text"> - <option></option> - </select> + <form class="js-form" method="PUT" action="{{ site.uri.public }}/api/users/u/{{ user.user_name }}/roles"> + {% include "forms/csrf.html.twig" %} + <div class="js-form-alerts"> </div> - </div> - <br> - <div class="row"> - <div class="col-xs-8 col-sm-4"> - <button type="submit" class="btn btn-block btn-lg btn-success">{{translate("UPDATE")}}</button> + <div class="js-form-roles"> + <table class="table table-striped"> + <thead> + <tr> + <th>{{ translate("NAME") }}</th> + <th>{{ translate("DESCRIPTION") }}</th> + <th>{{ translate("REMOVE") }}</th> + </tr> + </thead> + <tbody> + </tbody> + </table> + <div class="padding-bottom"> + <label>{{ translate("ROLE.ASSIGN_NEW") }}:</label> + <select class="form-control js-select-new" type="text"> + <option></option> + </select> + </div> </div> - <div class="col-xs-4 col-sm-3 pull-right"> - <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button> + <br> + <div class="row"> + <div class="col-xs-8 col-sm-4"> + <button type="submit" class="btn btn-block btn-lg btn-success">{{ translate("UPDATE") }}</button> + </div> + <div class="col-xs-4 col-sm-3 pull-right"> + <button type="button" class="btn btn-block btn-lg btn-link" + data-dismiss="modal">{{ translate('CANCEL') }}</button> + </div> </div> - </div> -</form> + </form> -{# This contains a series of <script> blocks, each of which is a client-side Handlebars template. - # Note that these are NOT Twig templates, although the syntax is similar. We wrap them in the `verbatim` tag, - # so that Twig will output them directly into the DOM instead of trying to treat them like Twig templates. - # - # These templates require handlebars-helpers.js, moment.js -#} -{% verbatim %} + {# This contains a series of <script> blocks, each of which is a client-side Handlebars template. + # Note that these are NOT Twig templates, although the syntax is similar. We wrap them in the `verbatim` tag, + # so that Twig will output them directly into the DOM instead of trying to treat them like Twig templates. + # + # These templates require handlebars-helpers.js, moment.js + #} + {% verbatim %} <script id="user-roles-select-option" type="text/x-handlebars-template"> <div> <strong> @@ -70,8 +71,8 @@ </script> {% endverbatim %} -<!-- Include validation rules --> -<script> - {% include "pages/partials/page.js.twig" %} -</script> + <!-- Include validation rules --> + <script> + {% include "pages/partials/page.js.twig" %} + </script> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig b/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig index 922d4e2..9b2c017 100644 --- a/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig +++ b/main/app/sprinkles/admin/templates/modals/user-set-password.html.twig @@ -1,62 +1,67 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% endblock %} +{% block modal_title %}{{ translate("USER.ADMIN.CHANGE_PASSWORD") }}{% endblock %} {% block modal_body %} -<form class="js-form" method="PUT" action="{{site.uri.public}}/api/users/u/{{user.user_name}}"> - {% include "forms/csrf.html.twig" %} - <!-- Prevent browsers from trying to autofill the password field. See http://stackoverflow.com/a/23234498/2970321 --> - <input type="text" style="display:none"> - <input type="password" style="display:none"> - <div class="js-form-alerts"> - </div> - <div class="row"> - <div class="col-sm-12"> - <div class="radio"> - <label for="change_password_mode_link"> - <input type="radio" name="change_password_mode" id="change_password_mode_link" value="link" checked> - {{translate("USER.ADMIN.SEND_PASSWORD_LINK")}} - </label> - </div> + <form class="js-form" method="PUT" action="{{ site.uri.public }}/api/users/u/{{ user.user_name }}"> + {% include "forms/csrf.html.twig" %} + <!-- Prevent browsers from trying to autofill the password field. See http://stackoverflow.com/a/23234498/2970321 --> + <input type="text" style="display:none"> + <input type="password" style="display:none"> + <div class="js-form-alerts"> </div> - <div class="col-sm-12"> - <div class="radio"> - <label for="change_password_mode_manual"> - <input type="radio" name="change_password_mode" id="change_password_mode_manual" value="manual"> - {{translate("USER.ADMIN.SET_PASSWORD")}}: - </label> + <div class="row"> + <div class="col-sm-12"> + <div class="radio"> + <label for="change_password_mode_link"> + <input type="radio" name="change_password_mode" id="change_password_mode_link" value="link" + checked> + {{ translate("USER.ADMIN.SEND_PASSWORD_LINK") }} + </label> + </div> </div> - <div class="row controls-password"> - <div class="col-sm-11 col-sm-offset-1"> - <div class="form-group"> - <label>{{translate('PASSWORD')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-key"></i></span> - <input type="password" class="form-control" name="value" autocomplete="off" value="" placeholder="{{translate("PASSWORD.BETWEEN", {min: 12, max: 50})}}"> + <div class="col-sm-12"> + <div class="radio"> + <label for="change_password_mode_manual"> + <input type="radio" name="change_password_mode" id="change_password_mode_manual" value="manual"> + {{ translate("USER.ADMIN.SET_PASSWORD") }}: + </label> + </div> + <div class="row controls-password"> + <div class="col-sm-11 col-sm-offset-1"> + <div class="form-group"> + <label>{{ translate('PASSWORD') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-key"></i></span> + <input type="password" class="form-control" name="value" autocomplete="off" value="" + placeholder="{{ translate("PASSWORD.BETWEEN", {min: 12, max: 50}) }}"> + </div> </div> - </div> - <div class="form-group"> - <label>{{translate('PASSWORD.CONFIRM')}}</label> - <div class="input-group"> - <span class="input-group-addon"><i class="fa fa-key"></i></span> - <input type="password" class="form-control" name="passwordc" autocomplete="off" value="" placeholder="{{translate('PASSWORD.CONFIRM')}}"> + <div class="form-group"> + <label>{{ translate('PASSWORD.CONFIRM') }}</label> + <div class="input-group"> + <span class="input-group-addon"><i class="fa fa-key"></i></span> + <input type="password" class="form-control" name="passwordc" autocomplete="off" value="" + placeholder="{{ translate('PASSWORD.CONFIRM') }}"> + </div> </div> </div> </div> </div> </div> - </div><br> - <div class="row"> - <div class="col-xs-8 col-sm-4"> - <button type="submit" class="btn btn-block btn-lg btn-success">{{translate('SUBMIT')}}</button> - </div> - <div class="col-xs-4 col-sm-3 pull-right"> - <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button> + <br> + <div class="row"> + <div class="col-xs-8 col-sm-4"> + <button type="submit" class="btn btn-block btn-lg btn-success">{{ translate('SUBMIT') }}</button> + </div> + <div class="col-xs-4 col-sm-3 pull-right"> + <button type="button" class="btn btn-block btn-lg btn-link" + data-dismiss="modal">{{ translate('CANCEL') }}</button> + </div> </div> - </div> -</form> -<!-- Include validation rules --> -<script> - {% include "pages/partials/page.js.twig" %} -</script> + </form> + <!-- Include validation rules --> + <script> + {% include "pages/partials/page.js.twig" %} + </script> {% endblock %} diff --git a/main/app/sprinkles/admin/templates/modals/user.html.twig b/main/app/sprinkles/admin/templates/modals/user.html.twig index 892fe4f..850844d 100644 --- a/main/app/sprinkles/admin/templates/modals/user.html.twig +++ b/main/app/sprinkles/admin/templates/modals/user.html.twig @@ -1,6 +1,6 @@ {% extends "modals/modal.html.twig" %} -{% block modal_title %}{{translate('USER')}}{% endblock %} +{% block modal_title %}{{ translate('USER') }}{% endblock %} {% block modal_body %} {% include "forms/user.html.twig" %} diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig index e6d4a7c..446f260 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig @@ -1,38 +1,53 @@ {% block navigation %} {% if checkAccess('uri_dashboard') %} - <li> - <a href="{{site.uri.public}}/dashboard"><i class="fa fa-dashboard fa-fw"></i> <span>{{ translate("DASHBOARD") }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/dashboard"><i class="fa fa-dashboard fa-fw"></i> + <span>{{ translate("DASHBOARD") }}</span> + </a> + </li> {% endif %} {% if checkAccess('uri_users') %} - <li> - <a href="{{site.uri.public}}/users"><i class="fa fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/users"><i class="fa fa-user fa-fw"></i> + <span>{{ translate("USER", 2) }}</span> + </a> + </li> {% elseif checkAccess('uri_group', { 'group': current_user.group }) %} - <li> - <a href="{{site.uri.public}}/groups/g/{{current_user.group.slug}}"><i class="{{current_user.group.icon}} fa-fw"></i> <span>{{ translate("GROUP.MANAGE") }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/groups/g/{{ current_user.group.slug }}"><i + class="{{ current_user.group.icon }} fa-fw"></i> + <span>{{ translate("GROUP.MANAGE") }}</span> + </a> + </li> {% endif %} {% if checkAccess('uri_activities') %} - <li> - <a href="{{site.uri.public}}/activities"><i class="fa fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/activities"><i class="fa fa-tasks fa-fw"></i> + <span>{{ translate("ACTIVITY", 2) }}</span> + </a> + </li> {% endif %} {% if checkAccess('uri_roles') %} - <li> - <a href="{{site.uri.public}}/roles"><i class="fa fa-drivers-license fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/roles"><i class="fa fa-drivers-license fa-fw"></i> + <span>{{ translate("ROLE", 2) }}</span> + </a> + </li> {% endif %} {% if checkAccess('uri_permissions') %} - <li> - <a href="{{site.uri.public}}/permissions"><i class="fa fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/permissions"><i class="fa fa-key fa-fw"></i> + <span>{{ translate("PERMISSION", 2) }}</span> + </a> + </li> {% endif %} {% if checkAccess('uri_groups') %} - <li> - <a href="{{site.uri.public}}/groups"><i class="fa fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a> - </li> + <li> + <a href="{{ site.uri.public }}/groups"><i class="fa fa-users fa-fw"></i> + <span>{{ translate("GROUP", 2) }}</span> + </a> + </li> {% endif %} {% endblock %}
\ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig index 018e644..4b1881c 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig @@ -1,10 +1,10 @@ <!-- Sidebar user panel --> <div class="user-panel"> - <div class="pull-left image"> - <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image"> - </div> - <div class="pull-left info"> - <p>{{current_user.first_name}} {{current_user.last_name}}</p> - <i class="{{current_user.group.icon}}"></i> {{current_user.group.name}} - </div> + <div class="pull-left image"> + <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image"> + </div> + <div class="pull-left info"> + <p>{{ current_user.first_name }} {{ current_user.last_name }}</p> + <i class="{{ current_user.group.icon }}"></i> {{ current_user.group.name }} + </div> </div>
\ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig index 1b2939e..59f87b0 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig @@ -3,8 +3,8 @@ {% endblock %} {% block sidebar_menu %} -<ul class="sidebar-menu"> - <li class="header" style="text-transform: uppercase">{{translate('NAVIGATION')}}</li> - {% include 'navigation/sidebar-menu.html.twig' %} -</ul> + <ul class="sidebar-menu"> + <li class="header" style="text-transform: uppercase">{{ translate('NAVIGATION') }}</li> + {% include 'navigation/sidebar-menu.html.twig' %} + </ul> {% endblock %}
\ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig index 36fdb4b..8b40cd3 100644 --- a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig @@ -2,7 +2,8 @@ {% block userCard_menu %} {% if checkAccess('uri_dashboard') %} - <a href="{{site.uri.public}}/dashboard" class="btn btn-default btn-flat btn-block">{{translate("DASHBOARD")}}</a> + <a href="{{ site.uri.public }}/dashboard" + class="btn btn-default btn-flat btn-block">{{ translate("DASHBOARD") }}</a> {% endif %} {{ parent() }} {% endblock %}
\ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig b/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig index 2a53de4..0d2e0ef 100644 --- a/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig +++ b/main/app/sprinkles/admin/templates/pages/abstract/dashboard.html.twig @@ -9,7 +9,7 @@ {% if current_user.isMaster() %} class="hold-transition skin-red sidebar-mini" {% else %} - class="hold-transition skin-{{site.AdminLTE.skin}} sidebar-mini" + class="hold-transition skin-{{ site.AdminLTE.skin }} sidebar-mini" {% endif %} {% endblock %} @@ -17,65 +17,68 @@ {# This needs to be here (early in the body) to make sure the animation doesn't fire #} <script> (function () { - if (Boolean(sessionStorage.getItem('sidebar-toggle-collapsed'))) { - var body = document.getElementsByTagName('body')[0]; - body.className = body.className + ' sidebar-collapse'; - } + if (Boolean(sessionStorage.getItem('sidebar-toggle-collapsed'))) { + var body = document.getElementsByTagName('body')[0]; + body.className = body.className + ' sidebar-collapse'; + } })(); </script> <div class="wrapper"> - <header class="main-header"> - <!-- Logo --> - {% block navbar_logo %} - <a href="{{site.uri.public}}" class="logo"> - <i class="fa fa-home"></i> - {{site.title}} - </a> - {% endblock %} - <!-- Header Navbar: style can be found in header.less --> - <nav class="navbar navbar-static-top"> - <!-- Sidebar toggle button--> - <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button"> - <span class="sr-only">Toggle navigation</span> - </a> - <!-- Main nav buttons --> - {% include "navigation/navbar.html.twig" %} - </nav> - </header> - <!-- Left side column. contains the logo and sidebar --> - <aside class="main-sidebar"> - <!-- sidebar: style can be found in sidebar.less --> - <section class="sidebar"> - {% include 'navigation/sidebar.html.twig' %} - </section> - <!-- /.sidebar --> - </aside> + <header class="main-header"> + <!-- Logo --> + {% block navbar_logo %} + <a href="{{ site.uri.public }}" class="logo"> + <i class="fa fa-home"></i> + {{ site.title }} + </a> + {% endblock %} + <!-- Header Navbar: style can be found in header.less --> + <nav class="navbar navbar-static-top"> + <!-- Sidebar toggle button--> + <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button"> + <span class="sr-only">Toggle navigation</span> + </a> + <!-- Main nav buttons --> + {% include "navigation/navbar.html.twig" %} + </nav> + </header> + <!-- Left side column. contains the logo and sidebar --> + <aside class="main-sidebar"> + <!-- sidebar: style can be found in sidebar.less --> + <section class="sidebar"> + {% include 'navigation/sidebar.html.twig' %} + </section> + <!-- /.sidebar --> + </aside> - <!-- Content Wrapper. Contains page content --> - <div class="content-wrapper"> - <!-- Content Header (Page header) --> - {% block content_header %} - <section class="content-header"> - <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1> - {% if block('page_description') is not empty %}<h1><small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small></h1>{% endif %} - {% block breadcrumb %} - {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} - {% endblock %} - <div id="alerts-page"></div> - </section> - {% endblock %} - <section class="content"> - {% block body_matter %}{% endblock %} - </section> - </div> - <!-- /.content-wrapper --> + <!-- Content Wrapper. Contains page content --> + <div class="content-wrapper"> + <!-- Content Header (Page header) --> + {% block content_header %} + <section class="content-header"> + <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1> + {% if block('page_description') is not empty %} + <h1> + <small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small> + </h1>{% endif %} + {% block breadcrumb %} + {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} + {% endblock %} + <div id="alerts-page"></div> + </section> + {% endblock %} + <section class="content"> + {% block body_matter %}{% endblock %} + </section> + </div> + <!-- /.content-wrapper --> - <!-- Footer --> - {% block footer %} - {% include "pages/partials/footer.html.twig" %} - {% endblock %} + <!-- Footer --> + {% block footer %} + {% include "pages/partials/footer.html.twig" %} + {% endblock %} </div> <!-- ./wrapper --> diff --git a/main/app/sprinkles/admin/templates/pages/activities.html.twig b/main/app/sprinkles/admin/templates/pages/activities.html.twig index bcbd9c6..7927601 100644 --- a/main/app/sprinkles/admin/templates/pages/activities.html.twig +++ b/main/app/sprinkles/admin/templates/pages/activities.html.twig @@ -15,17 +15,16 @@ <div class="col-md-12"> <div id="widget-activities" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3> + <h3 class="box-title"><i class="fa fa-tasks fa-fw"></i> {{ translate('ACTIVITY', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/activities.html.twig" with { - "table" : { - "id" : "table-activities", - "columns" : ["user"] - } + "table" : { + "id" : "table-activities", + "columns" : ["user"] } - %} + } %} </div> </div> </div> @@ -34,7 +33,7 @@ {% block scripts_page %} <!-- Include validation rules --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/dashboard.html.twig b/main/app/sprinkles/admin/templates/pages/dashboard.html.twig index f9c85a3..461e13d 100644 --- a/main/app/sprinkles/admin/templates/pages/dashboard.html.twig +++ b/main/app/sprinkles/admin/templates/pages/dashboard.html.twig @@ -7,255 +7,257 @@ {% block body_matter %} <!-- Info boxes --> {% if checkAccess('uri_users') %} - <div class="row"> - <div class="col-md-4 col-sm-6 col-xs-12"> - <a href="{{site.uri.public}}/users"> - <div class="info-box"> - <span class="info-box-icon bg-aqua"><i class="fa fa-user fa-fw"></i></span> - <div class="info-box-content"> - <span class="info-box-text">{{ translate("USER", 2) }}</span> - <span class="info-box-number">{{counter.users}}</span> - </div> - <!-- /.info-box-content --> + <div class="row"> + <div class="col-md-4 col-sm-6 col-xs-12"> + <a href="{{ site.uri.public }}/users"> + <div class="info-box"> + <span class="info-box-icon bg-aqua"><i class="fa fa-user fa-fw"></i></span> + <div class="info-box-content"> + <span class="info-box-text">{{ translate("USER", 2) }}</span> + <span class="info-box-number">{{ counter.users }}</span> + </div> + <!-- /.info-box-content --> + </div> + <!-- /.info-box --> + </a> </div> - <!-- /.info-box --> - </a> - </div> - <!-- /.col --> + <!-- /.col --> - <div class="col-md-4 col-sm-6 col-xs-12"> - <a href="{{site.uri.public}}/roles"> - <div class="info-box"> - <span class="info-box-icon bg-red"><i class="fa fa-drivers-license"></i></span> - <div class="info-box-content"> - <span class="info-box-text">{{ translate("ROLE", 2) }}</span> - <span class="info-box-number">{{counter.roles}}</span> - </div> - <!-- /.info-box-content --> + <div class="col-md-4 col-sm-6 col-xs-12"> + <a href="{{ site.uri.public }}/roles"> + <div class="info-box"> + <span class="info-box-icon bg-red"><i class="fa fa-drivers-license"></i></span> + <div class="info-box-content"> + <span class="info-box-text">{{ translate("ROLE", 2) }}</span> + <span class="info-box-number">{{ counter.roles }}</span> + </div> + <!-- /.info-box-content --> + </div> + <!-- /.info-box --> + </a> </div> - <!-- /.info-box --> - </a> - </div> - <!-- /.col --> + <!-- /.col --> - <div class="col-md-4 col-sm-6 col-xs-12"> - <a href="{{site.uri.public}}/groups"> - <div class="info-box"> - <span class="info-box-icon bg-green"><i class="fa fa-users"></i></span> - <div class="info-box-content"> - <span class="info-box-text">{{ translate("GROUP", 2) }}</span> - <span class="info-box-number">{{counter.groups}}</span> - </div> - <!-- /.info-box-content --> + <div class="col-md-4 col-sm-6 col-xs-12"> + <a href="{{ site.uri.public }}/groups"> + <div class="info-box"> + <span class="info-box-icon bg-green"><i class="fa fa-users"></i></span> + <div class="info-box-content"> + <span class="info-box-text">{{ translate("GROUP", 2) }}</span> + <span class="info-box-number">{{ counter.groups }}</span> + </div> + <!-- /.info-box-content --> + </div> + <!-- /.info-box --> + </a> </div> - <!-- /.info-box --> - </a> + <!-- /.col --> </div> - <!-- /.col --> - </div> - <!-- /.row --> + <!-- /.row --> {% elseif checkAccess('uri_group', { 'group': current_user.group }) %} - <div class="row"> - <div class="col-sm-6 col-xs-12"> - <div class="info-box"> - <span class="info-box-icon bg-aqua"><i class="{{current_user.group.icon}}"></i></span> - <div class="info-box-content"> - <h1>{{current_user.group.name}}</h1> + <div class="row"> + <div class="col-sm-6 col-xs-12"> + <div class="info-box"> + <span class="info-box-icon bg-aqua"><i class="{{ current_user.group.icon }}"></i></span> + <div class="info-box-content"> + <h1>{{ current_user.group.name }}</h1> + </div> + <!-- /.info-box-content --> + </div> + <!-- /.info-box --> </div> - <!-- /.info-box-content --> - </div> - <!-- /.info-box --> - </div> - <!-- /.col --> - <div class="col-sm-6 col-xs-12"> - <div class="info-box"> - <span class="info-box-icon bg-aqua"><i class="fa fa-user fa-fw"></i></span> - <div class="info-box-content"> - <span class="info-box-text">{{ translate("USER", 2) }}</span> - <span class="info-box-number">{{current_user.group.users.count}}</span> + <!-- /.col --> + <div class="col-sm-6 col-xs-12"> + <div class="info-box"> + <span class="info-box-icon bg-aqua"><i class="fa fa-user fa-fw"></i></span> + <div class="info-box-content"> + <span class="info-box-text">{{ translate("USER", 2) }}</span> + <span class="info-box-number">{{ current_user.group.users.count }}</span> + </div> + <!-- /.info-box-content --> + </div> + <!-- /.info-box --> </div> - <!-- /.info-box-content --> - </div> - <!-- /.info-box --> + <!-- /.col --> </div> - <!-- /.col --> - </div> - <!-- /.row --> + <!-- /.row --> {% endif %} <!-- Main panels --> <div class="row"> {% if checkAccess('uri_users') or checkAccess('view_system_info') %} - <div class="col-md-6 col-sm-12 col-xs-12"> - {% if checkAccess('uri_users') %} - <div class="row"> - <div class="col-sm-12"> - <!-- USERS LIST --> - <div class="box box-info"> - <div class="box-header with-border"> - <h3 class="box-title">{{translate("USER.LATEST")}}</h3> - </div> - <!-- /.box-header --> - <div class="box-body no-padding"> - <ul class="users-list clearfix"> - {% for user in users %} - <li> - <img src="{{ user.avatar }}" alt="User Image"> - <a class="users-list-name" href="{{site.uri.public}}/users/u/{{user.user_name}}">{{user.first_name}} {{user.last_name}}</a> - <span class="users-list-date">{{ user.registered }}</span> - </li> - {% endfor %} - </ul> - <!-- /.users-list --> - </div> - <!-- /.box-body --> - <div class="box-footer text-center"> - <a href="{{site.uri.public}}/users" class="uppercase">{{translate("USER.VIEW_ALL")}}</a> + <div class="col-md-6 col-sm-12 col-xs-12"> + {% if checkAccess('uri_users') %} + <div class="row"> + <div class="col-sm-12"> + <!-- USERS LIST --> + <div class="box box-info"> + <div class="box-header with-border"> + <h3 class="box-title">{{ translate("USER.LATEST") }}</h3> + </div> + <!-- /.box-header --> + <div class="box-body no-padding"> + <ul class="users-list clearfix"> + {% for user in users %} + <li> + <img src="{{ user.avatar }}" alt="User Image"> + <a class="users-list-name" + href="{{ site.uri.public }}/users/u/{{ user.user_name }}">{{ user.first_name }} {{ user.last_name }}</a> + <span class="users-list-date">{{ user.registered }}</span> + </li> + {% endfor %} + </ul> + <!-- /.users-list --> + </div> + <!-- /.box-body --> + <div class="box-footer text-center"> + <a href="{{ site.uri.public }}/users" + class="uppercase">{{ translate("USER.VIEW_ALL") }}</a> + </div> + <!-- /.box-footer --> + </div> + <!--/.box --> + </div> + <!-- /.col --> </div> - <!-- /.box-footer --> - </div> - <!--/.box --> - </div> - <!-- /.col --> - </div> - <!-- /.row --> - {% endif %} + <!-- /.row --> + {% endif %} - {% if checkAccess('view_system_info') %} - <div class="row"> - <div class="col-sm-12"> - <div class="box box-primary"> - <div class="box-header with-border"> - <h3 class="box-title">{{translate("SYSTEM_INFO")}}</h3> - </div> - <!-- /.box-header --> - <div class="box-body"> - <dl class="dl-horizontal"> - <dt>{{translate("SYSTEM_INFO.UF_VERSION")}}</dt> - <dd>{{info.version.UF}}</dd> + {% if checkAccess('view_system_info') %} + <div class="row"> + <div class="col-sm-12"> + <div class="box box-primary"> + <div class="box-header with-border"> + <h3 class="box-title">{{ translate("SYSTEM_INFO") }}</h3> + </div> + <!-- /.box-header --> + <div class="box-body"> + <dl class="dl-horizontal"> + <dt>{{ translate("SYSTEM_INFO.UF_VERSION") }}</dt> + <dd>{{ info.version.UF }}</dd> - <dt>{{translate("SYSTEM_INFO.PHP_VERSION")}}</dt> - <dd>{{info.version.php}}</dd> + <dt>{{ translate("SYSTEM_INFO.PHP_VERSION") }}</dt> + <dd>{{ info.version.php }}</dd> - <dt>{{translate("SYSTEM_INFO.SERVER")}}</dt> - <dd>{{info.environment.SERVER_SOFTWARE}}</dd> + <dt>{{ translate("SYSTEM_INFO.SERVER") }}</dt> + <dd>{{ info.environment.SERVER_SOFTWARE }}</dd> - <dt>{{translate("SYSTEM_INFO.DB_VERSION")}}</dt> - <dd>{{info.version.database.type}} {{info.version.database.version}}</dd> + <dt>{{ translate("SYSTEM_INFO.DB_VERSION") }}</dt> + <dd>{{ info.version.database.type }} {{ info.version.database.version }}</dd> - <dt>{{translate("SYSTEM_INFO.DB_NAME")}}</dt> - <dd>{{info.database.name}}</dd> + <dt>{{ translate("SYSTEM_INFO.DB_NAME") }}</dt> + <dd>{{ info.database.name }}</dd> - <dt>{{translate("SYSTEM_INFO.DIRECTORY")}}</dt> - <dd>{{info.path.project}}</dd> + <dt>{{ translate("SYSTEM_INFO.DIRECTORY") }}</dt> + <dd>{{ info.path.project }}</dd> - <dt>{{translate("SYSTEM_INFO.URL")}}</dt> - <dd>{{site.uri.public}}</dd> + <dt>{{ translate("SYSTEM_INFO.URL") }}</dt> + <dd>{{ site.uri.public }}</dd> - <dt>{{translate("SYSTEM_INFO.SPRINKLES")}}</dt> - <dd> - <ul class="list-unstyled"> - {% for sprinkle in sprinkles %} - <li> - {{sprinkle}} - </li> - {% endfor %} - </ul> - </dd> - </dl> + <dt>{{ translate("SYSTEM_INFO.SPRINKLES") }}</dt> + <dd> + <ul class="list-unstyled"> + {% for sprinkle in sprinkles %} + <li> + {{ sprinkle }} + </li> + {% endfor %} + </ul> + </dd> + </dl> + </div> + <!-- /.box-body --> + <div class="box-footer text-center"> + <a href="javascript:void(0)" + class="js-clear-cache uppercase">{{ translate("CACHE.CLEAR") }}</a> + </div> + <!-- /.box-footer --> + </div> + <!--/.box --> </div> - <!-- /.box-body --> - <div class="box-footer text-center"> - <a href="javascript:void(0)" class="js-clear-cache uppercase">{{ translate("CACHE.CLEAR") }}</a> - </div> - <!-- /.box-footer --> + <!-- /.col --> </div> - <!--/.box --> - </div> - <!-- /.col --> + <!-- /.row --> + {% endif %} </div> - <!-- /.row --> - {% endif %} - </div> - <!-- /.col --> + <!-- /.col --> {% endif %} {% if checkAccess('uri_activities') %} - <div class="col-md-6 col-sm-12 col-xs-12"> - <div id="widget-activities" class="box box-primary"> - <div class="box-header"> - <h3 class="box-title"><i class="fa fa-tasks fa-fw"></i> {{translate('ACTIVITY', 2)}}</h3> - {% include "tables/table-tool-menu.html.twig" %} - </div> - <div class="box-body"> - {% include "tables/activities.html.twig" with { + <div class="col-md-6 col-sm-12 col-xs-12"> + <div id="widget-activities" class="box box-primary"> + <div class="box-header"> + <h3 class="box-title"><i class="fa fa-tasks fa-fw"></i> {{ translate('ACTIVITY', 2) }}</h3> + {% include "tables/table-tool-menu.html.twig" %} + </div> + <div class="box-body"> + {% include "tables/activities.html.twig" with { "table" : { "id" : "table-activities", "columns" : ["user"] } - } - %} + } %} + </div> </div> </div> - </div> {% elseif checkAccess('view_group_field', { 'group': current_user.group, 'property': 'users' }) %} - <div class="col-md-6 col-sm-12 col-xs-12"> - <div id="widget-group-users" class="box box-primary"> - <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-user"></i> {{translate('USER', 2)}}</h3> - {% include "tables/table-tool-menu.html.twig" %} - </div> - <div class="box-body"> - {% include "tables/users.html.twig" with { + <div class="col-md-6 col-sm-12 col-xs-12"> + <div id="widget-group-users" class="box box-primary"> + <div class="box-header"> + <h3 class="box-title"><i class="fa fa-fw fa-user"></i> {{ translate('USER', 2) }}</h3> + {% include "tables/table-tool-menu.html.twig" %} + </div> + <div class="box-body"> + {% include "tables/users.html.twig" with { "table" : { "id" : "table-group-users" } - } - %} - </div> - <div class="box-footer"> - <button type="button" class="btn btn-success js-user-create"> - <i class="fa fa-plus-square"></i> {{translate("USER.CREATE")}} - </button> + } %} + </div> + <div class="box-footer"> + <button type="button" class="btn btn-success js-user-create"> + <i class="fa fa-plus-square"></i> {{ translate("USER.CREATE") }} + </button> + </div> </div> </div> - </div> {% else %} - <div class="col-sm-4 col-sm-offset-4 col-xs-12"> - <div class="box box-widget widget-user"> - <!-- Add the bg color to the header using any of the bg-* classes --> - <div class="widget-user-header bg-black-active"> - <h3 class="widget-user-username"> - {{translate("WELCOME", { - 'first_name': current_user.first_name - })}} - </h3> - </div> - <div class="widget-user-image"> - <img class="img-circle" src="{{assets.url('assets://userfrosting/images/cupcake.png')}}" alt="User Avatar"> - </div> - <div class="box-footer"> - <h4> - {{translate("WELCOME_TO", { - 'title': site.title - })}} - </h4> - <p> - {{translate("NO_FEATURES_YET")}} - </p> + <div class="col-sm-4 col-sm-offset-4 col-xs-12"> + <div class="box box-widget widget-user"> + <!-- Add the bg color to the header using any of the bg-* classes --> + <div class="widget-user-header bg-black-active"> + <h3 class="widget-user-username"> + {{ translate("WELCOME", { + 'first_name': current_user.first_name + }) }} + </h3> + </div> + <div class="widget-user-image"> + <img class="img-circle" src="{{ assets.url('assets://userfrosting/images/cupcake.png') }}" + alt="User Avatar"> + </div> + <div class="box-footer"> + <h4> + {{ translate("WELCOME_TO", { + 'title': site.title + }) }} + </h4> + <p> + {{ translate("NO_FEATURES_YET") }} + </p> + </div> </div> - </div> - <!-- /.widget-user --> + <!-- /.widget-user --> - </div> - <!-- /.row --> + </div> + <!-- /.row --> {% endif %} </div> <!-- /.row --> @@ -264,16 +266,16 @@ {% block scripts_page %} <!-- Include page variables --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} - // Add user name - page = $.extend( - true, // deep extend - { - "group_slug": "{{current_user.group.slug}}" - }, - page - ); + // Add user name + page = $.extend( + true, // deep extend + { + "group_slug": "{{ current_user.group.slug }}" + }, + page + ); </script> <!-- Include page-specific JS --> diff --git a/main/app/sprinkles/admin/templates/pages/group.html.twig b/main/app/sprinkles/admin/templates/pages/group.html.twig index bf4d275..bab5b13 100644 --- a/main/app/sprinkles/admin/templates/pages/group.html.twig +++ b/main/app/sprinkles/admin/templates/pages/group.html.twig @@ -6,7 +6,7 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("GROUP", 2) }} | {{group.name}}{% endblock %} +{% block page_title %}{{ translate("GROUP", 2) }} | {{ group.name }}{% endblock %} {% block page_description %}{{ translate("GROUP.INFO_PAGE", {name: group.name}) }}{% endblock %} @@ -15,24 +15,26 @@ <div class="col-lg-4"> <div id="view-group" class="box box-primary"> <div class="box-header with-border"> - <h3 class="box-title">{{translate('GROUP.SUMMARY')}}</h3> + <h3 class="box-title">{{ translate('GROUP.SUMMARY') }}</h3> {% if 'tools' not in tools.hidden %} <div class="box-tools pull-right"> <div class="btn-group"> - <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-gear"></i> <span class="caret"></span> + <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" + aria-haspopup="true" aria-expanded="false"> + <i class="fa fa-gear"></i> + <span class="caret"></span> </button> <ul class="dropdown-menu box-tool-menu"> {% block tools %} <li> - <a href="#" class="js-group-edit" data-slug="{{group.slug}}"> - <i class="fa fa-edit fa-fw"></i> {{translate('EDIT')}} + <a href="#" class="js-group-edit" data-slug="{{ group.slug }}"> + <i class="fa fa-edit fa-fw"></i> {{ translate('EDIT') }} </a> </li> {% if 'delete' not in tools.hidden %} <li> - <a href="#" class="js-group-delete" data-slug="{{group.slug}}"> - <i class="fa fa-trash-o fa-fw"></i> {{translate('DELETE')}} + <a href="#" class="js-group-delete" data-slug="{{ group.slug }}"> + <i class="fa fa-trash-o fa-fw"></i> {{ translate('DELETE') }} </a> </li> {% endif %} @@ -44,21 +46,21 @@ </div> <div class="box-body box-profile"> <div class="text-center"> - <i class="{{group.icon}} fa-5x"></i> + <i class="{{ group.icon }} fa-5x"></i> </div> - <h3 class="profile-username text-center">{{group.name}}</h3> + <h3 class="profile-username text-center">{{ group.name }}</h3> {% if 'description' not in fields.hidden %} <p class="text-muted"> - {{group.description}} + {{ group.description }} </p> {% endif %} {% if 'users' not in fields.hidden %} <hr> - <strong><i class="fa fa-users margin-r-5"></i> {{ translate('USER', 2)}}</strong> + <strong><i class="fa fa-users margin-r-5"></i> {{ translate('USER', 2) }}</strong> <p class="badge bg-blue box-profile-property"> - {{group.users.count}} + {{ group.users.count }} </p> {% endif %} {% block group_profile %}{% endblock %} @@ -68,16 +70,15 @@ <div class="col-lg-8"> <div id="widget-group-users" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-user"></i> {{translate('USER', 2)}}</h3> + <h3 class="box-title"><i class="fa fa-fw fa-user"></i> {{ translate('USER', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-group-users" - } + "table" : { + "id" : "table-group-users" } - %} + } %} </div> </div> </div> @@ -86,16 +87,16 @@ {% block scripts_page %} <!-- Include page variables --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} - // Add user name - page = $.extend( - true, // deep extend - { - "group_slug": "{{group.slug}}" - }, - page - ); + // Add user name + page = $.extend( + true, // deep extend + { + "group_slug": "{{ group.slug }}" + }, + page + ); </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/groups.html.twig b/main/app/sprinkles/admin/templates/pages/groups.html.twig index 35e9a88..43b0618 100644 --- a/main/app/sprinkles/admin/templates/pages/groups.html.twig +++ b/main/app/sprinkles/admin/templates/pages/groups.html.twig @@ -15,23 +15,22 @@ <div class="col-md-12"> <div id="widget-groups" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-users"></i> {{translate('GROUP', 2)}}</h3> + <h3 class="box-title"><i class="fa fa-fw fa-users"></i> {{ translate('GROUP', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/groups.html.twig" with { - "table" : { - "id" : "table-groups" - } + "table" : { + "id" : "table-groups" } - %} + } %} </div> {% if checkAccess('create_group') %} - <div class="box-footer"> - <button type="button" class="btn btn-success js-group-create"> - <i class="fa fa-plus-square"></i> {{translate("GROUP.CREATE")}} - </button> - </div> + <div class="box-footer"> + <button type="button" class="btn btn-success js-group-create"> + <i class="fa fa-plus-square"></i> {{ translate("GROUP.CREATE") }} + </button> + </div> {% endif %} </div> </div> @@ -40,7 +39,7 @@ {% block scripts_page %} <!-- Include validation rules --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/permission.html.twig b/main/app/sprinkles/admin/templates/pages/permission.html.twig index 6adc014..004131e 100644 --- a/main/app/sprinkles/admin/templates/pages/permission.html.twig +++ b/main/app/sprinkles/admin/templates/pages/permission.html.twig @@ -6,63 +6,63 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{translate("PERMISSION", 2)}} | {{permission.name}}{% endblock %} +{% block page_title %}{{ translate("PERMISSION", 2) }} | {{ permission.name }}{% endblock %} -{% block page_description %}{{translate("PERMISSION.INFO_PAGE", {name: permission.name})}}{% endblock %} +{% block page_description %}{{ translate("PERMISSION.INFO_PAGE", {name: permission.name}) }}{% endblock %} {% block body_matter %} <div class="row"> <div class="col-lg-4"> <div id="view-permission" class="box box-primary"> <div class="box-header with-border"> - <h3 class="box-title">{{translate("PERMISSION.SUMMARY")}}</h3> + <h3 class="box-title">{{ translate("PERMISSION.SUMMARY") }}</h3> </div> <div class="box-body box-profile"> <div class="text-center"> <i class="fa fa-key fa-5x"></i> </div> - <h3 class="profile-username text-center">{{permission.name}}</h3> + <h3 class="profile-username text-center">{{ permission.name }}</h3> <p class="text-muted"> - {{permission.description}} + {{ permission.description }} </p> <hr> - <strong>{{translate("PERMISSION.ID")}}: </strong> + <strong>{{ translate("PERMISSION.ID") }}: </strong> <span class="js-copy-container"> - <span class="js-copy-target" style="margin: 0 5px;">{{permission.id}}</span> + <span class="js-copy-target" style="margin: 0 5px;">{{ permission.id }}</span> <i class="fa fa-copy text-blue uf-copy-trigger js-copy-trigger"></i> </span> <hr> - <strong>{{translate("SLUG_CONDITION")}}</strong> + <strong>{{ translate("SLUG_CONDITION") }}</strong> <br> <br> <p> - <code>{{permission.slug}}</code> + <code>{{ permission.slug }}</code> </p> <p> - ↳ <code>{{permission.conditions}}</code> + ↳ + <code>{{ permission.conditions }}</code> </p> </div> <div class="box-footer"> - {{translate("PERMISSION.NOTE_READ_ONLY")}} + {{ translate("PERMISSION.NOTE_READ_ONLY") }} </div> </div> </div> <div class="col-lg-8"> <div id="widget-permission-users" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{translate("USER.WITH_PERMISSION")}}</h3> + <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{ translate("USER.WITH_PERMISSION") }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-permission-users", - "columns" : ["via_roles"] - } + "table" : { + "id" : "table-permission-users", + "columns" : ["via_roles"] } - %} + } %} </div> </div> </div> @@ -71,16 +71,16 @@ {% block scripts_page %} <!-- Include page variables --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} - // Add user name - page = $.extend( - true, // deep extend - { - "permission_id": "{{permission.id}}" - }, - page - ); + // Add user name + page = $.extend( + true, // deep extend + { + "permission_id": "{{ permission.id }}" + }, + page + ); </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/permissions.html.twig b/main/app/sprinkles/admin/templates/pages/permissions.html.twig index 2696209..5cf95da 100644 --- a/main/app/sprinkles/admin/templates/pages/permissions.html.twig +++ b/main/app/sprinkles/admin/templates/pages/permissions.html.twig @@ -6,25 +6,25 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("PERMISSION", 2)}}{% endblock %} +{% block page_title %}{{ translate("PERMISSION", 2) }}{% endblock %} -{% block page_description %}{{ translate("PERMISSION.PAGE_DESCRIPTION")}}{% endblock %} +{% block page_description %}{{ translate("PERMISSION.PAGE_DESCRIPTION") }}{% endblock %} {% block body_matter %} <div class="row"> <div class="col-md-12"> <div id="widget-permissions" class="box box-primary"> <div class="box-header"> - <h3 class="box-title pull-left"><i class="fa fa-key fa-fw"></i> {{translate('PERMISSION', 2)}}</h3> + <h3 class="box-title pull-left"><i class="fa fa-key fa-fw"></i> {{ translate('PERMISSION', 2) }} + </h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/permissions.html.twig" with { - "table" : { - "id" : "table-permissions" - } + "table" : { + "id" : "table-permissions" } - %} + } %} </div> </div> </div> @@ -33,7 +33,7 @@ {% block scripts_page %} <!-- Include validation rules --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/role.html.twig b/main/app/sprinkles/admin/templates/pages/role.html.twig index daf1004..1892d32 100644 --- a/main/app/sprinkles/admin/templates/pages/role.html.twig +++ b/main/app/sprinkles/admin/templates/pages/role.html.twig @@ -6,40 +6,42 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{translate("ROLE", 2)}} | {{role.name}}{% endblock %} +{% block page_title %}{{ translate("ROLE", 2) }} | {{ role.name }}{% endblock %} -{% block page_description %}{{translate("ROLE.INFO_PAGE", {name: role.name})}}{% endblock %} +{% block page_description %}{{ translate("ROLE.INFO_PAGE", {name: role.name}) }}{% endblock %} {% block body_matter %} <div class="row"> <div class="col-lg-4"> <div id="view-role" class="box box-primary"> <div class="box-header with-border"> - <h3 class="box-title">{{translate('ROLE.SUMMARY')}}</h3> + <h3 class="box-title">{{ translate('ROLE.SUMMARY') }}</h3> {% if 'tools' not in tools.hidden %} <div class="box-tools pull-right"> <div class="btn-group"> - <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-gear"></i> <span class="caret"></span> + <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" + aria-haspopup="true" aria-expanded="false"> + <i class="fa fa-gear"></i> + <span class="caret"></span> </button> <ul class="dropdown-menu box-tool-menu"> {% block tools %} <li> - <a href="#" class="js-role-edit" data-slug="{{role.slug}}"> - <i class="fa fa-edit fa-fw"></i> {{translate('EDIT')}} + <a href="#" class="js-role-edit" data-slug="{{ role.slug }}"> + <i class="fa fa-edit fa-fw"></i> {{ translate('EDIT') }} </a> </li> {% if 'permissions' not in tools.hidden %} - <li> - <a href="#" class="js-role-permissions" data-slug="{{role.slug}}"> - <i class="fa fa-key"></i> {{translate("PERMISSION.MANAGE")}} - </a> - </li> + <li> + <a href="#" class="js-role-permissions" data-slug="{{ role.slug }}"> + <i class="fa fa-key"></i> {{ translate("PERMISSION.MANAGE") }} + </a> + </li> {% endif %} {% if 'delete' not in tools.hidden %} <li> - <a href="#" class="js-role-delete" data-slug="{{role.slug}}"> - <i class="fa fa-trash-o fa-fw"></i> {{translate('DELETE')}} + <a href="#" class="js-role-delete" data-slug="{{ role.slug }}"> + <i class="fa fa-trash-o fa-fw"></i> {{ translate('DELETE') }} </a> </li> {% endif %} @@ -54,18 +56,18 @@ <i class="fa fa-drivers-license fa-5x"></i> </div> - <h3 class="profile-username text-center">{{role.name}}</h3> + <h3 class="profile-username text-center">{{ role.name }}</h3> {% if 'description' not in fields.hidden %} <p class="text-muted"> - {{role.description}} + {{ role.description }} </p> {% endif %} {% if 'users' not in fields.hidden %} <hr> - <strong><i class="fa fa-users margin-r-5"></i> {{ translate('USER', 2)}}</strong> + <strong><i class="fa fa-users margin-r-5"></i> {{ translate('USER', 2) }}</strong> <p class="badge bg-blue box-profile-property"> - {{role.users.count}} + {{ role.users.count }} </p> {% endif %} </div> @@ -74,33 +76,31 @@ <div class="col-lg-8"> <div id="widget-role-permissions" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{translate('PERMISSION', 2)}}</h3> + <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{ translate('PERMISSION', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/permissions.html.twig" with { - "table" : { - "id" : "table-role-permissions" - } + "table" : { + "id" : "table-role-permissions" } - %} + } %} </div> </div> </div> <div class="col-lg-12"> <div id="widget-role-users" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{translate('USER', 2)}}</h3> + <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{ translate('USER', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-role-users", - "columns" : ["last_activity"] - } + "table" : { + "id" : "table-role-users", + "columns" : ["last_activity"] } - %} + } %} </div> </div> </div> @@ -109,16 +109,16 @@ {% block scripts_page %} <!-- Include page variables --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} - // Add user name - page = $.extend( - true, // deep extend - { - "role_slug": "{{role.slug}}" - }, - page - ); + // Add user name + page = $.extend( + true, // deep extend + { + "role_slug": "{{ role.slug }}" + }, + page + ); </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/roles.html.twig b/main/app/sprinkles/admin/templates/pages/roles.html.twig index c5b3995..2677f87 100644 --- a/main/app/sprinkles/admin/templates/pages/roles.html.twig +++ b/main/app/sprinkles/admin/templates/pages/roles.html.twig @@ -6,29 +6,28 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("ROLE", 2)}}{% endblock %} +{% block page_title %}{{ translate("ROLE", 2) }}{% endblock %} -{% block page_description %}{{ translate("ROLE.PAGE_DESCRIPTION")}}{% endblock %} +{% block page_description %}{{ translate("ROLE.PAGE_DESCRIPTION") }}{% endblock %} {% block body_matter %} <div class="row"> <div class="col-md-12"> <div id="widget-roles" class="box box-primary"> <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-drivers-license"></i> {{translate('ROLE', 2)}}</h3> + <h3 class="box-title"><i class="fa fa-fw fa-drivers-license"></i> {{ translate('ROLE', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="panel-body"> {% include "tables/roles.html.twig" with { - "table" : { - "id" : "table-roles" - } + "table" : { + "id" : "table-roles" } - %} + } %} </div> <div class="box-footer"> <button type="button" class="btn btn-success js-role-create"> - <i class="fa fa-plus-square"></i> {{translate("ROLE.CREATE")}} + <i class="fa fa-plus-square"></i> {{ translate("ROLE.CREATE") }} </button> </div> </div> @@ -38,7 +37,7 @@ {% block scripts_page %} <!-- Include validation rules --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/user.html.twig b/main/app/sprinkles/admin/templates/pages/user.html.twig index d9c9ab2..47228fd 100644 --- a/main/app/sprinkles/admin/templates/pages/user.html.twig +++ b/main/app/sprinkles/admin/templates/pages/user.html.twig @@ -6,7 +6,7 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("USER", 2)}} | {{user.full_name}}{% endblock %} +{% block page_title %}{{ translate("USER", 2) }} | {{ user.full_name }}{% endblock %} {% block page_description %}{{ translate("USER.INFO_PAGE", {name: user.user_name}) }}{% endblock %} @@ -19,60 +19,69 @@ {% block user_box %} <div class="box box-primary"> <div class="box-header with-border"> - <h3 class="box-title">{{translate('USER.SUMMARY')}}</h3> + <h3 class="box-title">{{ translate('USER.SUMMARY') }}</h3> {% if 'tools' not in tools.hidden %} <div class="box-tools pull-right"> <div class="btn-group"> - <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-gear"></i> <span class="caret"></span> + <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" + aria-haspopup="true" aria-expanded="false"> + <i class="fa fa-gear"></i> + <span class="caret"></span> </button> <ul class="dropdown-menu box-tool-menu"> {% block tools %} <li> - <a href="#" class="js-user-edit" data-user_name="{{user.user_name}}"> - <i class="fa fa-edit fa-fw"></i> {{translate('EDIT')}} + <a href="#" class="js-user-edit" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-edit fa-fw"></i> {{ translate('EDIT') }} </a> </li> {% if 'password' not in tools.hidden %} <li> - <a href="#" class="js-user-password" data-user_name="{{user.user_name}}"> - <i class="fa fa-lock fa-fw"></i> {{translate('PASSWORD')}} + <a href="#" class="js-user-password" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-lock fa-fw"></i> {{ translate('PASSWORD') }} </a> </li> {% endif %} {% if 'roles' not in tools.hidden %} <li> - <a href="#" class="js-user-roles" data-user_name="{{user.user_name}}"> - <i class="fa fa-drivers-license fa-fw"></i> {{translate('ROLE', 2)}} + <a href="#" class="js-user-roles" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-drivers-license fa-fw"></i> {{ translate('ROLE', 2) }} </a> </li> {% endif %} {% if 'activate' not in tools.hidden and user.flag_verified == "0" %} <li> - <a href="#" class="js-user-activate" data-user_name="{{user.user_name}}"> - <i class="fa fa-bolt fa-fw"></i> {{translate('ACTIVATE')}} + <a href="#" class="js-user-activate" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-bolt fa-fw"></i> {{ translate('ACTIVATE') }} </a> </li> {% endif %} {% if 'enable' not in tools.hidden %} {% if user.flag_enabled == "1" %} <li> - <a href="#" class="js-user-disable" data-user_name="{{user.user_name}}"> - <i class="fa fa-minus-circle fa-fw"></i> {{translate('DISABLE')}} + <a href="#" class="js-user-disable" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-minus-circle fa-fw"></i> {{ translate('DISABLE') }} </a> </li> {% else %} <li> - <a href="#" class="js-user-enable" data-user_name="{{user.user_name}}"> - <i class="fa fa-plus-circle fa-fw"></i> {{translate('ENABLE')}} + <a href="#" class="js-user-enable" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-plus-circle fa-fw"></i> {{ translate('ENABLE') }} </a> </li> {% endif %} {% endif %} {% if 'delete' not in tools.hidden %} <li> - <a href="#" class="js-user-delete" data-user_name="{{user.user_name}}"> - <i class="fa fa-trash-o fa-fw"></i> {{translate('DELETE')}} + <a href="#" class="js-user-delete" + data-user_name="{{ user.user_name }}"> + <i class="fa fa-trash-o fa-fw"></i> {{ translate('DELETE') }} </a> </li> {% endif %} @@ -83,33 +92,36 @@ {% endif %} </div> <div class="box-body box-profile"> - <img class="profile-user-img img-responsive img-circle" src="{{user.avatar}}" alt="{{user.user_name}}"> + <img class="profile-user-img img-responsive img-circle" src="{{ user.avatar }}" + alt="{{ user.user_name }}"> - <h3 class="profile-username text-center">{{user.full_name}}</h3> + <h3 class="profile-username text-center">{{ user.full_name }}</h3> <div class="text-center"> {% if user.flag_enabled == 0 %} - <i class="fa fa-fw fa-minus-circle fa-lg text-red" title="{{translate('DISABLED')}}"></i> + <i class="fa fa-fw fa-minus-circle fa-lg text-red" + title="{{ translate('DISABLED') }}"></i> {% endif %} {% if user.flag_verified == 0 %} - <i class="fa fa-fw fa-bolt fa-lg text-yellow" title="{{translate('UNACTIVATED')}}"></i> + <i class="fa fa-fw fa-bolt fa-lg text-yellow" + title="{{ translate('UNACTIVATED') }}"></i> {% endif %} </div> - <h4 class="text-muted text-center">{{user.user_name}}{% if 'group' not in fields.hidden %} • {{user.group.name}}{% endif %}</h4> + <h4 class="text-muted text-center">{{ user.user_name }}{% if 'group' not in fields.hidden %} • {{ user.group.name }}{% endif %}</h4> {% if 'email' not in fields.hidden %} <hr> - <strong><i class="fa fa-envelope margin-r-5"></i> {{translate("EMAIL")}}</strong> + <strong><i class="fa fa-envelope margin-r-5"></i> {{ translate("EMAIL") }}</strong> <p class="text-muted box-profile-property js-copy-container"> <i class="fa fa-copy uf-copy-trigger js-copy-trigger"></i> - <span class="js-copy-target">{{user.email}}</span> + <span class="js-copy-target">{{ user.email }}</span> </p> {% endif %} {% if 'locale' not in fields.hidden %} <hr> - <strong><i class="fa fa-language margin-r-5"></i> {{translate("LOCALE")}}</strong> + <strong><i class="fa fa-language margin-r-5"></i> {{ translate("LOCALE") }}</strong> <p class="text-muted box-profile-property"> - {{locales[user.locale]}} + {{ locales[user.locale] }} </p> {% endif %} @@ -117,10 +129,12 @@ {% if 'roles' not in fields.hidden %} <hr> - <strong><i class="fa fa-drivers-license margin-r-5"></i> {{translate("ROLE", 2)}}</strong> + <strong><i class="fa fa-drivers-license margin-r-5"></i> {{ translate("ROLE", 2) }} + </strong> <p class="box-profile-property"> {% for role in user.roles %} - <span class="label label-primary" title="{{role.description}}">{{role.name}}</span> + <span class="label label-primary" + title="{{ role.description }}">{{ role.name }}</span> {% endfor %} </p> {% endif %} @@ -130,61 +144,60 @@ </div> </div> {% if 'activities' not in widgets.hidden %} - <div class="col-lg-8"> - {% block activity_box %} - <div id="widget-user-activities" class="box box-primary"> - <div class="box-header"> - <h3 class="box-title"><i class="fa fa-fw fa-tasks"></i> {{translate('ACTIVITY', 2)}}</h3> - {% include "tables/table-tool-menu.html.twig" %} - </div> - <div class="box-body"> - {% include "tables/activities.html.twig" with { + <div class="col-lg-8"> + {% block activity_box %} + <div id="widget-user-activities" class="box box-primary"> + <div class="box-header"> + <h3 class="box-title"><i class="fa fa-fw fa-tasks"></i> {{ translate('ACTIVITY', 2) }}</h3> + {% include "tables/table-tool-menu.html.twig" %} + </div> + <div class="box-body"> + {% include "tables/activities.html.twig" with { "table" : { "id" : "table-user-activities" } - } - %} + } %} + </div> </div> - </div> - {% endblock %} - </div> + {% endblock %} + </div> {% endif %} </div> {% if 'permissions' not in widgets.hidden %} - <div class="row"> - <div class="col-md-12"> - <div id="widget-permissions" class="box box-primary"> - <div class="box-header"> - <h3 class="box-title pull-left"><i class="fa fa-key fa-fw"></i> {{translate('PERMISSION', 2)}}</h3> - {% include "tables/table-tool-menu.html.twig" %} - </div> - <div class="box-body"> - {% include "tables/permissions.html.twig" with { + <div class="row"> + <div class="col-md-12"> + <div id="widget-permissions" class="box box-primary"> + <div class="box-header"> + <h3 class="box-title pull-left"><i class="fa fa-key fa-fw"></i> {{ translate('PERMISSION', 2) }} + </h3> + {% include "tables/table-tool-menu.html.twig" %} + </div> + <div class="box-body"> + {% include "tables/permissions.html.twig" with { "table" : { "id" : "table-permissions", "columns" : ["via_roles"] } - } - %} + } %} + </div> </div> </div> </div> - </div> {% endif %} {% endblock %} {% block scripts_page %} <!-- Include page variables --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} - // Add user name - page = $.extend( - true, // deep extend - { - "user_name": "{{user.user_name}}" - }, - page - ); + // Add user name + page = $.extend( + true, // deep extend + { + "user_name": "{{ user.user_name }}" + }, + page + ); </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/pages/users.html.twig b/main/app/sprinkles/admin/templates/pages/users.html.twig index 3e4642d..cbd86f4 100644 --- a/main/app/sprinkles/admin/templates/pages/users.html.twig +++ b/main/app/sprinkles/admin/templates/pages/users.html.twig @@ -6,33 +6,32 @@ {% endblock %} {# Overrides blocks in head of base template #} -{% block page_title %}{{ translate("USER", 2)}}{% endblock %} +{% block page_title %}{{ translate("USER", 2) }}{% endblock %} -{% block page_description %}{{ translate("USER.PAGE_DESCRIPTION")}}{% endblock %} +{% block page_description %}{{ translate("USER.PAGE_DESCRIPTION") }}{% endblock %} {% block body_matter %} <div class="row"> <div class="col-md-12"> <div id="widget-users" class="box box-primary"> <div class="box-header"> - <h3 class="box-title pull-left"><i class="fa fa-fw fa-user"></i> {{translate('USER', 2)}}</h3> + <h3 class="box-title pull-left"><i class="fa fa-fw fa-user"></i> {{ translate('USER', 2) }}</h3> {% include "tables/table-tool-menu.html.twig" %} </div> <div class="box-body"> {% include "tables/users.html.twig" with { - "table" : { - "id" : "table-users", - "columns" : ["last_activity"] - } + "table" : { + "id" : "table-users", + "columns" : ["last_activity"] } - %} + } %} </div> {% if checkAccess('create_user') %} - <div class="box-footer"> - <button type="button" class="btn btn-success js-user-create"> - <i class="fa fa-plus-square"></i> {{ translate("USER.CREATE")}} - </button> - </div> + <div class="box-footer"> + <button type="button" class="btn btn-success js-user-create"> + <i class="fa fa-plus-square"></i> {{ translate("USER.CREATE") }} + </button> + </div> {% endif %} </div> </div> @@ -41,7 +40,7 @@ {% block scripts_page %} <!-- Include validation rules --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> <!-- Include form widgets JS --> diff --git a/main/app/sprinkles/admin/templates/tables/activities.html.twig b/main/app/sprinkles/admin/templates/tables/activities.html.twig index d70541b..dce1d99 100644 --- a/main/app/sprinkles/admin/templates/tables/activities.html.twig +++ b/main/app/sprinkles/admin/templates/tables/activities.html.twig @@ -8,14 +8,21 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="[[0, 1]]"> + <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped" + data-sortlist="[[0, 1]]"> <thead> <tr> - <th class="sorter-metanum" data-column-name="occurred_at" data-column-template="#activity-table-column-occurred-at" data-priority="1">{{translate('ACTIVITY.TIME')}} <i class="fa fa-sort"></i></th> + <th class="sorter-metanum" data-column-name="occurred_at" + data-column-template="#activity-table-column-occurred-at" + data-priority="1">{{ translate('ACTIVITY.TIME') }} <i class="fa fa-sort"></i></th> {% if 'user' in table.columns %} - <th class="sorter-metatext" data-column-name="user" data-column-template="#activity-table-column-user" data-priority="1">{{translate('USER')}} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="user" + data-column-template="#activity-table-column-user" data-priority="1">{{ translate('USER') }} <i + class="fa fa-sort"></i></th> {% endif %} - <th class="sorter-metatext" data-column-name="description" data-column-template="#activity-table-column-description" data-priority="1">{{translate("DESCRIPTION")}} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="description" + data-column-template="#activity-table-column-description" + data-priority="1">{{ translate("DESCRIPTION") }} <i class="fa fa-sort"></i></th> </tr> </thead> <tbody> @@ -38,7 +45,7 @@ </td> {{ else }} <td data-num="0"> - <i>{% endverbatim %}{{translate("UNKNOWN")}}{% verbatim %}</i> + <i>{% endverbatim %}{{ translate("UNKNOWN") }}{% verbatim %}</i> </td> {{/if }} </script> @@ -54,7 +61,7 @@ <button class="btn btn-xs uf-copy-trigger js-copy-trigger"><i class="fa fa-copy"></i></button> </div> {{ else }} - <i>{% endverbatim %}{{translate("USER.DELETED")}}{% verbatim %}</i> + <i>{% endverbatim %}{{ translate("USER.DELETED") }}{% verbatim %}</i> {{/if }} </td> </script> diff --git a/main/app/sprinkles/admin/templates/tables/groups.html.twig b/main/app/sprinkles/admin/templates/tables/groups.html.twig index 2c5a84a..8d14e98 100644 --- a/main/app/sprinkles/admin/templates/tables/groups.html.twig +++ b/main/app/sprinkles/admin/templates/tables/groups.html.twig @@ -8,12 +8,17 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}"> + <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped" + data-sortlist="{{ table.sortlist }}"> <thead> <tr> - <th class="sorter-metatext" data-column-name="name" data-column-template="#group-table-column-info" data-priority="1">{{translate('GROUP')}} <i class="fa fa-sort"></i></th> - <th class="sorter-metatext" data-column-name="description" data-column-template="#group-table-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fa fa-sort"></i></th> - <th data-column-template="#group-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th> + <th class="sorter-metatext" data-column-name="name" data-column-template="#group-table-column-info" + data-priority="1">{{ translate('GROUP') }} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="description" + data-column-template="#group-table-column-description" + data-priority="2">{{ translate("DESCRIPTION") }} <i class="fa fa-sort"></i></th> + <th data-column-template="#group-table-column-actions" data-sorter="false" data-filter="false" + data-priority="1">{{ translate("ACTIONS") }}</th> </tr> </thead> <tbody> @@ -47,18 +52,18 @@ <td> <div class="btn-group"> <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> - {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %} + {% endverbatim %}{{ translate("ACTIONS") }}{% verbatim %} <span class="caret"></span> </button> <ul class="dropdown-menu dropdown-menu-right" role="menu"> <li> <a href="#" data-slug="{{row.slug}}" class="js-group-edit"> - <i class="fa fa-edit"></i> {% endverbatim %}{{translate("GROUP.EDIT")}}{% verbatim %} + <i class="fa fa-edit"></i> {% endverbatim %}{{ translate("GROUP.EDIT") }}{% verbatim %} </a> </li> <li> <a href="#" data-slug="{{row.slug}}" class="js-group-delete"> - <i class="fa fa-trash-o"></i> {% endverbatim %}{{translate("GROUP.DELETE")}}{% verbatim %} + <i class="fa fa-trash-o"></i> {% endverbatim %}{{ translate("GROUP.DELETE") }}{% verbatim %} </a> </li> </ul> diff --git a/main/app/sprinkles/admin/templates/tables/permissions.html.twig b/main/app/sprinkles/admin/templates/tables/permissions.html.twig index 92e236a..6ff13c6 100644 --- a/main/app/sprinkles/admin/templates/tables/permissions.html.twig +++ b/main/app/sprinkles/admin/templates/tables/permissions.html.twig @@ -8,13 +8,18 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}"> + <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped" + data-sortlist="{{ table.sortlist }}"> <thead> <tr> - <th class="sorter-metatext" data-column-name="name" data-column-template="#permission-table-column-name" data-priority="1">{{translate('PERMISSION')}} <i class="fa fa-sort"></i></th> - <th class="sorter-metatext" data-column-name="properties" data-column-template="#permission-table-column-properties" data-priority="1">{{translate('SLUG_CONDITION')}} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="name" data-column-template="#permission-table-column-name" + data-priority="1">{{ translate('PERMISSION') }} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="properties" + data-column-template="#permission-table-column-properties" + data-priority="1">{{ translate('SLUG_CONDITION') }} <i class="fa fa-sort"></i></th> {% if 'via_roles' in table.columns %} - <th data-column-template="#permission-table-column-via-roles" data-sorter="false" data-filter="false" data-priority="2">{{translate('PERMISSION.VIA_ROLES')}}</th> + <th data-column-template="#permission-table-column-via-roles" data-sorter="false" + data-filter="false" data-priority="2">{{ translate('PERMISSION.VIA_ROLES') }}</th> {% endif %} </tr> </thead> @@ -58,7 +63,7 @@ <script id="permission-table-column-via-roles" type="text/x-handlebars-template"> <td> {{#each row.roles_via }} - <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{site.uri.public}}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a> + <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{ site.uri.public }}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a> {{/each}} </td> </script> diff --git a/main/app/sprinkles/admin/templates/tables/roles.html.twig b/main/app/sprinkles/admin/templates/tables/roles.html.twig index dbdb49e..f8e136b 100644 --- a/main/app/sprinkles/admin/templates/tables/roles.html.twig +++ b/main/app/sprinkles/admin/templates/tables/roles.html.twig @@ -8,12 +8,17 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}"> + <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped" + data-sortlist="{{ table.sortlist }}"> <thead> <tr> - <th class="sorter-metatext" data-column-name="name" data-column-template="#role-table-column-info" data-priority="1">{{translate('ROLE')}} <i class="fa fa-sort"></i></th> - <th class="sorter-metatext" data-column-name="description" data-column-template="#role-table-column-description" data-priority="2">{{translate('DESCRIPTION')}} <i class="fa fa-sort"></i></th> - <th data-column-template="#role-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate('ACTIONS')}}</th> + <th class="sorter-metatext" data-column-name="name" data-column-template="#role-table-column-info" + data-priority="1">{{ translate('ROLE') }} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="description" + data-column-template="#role-table-column-description" + data-priority="2">{{ translate('DESCRIPTION') }} <i class="fa fa-sort"></i></th> + <th data-column-template="#role-table-column-actions" data-sorter="false" data-filter="false" + data-priority="1">{{ translate('ACTIONS') }}</th> </tr> </thead> <tbody> @@ -47,23 +52,23 @@ <td> <div class="btn-group"> <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> - {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %} + {% endverbatim %}{{ translate("ACTIONS") }}{% verbatim %} <span class="caret"></span> </button> <ul class="dropdown-menu dropdown-menu-right" role="menu"> <li> <a href="#" data-slug="{{row.slug}}" class="js-role-permissions"> - <i class="fa fa-key"></i> {% endverbatim %}{{translate("PERMISSION.MANAGE")}}{% verbatim %} + <i class="fa fa-key"></i> {% endverbatim %}{{ translate("PERMISSION.MANAGE") }}{% verbatim %} </a> </li> <li> <a href="#" data-slug="{{row.slug}}" class="js-role-edit"> - <i class="fa fa-edit"></i> {% endverbatim %}{{translate("ROLE.EDIT")}}{% verbatim %} + <i class="fa fa-edit"></i> {% endverbatim %}{{ translate("ROLE.EDIT") }}{% verbatim %} </a> </li> <li> <a href="#" data-slug="{{row.slug}}" class="js-role-delete"> - <i class="fa fa-trash-o"></i> {% endverbatim %}{{translate("ROLE.DELETE")}}{% verbatim %} + <i class="fa fa-trash-o"></i> {% endverbatim %}{{ translate("ROLE.DELETE") }}{% verbatim %} </a> </li> </ul> diff --git a/main/app/sprinkles/admin/templates/tables/users.html.twig b/main/app/sprinkles/admin/templates/tables/users.html.twig index 1cebb47..bd9fffe 100644 --- a/main/app/sprinkles/admin/templates/tables/users.html.twig +++ b/main/app/sprinkles/admin/templates/tables/users.html.twig @@ -8,18 +8,26 @@ {% extends "tables/table-paginated.html.twig" %} {% block table %} - <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}"> + <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped" + data-sortlist="{{ table.sortlist }}"> <thead> <tr> - <th class="sorter-metatext" data-column-name="name" data-column-template="#user-table-column-info" data-priority="1">{{translate('USER')}} <i class="fa fa-sort"></i></th> + <th class="sorter-metatext" data-column-name="name" data-column-template="#user-table-column-info" + data-priority="1">{{ translate('USER') }} <i class="fa fa-sort"></i></th> {% if 'last_activity' in table.columns %} - <th class="sorter-metanum" data-column-name="last_activity" data-column-template="#user-table-column-last-activity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fa fa-sort"></i></th> + <th class="sorter-metanum" data-column-name="last_activity" + data-column-template="#user-table-column-last-activity" + data-priority="3">{{ translate("ACTIVITY.LAST") }} <i class="fa fa-sort"></i></th> {% endif %} {% if 'via_roles' in table.columns %} - <th data-column-template="#user-table-column-via-roles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th> + <th data-column-template="#user-table-column-via-roles" data-sorter="false" data-filter="false" + data-priority="1">{{ translate('PERMISSION.VIA_ROLES') }}</th> {% endif %} - <th class="filter-select filter-metatext" data-column-name="status" data-column-template="#user-table-column-status" data-priority="2">{{translate("STATUS")}} <i class="fa fa-sort"></i></th> - <th data-column-name="actions" data-column-template="#user-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th> + <th class="filter-select filter-metatext" data-column-name="status" + data-column-template="#user-table-column-status" data-priority="2">{{ translate("STATUS") }} <i + class="fa fa-sort"></i></th> + <th data-column-name="actions" data-column-template="#user-table-column-actions" data-sorter="false" + data-filter="false" data-priority="1">{{ translate("ACTIONS") }}</th> </tr> </thead> <tbody> @@ -56,7 +64,7 @@ </td> {{ else }} <td data-num="0"> - <i>{% endverbatim %}{{translate("UNKNOWN")}}{% verbatim %}</i> + <i>{% endverbatim %}{{ translate("UNKNOWN") }}{% verbatim %}</i> </td> {{/if }} </script> @@ -75,16 +83,16 @@ > {{#ifx row.flag_enabled '==' 0 }} <span class="text-muted"> - {% endverbatim %}{{translate("DISABLED")}}{% verbatim %} + {% endverbatim %}{{ translate("DISABLED") }}{% verbatim %} </span> {{ else }} {{#ifx row.flag_verified '==' 0 }} <span class="text-yellow"> - {% endverbatim %}{{translate("UNACTIVATED")}}{% verbatim %} + {% endverbatim %}{{ translate("UNACTIVATED") }}{% verbatim %} </span> {{ else }} <span> - {% endverbatim %}{{translate("ACTIVE")}}{% verbatim %} + {% endverbatim %}{{ translate("ACTIVE") }}{% verbatim %} </span> {{/ifx }} {{/ifx }} @@ -93,44 +101,44 @@ <script id="user-table-column-actions" type="text/x-handlebars-template"> <td class="uf-table-fit-width"> <div class="btn-group"> - <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button> + <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{ translate("ACTIONS") }}{% verbatim %}<span class="caret"></span></button> <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu"> {{#ifx row.flag_verified '==' 0 }} <li> <a href="#" data-user_name="{{row.user_name}}" class="js-user-activate"> - <i class="fa fa-bolt"></i> {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %} + <i class="fa fa-bolt"></i> {% endverbatim %}{{ translate("USER.ACTIVATE") }}{% verbatim %} </a> </li> {{/ifx }} <li> <a href="#" data-user_name="{{row.user_name}}" class="js-user-edit"> - <i class="fa fa-edit"></i> {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %} + <i class="fa fa-edit"></i> {% endverbatim %}{{ translate("USER.EDIT") }}{% verbatim %} </a> </li> <li> <a href="#" data-user_name="{{row.user_name}}" class="js-user-roles"> - <i class="fa fa-drivers-license"></i> {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %} + <i class="fa fa-drivers-license"></i> {% endverbatim %}{{ translate("ROLE.MANAGE") }}{% verbatim %} </a> </li> <li> <a href="#" data-user_name="{{row.user_name}}" class="js-user-password"> - <i class="fa fa-key"></i> {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %} + <i class="fa fa-key"></i> {% endverbatim %}{{ translate("USER.ADMIN.CHANGE_PASSWORD") }}{% verbatim %} </a> </li> <li> {{#ifx row.flag_enabled '==' 1 }} <a href="#" data-user_name="{{row.user_name}}" class="js-user-disable"> - <i class="fa fa-minus-circle"></i> {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %} + <i class="fa fa-minus-circle"></i> {% endverbatim %}{{ translate("USER.DISABLE") }}{% verbatim %} </a> {{ else }} <a href="#" data-user_name="{{row.user_name}}" class="js-user-enable"> - <i class="fa fa-plus-circle"></i> {% endverbatim %}{{translate("USER.ENABLE")}}{% verbatim %} + <i class="fa fa-plus-circle"></i> {% endverbatim %}{{ translate("USER.ENABLE") }}{% verbatim %} </a> {{/ifx }} </li> <li> <a href="#" data-user_name="{{row.user_name}}" class="js-user-delete"> - <i class="fa fa-trash-o"></i> {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %} + <i class="fa fa-trash-o"></i> {% endverbatim %}{{ translate("USER.DELETE") }}{% verbatim %} </a> </li> </ul> @@ -141,7 +149,7 @@ <script id="user-table-column-via-roles" type="text/x-handlebars-template"> <td> {{#each row.roles_via }} - <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{site.uri.public}}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a> + <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{ site.uri.public }}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a> {{/each}} </td> </script> |