diff options
Diffstat (limited to 'main/app/sprinkles/admin')
77 files changed, 2240 insertions, 2158 deletions
diff --git a/main/app/sprinkles/admin/asset-bundles.json b/main/app/sprinkles/admin/asset-bundles.json index 1bc1706..e5c4ca8 100644 --- a/main/app/sprinkles/admin/asset-bundles.json +++ b/main/app/sprinkles/admin/asset-bundles.json @@ -1,170 +1,170 @@ { - "bundle": { - "js/admin": { - "scripts": [ - "vendor/moment/moment.js", - "userfrosting/js/handlebars-helpers.js", - "vendor/tablesorter/dist/js/jquery.tablesorter.js", - "vendor/tablesorter/dist/js/jquery.tablesorter.widgets.js", - "userfrosting/js/tablesorter/widget-sort2Hash.js", - "vendor/tablesorter/dist/js/widgets/widget-columnSelector.min.js", - "vendor/tablesorter/dist/js/widgets/widget-reflow.min.js", - "vendor/tablesorter/dist/js/widgets/widget-pager.min.js", - "userfrosting/js/query-string.js", - "userfrosting/js/uf-table.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/activities": { - "scripts": [ - "userfrosting/js/pages/activities.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/dashboard": { - "scripts": [ - "userfrosting/js/widgets/users.js", - "userfrosting/js/pages/dashboard.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/group": { - "scripts": [ - "userfrosting/js/widgets/users.js", - "userfrosting/js/widgets/groups.js", - "userfrosting/js/pages/group.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/permission": { - "scripts": [ - "userfrosting/js/widgets/users.js", - "userfrosting/js/pages/permission.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/role": { - "scripts": [ - "userfrosting/js/widgets/roles.js", - "userfrosting/js/pages/role.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/user": { - "scripts": [ - "userfrosting/js/widgets/users.js", - "userfrosting/js/pages/user.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/users": { - "scripts": [ - "userfrosting/js/widgets/users.js", - "userfrosting/js/pages/users.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/groups": { - "scripts": [ - "userfrosting/js/widgets/groups.js", - "userfrosting/js/pages/groups.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/permissions": { - "scripts": [ - "userfrosting/js/pages/permissions.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "js/pages/roles": { - "scripts": [ - "userfrosting/js/widgets/roles.js", - "userfrosting/js/pages/roles.js" - ], - "options": { - "result": { - "type": { - "scripts": "plain" - } - } - } - }, - "css/admin": { - "styles": [ - "font-starcraft/css/font-starcraft.css", - "vendor/tablesorter/dist/css/theme.bootstrap.min.css", - "vendor/tablesorter/dist/css/jquery.tablesorter.pager.min.css", - "userfrosting/css/tablesorter-reflow.css", - "userfrosting/css/tablesorter-custom.css" - ], - "options": { - "result": { - "type": { - "styles": "plain" - } - } - } + "bundle": { + "js/admin": { + "scripts": [ + "vendor/moment/moment.js", + "userfrosting/js/handlebars-helpers.js", + "vendor/tablesorter/dist/js/jquery.tablesorter.js", + "vendor/tablesorter/dist/js/jquery.tablesorter.widgets.js", + "userfrosting/js/tablesorter/widget-sort2Hash.js", + "vendor/tablesorter/dist/js/widgets/widget-columnSelector.min.js", + "vendor/tablesorter/dist/js/widgets/widget-reflow.min.js", + "vendor/tablesorter/dist/js/widgets/widget-pager.min.js", + "userfrosting/js/query-string.js", + "userfrosting/js/uf-table.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } } + } + }, + "js/pages/activities": { + "scripts": [ + "userfrosting/js/pages/activities.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/dashboard": { + "scripts": [ + "userfrosting/js/widgets/users.js", + "userfrosting/js/pages/dashboard.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/group": { + "scripts": [ + "userfrosting/js/widgets/users.js", + "userfrosting/js/widgets/groups.js", + "userfrosting/js/pages/group.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/permission": { + "scripts": [ + "userfrosting/js/widgets/users.js", + "userfrosting/js/pages/permission.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/role": { + "scripts": [ + "userfrosting/js/widgets/roles.js", + "userfrosting/js/pages/role.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/user": { + "scripts": [ + "userfrosting/js/widgets/users.js", + "userfrosting/js/pages/user.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/users": { + "scripts": [ + "userfrosting/js/widgets/users.js", + "userfrosting/js/pages/users.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/groups": { + "scripts": [ + "userfrosting/js/widgets/groups.js", + "userfrosting/js/pages/groups.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/permissions": { + "scripts": [ + "userfrosting/js/pages/permissions.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "js/pages/roles": { + "scripts": [ + "userfrosting/js/widgets/roles.js", + "userfrosting/js/pages/roles.js" + ], + "options": { + "result": { + "type": { + "scripts": "plain" + } + } + } + }, + "css/admin": { + "styles": [ + "font-starcraft/css/font-starcraft.css", + "vendor/tablesorter/dist/css/theme.bootstrap.min.css", + "vendor/tablesorter/dist/css/jquery.tablesorter.pager.min.css", + "userfrosting/css/tablesorter-reflow.css", + "userfrosting/css/tablesorter-custom.css" + ], + "options": { + "result": { + "type": { + "styles": "plain" + } + } + } } + } }
\ No newline at end of file diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js index 89ac5c1..4968ffd 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/activities.js @@ -7,7 +7,7 @@ * Target page: /activities */ -$(document).ready(function() { +$(document).ready(function () { // Set up table of activities $("#widget-activities").ufTable({ dataUrl: site.uri.public + "/api/activities", diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js index f2b8a4f..d78d611 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/dashboard.js @@ -5,8 +5,8 @@ * Target page: /dashboard */ -$(document).ready(function() { - $('.js-clear-cache').click(function() { +$(document).ready(function () { + $('.js-clear-cache').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/dashboard/clear-cache", ajaxParams: { @@ -20,10 +20,10 @@ $(document).ready(function() { var form = modal.find('.js-form'); form.ufForm() - .on("submitSuccess.ufForm", function() { - // Reload page on success - window.location.reload(); - }); + .on("submitSuccess.ufForm", function () { + // Reload page on success + window.location.reload(); + }); }); }); diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js index a1ca959..e54b897 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/group.js @@ -7,7 +7,7 @@ * Target page: /groups/g/{slug} */ -$(document).ready(function() { +$(document).ready(function () { // Control buttons bindGroupButtons($("#view-group")); diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js index 0bfc65a..42a1f05 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/groups.js @@ -7,7 +7,7 @@ * Target page: /groups */ -$(document).ready(function() { +$(document).ready(function () { $("#widget-groups").ufTable({ dataUrl: site.uri.public + "/api/groups", diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js index 87e851f..61eefb6 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permission.js @@ -7,7 +7,7 @@ * Target page: /permissions/p/{id} */ -$(document).ready(function() { +$(document).ready(function () { $("#widget-permission-users").ufTable({ dataUrl: site.uri.public + '/api/permissions/p/' + page.permission_id + '/users', useLoadingTransition: site.uf_table.use_loading_transition diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js index 6266ff4..4881d25 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/permissions.js @@ -7,7 +7,7 @@ * Target page: /permissions */ -$(document).ready(function() { +$(document).ready(function () { // Set up table of permissions $("#widget-permissions").ufTable({ dataUrl: site.uri.public + "/api/permissions", diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js index 8dae7f5..3bfcef7 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/role.js @@ -7,7 +7,7 @@ * Target page: /roles/r/{slug} */ -$(document).ready(function() { +$(document).ready(function () { // Control buttons bindRoleButtons($("#view-role")); diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js index b1febb2..0643305 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/roles.js @@ -7,7 +7,7 @@ * Target page: /roles */ -$(document).ready(function() { +$(document).ready(function () { // Set up table of roles $("#widget-roles").ufTable({ dataUrl: site.uri.public + "/api/roles", diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js index 70acf7c..79d0301 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/user.js @@ -7,7 +7,7 @@ * Target page: /users/u/{user_name} */ -$(document).ready(function() { +$(document).ready(function () { // Control buttons bindUserButtons($("#view-user")); diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js b/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js index d9e4bb7..2e8685c 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/pages/users.js @@ -7,7 +7,7 @@ * Target page: /users */ -$(document).ready(function() { +$(document).ready(function () { // Set up table of users $("#widget-users").ufTable({ dataUrl: site.uri.public + "/api/users", diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js index d701d81..cae3514 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/groups.js @@ -19,7 +19,7 @@ function attachGroupForm() { }); // Auto-generate slug - form.find('input[name=name]').on('input change', function() { + form.find('input[name=name]').on('input change', function () { var manualSlug = form.find('#form-group-slug-override').prop('checked'); if (!manualSlug) { var slug = getSlug($(this).val()); @@ -27,7 +27,7 @@ function attachGroupForm() { } }); - form.find('#form-group-slug-override').on('change', function() { + form.find('#form-group-slug-override').on('change', function () { if ($(this).prop('checked')) { form.find('input[name=slug]').prop('readonly', false); } else { @@ -37,14 +37,14 @@ function attachGroupForm() { }); // Set icon when changed - form.find('input[name=icon]').on('input change', function() { + form.find('input[name=icon]').on('input change', function () { $(this).prev(".icon-preview").find("i").removeClass().addClass($(this).val()); }); // Set up the form for submission form.ufForm({ validators: page.validators - }).on("submitSuccess.ufForm", function() { + }).on("submitSuccess.ufForm", function () { // Reload page on success window.location.reload(); }); @@ -63,7 +63,7 @@ function bindGroupButtons(el) { * Buttons that launch a modal dialog */ // Edit group details button - el.find('.js-group-edit').click(function() { + el.find('.js-group-edit').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/groups/edit", ajaxParams: { @@ -76,7 +76,7 @@ function bindGroupButtons(el) { }); // Delete group button - el.find('.js-group-delete').click(function() { + el.find('.js-group-delete').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/groups/confirm-delete", ajaxParams: { @@ -90,17 +90,17 @@ function bindGroupButtons(el) { var form = modal.find('.js-form'); form.ufForm() - .on("submitSuccess.ufForm", function() { - // Reload page on success - window.location.reload(); - }); + .on("submitSuccess.ufForm", function () { + // Reload page on success + window.location.reload(); + }); }); }); } function bindGroupCreationButton(el) { // Link create button - el.find('.js-group-create').click(function() { + el.find('.js-group-create').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/groups/create", msgTarget: $("#alerts-page") diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js index 0e32651..42b58ed 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/roles.js @@ -15,7 +15,7 @@ function attachRoleForm() { */ // Auto-generate slug - form.find('input[name=name]').on('input change', function() { + form.find('input[name=name]').on('input change', function () { var manualSlug = form.find('#form-role-slug-override').prop('checked'); if (!manualSlug) { var slug = getSlug($(this).val()); @@ -23,7 +23,7 @@ function attachRoleForm() { } }); - form.find('#form-role-slug-override').on('change', function() { + form.find('#form-role-slug-override').on('change', function () { if ($(this).prop('checked')) { form.find('input[name=slug]').prop('readonly', false); } else { @@ -35,7 +35,7 @@ function attachRoleForm() { // Set up the form for submission form.ufForm({ validators: page.validators - }).on("submitSuccess.ufForm", function() { + }).on("submitSuccess.ufForm", function () { // Reload page on success window.location.reload(); }); @@ -51,7 +51,7 @@ function bindRoleButtons(el) { */ // Manage permissions button - el.find('.js-role-permissions').click(function() { + el.find('.js-role-permissions').click(function () { var slug = $(this).data('slug'); $("body").ufModal({ sourceUrl: site.uri.public + "/modals/roles/permissions", @@ -70,26 +70,25 @@ function bindRoleButtons(el) { permissionWidget.ufCollection({ dropdown: { ajax: { - url : site.uri.public + '/api/permissions' + url: site.uri.public + '/api/permissions' }, - placeholder : "Select a permission" + placeholder: "Select a permission" }, dropdownTemplate: modal.find('#role-permissions-select-option').html(), - rowTemplate : modal.find('#role-permissions-row').html() + rowTemplate: modal.find('#role-permissions-row').html() }); // Get current roles and add to widget $.getJSON(site.uri.public + '/api/roles/r/' + slug + '/permissions') - .done(function (data) { - $.each(data.rows, function (idx, permission) { - permission.text = permission.name; - permissionWidget.ufCollection('addRow', permission); + .done(function (data) { + $.each(data.rows, function (idx, permission) { + permission.text = permission.name; + permissionWidget.ufCollection('addRow', permission); + }); }); - }); // Set up form for submission - form.ufForm({ - }).on("submitSuccess.ufForm", function() { + form.ufForm({}).on("submitSuccess.ufForm", function () { // Reload page on success window.location.reload(); }); @@ -100,7 +99,7 @@ function bindRoleButtons(el) { * Buttons that launch a modal dialog */ // Edit role details button - el.find('.js-role-edit').click(function() { + el.find('.js-role-edit').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/roles/edit", ajaxParams: { @@ -113,7 +112,7 @@ function bindRoleButtons(el) { }); // Delete role button - el.find('.js-role-delete').click(function() { + el.find('.js-role-delete').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/roles/confirm-delete", ajaxParams: { @@ -127,17 +126,17 @@ function bindRoleButtons(el) { var form = modal.find('.js-form'); form.ufForm() - .on("submitSuccess.ufForm", function() { - // Reload page on success - window.location.reload(); - }); + .on("submitSuccess.ufForm", function () { + // Reload page on success + window.location.reload(); + }); }); }); } function bindRoleCreationButton(el) { // Link create button - el.find('.js-role-create').click(function() { + el.find('.js-role-create').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/roles/create", msgTarget: $("#alerts-page") diff --git a/main/app/sprinkles/admin/composer.json b/main/app/sprinkles/admin/composer.json index 8ccd5c0..850543d 100644 --- a/main/app/sprinkles/admin/composer.json +++ b/main/app/sprinkles/admin/composer.json @@ -1,22 +1,26 @@ { - "name": "userfrosting/sprinkle-admin", - "type": "userfrosting-sprinkle", - "description": "Administrative management module for UserFrosting.", - "keywords": ["php user management", "usercake", "bootstrap"], - "homepage": "https://github.com/userfrosting/UserFrosting", - "license" : "MIT", - "authors" : [ - { - "name": "Alexander Weissman", - "homepage": "https://alexanderweissman.com" - } - ], - "require": { - "php": ">=5.6" - }, - "autoload": { - "psr-4": { - "UserFrosting\\Sprinkle\\Admin\\": "src/" - } + "name": "userfrosting/sprinkle-admin", + "type": "userfrosting-sprinkle", + "description": "Administrative management module for UserFrosting.", + "keywords": [ + "php user management", + "usercake", + "bootstrap" + ], + "homepage": "https://github.com/userfrosting/UserFrosting", + "license": "MIT", + "authors": [ + { + "name": "Alexander Weissman", + "homepage": "https://alexanderweissman.com" } + ], + "require": { + "php": ">=5.6" + }, + "autoload": { + "psr-4": { + "UserFrosting\\Sprinkle\\Admin\\": "src/" + } + } } diff --git a/main/app/sprinkles/admin/locale/ar/messages.php b/main/app/sprinkles/admin/locale/ar/messages.php index d4a3a44..4cbe3bd 100644 --- a/main/app/sprinkles/admin/locale/ar/messages.php +++ b/main/app/sprinkles/admin/locale/ar/messages.php @@ -16,25 +16,25 @@ return [ 1 => "نشاط", 2 => "أنشطة", - "LAST" => "النشاط الاخير", - "PAGE" => "قائمة من أنشطة المستخدم", - "TIME" => "وقت نشاط" + "LAST" => "النشاط الاخير", + "PAGE" => "قائمة من أنشطة المستخدم", + "TIME" => "وقت نشاط" ], "CACHE" => [ - "CLEAR" => "مسح ذاكرة التخزين", - "CLEAR_CONFIRM" => "هل أنت متأكد أنك تريد مسح ذاكرة التخزين بالموقع؟", + "CLEAR" => "مسح ذاكرة التخزين", + "CLEAR_CONFIRM" => "هل أنت متأكد أنك تريد مسح ذاكرة التخزين بالموقع؟", "CLEAR_CONFIRM_YES" => "نعم، إمسح ذاكرة التخزين", - "CLEARED" => "تم مسح ذاكرة التخزين بنجاح" + "CLEARED" => "تم مسح ذاكرة التخزين بنجاح" ], - "DASHBOARD" => "لوحة القيادة", - "NO_FEATURES_YET" => "لا يبدو أن أي ميزات تم إعدادها لهذا الحساب حتى الآن. ربما لم يتم تنفيذها بعد، أو ربما شخص نسي أن يعطيك الوصول. في كلتا الحالتين، نحن سعداء أن يكون لك على متن!", - "DELETE_MASTER" => "لا يمكنك حذف الحساب الرئيسي", - "DELETION_SUCCESSFUL" => "المستعمل <strong>{{user_name}}</strong> حذف بنجاح", - "DETAILS_UPDATED" => "جدد تفاصيل الحساب للمستخدم <strong>{{user_name}}</strong>", - "DISABLE_MASTER" => "لا يمكنك تعطيل الحساب الرئيسي", - "DISABLE_SUCCESSFUL" => "حساب المستخدم <strong>{{user_name}}</strong> عطيل بنجاح", + "DASHBOARD" => "لوحة القيادة", + "NO_FEATURES_YET" => "لا يبدو أن أي ميزات تم إعدادها لهذا الحساب حتى الآن. ربما لم يتم تنفيذها بعد، أو ربما شخص نسي أن يعطيك الوصول. في كلتا الحالتين، نحن سعداء أن يكون لك على متن!", + "DELETE_MASTER" => "لا يمكنك حذف الحساب الرئيسي", + "DELETION_SUCCESSFUL" => "المستعمل <strong>{{user_name}}</strong> حذف بنجاح", + "DETAILS_UPDATED" => "جدد تفاصيل الحساب للمستخدم <strong>{{user_name}}</strong>", + "DISABLE_MASTER" => "لا يمكنك تعطيل الحساب الرئيسي", + "DISABLE_SUCCESSFUL" => "حساب المستخدم <strong>{{user_name}}</strong> عطيل بنجاح", "ENABLE_SUCCESSFUL" => "حساب المستخدم <strong>{{user_name}}</strong> مكين بنجاح", @@ -42,66 +42,66 @@ return [ 1 => "مجموعة", 2 => "مجموعات", - "CREATE" => "إنشاء مجموعة", - "DELETE" => "حذف مجموعة", - "DELETE_CONFIRM" => "هل أنت متأكد أنك تريد حذف مجموعة <strong>{{name}}</strong>?", - "DELETE_YES" => "نعم، إحذف مجموعة", - "EDIT" => "تعديل مجموعة", - "ICON" => "رمز المجموعة", - "ICON_EXPLAIN" => "رمز المستخدمين في المجموعه", - "INFO_PAGE" => "صفحة معلومات المجموعة ل {{name}}", + "CREATE" => "إنشاء مجموعة", + "DELETE" => "حذف مجموعة", + "DELETE_CONFIRM" => "هل أنت متأكد أنك تريد حذف مجموعة <strong>{{name}}</strong>?", + "DELETE_YES" => "نعم، إحذف مجموعة", + "EDIT" => "تعديل مجموعة", + "ICON" => "رمز المجموعة", + "ICON_EXPLAIN" => "رمز المستخدمين في المجموعه", + "INFO_PAGE" => "صفحة معلومات المجموعة ل {{name}}", //"MANAGE" => "Manage group", - "NAME" => "أسم المجموعة", - "NAME_EXPLAIN" => "ادخال اسم للمجموعة", + "NAME" => "أسم المجموعة", + "NAME_EXPLAIN" => "ادخال اسم للمجموعة", "PAGE_DESCRIPTION" => "قائمة المجموعات لموقعك يوفر أدوات لإدارة التحرير وحذف مجموعات" ], - "MANUALLY_ACTIVATED" => "تم تفعيل حساب{{user_name}}", + "MANUALLY_ACTIVATED" => "تم تفعيل حساب{{user_name}}", "MASTER_ACCOUNT_EXISTS" => "الحساب الرئيسي موجود بالفعل", "MIGRATION" => [ - "REQUIRED" => "تحديث قاعدة البيانات مطلوب" + "REQUIRED" => "تحديث قاعدة البيانات مطلوب" ], "PERMISSION" => [ 1 => "الإذن", 2 => "مأذونيات", - "ASSIGN_NEW" => "تعيين إذن جديد", - "HOOK_CONDITION" => "الظروف", - "MANAGE" => "إدارة المأذونات", - "PAGE_DESCRIPTION" => "قائمة المأذونات لموقعك", - "UPDATE" => "تحديث المأذونات" + "ASSIGN_NEW" => "تعيين إذن جديد", + "HOOK_CONDITION" => "الظروف", + "MANAGE" => "إدارة المأذونات", + "PAGE_DESCRIPTION" => "قائمة المأذونات لموقعك", + "UPDATE" => "تحديث المأذونات" ], "ROLE" => [ 1 => "وظيفة", 2 => "وظائف", - "ASSIGN_NEW" => "تعيين دور جديد", - "CREATE" => "إنشاء دور", - "DELETE" => "حذف دور", - "DELETE_CONFIRM" => "هل أنت متأكد أنك تريد حذف الدور <strong>{{name}}</strong>?", - "DELETE_YES" => "نعم، حذف دور", - "EDIT" => "إدارة دور", - "INFO_PAGE" => "صفحة معلومات دور {{name}}", - "MANAGE" => "إدارة الوظائف", - "NAME" => "اسم", - "NAME_EXPLAIN" => "أدخل اسما للدور", - "PAGE_DESCRIPTION" => "قائمة الوظائف لموقعك", - "UPDATED" => "تحديث الوظائف" + "ASSIGN_NEW" => "تعيين دور جديد", + "CREATE" => "إنشاء دور", + "DELETE" => "حذف دور", + "DELETE_CONFIRM" => "هل أنت متأكد أنك تريد حذف الدور <strong>{{name}}</strong>?", + "DELETE_YES" => "نعم، حذف دور", + "EDIT" => "إدارة دور", + "INFO_PAGE" => "صفحة معلومات دور {{name}}", + "MANAGE" => "إدارة الوظائف", + "NAME" => "اسم", + "NAME_EXPLAIN" => "أدخل اسما للدور", + "PAGE_DESCRIPTION" => "قائمة الوظائف لموقعك", + "UPDATED" => "تحديث الوظائف" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "معلومات الجهاز", - - "DB_NAME" => "اسم قاعدة البيانات", - "DB_VERSION" => "إصدار قاعدة البيانات", - "DIRECTORY" => "دليل المشروع", - "PHP_VERSION" => "الإصدار PHP", - "SERVER" => "برنامج الخادم", - "SPRINKLES" => "sprinkles المحمل", - "UF_VERSION" => "إصدار UserFrosting", - "URL" => "رابط قاعدة الموقع" + "@TRANSLATION" => "معلومات الجهاز", + + "DB_NAME" => "اسم قاعدة البيانات", + "DB_VERSION" => "إصدار قاعدة البيانات", + "DIRECTORY" => "دليل المشروع", + "PHP_VERSION" => "الإصدار PHP", + "SERVER" => "برنامج الخادم", + "SPRINKLES" => "sprinkles المحمل", + "UF_VERSION" => "إصدار UserFrosting", + "URL" => "رابط قاعدة الموقع" ], "USER" => [ @@ -114,18 +114,18 @@ return [ "SET_PASSWORD" => "تعيين كلمة المرور الخاصة بالمستخدم" ], - "ACTIVATE" => "تفعيل المستخدم", - "CREATE" => "إنشاء مستخدم", - "DELETE" => "مسح المستخدم", - "DELETE_CONFIRM" => "هل أنت متأكد أنك تريد حذف المستخدم <strong>{{name}}</strong>?", - "DELETE_YES" => "نعم، حذف المستخدم", - "DISABLE" => "تعطيل المستخدم ", - "EDIT" => "إدارة المستخدم", - "ENABLE" => "تمكين المستخدم", - "INFO_PAGE" => "صفحة معلومات المستخدم {{name}}", - "PAGE_DESCRIPTION" => "قائمة المستخدمين لموقعك", - "LATEST" => "أحدث المستخدمين", - "VIEW_ALL" => "عرض جميع المستخدمين" + "ACTIVATE" => "تفعيل المستخدم", + "CREATE" => "إنشاء مستخدم", + "DELETE" => "مسح المستخدم", + "DELETE_CONFIRM" => "هل أنت متأكد أنك تريد حذف المستخدم <strong>{{name}}</strong>?", + "DELETE_YES" => "نعم، حذف المستخدم", + "DISABLE" => "تعطيل المستخدم ", + "EDIT" => "إدارة المستخدم", + "ENABLE" => "تمكين المستخدم", + "INFO_PAGE" => "صفحة معلومات المستخدم {{name}}", + "PAGE_DESCRIPTION" => "قائمة المستخدمين لموقعك", + "LATEST" => "أحدث المستخدمين", + "VIEW_ALL" => "عرض جميع المستخدمين" ], "X_USER" => [ 0 => "لا يوجد اي مستخدمين", diff --git a/main/app/sprinkles/admin/locale/de_DE/messages.php b/main/app/sprinkles/admin/locale/de_DE/messages.php index 6e21ab5..fa6883a 100644 --- a/main/app/sprinkles/admin/locale/de_DE/messages.php +++ b/main/app/sprinkles/admin/locale/de_DE/messages.php @@ -15,147 +15,147 @@ return [ "ACTIVITY" => [ - 1 => "Aktivität", - 2 => "Aktivitäten", + 1 => "Aktivität", + 2 => "Aktivitäten", - "LAST" => "Letzte Aktivität", - "PAGE" => "Eine Auflistung der Benutzeraktivitäten", - "TIME" => "Aktivitätszeit" + "LAST" => "Letzte Aktivität", + "PAGE" => "Eine Auflistung der Benutzeraktivitäten", + "TIME" => "Aktivitätszeit" ], "CACHE" => [ - "CLEAR" => "Cache löschen", - "CLEAR_CONFIRM" => "Sind Sie sicher, dass Sie den Seiten-Cache löschen möchten?", - "CLEAR_CONFIRM_YES" => "Ja, Cache löschen", - "CLEARED" => "Cache wurde erfolgreich gelöscht!" + "CLEAR" => "Cache löschen", + "CLEAR_CONFIRM" => "Sind Sie sicher, dass Sie den Seiten-Cache löschen möchten?", + "CLEAR_CONFIRM_YES" => "Ja, Cache löschen", + "CLEARED" => "Cache wurde erfolgreich gelöscht!" ], - "DASHBOARD" => "Übersicht", - "NO_FEATURES_YET" => "Es sieht aus, als wären für Ihren Account noch keine Funktionen aktiviert... bisher. Entweder sie wurden bisher noch nicht implementiert, oder Ihnen fehlen noch die Berechtigungen. Trotzdem ist es schön, dass Sie auf unsere Seite gekommen sind!", - "DELETE_MASTER" => "Sie können das Root-Konto nicht löschen!", - "DELETION_SUCCESSFUL" => "Benutzer <strong>{{user_name}}</strong> wurde erfolgreich gelöscht.", - "DETAILS_UPDATED" => "Konto-Daten für <strong>{{user_name}}</strong> aktualisiert.", - "DISABLE_MASTER" => "Sie können das Root-Konto nicht deaktivieren!", - "DISABLE_SELF" => "Sie können Ihr eigenes Konto nicht deaktivieren!", - "DISABLE_SUCCESSFUL" => "Konto von <strong>{{user_name}}</strong> wurde erfolgreich deaktiviert.", + "DASHBOARD" => "Übersicht", + "NO_FEATURES_YET" => "Es sieht aus, als wären für Ihren Account noch keine Funktionen aktiviert... bisher. Entweder sie wurden bisher noch nicht implementiert, oder Ihnen fehlen noch die Berechtigungen. Trotzdem ist es schön, dass Sie auf unsere Seite gekommen sind!", + "DELETE_MASTER" => "Sie können das Root-Konto nicht löschen!", + "DELETION_SUCCESSFUL" => "Benutzer <strong>{{user_name}}</strong> wurde erfolgreich gelöscht.", + "DETAILS_UPDATED" => "Konto-Daten für <strong>{{user_name}}</strong> aktualisiert.", + "DISABLE_MASTER" => "Sie können das Root-Konto nicht deaktivieren!", + "DISABLE_SELF" => "Sie können Ihr eigenes Konto nicht deaktivieren!", + "DISABLE_SUCCESSFUL" => "Konto von <strong>{{user_name}}</strong> wurde erfolgreich deaktiviert.", - "ENABLE_SUCCESSFUL" => "Konto von {{user_name}} wurde erfolgreich aktiviert.", + "ENABLE_SUCCESSFUL" => "Konto von {{user_name}} wurde erfolgreich aktiviert.", "GROUP" => [ - 1 => "Gruppe", - 2 => "Gruppen", - - "CREATE" => "Gruppe erstellen", - "CREATION_SUCCESSFUL" => "Die Gruppe <strong>{{name}}</strong> wurde erfolgreich erstellt", - "DELETE" => "Gruppe löschen", - "DELETE_CONFIRM" => "Möchten Sie die Gruppe <strong>{{name}}</strong> wirklich löschen?", - "DELETE_DEFAULT" => "Sie können die Gruppe <strong>{{name}}</strong> nicht löschen, da es die Standardgruppe für neu registrierte Benutzer ist.", - "DELETE_YES" => "Ja, Gruppe löschen", - "DELETION_SUCCESSFUL" => "Die Gruppe <strong>{{name}}</strong> wurde erfolgreich gelöscht", - "EDIT" => "Gruppe bearbeiten", - "ICON" => "Gruppensymbol", - "ICON_EXPLAIN" => "Symbol für Gruppenmitglieder", - "INFO_PAGE" => "Gruppeninformationsseite für {{name}}", - "MANAGE" => "Gruppe verwalten", - "NAME" => "Gruppenname", - "NAME_EXPLAIN" => "Geben Sie einen Namen für die Gruppe ein", - "NOT_EMPTY" => "Sie können das nicht tun, denn es sind noch Benutzer mit der Gruppe <strong>{{name}}</strong> verbunden.", - "PAGE_DESCRIPTION" => "Eine Liste der Gruppen für Ihre Website. Bietet Verwaltungstools für das Bearbeiten und Löschen von Gruppen.", - "SUMMARY" => "Gruppen Zusammenfassung", - "UPDATE" => "Details für die Gruppe <strong>{{name}}</strong> aktualisiert" + 1 => "Gruppe", + 2 => "Gruppen", + + "CREATE" => "Gruppe erstellen", + "CREATION_SUCCESSFUL" => "Die Gruppe <strong>{{name}}</strong> wurde erfolgreich erstellt", + "DELETE" => "Gruppe löschen", + "DELETE_CONFIRM" => "Möchten Sie die Gruppe <strong>{{name}}</strong> wirklich löschen?", + "DELETE_DEFAULT" => "Sie können die Gruppe <strong>{{name}}</strong> nicht löschen, da es die Standardgruppe für neu registrierte Benutzer ist.", + "DELETE_YES" => "Ja, Gruppe löschen", + "DELETION_SUCCESSFUL" => "Die Gruppe <strong>{{name}}</strong> wurde erfolgreich gelöscht", + "EDIT" => "Gruppe bearbeiten", + "ICON" => "Gruppensymbol", + "ICON_EXPLAIN" => "Symbol für Gruppenmitglieder", + "INFO_PAGE" => "Gruppeninformationsseite für {{name}}", + "MANAGE" => "Gruppe verwalten", + "NAME" => "Gruppenname", + "NAME_EXPLAIN" => "Geben Sie einen Namen für die Gruppe ein", + "NOT_EMPTY" => "Sie können das nicht tun, denn es sind noch Benutzer mit der Gruppe <strong>{{name}}</strong> verbunden.", + "PAGE_DESCRIPTION" => "Eine Liste der Gruppen für Ihre Website. Bietet Verwaltungstools für das Bearbeiten und Löschen von Gruppen.", + "SUMMARY" => "Gruppen Zusammenfassung", + "UPDATE" => "Details für die Gruppe <strong>{{name}}</strong> aktualisiert" ], - "MANUALLY_ACTIVATED" => "{{user_name}}'s Konto wurde manuell aktiviert.", - "MASTER_ACCOUNT_EXISTS" => "Das Root-Konto existiert bereits!", + "MANUALLY_ACTIVATED" => "{{user_name}}'s Konto wurde manuell aktiviert.", + "MASTER_ACCOUNT_EXISTS" => "Das Root-Konto existiert bereits!", "MIGRATION" => [ - "REQUIRED" => "Datenbankaktualisierung erforderlich" + "REQUIRED" => "Datenbankaktualisierung erforderlich" ], "PERMISSION" => [ - 1 => "Berechtigung", - 2 => "Berechtigungen", - - "ASSIGN_NEW" => "Neue Berechtigung zuweisen", - "HOOK_CONDITION" => "Haken/Bedingungen", - "ID" => "Berechtigungs-ID", - "INFO_PAGE" => "Berechtigungs Informationen für '{{name}}'", - "MANAGE" => "Berechtigungen verwalten", - "NOTE_READ_ONLY" => "<strong>Bitte beachten Sie:</strong> Berechtigungen werden als \"Teil des Quelltexts\" gesehen und können hier nicht bearbeitet werden. Um Berechtigungen hinzuzufügen, zu bearbeiten, oder zu löschen, benutzen Sie bitte folgende Dokumentation zur <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">Datenbank Migration.</a>", - "PAGE_DESCRIPTION" => "Eine Liste der Berechtigungen für Ihre Website. Bietet Verwaltungstools zum Bearbeiten und Löschen von Berechtigungen.", - "SUMMARY" => "Berechtigungs Zusammenfassung", - "UPDATE" => "Berechtigungen aktualisieren", - "VIA_ROLES" => "Besitzt die Berechtigung durch die Rolle" + 1 => "Berechtigung", + 2 => "Berechtigungen", + + "ASSIGN_NEW" => "Neue Berechtigung zuweisen", + "HOOK_CONDITION" => "Haken/Bedingungen", + "ID" => "Berechtigungs-ID", + "INFO_PAGE" => "Berechtigungs Informationen für '{{name}}'", + "MANAGE" => "Berechtigungen verwalten", + "NOTE_READ_ONLY" => "<strong>Bitte beachten Sie:</strong> Berechtigungen werden als \"Teil des Quelltexts\" gesehen und können hier nicht bearbeitet werden. Um Berechtigungen hinzuzufügen, zu bearbeiten, oder zu löschen, benutzen Sie bitte folgende Dokumentation zur <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">Datenbank Migration.</a>", + "PAGE_DESCRIPTION" => "Eine Liste der Berechtigungen für Ihre Website. Bietet Verwaltungstools zum Bearbeiten und Löschen von Berechtigungen.", + "SUMMARY" => "Berechtigungs Zusammenfassung", + "UPDATE" => "Berechtigungen aktualisieren", + "VIA_ROLES" => "Besitzt die Berechtigung durch die Rolle" ], "ROLE" => [ - 1 => "Rolle", - 2 => "Rollen", - - "ASSIGN_NEW" => "Neue Rolle zuweisen", - "CREATE" => "Rolle erstellen", - "CREATION_SUCCESSFUL" => "Die Rolle <strong>{{name}}</strong> wurde erfolgreich erstellt", - "DELETE" => "Rolle löschen", - "DELETE_CONFIRM" => "Sind Sie sicher, dass Sie die Rolle <strong>{{name}}</strong> löschen möchten?", - "DELETE_DEFAULT" => "Sie können die Rolle <strong>{{name}}</strong> nicht löschen, da es eine Standardrolle für neu registrierte Benutzer ist.", - "DELETE_YES" => "Ja, Rolle löschen", - "DELETION_SUCCESSFUL" => "Die Rolle <strong>{{name}}</strong> wurde erfolgreich gelöscht", - "EDIT" => "Rolle bearbeiten", - "HAS_USERS" => "Sie können das nicht machen weil es noch Benutzer gibt, die die Rolle <strong>{{name}}</strong> haben.", - "INFO_PAGE" => "Rolleninformationsseite für {{name}}", - "MANAGE" => "Rollen verwalten", - "NAME" => "Name", - "NAME_EXPLAIN" => "Geben Sie einen Namen für die Rolle ein", - "NAME_IN_USE" => "Eine Rolle mit dem Namen <strong>{{name}}</strong> existiert bereits", - "PAGE_DESCRIPTION" => "Eine Liste der Rollen für Ihre Website. Bietet Verwaltungstools zum Bearbeiten und Löschen von Rollen.", - "PERMISSIONS_UPDATED" => "Berechtigungen für die Rolle <strong>{{name}}</strong> aktualisiert", - "SUMMARY" => "Rollen Zusammenfassung", - "UPDATED" => "Rollen aktualisieren" + 1 => "Rolle", + 2 => "Rollen", + + "ASSIGN_NEW" => "Neue Rolle zuweisen", + "CREATE" => "Rolle erstellen", + "CREATION_SUCCESSFUL" => "Die Rolle <strong>{{name}}</strong> wurde erfolgreich erstellt", + "DELETE" => "Rolle löschen", + "DELETE_CONFIRM" => "Sind Sie sicher, dass Sie die Rolle <strong>{{name}}</strong> löschen möchten?", + "DELETE_DEFAULT" => "Sie können die Rolle <strong>{{name}}</strong> nicht löschen, da es eine Standardrolle für neu registrierte Benutzer ist.", + "DELETE_YES" => "Ja, Rolle löschen", + "DELETION_SUCCESSFUL" => "Die Rolle <strong>{{name}}</strong> wurde erfolgreich gelöscht", + "EDIT" => "Rolle bearbeiten", + "HAS_USERS" => "Sie können das nicht machen weil es noch Benutzer gibt, die die Rolle <strong>{{name}}</strong> haben.", + "INFO_PAGE" => "Rolleninformationsseite für {{name}}", + "MANAGE" => "Rollen verwalten", + "NAME" => "Name", + "NAME_EXPLAIN" => "Geben Sie einen Namen für die Rolle ein", + "NAME_IN_USE" => "Eine Rolle mit dem Namen <strong>{{name}}</strong> existiert bereits", + "PAGE_DESCRIPTION" => "Eine Liste der Rollen für Ihre Website. Bietet Verwaltungstools zum Bearbeiten und Löschen von Rollen.", + "PERMISSIONS_UPDATED" => "Berechtigungen für die Rolle <strong>{{name}}</strong> aktualisiert", + "SUMMARY" => "Rollen Zusammenfassung", + "UPDATED" => "Rollen aktualisieren" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "System Information", - - "DB_NAME" => "Name der Datenbank", - "DB_VERSION" => "Datenbankversion", - "DIRECTORY" => "Projektverzeichnis", - "PHP_VERSION" => "PHP-Version", - "SERVER" => "Web-Server-Software", - "SPRINKLES" => "Geladene Sprinkles", - "UF_VERSION" => "UserFrosting Version", - "URL" => "Website-Stamm-Url" + "@TRANSLATION" => "System Information", + + "DB_NAME" => "Name der Datenbank", + "DB_VERSION" => "Datenbankversion", + "DIRECTORY" => "Projektverzeichnis", + "PHP_VERSION" => "PHP-Version", + "SERVER" => "Web-Server-Software", + "SPRINKLES" => "Geladene Sprinkles", + "UF_VERSION" => "UserFrosting Version", + "URL" => "Website-Stamm-Url" ], "TOGGLE_COLUMNS" => "Spalten anpassen", "USER" => [ - 1 => "Benutzer", - 2 => "Benutzer", + 1 => "Benutzer", + 2 => "Benutzer", "ADMIN" => [ - "CHANGE_PASSWORD" => "Benutzerpasswort ändern", - "SEND_PASSWORD_LINK" => "Senden Sie dem Benutzer einen Link, der ihnen erlaubt, ihr eigenes Passwort zu wählen", - "SET_PASSWORD" => "Setzen Sie das Passwort des Benutzers als" + "CHANGE_PASSWORD" => "Benutzerpasswort ändern", + "SEND_PASSWORD_LINK" => "Senden Sie dem Benutzer einen Link, der ihnen erlaubt, ihr eigenes Passwort zu wählen", + "SET_PASSWORD" => "Setzen Sie das Passwort des Benutzers als" ], - "ACTIVATE" => "Benutzer aktivieren", - "CREATE" => "Benutzer erstellen", - "CREATED" => "Benutzer <strong>{{user_name}}</strong> wurde erfolgreich erstellt", - "DELETE" => "Benutzer löschen", - "DELETE_CONFIRM" => "Sind Sie sicher, dass Sie den Benutzer <strong>{{name}}</strong> löschen möchten?", - "DELETE_YES" => "Ja, Benutzer löschen", - "DISABLE" => "Benutzer deaktivieren", - "EDIT" => "Benutzer bearbeiten", - "ENABLE" => "Benutzer aktivieren", - "INFO_PAGE" => "Benutzerinformationsseite für {{name}}", - "LATEST" => "Neueste Benutzer", - "PAGE_DESCRIPTION" => "Eine Liste der Benutzer für Ihre Website. Bietet Management-Tools, einschließlich der Möglichkeit, Benutzerdaten bearbeiten, manuell aktivieren, Benutzer aktivieren/deaktivieren, und vieles mehr.", - "SUMMARY" => "Benutzer Zusammenfassung", - "VIEW_ALL" => "Alle Benutzer anzeigen", - "WITH_PERMISSION" => "Benutzer mit dieser Berechtigung" + "ACTIVATE" => "Benutzer aktivieren", + "CREATE" => "Benutzer erstellen", + "CREATED" => "Benutzer <strong>{{user_name}}</strong> wurde erfolgreich erstellt", + "DELETE" => "Benutzer löschen", + "DELETE_CONFIRM" => "Sind Sie sicher, dass Sie den Benutzer <strong>{{name}}</strong> löschen möchten?", + "DELETE_YES" => "Ja, Benutzer löschen", + "DISABLE" => "Benutzer deaktivieren", + "EDIT" => "Benutzer bearbeiten", + "ENABLE" => "Benutzer aktivieren", + "INFO_PAGE" => "Benutzerinformationsseite für {{name}}", + "LATEST" => "Neueste Benutzer", + "PAGE_DESCRIPTION" => "Eine Liste der Benutzer für Ihre Website. Bietet Management-Tools, einschließlich der Möglichkeit, Benutzerdaten bearbeiten, manuell aktivieren, Benutzer aktivieren/deaktivieren, und vieles mehr.", + "SUMMARY" => "Benutzer Zusammenfassung", + "VIEW_ALL" => "Alle Benutzer anzeigen", + "WITH_PERMISSION" => "Benutzer mit dieser Berechtigung" ], "X_USER" => [ - 0 => "Keine Benutzer", - 1 => "{{plural}} Benutzer", - 2 => "{{plural}} Benutzer" + 0 => "Keine Benutzer", + 1 => "{{plural}} Benutzer", + 2 => "{{plural}} Benutzer" ] ]; diff --git a/main/app/sprinkles/admin/locale/en_US/messages.php b/main/app/sprinkles/admin/locale/en_US/messages.php index a21e325..225e524 100644 --- a/main/app/sprinkles/admin/locale/en_US/messages.php +++ b/main/app/sprinkles/admin/locale/en_US/messages.php @@ -16,26 +16,26 @@ return [ 1 => "Activity", 2 => "Activities", - "LAST" => "Last Activity", - "PAGE" => "A listing of user activities", - "TIME" => "Activity Time" + "LAST" => "Last Activity", + "PAGE" => "A listing of user activities", + "TIME" => "Activity Time" ], "CACHE" => [ - "CLEAR" => "Clear cache", - "CLEAR_CONFIRM" => "Are you sure you want to clear the site cache?", + "CLEAR" => "Clear cache", + "CLEAR_CONFIRM" => "Are you sure you want to clear the site cache?", "CLEAR_CONFIRM_YES" => "Yes, clear cache", - "CLEARED" => "Cache cleared successfully !" + "CLEARED" => "Cache cleared successfully !" ], - "DASHBOARD" => "Dashboard", - "NO_FEATURES_YET" => "It doesn't look like any features have been set up for this account...yet. Maybe they haven't been implemented yet, or maybe someone forgot to give you access. Either way, we're glad to have you aboard!", - "DELETE_MASTER" => "You cannot delete the master account!", - "DELETION_SUCCESSFUL" => "User <strong>{{user_name}}</strong> has been successfully deleted.", - "DETAILS_UPDATED" => "Account details updated for user <strong>{{user_name}}</strong>", - "DISABLE_MASTER" => "You cannot disable the master account!", - "DISABLE_SELF" => "You cannot disable your own account!", - "DISABLE_SUCCESSFUL" => "Account for user <strong>{{user_name}}</strong> has been successfully disabled.", + "DASHBOARD" => "Dashboard", + "NO_FEATURES_YET" => "It doesn't look like any features have been set up for this account...yet. Maybe they haven't been implemented yet, or maybe someone forgot to give you access. Either way, we're glad to have you aboard!", + "DELETE_MASTER" => "You cannot delete the master account!", + "DELETION_SUCCESSFUL" => "User <strong>{{user_name}}</strong> has been successfully deleted.", + "DETAILS_UPDATED" => "Account details updated for user <strong>{{user_name}}</strong>", + "DISABLE_MASTER" => "You cannot disable the master account!", + "DISABLE_SELF" => "You cannot disable your own account!", + "DISABLE_SUCCESSFUL" => "Account for user <strong>{{user_name}}</strong> has been successfully disabled.", "ENABLE_SUCCESSFUL" => "Account for user <strong>{{user_name}}</strong> has been successfully enabled.", @@ -43,84 +43,84 @@ return [ 1 => "Group", 2 => "Groups", - "CREATE" => "Create group", + "CREATE" => "Create group", "CREATION_SUCCESSFUL" => "Successfully created group <strong>{{name}}</strong>", - "DELETE" => "Delete group", - "DELETE_CONFIRM" => "Are you sure you want to delete the group <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "You can't delete the group <strong>{{name}}</strong> because it is the default group for newly registered users.", - "DELETE_YES" => "Yes, delete group", + "DELETE" => "Delete group", + "DELETE_CONFIRM" => "Are you sure you want to delete the group <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "You can't delete the group <strong>{{name}}</strong> because it is the default group for newly registered users.", + "DELETE_YES" => "Yes, delete group", "DELETION_SUCCESSFUL" => "Successfully deleted group <strong>{{name}}</strong>", - "EDIT" => "Edit group", - "ICON" => "Group icon", - "ICON_EXPLAIN" => "Icon for group members", - "INFO_PAGE" => "Group information page for {{name}}", - "MANAGE" => "Manage group", - "NAME" => "Group name", - "NAME_EXPLAIN" => "Please enter a name for the group", - "NOT_EMPTY" => "You can't do that because there are still users associated with the group <strong>{{name}}</strong>.", + "EDIT" => "Edit group", + "ICON" => "Group icon", + "ICON_EXPLAIN" => "Icon for group members", + "INFO_PAGE" => "Group information page for {{name}}", + "MANAGE" => "Manage group", + "NAME" => "Group name", + "NAME_EXPLAIN" => "Please enter a name for the group", + "NOT_EMPTY" => "You can't do that because there are still users associated with the group <strong>{{name}}</strong>.", "PAGE_DESCRIPTION" => "A listing of the groups for your site. Provides management tools for editing and deleting groups.", - "SUMMARY" => "Group Summary", - "UPDATE" => "Details updated for group <strong>{{name}}</strong>" + "SUMMARY" => "Group Summary", + "UPDATE" => "Details updated for group <strong>{{name}}</strong>" ], - "MANUALLY_ACTIVATED" => "{{user_name}}'s account has been manually activated", + "MANUALLY_ACTIVATED" => "{{user_name}}'s account has been manually activated", "MASTER_ACCOUNT_EXISTS" => "The master account already exists!", "MIGRATION" => [ - "REQUIRED" => "Database update required" + "REQUIRED" => "Database update required" ], "PERMISSION" => [ 1 => "Permission", 2 => "Permissions", - "ASSIGN_NEW" => "Assign new permission", - "HOOK_CONDITION" => "Hook/Conditions", - "ID" => "Permission ID", - "INFO_PAGE" => "Permission information page for '{{name}}'", - "MANAGE" => "Manage permissions", - "NOTE_READ_ONLY" => "<strong>Please note:</strong> permissions are considered \"part of the code\" and cannot be modified through the interface. To add, remove, or modify permissions, the site maintainers will need to use a <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">database migration.</a>", - "PAGE_DESCRIPTION" => "A listing of the permissions for your site. Provides management tools for editing and deleting permissions.", - "SUMMARY" => "Permission Summary", - "UPDATE" => "Update permissions", - "VIA_ROLES" => "Has permission via roles" + "ASSIGN_NEW" => "Assign new permission", + "HOOK_CONDITION" => "Hook/Conditions", + "ID" => "Permission ID", + "INFO_PAGE" => "Permission information page for '{{name}}'", + "MANAGE" => "Manage permissions", + "NOTE_READ_ONLY" => "<strong>Please note:</strong> permissions are considered \"part of the code\" and cannot be modified through the interface. To add, remove, or modify permissions, the site maintainers will need to use a <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">database migration.</a>", + "PAGE_DESCRIPTION" => "A listing of the permissions for your site. Provides management tools for editing and deleting permissions.", + "SUMMARY" => "Permission Summary", + "UPDATE" => "Update permissions", + "VIA_ROLES" => "Has permission via roles" ], "ROLE" => [ 1 => "Role", 2 => "Roles", - "ASSIGN_NEW" => "Assign new role", - "CREATE" => "Create role", + "ASSIGN_NEW" => "Assign new role", + "CREATE" => "Create role", "CREATION_SUCCESSFUL" => "Successfully created role <strong>{{name}}</strong>", - "DELETE" => "Delete role", - "DELETE_CONFIRM" => "Are you sure you want to delete the role <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "You can't delete the role <strong>{{name}}</strong> because it is a default role for newly registered users.", - "DELETE_YES" => "Yes, delete role", + "DELETE" => "Delete role", + "DELETE_CONFIRM" => "Are you sure you want to delete the role <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "You can't delete the role <strong>{{name}}</strong> because it is a default role for newly registered users.", + "DELETE_YES" => "Yes, delete role", "DELETION_SUCCESSFUL" => "Successfully deleted role <strong>{{name}}</strong>", - "EDIT" => "Edit role", - "HAS_USERS" => "You can't do that because there are still users who have the role <strong>{{name}}</strong>.", - "INFO_PAGE" => "Role information page for {{name}}", - "MANAGE" => "Manage Roles", - "NAME" => "Name", - "NAME_EXPLAIN" => "Please enter a name for the role", - "NAME_IN_USE" => "A role named <strong>{{name}}</strong> already exist", - "PAGE_DESCRIPTION" => "A listing of the roles for your site. Provides management tools for editing and deleting roles.", + "EDIT" => "Edit role", + "HAS_USERS" => "You can't do that because there are still users who have the role <strong>{{name}}</strong>.", + "INFO_PAGE" => "Role information page for {{name}}", + "MANAGE" => "Manage Roles", + "NAME" => "Name", + "NAME_EXPLAIN" => "Please enter a name for the role", + "NAME_IN_USE" => "A role named <strong>{{name}}</strong> already exist", + "PAGE_DESCRIPTION" => "A listing of the roles for your site. Provides management tools for editing and deleting roles.", "PERMISSIONS_UPDATED" => "Permissions updated for role <strong>{{name}}</strong>", - "SUMMARY" => "Role Summary", - "UPDATED" => "Details updated for role <strong>{{name}}</strong>" + "SUMMARY" => "Role Summary", + "UPDATED" => "Details updated for role <strong>{{name}}</strong>" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "System information", - - "DB_NAME" => "Database name", - "DB_VERSION" => "Database version", - "DIRECTORY" => "Project directory", - "PHP_VERSION" => "PHP version", - "SERVER" => "Webserver software", - "SPRINKLES" => "Loaded sprinkles", - "UF_VERSION" => "UserFrosting version", - "URL" => "Site root url" + "@TRANSLATION" => "System information", + + "DB_NAME" => "Database name", + "DB_VERSION" => "Database version", + "DIRECTORY" => "Project directory", + "PHP_VERSION" => "PHP version", + "SERVER" => "Webserver software", + "SPRINKLES" => "Loaded sprinkles", + "UF_VERSION" => "UserFrosting version", + "URL" => "Site root url" ], "TOGGLE_COLUMNS" => "Toggle columns", @@ -135,22 +135,22 @@ return [ "SET_PASSWORD" => "Set the user's password as" ], - "ACTIVATE" => "Activate user", - "CREATE" => "Create user", - "CREATED" => "User <strong>{{user_name}}</strong> has been successfully created", - "DELETE" => "Delete user", - "DELETE_CONFIRM" => "Are you sure you want to delete the user <strong>{{name}}</strong>?", - "DELETE_YES" => "Yes, delete user", - "DELETED" => "User deleted", - "DISABLE" => "Disable user", - "EDIT" => "Edit user", - "ENABLE" => "Enable user", - "INFO_PAGE" => "User information page for {{name}}", - "LATEST" => "Latest Users", - "PAGE_DESCRIPTION" => "A listing of the users for your site. Provides management tools including the ability to edit user details, manually activate users, enable/disable users, and more.", - "SUMMARY" => "Account Summary", - "VIEW_ALL" => "View all users", - "WITH_PERMISSION" => "Users with this permission" + "ACTIVATE" => "Activate user", + "CREATE" => "Create user", + "CREATED" => "User <strong>{{user_name}}</strong> has been successfully created", + "DELETE" => "Delete user", + "DELETE_CONFIRM" => "Are you sure you want to delete the user <strong>{{name}}</strong>?", + "DELETE_YES" => "Yes, delete user", + "DELETED" => "User deleted", + "DISABLE" => "Disable user", + "EDIT" => "Edit user", + "ENABLE" => "Enable user", + "INFO_PAGE" => "User information page for {{name}}", + "LATEST" => "Latest Users", + "PAGE_DESCRIPTION" => "A listing of the users for your site. Provides management tools including the ability to edit user details, manually activate users, enable/disable users, and more.", + "SUMMARY" => "Account Summary", + "VIEW_ALL" => "View all users", + "WITH_PERMISSION" => "Users with this permission" ], "X_USER" => [ 0 => "No users", diff --git a/main/app/sprinkles/admin/locale/es_ES/messages.php b/main/app/sprinkles/admin/locale/es_ES/messages.php index a8950c0..2f6012f 100644 --- a/main/app/sprinkles/admin/locale/es_ES/messages.php +++ b/main/app/sprinkles/admin/locale/es_ES/messages.php @@ -58,7 +58,7 @@ return [ "ICON" => "Icono de grupo", "ICON_EXPLAIN" => "Icono para los miembros del grupo", "INFO_PAGE" => "Página de información de grupo para {{name}}", - "MANAGE" => "Administrar grupo", + "MANAGE" => "Administrar grupo", "NAME" => "Nombre del grupo", "NAME_EXPLAIN" => "Introduzca un nombre para el grupo", "NOT_EMPTY" => "No puedes hacerlo porque todavía hay usuarios asociados con el grupo <strong> {{name}} </strong>.", diff --git a/main/app/sprinkles/admin/locale/fa/messages.php b/main/app/sprinkles/admin/locale/fa/messages.php index 75a8dee..e3d3b2a 100644 --- a/main/app/sprinkles/admin/locale/fa/messages.php +++ b/main/app/sprinkles/admin/locale/fa/messages.php @@ -13,113 +13,113 @@ */ return [ - "ACTIVITY" => [ - 1 => "فعالیت", - 2 => "فعالیت ها", - - "LAST" => "آخرین فعالیت", - "PAGE" => "لیستی از فعالیت های کاربر", - "TIME" => "زمان فعالیت" - ], - - "CACHE" => [ - "CLEAR" => "پاک سازی کش", - "CLEAR_CONFIRM" => "آیا مطمئن هستید که میخواهید کش سایت را پاک سازی کنید؟", - "CLEAR_CONFIRM_YES" => "بله، کش پاک سازی شود", - "CLEARED" => "کش با موفقیت پاک سازی شد" - ], - - "DASHBOARD" => "کارتابل", - "DELETE_MASTER" => "شما نمیتوانید کاربر اصلی را حذف کنید", - "DELETION_SUCCESSFUL" => "<strong>{{user_name}}</strong> با موفقیت حذف شد.", - "DETAILS_UPDATED" => "جزئیات <strong>{{user_name}}</strong> با موفقیت ذخیره شد.", - "DISABLE_MASTER" => "شما نمیتوانید کاربر اصلی را غیر فعال کنید.", - "DISABLE_SUCCESSFUL" => "حساب کاربری <strong>{{user_name}}</strong> با موفقیت غیر فعال شد.", - - "ENABLE_SUCCESSFUL" => "حساب کاربری <strong>{{user_name}}</strong> با موفقیت فعال شد.", + "ACTIVITY" => [ + 1 => "فعالیت", + 2 => "فعالیت ها", + + "LAST" => "آخرین فعالیت", + "PAGE" => "لیستی از فعالیت های کاربر", + "TIME" => "زمان فعالیت" + ], + + "CACHE" => [ + "CLEAR" => "پاک سازی کش", + "CLEAR_CONFIRM" => "آیا مطمئن هستید که میخواهید کش سایت را پاک سازی کنید؟", + "CLEAR_CONFIRM_YES" => "بله، کش پاک سازی شود", + "CLEARED" => "کش با موفقیت پاک سازی شد" + ], + + "DASHBOARD" => "کارتابل", + "DELETE_MASTER" => "شما نمیتوانید کاربر اصلی را حذف کنید", + "DELETION_SUCCESSFUL" => "<strong>{{user_name}}</strong> با موفقیت حذف شد.", + "DETAILS_UPDATED" => "جزئیات <strong>{{user_name}}</strong> با موفقیت ذخیره شد.", + "DISABLE_MASTER" => "شما نمیتوانید کاربر اصلی را غیر فعال کنید.", + "DISABLE_SUCCESSFUL" => "حساب کاربری <strong>{{user_name}}</strong> با موفقیت غیر فعال شد.", + + "ENABLE_SUCCESSFUL" => "حساب کاربری <strong>{{user_name}}</strong> با موفقیت فعال شد.", "GROUP" => [ 1 => "گروه", 2 => "گروه ها", - "CREATE" => "اضافه کردن گروه", + "CREATE" => "اضافه کردن گروه", "CREATION_SUCCESSFUL" => "گروه <strong>{{name}}</strong> با موفقیت اضافه شد", - "DELETE" => "حذف گروه", - "DELETE_CONFIRM" => "آیا مطمئن هستید که میخواهید گروه <strong>{{name}}</strong> را حذف کنید؟", - "DELETE_DEFAULT" => "شما نمیتوانید گروه <strong>{{name}}</strong> را حذف کنید چون به عنوان گروه پیش فرض برای کاربران جدید انتخاب شده است.", - "DELETE_YES" => "بله، گروه حذف شود", + "DELETE" => "حذف گروه", + "DELETE_CONFIRM" => "آیا مطمئن هستید که میخواهید گروه <strong>{{name}}</strong> را حذف کنید؟", + "DELETE_DEFAULT" => "شما نمیتوانید گروه <strong>{{name}}</strong> را حذف کنید چون به عنوان گروه پیش فرض برای کاربران جدید انتخاب شده است.", + "DELETE_YES" => "بله، گروه حذف شود", "DELETION_SUCCESSFUL" => "گروه <strong>{{name}}</strong> با موفقیت حذف شد.", - "EDIT" => "ویرایش گروه", - "ICON" => "آیکن گروه", - "ICON_EXPLAIN" => "آیکن برای اعضای گروه", - "INFO_PAGE" => "صفحه توضیحات گروه برای {{name}}", - "MANAGE" => "مدیریت گروه", - "NAME" => "نام گروه", - "NAME_EXPLAIN" => "لطفا نام گروه را وارد کنید", - "NOT_EMPTY" => "نمیتوان این کار را کرد چون هنوز کاربرانی عضو گروه <strong>{{name}}</strong> هستند.", + "EDIT" => "ویرایش گروه", + "ICON" => "آیکن گروه", + "ICON_EXPLAIN" => "آیکن برای اعضای گروه", + "INFO_PAGE" => "صفحه توضیحات گروه برای {{name}}", + "MANAGE" => "مدیریت گروه", + "NAME" => "نام گروه", + "NAME_EXPLAIN" => "لطفا نام گروه را وارد کنید", + "NOT_EMPTY" => "نمیتوان این کار را کرد چون هنوز کاربرانی عضو گروه <strong>{{name}}</strong> هستند.", "PAGE_DESCRIPTION" => "لیست گروه های وب سایت شما. امکان مدیریت این گروه ها در این صفحه وجود دارد.", - "SUMMARY" => "توضیحات گروه", - "UPDATE" => "اطلاعات گروه <strong>{{name}}</strong> به روز رسانی شد." + "SUMMARY" => "توضیحات گروه", + "UPDATE" => "اطلاعات گروه <strong>{{name}}</strong> به روز رسانی شد." ], - "MANUALLY_ACTIVATED" => "حساب کاربری {{user_name}} بصورت دستی فعال شد.", + "MANUALLY_ACTIVATED" => "حساب کاربری {{user_name}} بصورت دستی فعال شد.", "MASTER_ACCOUNT_EXISTS" => "حساب کاربری اصلی وجود دارد!", "MIGRATION" => [ - "REQUIRED" => "به روز رسانی پایگاه داده ها باید انجام شود" + "REQUIRED" => "به روز رسانی پایگاه داده ها باید انجام شود" ], "PERMISSION" => [ 1 => "دسترسی", 2 => "دسترسی ها", - "ASSIGN_NEW" => "دادن دسترسی", - "HOOK_CONDITION" => "قلاب/شرط", - "ID" => "آی دی دسترسی", - "INFO_PAGE" => "توضیحات دسترسی {{name}}", - "MANAGE" => "مدیریت دسترسی ها", - "NOTE_READ_ONLY" => "<strong>توجه بفرمایید</strong>دسترسی ها بخشی از کد میباشند و آن ها را نمیتوان از اینترفیس تغییر داد. برای این تغییرات، مبایستی که مدیر، از <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">دیتابیس مایگریشن</a> استفاده کند. ", - "PAGE_DESCRIPTION" => "لیست دسترسی های وب سایت شما. امکان مدیریت این دسترسی ها در این صفحه وجود دارد.", - "SUMMARY" => "توضیحات دسترسی ها", - "UPDATE" => "به روز رسانی دسترسی ها", - "VIA_ROLES" => "از طریق وظیفه ها دسترسی دارد" + "ASSIGN_NEW" => "دادن دسترسی", + "HOOK_CONDITION" => "قلاب/شرط", + "ID" => "آی دی دسترسی", + "INFO_PAGE" => "توضیحات دسترسی {{name}}", + "MANAGE" => "مدیریت دسترسی ها", + "NOTE_READ_ONLY" => "<strong>توجه بفرمایید</strong>دسترسی ها بخشی از کد میباشند و آن ها را نمیتوان از اینترفیس تغییر داد. برای این تغییرات، مبایستی که مدیر، از <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">دیتابیس مایگریشن</a> استفاده کند. ", + "PAGE_DESCRIPTION" => "لیست دسترسی های وب سایت شما. امکان مدیریت این دسترسی ها در این صفحه وجود دارد.", + "SUMMARY" => "توضیحات دسترسی ها", + "UPDATE" => "به روز رسانی دسترسی ها", + "VIA_ROLES" => "از طریق وظیفه ها دسترسی دارد" ], "ROLE" => [ 1 => "وظیفه", 2 => "وظیفه ها", - "ASSIGN_NEW" => "دادن وظیفه", - "CREATE" => "ساخت وظیفه", + "ASSIGN_NEW" => "دادن وظیفه", + "CREATE" => "ساخت وظیفه", "CREATION_SUCCESSFUL" => "وظیفه <strong>{{name}}</strong> با موفقیت ساخته شد", - "DELETE" => "حذف وظیفه", - "DELETE_CONFIRM" => "اطمینان دارید که میخواهید وظیفه <strong>{{name}}</strong> را حذف کنید؟", - "DELETE_DEFAULT" => "شما نمیتوانید وظیفه <strong>{{name}}</strong> را حذف کنید زیرا کاربرانی که تازه ثبت نام کنند، این وظیفه را دریافت خواهند کرد.", - "DELETE_YES" => "بله، وظیفه حذف شود", + "DELETE" => "حذف وظیفه", + "DELETE_CONFIRM" => "اطمینان دارید که میخواهید وظیفه <strong>{{name}}</strong> را حذف کنید؟", + "DELETE_DEFAULT" => "شما نمیتوانید وظیفه <strong>{{name}}</strong> را حذف کنید زیرا کاربرانی که تازه ثبت نام کنند، این وظیفه را دریافت خواهند کرد.", + "DELETE_YES" => "بله، وظیفه حذف شود", "DELETION_SUCCESSFUL" => "وظیفه <strong>{{name}}</strong> با موفقیت حذف شد", - "EDIT" => "ویرایش وظیفه", - "HAS_USERS" => "نمیتوانید این کار را انجام دهید زیرا کاربرانی وظیفه <strong>{{name}}</strong> را هنوز دارند.", - "INFO_PAGE" => "صفحه توضیحات وظیفه {{name}}", - "MANAGE" => "مدیریت وظیفه ها", - "NAME" => "نام", - "NAME_EXPLAIN" => "لطفا برای وظیفه نامی انتخاب کنید", - "NAME_IN_USE" => "وظیفه ای با نام <strong>{{name}}</strong> موجود است", - "PAGE_DESCRIPTION" => "لیست وظیفه های وب سایت شما. امکان مدیریت این وظیفه ها در این صفحه وجود دارد.", + "EDIT" => "ویرایش وظیفه", + "HAS_USERS" => "نمیتوانید این کار را انجام دهید زیرا کاربرانی وظیفه <strong>{{name}}</strong> را هنوز دارند.", + "INFO_PAGE" => "صفحه توضیحات وظیفه {{name}}", + "MANAGE" => "مدیریت وظیفه ها", + "NAME" => "نام", + "NAME_EXPLAIN" => "لطفا برای وظیفه نامی انتخاب کنید", + "NAME_IN_USE" => "وظیفه ای با نام <strong>{{name}}</strong> موجود است", + "PAGE_DESCRIPTION" => "لیست وظیفه های وب سایت شما. امکان مدیریت این وظیفه ها در این صفحه وجود دارد.", "PERMISSIONS_UPDATED" => "دسترسی ها برای وظیفه <strong>{{name}}</strong> به روز رسانی شد", - "SUMMARY" => "خلاصه وظیفه", - "UPDATED" => "اطلاعات وظیفه <strong>{{name}}</strong> به روز رسانی شد" + "SUMMARY" => "خلاصه وظیفه", + "UPDATED" => "اطلاعات وظیفه <strong>{{name}}</strong> به روز رسانی شد" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "توضیحات سیستم", - - "DB_NAME" => "نام پایگاه داده", - "DB_VERSION" => "نسخه پایگاه داده", - "DIRECTORY" => "دایرکتوری پروژه", - "PHP_VERSION" => "نسخه پی اچ پی", - "SERVER" => "نرمافزار وب سرور", - "SPRINKLES" => "اسپرینکل های بارگذاری شده", - "UF_VERSION" => "نسخه یوزرفروستینگ", - "URL" => "آدرس رووت وب سایت" + "@TRANSLATION" => "توضیحات سیستم", + + "DB_NAME" => "نام پایگاه داده", + "DB_VERSION" => "نسخه پایگاه داده", + "DIRECTORY" => "دایرکتوری پروژه", + "PHP_VERSION" => "نسخه پی اچ پی", + "SERVER" => "نرمافزار وب سرور", + "SPRINKLES" => "اسپرینکل های بارگذاری شده", + "UF_VERSION" => "نسخه یوزرفروستینگ", + "URL" => "آدرس رووت وب سایت" ], "TOGGLE_COLUMNS" => "تغییر ستون", @@ -134,21 +134,21 @@ return [ "SET_PASSWORD" => "گذرواژه کاربر را انتخاب کنید" ], - "ACTIVATE" => "کاربر فعال", - "CREATE" => "اضافه کردن کاربر", - "CREATED" => "کاربر <strong>{{user_name}}</strong> با موفقیت اضافه شد", - "DELETE" => "حذف کاربر", - "DELETE_CONFIRM" => "آیا اطمینان دارید که میخواهید کاربر <strong>{{name}}</strong> را حذف کنید؟", - "DELETE_YES" => "بله، کاربر حذف شود", - "DISABLE" => "غیر فعال سازی کاربر", - "EDIT" => "ویرایش کاربر", - "ENABLE" => "فعال سازی کاربر", - "INFO_PAGE" => "صفحه توضیحات کاربر {{name}}", - "LATEST" => "آخرین کاربران", - "PAGE_DESCRIPTION" => "لیستی از کاربران سایت. این صفحه به شما امکان ویرایش، فعال سازی و غیر فعال سازی کاربران را می دهد.", - "SUMMARY" => "خلاصه حساب", - "VIEW_ALL" => "تماشای همه ی کاربران", - "WITH_PERMISSION" => "کاربرانی که این دسترسی را دارند" + "ACTIVATE" => "کاربر فعال", + "CREATE" => "اضافه کردن کاربر", + "CREATED" => "کاربر <strong>{{user_name}}</strong> با موفقیت اضافه شد", + "DELETE" => "حذف کاربر", + "DELETE_CONFIRM" => "آیا اطمینان دارید که میخواهید کاربر <strong>{{name}}</strong> را حذف کنید؟", + "DELETE_YES" => "بله، کاربر حذف شود", + "DISABLE" => "غیر فعال سازی کاربر", + "EDIT" => "ویرایش کاربر", + "ENABLE" => "فعال سازی کاربر", + "INFO_PAGE" => "صفحه توضیحات کاربر {{name}}", + "LATEST" => "آخرین کاربران", + "PAGE_DESCRIPTION" => "لیستی از کاربران سایت. این صفحه به شما امکان ویرایش، فعال سازی و غیر فعال سازی کاربران را می دهد.", + "SUMMARY" => "خلاصه حساب", + "VIEW_ALL" => "تماشای همه ی کاربران", + "WITH_PERMISSION" => "کاربرانی که این دسترسی را دارند" ], "X_USER" => [ 0 => "هیچ کاربری", diff --git a/main/app/sprinkles/admin/locale/fr_FR/messages.php b/main/app/sprinkles/admin/locale/fr_FR/messages.php index 82bdf3e..773c856 100644 --- a/main/app/sprinkles/admin/locale/fr_FR/messages.php +++ b/main/app/sprinkles/admin/locale/fr_FR/messages.php @@ -10,7 +10,7 @@ * @package userfrosting\i18n\fr * @author Louis Charette */ - + return [ "ACTIVITY" => [ 1 => "Activité", @@ -22,19 +22,19 @@ return [ ], "CACHE" => [ - "CLEAR" => "Vider le cache", - "CLEAR_CONFIRM" => "Voulez-vous vraiment supprimer le cache du site?", + "CLEAR" => "Vider le cache", + "CLEAR_CONFIRM" => "Voulez-vous vraiment supprimer le cache du site?", "CLEAR_CONFIRM_YES" => "Oui, vider le cache", - "CLEARED" => "Cache effacé avec succès !" + "CLEARED" => "Cache effacé avec succès !" ], - "DASHBOARD" => "Tableau de bord", - "DELETE_MASTER" => "Vous ne pouvez pas supprimer le compte principal !", - "DELETION_SUCCESSFUL" => "L'utilisateur <strong>{{user_name}}</strong> a été supprimé avec succès.", - "DETAILS_UPDATED" => "Les détails du compte de <strong>{{user_name}}</strong> ont été mis à jour", - "DISABLE_MASTER" => "Vous ne pouvez pas désactiver le compte principal !", - "DISABLE_SELF" => "Vous ne pouvez pas désactiver votre propre compte !", - "DISABLE_SUCCESSFUL" => "Le compte de l'utilisateur <strong>{{user_name}}</strong> a été désactivé avec succès.", + "DASHBOARD" => "Tableau de bord", + "DELETE_MASTER" => "Vous ne pouvez pas supprimer le compte principal !", + "DELETION_SUCCESSFUL" => "L'utilisateur <strong>{{user_name}}</strong> a été supprimé avec succès.", + "DETAILS_UPDATED" => "Les détails du compte de <strong>{{user_name}}</strong> ont été mis à jour", + "DISABLE_MASTER" => "Vous ne pouvez pas désactiver le compte principal !", + "DISABLE_SELF" => "Vous ne pouvez pas désactiver votre propre compte !", + "DISABLE_SUCCESSFUL" => "Le compte de l'utilisateur <strong>{{user_name}}</strong> a été désactivé avec succès.", "ENABLE_SUCCESSFUL" => "Le compte de l'utilisateur <strong>{{user_name}}</strong> a été activé avec succès.", @@ -42,77 +42,77 @@ return [ 1 => "Groupe", 2 => "Groupes", - "CREATE" => "Créer un groupe", + "CREATE" => "Créer un groupe", "CREATION_SUCCESSFUL" => "Successfully created group <strong>{{name}}</strong>", - "DELETE" => "Supprimer le groupe", - "DELETE_CONFIRM" => "Êtes-vous certain de vouloir supprimer le groupe <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Vous ne pouvez pas supprimer le groupe <strong>{{name}}</strong> parce que c'est le groupe par défaut pour les utilisateurs nouvellement enregistrés.", - "DELETE_YES" => "Oui, supprimer le groupe", + "DELETE" => "Supprimer le groupe", + "DELETE_CONFIRM" => "Êtes-vous certain de vouloir supprimer le groupe <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Vous ne pouvez pas supprimer le groupe <strong>{{name}}</strong> parce que c'est le groupe par défaut pour les utilisateurs nouvellement enregistrés.", + "DELETE_YES" => "Oui, supprimer le groupe", "DELETION_SUCCESSFUL" => "Groupe <strong>{{name}}</strong> supprimé avec succès", - "EDIT" => "Modifier le groupe", - "ICON" => "Icône", - "ICON_EXPLAIN" => "Icône des membres du groupe", - "INFO_PAGE" => "Informations sur le groupe {{name}}", - "MANAGE" => "Gérer le groupe", - "NAME" => "Nom du groupe", - "NAME_EXPLAIN" => "Spécifiez le nom du groupe", - "NOT_EMPTY" => "Vous ne pouvez pas le faire car il y a encore des utilisateurs associés au groupe <strong>{{name}}</strong>.", + "EDIT" => "Modifier le groupe", + "ICON" => "Icône", + "ICON_EXPLAIN" => "Icône des membres du groupe", + "INFO_PAGE" => "Informations sur le groupe {{name}}", + "MANAGE" => "Gérer le groupe", + "NAME" => "Nom du groupe", + "NAME_EXPLAIN" => "Spécifiez le nom du groupe", + "NOT_EMPTY" => "Vous ne pouvez pas le faire car il y a encore des utilisateurs associés au groupe <strong>{{name}}</strong>.", "PAGE_DESCRIPTION" => "Une liste des groupes pour votre site. Fournit des outils de gestion pour éditer et supprimer des groupes.", - "UPDATE" => "Les détails du groupe <strong>{{name}}</strong> ont été enregistrés" + "UPDATE" => "Les détails du groupe <strong>{{name}}</strong> ont été enregistrés" ], - "MANUALLY_ACTIVATED" => "Le compte de {{user_name}} a été activé manuellement", + "MANUALLY_ACTIVATED" => "Le compte de {{user_name}} a été activé manuellement", "MASTER_ACCOUNT_EXISTS" => "Le compte principal existe déjà !", "MIGRATION" => [ - "REQUIRED" => "Mise à jour de la base de données requise" + "REQUIRED" => "Mise à jour de la base de données requise" ], "PERMISSION" => [ 1 => "Autorisation", 2 => "Autorisations", - "ASSIGN_NEW" => "Assigner une nouvelle autorisation", - "HOOK_CONDITION" => "Hook/Conditions", - "MANAGE" => "Gestion des autorisations", - "PAGE_DESCRIPTION" => "Une liste des autorisations pour votre site. Fournit des outils de gestion pour modifier et supprimer des autorisations.", - "UPDATE" => "Mettre à jour les autorisations" + "ASSIGN_NEW" => "Assigner une nouvelle autorisation", + "HOOK_CONDITION" => "Hook/Conditions", + "MANAGE" => "Gestion des autorisations", + "PAGE_DESCRIPTION" => "Une liste des autorisations pour votre site. Fournit des outils de gestion pour modifier et supprimer des autorisations.", + "UPDATE" => "Mettre à jour les autorisations" ], "ROLE" => [ 1 => "Rôle", 2 => "Rôles", - "ASSIGN_NEW" => "Assigner un nouveau rôle", - "CREATE" => "Créer un rôle", + "ASSIGN_NEW" => "Assigner un nouveau rôle", + "CREATE" => "Créer un rôle", "CREATION_SUCCESSFUL" => "Rôle <strong>{{name}}</strong> créé avec succès", - "DELETE" => "Supprimer le rôle", - "DELETE_CONFIRM" => "Êtes-vous certain de vouloir supprimer le rôle <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Vous ne pouvez pas supprimer le rôle <strong>{{name}}</strong> parce que c'est un rôle par défaut pour les utilisateurs nouvellement enregistrés.", - "DELETE_YES" => "Oui, supprimer le rôle", + "DELETE" => "Supprimer le rôle", + "DELETE_CONFIRM" => "Êtes-vous certain de vouloir supprimer le rôle <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Vous ne pouvez pas supprimer le rôle <strong>{{name}}</strong> parce que c'est un rôle par défaut pour les utilisateurs nouvellement enregistrés.", + "DELETE_YES" => "Oui, supprimer le rôle", "DELETION_SUCCESSFUL" => "Rôle <strong>{{name}}</strong> supprimé avec succès", - "EDIT" => "Modifier le rôle", - "HAS_USERS" => "Vous ne pouvez pas le faire parce qu'il y a encore des utilisateurs qui ont le rôle <strong>{{name}}</strong>.", - "INFO_PAGE" => "Page d'information pour le rôle {{name}}", - "MANAGE" => "Gérer les rôles", - "NAME" => "Nom du rôle", - "NAME_EXPLAIN" => "Spécifiez le nom du rôle", - "NAME_IN_USE" => "Un rôle nommé <strong>{{name}}</strong> existe déjà", - "PAGE_DESCRIPTION" => "Une liste des rôles de votre site. Fournit des outils de gestion pour modifier et supprimer des rôles.", + "EDIT" => "Modifier le rôle", + "HAS_USERS" => "Vous ne pouvez pas le faire parce qu'il y a encore des utilisateurs qui ont le rôle <strong>{{name}}</strong>.", + "INFO_PAGE" => "Page d'information pour le rôle {{name}}", + "MANAGE" => "Gérer les rôles", + "NAME" => "Nom du rôle", + "NAME_EXPLAIN" => "Spécifiez le nom du rôle", + "NAME_IN_USE" => "Un rôle nommé <strong>{{name}}</strong> existe déjà", + "PAGE_DESCRIPTION" => "Une liste des rôles de votre site. Fournit des outils de gestion pour modifier et supprimer des rôles.", "PERMISSIONS_UPDATED" => "Autorisations mises à jour pour le rôle <strong>{{name}}</strong>", - "UPDATED" => "Détails mis à jour pour le rôle <strong>{{name}}</strong>" + "UPDATED" => "Détails mis à jour pour le rôle <strong>{{name}}</strong>" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "Informations sur le système", - - "DB_NAME" => "Base de donnée", - "DB_VERSION" => "Version DB", - "DIRECTORY" => "Répertoire du projet", - "PHP_VERSION" => "Version de PHP", - "SERVER" => "Logiciel server", - "SPRINKLES" => "Sprinkles chargés", - "UF_VERSION" => "Version de UserFrosting", - "URL" => "Url racine" + "@TRANSLATION" => "Informations sur le système", + + "DB_NAME" => "Base de donnée", + "DB_VERSION" => "Version DB", + "DIRECTORY" => "Répertoire du projet", + "PHP_VERSION" => "Version de PHP", + "SERVER" => "Logiciel server", + "SPRINKLES" => "Sprinkles chargés", + "UF_VERSION" => "Version de UserFrosting", + "URL" => "Url racine" ], "USER" => [ @@ -125,19 +125,19 @@ return [ "SET_PASSWORD" => "Définissez le mot de passe de l'utilisateur comme" ], - "ACTIVATE" => "Autoriser l'utilisateur", - "CREATE" => "Créer un utilisateur", - "CREATED" => "L'utilisateur <strong>{{user_name}}</strong> a été créé avec succès", - "DELETE" => "Supprimer l'utilisateur", - "DELETE_CONFIRM" => "Êtes-vous certain de vouloir supprimer l'utilisateur <strong>{{name}}</strong>?", - "DELETE_YES" => "Oui, supprimer l'utilisateur", - "DISABLE" => "Désactiver l'utilisateur", - "EDIT" => "Modifier l'utilisateur", - "ENABLE" => "Activer l'utilisateur", - "INFO_PAGE" => "Page d'information de l'utilisateur pour {{name}}", - "PAGE_DESCRIPTION" => "Une liste des utilisateurs de votre site. Fournit des outils de gestion incluant la possibilité de modifier les détails de l'utilisateur, d'activer manuellement les utilisateurs, d'activer / désactiver les utilisateurs et plus.", - "LATEST" => "Derniers utilisateurs", - "VIEW_ALL" => "Voir tous les utilisateurs" + "ACTIVATE" => "Autoriser l'utilisateur", + "CREATE" => "Créer un utilisateur", + "CREATED" => "L'utilisateur <strong>{{user_name}}</strong> a été créé avec succès", + "DELETE" => "Supprimer l'utilisateur", + "DELETE_CONFIRM" => "Êtes-vous certain de vouloir supprimer l'utilisateur <strong>{{name}}</strong>?", + "DELETE_YES" => "Oui, supprimer l'utilisateur", + "DISABLE" => "Désactiver l'utilisateur", + "EDIT" => "Modifier l'utilisateur", + "ENABLE" => "Activer l'utilisateur", + "INFO_PAGE" => "Page d'information de l'utilisateur pour {{name}}", + "PAGE_DESCRIPTION" => "Une liste des utilisateurs de votre site. Fournit des outils de gestion incluant la possibilité de modifier les détails de l'utilisateur, d'activer manuellement les utilisateurs, d'activer / désactiver les utilisateurs et plus.", + "LATEST" => "Derniers utilisateurs", + "VIEW_ALL" => "Voir tous les utilisateurs" ], "X_USER" => [ 0 => "Aucun utilisateur", diff --git a/main/app/sprinkles/admin/locale/it_IT/messages.php b/main/app/sprinkles/admin/locale/it_IT/messages.php index c40d5b3..0bb737a 100644 --- a/main/app/sprinkles/admin/locale/it_IT/messages.php +++ b/main/app/sprinkles/admin/locale/it_IT/messages.php @@ -18,110 +18,110 @@ return [ 1 => "Attività", 2 => "Attività", - "LAST" => "Ultima attività", - "PAGE" => "Un elenco delle attività degli utenti", - "TIME" => "Tempo di attività" + "LAST" => "Ultima attività", + "PAGE" => "Un elenco delle attività degli utenti", + "TIME" => "Tempo di attività" ], "CACHE" => [ - "CLEAR" => "Cancellare la cache", - "CLEAR_CONFIRM" => "Sei sicuro di voler cancellare la cache del sito?", + "CLEAR" => "Cancellare la cache", + "CLEAR_CONFIRM" => "Sei sicuro di voler cancellare la cache del sito?", "CLEAR_CONFIRM_YES" => "Sì, cancellare la cache", - "CLEARED" => "La cache è stata eliminata correttamente!" + "CLEARED" => "La cache è stata eliminata correttamente!" ], - "DASHBOARD" => "Pannello di Controllo", - "NO_FEATURES_YET" => "Non sembra che alcune funzioni siano state create per questo account ... ancora. Forse non sono ancora state implementate, o forse qualcuno ha dimenticato di dare accesso. In entrambi i casi, siamo contenti di averti qui!", - "DELETE_MASTER" => "Non puoi eliminare l'account principale!", - "DELETION_SUCCESSFUL" => "Hai eliminato utente <strong>{{user_name}}</strong>.", - "DETAILS_UPDATED" => "Dettagli degli account aggiornati per l'utente <strong>{{user_name}}</strong>", - "DISABLE_MASTER" => "Non puoi disattivare l'account principale!", - "DISABLE_SELF" => "Non puoi disattivare il tuo account!", - "DISABLE_SUCCESSFUL" => "Account per l'utente <strong>{{user_name}}</strong> disattivato con successo!", - "ENABLE_SUCCESSFUL" => "Account per l'utente <strong>{{user_name}}</strong> attivato con successo.", + "DASHBOARD" => "Pannello di Controllo", + "NO_FEATURES_YET" => "Non sembra che alcune funzioni siano state create per questo account ... ancora. Forse non sono ancora state implementate, o forse qualcuno ha dimenticato di dare accesso. In entrambi i casi, siamo contenti di averti qui!", + "DELETE_MASTER" => "Non puoi eliminare l'account principale!", + "DELETION_SUCCESSFUL" => "Hai eliminato utente <strong>{{user_name}}</strong>.", + "DETAILS_UPDATED" => "Dettagli degli account aggiornati per l'utente <strong>{{user_name}}</strong>", + "DISABLE_MASTER" => "Non puoi disattivare l'account principale!", + "DISABLE_SELF" => "Non puoi disattivare il tuo account!", + "DISABLE_SUCCESSFUL" => "Account per l'utente <strong>{{user_name}}</strong> disattivato con successo!", + "ENABLE_SUCCESSFUL" => "Account per l'utente <strong>{{user_name}}</strong> attivato con successo.", "GROUP" => [ 1 => "Gruppo", 2 => "Gruppi", - "CREATE" => "Creare un gruppo", + "CREATE" => "Creare un gruppo", "CREATION_SUCCESSFUL" => "Ha creato con successo il gruppo <strong>{{name}}</strong>", - "DELETE" => "Elimina gruppo", - "DELETE_CONFIRM" => "Sei sicuro di voler eliminare il gruppo <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Non puoi eliminare il gruppo <strong>{{name}}</strong> perché è il gruppo predefinito per gli utenti appena registrati.", - "DELETE_YES" => "Sì, elimini il gruppo", + "DELETE" => "Elimina gruppo", + "DELETE_CONFIRM" => "Sei sicuro di voler eliminare il gruppo <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Non puoi eliminare il gruppo <strong>{{name}}</strong> perché è il gruppo predefinito per gli utenti appena registrati.", + "DELETE_YES" => "Sì, elimini il gruppo", "DELETION_SUCCESSFUL" => "Eliminato il gruppo <strong>{{name}}</strong> con successo", - "EDIT" => "Modifica gruppo", - "ICON" => "Icona del gruppo", - "ICON_EXPLAIN" => "Icona per i membri del gruppo", - "INFO_PAGE" => "Pagina informazioni di gruppo per <strong>{{name}}</strong>", - "MANAGE" => "Gestisci gruppo", - "NAME" => "Nome del gruppo", - "NAME_EXPLAIN" => "Inserisci un nome per il gruppo", - "NOT_EMPTY" => "Non puoi farlo perché ci sono ancora utenti associati al gruppo <strong>{{name}}</strong>.", + "EDIT" => "Modifica gruppo", + "ICON" => "Icona del gruppo", + "ICON_EXPLAIN" => "Icona per i membri del gruppo", + "INFO_PAGE" => "Pagina informazioni di gruppo per <strong>{{name}}</strong>", + "MANAGE" => "Gestisci gruppo", + "NAME" => "Nome del gruppo", + "NAME_EXPLAIN" => "Inserisci un nome per il gruppo", + "NOT_EMPTY" => "Non puoi farlo perché ci sono ancora utenti associati al gruppo <strong>{{name}}</strong>.", "PAGE_DESCRIPTION" => "Un elenco dei gruppi per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione di gruppi.", - "SUMMARY" => "Riepilogo del gruppo", - "UPDATE" => "Dettagli aggiornati per il gruppo <strong>{{name}}</strong>." + "SUMMARY" => "Riepilogo del gruppo", + "UPDATE" => "Dettagli aggiornati per il gruppo <strong>{{name}}</strong>." ], - "MANUALLY_ACTIVATED" => "<strong>{{user_name}}</strong> è stato attivato manualmente", + "MANUALLY_ACTIVATED" => "<strong>{{user_name}}</strong> è stato attivato manualmente", "MASTER_ACCOUNT_EXISTS" => "L'account primario esiste già!", "MIGRATION" => [ - "REQUIRED" => "È necessario aggiornare il database" + "REQUIRED" => "È necessario aggiornare il database" ], "PERMISSION" => [ 1 => "Autorizzazione", 2 => "Autorizzazioni", - "ASSIGN_NEW" => "Assegna nuova autorizzazione", - "HOOK_CONDITION" => "Hook/Condizioni", - "ID" => "ID di autorizzazione", - "INFO_PAGE" => "Pagina di informazioni sulle autorizzazioni per <strong>{{name}}</strong>", - "MANAGE" => "Gestione delle autorizzazioni", - "NOTE_READ_ONLY" => "<strong>Si prega di notare: le autorizzazioni</strong> sono considerate \"parte del codice\" e non possono essere modificate tramite l'interfaccia. Per aggiungere, rimuovere o modificare le autorizzazioni, i gestori del sito devono utilizzare <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about: _blank \">migrazione del database.</a>", - "PAGE_DESCRIPTION" => "Un elenco delle autorizzazioni per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione delle autorizzazioni.", - "SUMMARY" => "Sommario delle Autorizzazioni", - "UPDATE" => "Aggiorna le autorizzazioni", - "VIA_ROLES" => "Ha autorizzazione tramite ruoli" + "ASSIGN_NEW" => "Assegna nuova autorizzazione", + "HOOK_CONDITION" => "Hook/Condizioni", + "ID" => "ID di autorizzazione", + "INFO_PAGE" => "Pagina di informazioni sulle autorizzazioni per <strong>{{name}}</strong>", + "MANAGE" => "Gestione delle autorizzazioni", + "NOTE_READ_ONLY" => "<strong>Si prega di notare: le autorizzazioni</strong> sono considerate \"parte del codice\" e non possono essere modificate tramite l'interfaccia. Per aggiungere, rimuovere o modificare le autorizzazioni, i gestori del sito devono utilizzare <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about: _blank \">migrazione del database.</a>", + "PAGE_DESCRIPTION" => "Un elenco delle autorizzazioni per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione delle autorizzazioni.", + "SUMMARY" => "Sommario delle Autorizzazioni", + "UPDATE" => "Aggiorna le autorizzazioni", + "VIA_ROLES" => "Ha autorizzazione tramite ruoli" ], "ROLE" => [ 1 => "Ruolo", 2 => "Ruoli", - "ASSIGN_NEW" => "Assegna un nuovo ruolo", - "CREATE" => "Crea ruolo", + "ASSIGN_NEW" => "Assegna un nuovo ruolo", + "CREATE" => "Crea ruolo", "CREATION_SUCCESSFUL" => "Creato con successo il ruolo <strong>{{name}}</strong>", - "DELETE" => "Elimina il ruolo", - "DELETE_CONFIRM" => "Sei sicuro di voler eliminare il ruolo <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Non puoi eliminare il ruolo <strong>{{name}}</strong> perché è un ruolo predefinito per gli utenti appena registrati.", - "DELETE_YES" => "Sì, elimini il ruolo", + "DELETE" => "Elimina il ruolo", + "DELETE_CONFIRM" => "Sei sicuro di voler eliminare il ruolo <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Non puoi eliminare il ruolo <strong>{{name}}</strong> perché è un ruolo predefinito per gli utenti appena registrati.", + "DELETE_YES" => "Sì, elimini il ruolo", "DELETION_SUCCESSFUL" => "Eliminato il ruolo <strong>{{name}}</strong>", - "EDIT" => "Modifica ruolo", - "HAS_USERS" => "Non puoi farlo perché ci sono ancora utenti che hanno il ruolo <strong>{{name}}</strong>.", - "INFO_PAGE" => "Pagina di informazioni sui ruoli per <strong>{{name}}</strong>", - "MANAGE" => "Gestisci Ruoli", - "NAME" => "Nome", - "NAME_EXPLAIN" => "Inserisci un nome per il ruolo", - "NAME_IN_USE" => "Esiste già un ruolo denominato <strong>{{name}}</strong>", - "PAGE_DESCRIPTION" => "Un elenco dei ruoli per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione di ruoli.", + "EDIT" => "Modifica ruolo", + "HAS_USERS" => "Non puoi farlo perché ci sono ancora utenti che hanno il ruolo <strong>{{name}}</strong>.", + "INFO_PAGE" => "Pagina di informazioni sui ruoli per <strong>{{name}}</strong>", + "MANAGE" => "Gestisci Ruoli", + "NAME" => "Nome", + "NAME_EXPLAIN" => "Inserisci un nome per il ruolo", + "NAME_IN_USE" => "Esiste già un ruolo denominato <strong>{{name}}</strong>", + "PAGE_DESCRIPTION" => "Un elenco dei ruoli per il tuo sito. Fornisce strumenti di gestione per la modifica e l'eliminazione di ruoli.", "PERMISSIONS_UPDATED" => "Autorizzazioni aggiornate per ruolo <strong>{{name}}</strong>", - "SUMMARY" => "Riepilogo dei Ruoli", - "UPDATED" => "Dettagli aggiornati per ruolo <strong>{{name}}</strong>" + "SUMMARY" => "Riepilogo dei Ruoli", + "UPDATED" => "Dettagli aggiornati per ruolo <strong>{{name}}</strong>" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "Informazioni sul sistema", - - "DB_NAME" => "Nome del database", - "DB_VERSION" => "Versione del database", - "DIRECTORY" => "Directory del progetto", - "PHP_VERSION" => "Versione PHP", - "SERVER" => "Software del webserver", - "SPRINKLES" => "Sprinkles caricati", - "UF_VERSION" => "Versione UserFrosting", - "URL" => "Url della radice del sito" + "@TRANSLATION" => "Informazioni sul sistema", + + "DB_NAME" => "Nome del database", + "DB_VERSION" => "Versione del database", + "DIRECTORY" => "Directory del progetto", + "PHP_VERSION" => "Versione PHP", + "SERVER" => "Software del webserver", + "SPRINKLES" => "Sprinkles caricati", + "UF_VERSION" => "Versione UserFrosting", + "URL" => "Url della radice del sito" ], "TOGGLE_COLUMNS" => "Scambia le colonne", @@ -131,26 +131,26 @@ return [ 2 => "Utenti", "ADMIN" => [ - "CHANGE_PASSWORD" => "Cambia Password Utente", + "CHANGE_PASSWORD" => "Cambia Password Utente", "SEND_PASSWORD_LINK" => "Inviare all'utente un collegamento che permetterà loro di scegliere la propria password", - "SET_PASSWORD" => "Impostare la password dell'utente come" + "SET_PASSWORD" => "Impostare la password dell'utente come" ], - "ACTIVATE" => "Attiva l'utente", - "CREATE" => "Creare un utente", - "CREATED" => "Account per l'utente <strong>{{user_name}}</strong> è stato creato.", - "DELETE" => "Elimina utente", - "DELETE_CONFIRM" => "Sei sicuro di voler eliminare l'utente <strong>{{name}}</strong>?", - "DELETE_YES" => "Sì, elimina l'utente", - "DISABLE" => "Disabilita l'utente", - "EDIT" => "Modifica utente", - "ENABLE" => "Abilita l'utente", - "INFO_PAGE" => "Pagina informazioni utente per <strong>{{name}}</strong>", - "LATEST" => "Ultimi Utenti", - "PAGE_DESCRIPTION" => "Un elenco degli utenti del tuo sito. Fornisce strumenti di gestione, tra cui la possibilità di modificare i dettagli utente, attivare manualmente gli utenti, abilitare / disabilitare gli utenti e altro ancora.", - "SUMMARY" => "Riepilogo account", - "VIEW_ALL" => "Visualizza tutti gli utenti", - "WITH_PERMISSION" => "Utenti con questa autorizzazione" + "ACTIVATE" => "Attiva l'utente", + "CREATE" => "Creare un utente", + "CREATED" => "Account per l'utente <strong>{{user_name}}</strong> è stato creato.", + "DELETE" => "Elimina utente", + "DELETE_CONFIRM" => "Sei sicuro di voler eliminare l'utente <strong>{{name}}</strong>?", + "DELETE_YES" => "Sì, elimina l'utente", + "DISABLE" => "Disabilita l'utente", + "EDIT" => "Modifica utente", + "ENABLE" => "Abilita l'utente", + "INFO_PAGE" => "Pagina informazioni utente per <strong>{{name}}</strong>", + "LATEST" => "Ultimi Utenti", + "PAGE_DESCRIPTION" => "Un elenco degli utenti del tuo sito. Fornisce strumenti di gestione, tra cui la possibilità di modificare i dettagli utente, attivare manualmente gli utenti, abilitare / disabilitare gli utenti e altro ancora.", + "SUMMARY" => "Riepilogo account", + "VIEW_ALL" => "Visualizza tutti gli utenti", + "WITH_PERMISSION" => "Utenti con questa autorizzazione" ], "X_USER" => [ 0 => "Nessun utente", diff --git a/main/app/sprinkles/admin/locale/pt_PT/messages.php b/main/app/sprinkles/admin/locale/pt_PT/messages.php index 0faf818..440e674 100644 --- a/main/app/sprinkles/admin/locale/pt_PT/messages.php +++ b/main/app/sprinkles/admin/locale/pt_PT/messages.php @@ -16,24 +16,24 @@ return [ 1 => "Atividade", 2 => "Atividades", - "LAST" => "Última atividade", - "PAGE" => "Lista de atividade dos utilizadores", - "TIME" => "Tempo da Atividade" + "LAST" => "Última atividade", + "PAGE" => "Lista de atividade dos utilizadores", + "TIME" => "Tempo da Atividade" ], "CACHE" => [ - "CLEAR" => "Limpar cache", - "CLEAR_CONFIRM" => "Tem a certeza que pretende limpar a cache do site?", + "CLEAR" => "Limpar cache", + "CLEAR_CONFIRM" => "Tem a certeza que pretende limpar a cache do site?", "CLEAR_CONFIRM_YES" => "Sim, limpar cache", - "CLEARED" => "Cache limpa com sucesso!" + "CLEARED" => "Cache limpa com sucesso!" ], - "DASHBOARD" => "Painel de Controlo", - "DELETE_MASTER" => "Não pode apagar a conta principal!", - "DELETION_SUCCESSFUL" => "Utilizador <strong>{{user_name}}</strong> foi removido com sucesso.", - "DETAILS_UPDATED" => "Detalhes de conta atualizados para o utilizador <strong>{{user_name}}</strong>", - "DISABLE_MASTER" => "Não pode desativar a conta principal!", - "DISABLE_SUCCESSFUL" => "Conta do utilizador <strong>{{user_name}}</strong> foi desativada com sucesso.", + "DASHBOARD" => "Painel de Controlo", + "DELETE_MASTER" => "Não pode apagar a conta principal!", + "DELETION_SUCCESSFUL" => "Utilizador <strong>{{user_name}}</strong> foi removido com sucesso.", + "DETAILS_UPDATED" => "Detalhes de conta atualizados para o utilizador <strong>{{user_name}}</strong>", + "DISABLE_MASTER" => "Não pode desativar a conta principal!", + "DISABLE_SUCCESSFUL" => "Conta do utilizador <strong>{{user_name}}</strong> foi desativada com sucesso.", "ENABLE_SUCCESSFUL" => "Conta do utilizador <strong>{{user_name}}</strong> foi ativada com sucesso.", @@ -41,71 +41,71 @@ return [ 1 => "Grupo", 2 => "Grupos", - "CREATE" => "Criar grupo", + "CREATE" => "Criar grupo", "CREATION_SUCCESSFUL" => "Grupo criado com sucesso", - "DELETE" => "Remover grupo", + "DELETE" => "Remover grupo", "DELETION_SUCCESSFUL" => "Grupo removido com sucesso", - "DELETE_CONFIRM" => "Tem a certeza que pretende remover o grupo <strong>{{name}}</strong>?", - "DELETE_YES" => "Sim, remover grupo", - "EDIT" => "Editar grupo", - "ICON" => "Icon do grupo", - "ICON_EXPLAIN" => "Icon para membros do grupo", - "INFO_PAGE" => "Página informativa do grupo {{name}}", + "DELETE_CONFIRM" => "Tem a certeza que pretende remover o grupo <strong>{{name}}</strong>?", + "DELETE_YES" => "Sim, remover grupo", + "EDIT" => "Editar grupo", + "ICON" => "Icon do grupo", + "ICON_EXPLAIN" => "Icon para membros do grupo", + "INFO_PAGE" => "Página informativa do grupo {{name}}", //"MANAGE" => "Manage group", - "NAME" => "Nome do grupo", - "NAME_EXPLAIN" => "Por favor introduza um nome para o grupo", + "NAME" => "Nome do grupo", + "NAME_EXPLAIN" => "Por favor introduza um nome para o grupo", "PAGE_DESCRIPTION" => "Lista de grupos do site. Contém opções para editar e remover grupos." ], - "MANUALLY_ACTIVATED" => "A conta de {{user_name}} foi ativada manualmente.", + "MANUALLY_ACTIVATED" => "A conta de {{user_name}} foi ativada manualmente.", "MASTER_ACCOUNT_EXISTS" => "A contra principal já existe!", "MIGRATION" => [ - "REQUIRED" => "É necessário uma atualização da base de dados." + "REQUIRED" => "É necessário uma atualização da base de dados." ], "PERMISSION" => [ 1 => "Permissão", 2 => "Permissões", - "ASSIGN_NEW" => "Atribuir nova permissão", - "HOOK_CONDITION" => "Hook/Condições", - "MANAGE" => "Gerir permissões", - "PAGE_DESCRIPTION" => "Lista de permissões do site. Contém opções para editar e remover permissões.", - "UPDATE" => "Atualizar permissões" + "ASSIGN_NEW" => "Atribuir nova permissão", + "HOOK_CONDITION" => "Hook/Condições", + "MANAGE" => "Gerir permissões", + "PAGE_DESCRIPTION" => "Lista de permissões do site. Contém opções para editar e remover permissões.", + "UPDATE" => "Atualizar permissões" ], "ROLE" => [ 1 => "Cargo", 2 => "Cargos", - "ASSIGN_NEW" => "Atribuir novo cargo", - "CREATE" => "Criar cargo", + "ASSIGN_NEW" => "Atribuir novo cargo", + "CREATE" => "Criar cargo", "CREATION_SUCCESSFUL" => "Cargo criado com sucesso", - "DELETE" => "Remover cargo", + "DELETE" => "Remover cargo", "DELETION_SUCCESSFUL" => "Cargo removido com sucesso", - "DELETE_CONFIRM" => "Tem a certeza que pretende remover o cargo <strong>{{name}}</strong>?", - "DELETE_YES" => "Sim, remover cargo", - "EDIT" => "Editar cargo", - "INFO_PAGE" => "Página informativa do cargo {{name}}", - "MANAGE" => "Gerir cargos", - "NAME" => "Nome", - "NAME_EXPLAIN" => "Por favor introduza um nome para o cargo", - "PAGE_DESCRIPTION" => "Lista de cargos do site. Contém opções para editar e remover cargos.", - "UPDATE" => "Atualizar cargos", - "UPDATED" => "Cargo <strong>{{name}}</strong> atualizado" + "DELETE_CONFIRM" => "Tem a certeza que pretende remover o cargo <strong>{{name}}</strong>?", + "DELETE_YES" => "Sim, remover cargo", + "EDIT" => "Editar cargo", + "INFO_PAGE" => "Página informativa do cargo {{name}}", + "MANAGE" => "Gerir cargos", + "NAME" => "Nome", + "NAME_EXPLAIN" => "Por favor introduza um nome para o cargo", + "PAGE_DESCRIPTION" => "Lista de cargos do site. Contém opções para editar e remover cargos.", + "UPDATE" => "Atualizar cargos", + "UPDATED" => "Cargo <strong>{{name}}</strong> atualizado" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "Informação do sistema", - - "DB_NAME" => "Nome da base de dados", - "DB_VERSION" => "Versão da base de dados", - "DIRECTORY" => "Diretório do projeto", - "PHP_VERSION" => "Versão PHP", - "SERVER" => "Software do servidor web", - "SPRINKLES" => "Sprinkles carregados", - "UF_VERSION" => "Versão do UserFrosting", - "URL" => "Raiz (url) do site" + "@TRANSLATION" => "Informação do sistema", + + "DB_NAME" => "Nome da base de dados", + "DB_VERSION" => "Versão da base de dados", + "DIRECTORY" => "Diretório do projeto", + "PHP_VERSION" => "Versão PHP", + "SERVER" => "Software do servidor web", + "SPRINKLES" => "Sprinkles carregados", + "UF_VERSION" => "Versão do UserFrosting", + "URL" => "Raiz (url) do site" ], "USER" => [ @@ -118,18 +118,18 @@ return [ "SET_PASSWORD" => "Definir a password do utilizador como" ], - "ACTIVATE" => "Ativar utilizador", - "CREATE" => "Criar utilizador", - "DELETE" => "Remover utilizador", - "DELETE_CONFIRM" => "Tem a certeza que pretende remover o utilizador <strong>{{name}}</strong>?", - "DELETE_YES" => "Sim, remover utilizador", - "DISABLE" => "Desativar utilizador", - "EDIT" => "Editar utilizador", - "ENABLE" => "Ativar utilizador", - "INFO_PAGE" => "Página informativa do utilizador {{name}}", - "PAGE_DESCRIPTION" => "Lista de utilizadores do site. Contém opções para editar detalhes, ativar/desativar utilizadores e outras.", - "LATEST" => "Últimos Utilizadores", - "VIEW_ALL" => "Ver todos os utilizadores" + "ACTIVATE" => "Ativar utilizador", + "CREATE" => "Criar utilizador", + "DELETE" => "Remover utilizador", + "DELETE_CONFIRM" => "Tem a certeza que pretende remover o utilizador <strong>{{name}}</strong>?", + "DELETE_YES" => "Sim, remover utilizador", + "DISABLE" => "Desativar utilizador", + "EDIT" => "Editar utilizador", + "ENABLE" => "Ativar utilizador", + "INFO_PAGE" => "Página informativa do utilizador {{name}}", + "PAGE_DESCRIPTION" => "Lista de utilizadores do site. Contém opções para editar detalhes, ativar/desativar utilizadores e outras.", + "LATEST" => "Últimos Utilizadores", + "VIEW_ALL" => "Ver todos os utilizadores" ], "X_USER" => [ 0 => "Nenhum utilizador", diff --git a/main/app/sprinkles/admin/locale/ru_RU/messages.php b/main/app/sprinkles/admin/locale/ru_RU/messages.php index d6f6e1a..c0e018d 100644 --- a/main/app/sprinkles/admin/locale/ru_RU/messages.php +++ b/main/app/sprinkles/admin/locale/ru_RU/messages.php @@ -16,26 +16,26 @@ return [ 1 => "Активность", 2 => "Активность", - "LAST" => "Последняя активность", - "PAGE" => "Список действий пользователя", - "TIME" => "Время действия" + "LAST" => "Последняя активность", + "PAGE" => "Список действий пользователя", + "TIME" => "Время действия" ], "CACHE" => [ - "CLEAR" => "Очистить кэш", - "CLEAR_CONFIRM" => "Уверены, что хотите очистить кэш сайта?", + "CLEAR" => "Очистить кэш", + "CLEAR_CONFIRM" => "Уверены, что хотите очистить кэш сайта?", "CLEAR_CONFIRM_YES" => "Да, очистить кэш", - "CLEARED" => "Кэш успешно очищен !" + "CLEARED" => "Кэш успешно очищен !" ], - "DASHBOARD" => "Панель управления", - "NO_FEATURES_YET" => "Похоже, некоторые функции не были настроены для этого аккаунта... пока. Возможно, они еще не реализованы, или, может быть, кто-то забыл дать вам доступ. В любом случае, мы рады вас видеть здесь!", - "DELETE_MASTER" => "Нельзя удалить главный аккаунт!", - "DELETION_SUCCESSFUL" => "Пользователь <strong>{{user_name}}</strong> был успешно удален.", - "DETAILS_UPDATED" => "Данные для аккаунта <strong>{{user_name}}</strong> обновлены", - "DISABLE_MASTER" => "Нельзя отключить главный аккаунт!", - "DISABLE_SELF" => "Вы не можете отключить собственный аккаунт!", - "DISABLE_SUCCESSFUL" => "Пользователь <strong>{{user_name}}</strong> был успешно отключен.", + "DASHBOARD" => "Панель управления", + "NO_FEATURES_YET" => "Похоже, некоторые функции не были настроены для этого аккаунта... пока. Возможно, они еще не реализованы, или, может быть, кто-то забыл дать вам доступ. В любом случае, мы рады вас видеть здесь!", + "DELETE_MASTER" => "Нельзя удалить главный аккаунт!", + "DELETION_SUCCESSFUL" => "Пользователь <strong>{{user_name}}</strong> был успешно удален.", + "DETAILS_UPDATED" => "Данные для аккаунта <strong>{{user_name}}</strong> обновлены", + "DISABLE_MASTER" => "Нельзя отключить главный аккаунт!", + "DISABLE_SELF" => "Вы не можете отключить собственный аккаунт!", + "DISABLE_SUCCESSFUL" => "Пользователь <strong>{{user_name}}</strong> был успешно отключен.", "ENABLE_SUCCESSFUL" => "Пользователь <strong>{{user_name}}</strong> был успешно включен.", @@ -43,84 +43,84 @@ return [ 1 => "Группа", 2 => "Группы", - "CREATE" => "Создать группу", + "CREATE" => "Создать группу", "CREATION_SUCCESSFUL" => "Успешно создана группа <strong>{{name}}</strong>", - "DELETE" => "Удалить группу", - "DELETE_CONFIRM" => "Вы уверены, что вы хотите удалить группу <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Нельзя удалить группу <strong>{{name}}</strong>, потому что это группа по умолчанию для новых пользователей.", - "DELETE_YES" => "Да, удалить группу", + "DELETE" => "Удалить группу", + "DELETE_CONFIRM" => "Вы уверены, что вы хотите удалить группу <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Нельзя удалить группу <strong>{{name}}</strong>, потому что это группа по умолчанию для новых пользователей.", + "DELETE_YES" => "Да, удалить группу", "DELETION_SUCCESSFUL" => "Успешно удалена группа <strong>{{name}}</strong>", - "EDIT" => "Редактор группы", - "ICON" => "Значок группы", - "ICON_EXPLAIN" => "Значок для членов группы", - "INFO_PAGE" => "Описание группы {{name}}", - "MANAGE" => "Управление группой", - "NAME" => "Имя группы", - "NAME_EXPLAIN" => "Пожалуйста, введите имя группы", - "NOT_EMPTY" => "Вы не можете сделать это, потому что до сих пор есть пользователи, связанные с группой <strong>{{name}}</strong>.", + "EDIT" => "Редактор группы", + "ICON" => "Значок группы", + "ICON_EXPLAIN" => "Значок для членов группы", + "INFO_PAGE" => "Описание группы {{name}}", + "MANAGE" => "Управление группой", + "NAME" => "Имя группы", + "NAME_EXPLAIN" => "Пожалуйста, введите имя группы", + "NOT_EMPTY" => "Вы не можете сделать это, потому что до сих пор есть пользователи, связанные с группой <strong>{{name}}</strong>.", "PAGE_DESCRIPTION" => "Список групп для вашего сайта. Предоставляет инструменты управления для редактирования и удаления групп.", - "SUMMARY" => "Резюме группы", - "UPDATE" => "Информация обновлена для группы <strong>{{name}}</strong>" + "SUMMARY" => "Резюме группы", + "UPDATE" => "Информация обновлена для группы <strong>{{name}}</strong>" ], - "MANUALLY_ACTIVATED" => "{{user_name}} аккаунт был активирован вручную", + "MANUALLY_ACTIVATED" => "{{user_name}} аккаунт был активирован вручную", "MASTER_ACCOUNT_EXISTS" => "Мастер-аккаунт уже существует!", "MIGRATION" => [ - "REQUIRED" => "Необходимо обновление базы данных" + "REQUIRED" => "Необходимо обновление базы данных" ], "PERMISSION" => [ 1 => "Доступ", 2 => "Права доступа", - "ASSIGN_NEW" => "Назначить новые права", - "HOOK_CONDITION" => "Привязки/Условия", - "ID" => "ID доступа", - "INFO_PAGE" => "Информация о доступах для '{{name}}'", - "MANAGE" => "Управление правами", - "NOTE_READ_ONLY" => "<strong>Пожалуйста, обратите внимание:</strong> <u>права и доступы</u> считаются \"частью кода\" и не могут быть изменены через интерфейс. Чтобы добавить, удалить или изменить доступы, нужно будет использовать сайт <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\"> базы данных миграции.</a>", - "PAGE_DESCRIPTION" => "Список прав доступа для вашего сайта. Предоставляет инструменты управления для редактирования и удаления прав.", - "SUMMARY" => "Сводка доступов", - "UPDATE" => "Обновление прав", - "VIA_ROLES" => "Имеет права через роли" + "ASSIGN_NEW" => "Назначить новые права", + "HOOK_CONDITION" => "Привязки/Условия", + "ID" => "ID доступа", + "INFO_PAGE" => "Информация о доступах для '{{name}}'", + "MANAGE" => "Управление правами", + "NOTE_READ_ONLY" => "<strong>Пожалуйста, обратите внимание:</strong> <u>права и доступы</u> считаются \"частью кода\" и не могут быть изменены через интерфейс. Чтобы добавить, удалить или изменить доступы, нужно будет использовать сайт <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\"> базы данных миграции.</a>", + "PAGE_DESCRIPTION" => "Список прав доступа для вашего сайта. Предоставляет инструменты управления для редактирования и удаления прав.", + "SUMMARY" => "Сводка доступов", + "UPDATE" => "Обновление прав", + "VIA_ROLES" => "Имеет права через роли" ], "ROLE" => [ 1 => "Роль", 2 => "Роли", - "ASSIGN_NEW" => "Назначение новой роли", - "CREATE" => "Создать роль", + "ASSIGN_NEW" => "Назначение новой роли", + "CREATE" => "Создать роль", "CREATION_SUCCESSFUL" => "Успешно создана роль <strong>{{name}}</strong>", - "DELETE" => "Удалить роль", - "DELETE_CONFIRM" => "Вы уверены, что вы хотите удалить роль <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Невозможно удалить роль <strong>{{name}}</strong>, потому что это роль по умолчанию для новых пользователей.", - "DELETE_YES" => "Да, удалить роль", + "DELETE" => "Удалить роль", + "DELETE_CONFIRM" => "Вы уверены, что вы хотите удалить роль <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Невозможно удалить роль <strong>{{name}}</strong>, потому что это роль по умолчанию для новых пользователей.", + "DELETE_YES" => "Да, удалить роль", "DELETION_SUCCESSFUL" => "Успешно удалена роль <strong>{{name}}</strong>", - "EDIT" => "Изменить роль", - "HAS_USERS" => "Вы не можете сделать это, потому что до сих пор есть пользователи, имеющие роль <strong>{{name}}</strong>.", - "INFO_PAGE" => "Информации роли для {{name}}", - "MANAGE" => "Управление ролями", - "NAME" => "Имя", - "NAME_EXPLAIN" => "Пожалуйста, укажите имя для роли", - "NAME_IN_USE" => "Роль с именем <strong>{{name}}</strong> уже существует", - "PAGE_DESCRIPTION" => "Список ролей для вашего сайта. Предоставляет инструменты управления для редактирования и удаления ролей.", + "EDIT" => "Изменить роль", + "HAS_USERS" => "Вы не можете сделать это, потому что до сих пор есть пользователи, имеющие роль <strong>{{name}}</strong>.", + "INFO_PAGE" => "Информации роли для {{name}}", + "MANAGE" => "Управление ролями", + "NAME" => "Имя", + "NAME_EXPLAIN" => "Пожалуйста, укажите имя для роли", + "NAME_IN_USE" => "Роль с именем <strong>{{name}}</strong> уже существует", + "PAGE_DESCRIPTION" => "Список ролей для вашего сайта. Предоставляет инструменты управления для редактирования и удаления ролей.", "PERMISSIONS_UPDATED" => "Права обновлены для роли <strong>{{name}}</strong>", - "SUMMARY" => "Основная информация", - "UPDATED" => "Информация для роли <strong>{{name}}</strong>" + "SUMMARY" => "Основная информация", + "UPDATED" => "Информация для роли <strong>{{name}}</strong>" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "Системная информация", - - "DB_NAME" => "Имя базы данных", - "DB_VERSION" => "Версия базы данных", - "DIRECTORY" => "Каталог проекта", - "PHP_VERSION" => "Версия PHP", - "SERVER" => "ПО Сервера", - "SPRINKLES" => "Загружены модули", - "UF_VERSION" => "Версия UserFrosting", - "URL" => "URL-адрес сайта" + "@TRANSLATION" => "Системная информация", + + "DB_NAME" => "Имя базы данных", + "DB_VERSION" => "Версия базы данных", + "DIRECTORY" => "Каталог проекта", + "PHP_VERSION" => "Версия PHP", + "SERVER" => "ПО Сервера", + "SPRINKLES" => "Загружены модули", + "UF_VERSION" => "Версия UserFrosting", + "URL" => "URL-адрес сайта" ], "TOGGLE_COLUMNS" => "Переключатель столбцов", @@ -135,22 +135,22 @@ return [ "SET_PASSWORD" => "Установите пароль пользователя как" ], - "ACTIVATE" => "Активировать пользователя", - "CREATE" => "Создать пользователя", - "CREATED" => "Пользователь <strong>{{user_name}}</strong> был успешно создан", - "DELETE" => "Удалить пользователя", - "DELETE_CONFIRM" => "Вы уверены, что вы хотите удалить пользователя <strong>{{name}}</strong>?", - "DELETE_YES" => "Да, удалить пользователя", - "DELETED" => "Пользователь удален", - "DISABLE" => "Отключить пользователя", - "EDIT" => "Изменить пользователя", - "ENABLE" => "Включить пользователя", - "INFO_PAGE" => "Информация о пользователе для {{name}}", - "LATEST" => "Последние пользователи", - "PAGE_DESCRIPTION" => "Список пользователей для вашего сайта. Предоставляет средства управления, включая возможность редактирования сведений о пользователях, ручной активации пользователей, включения/отключения пользователей и многое другое.", - "SUMMARY" => "Сводка аккаунта", - "VIEW_ALL" => "Все пользователи", - "WITH_PERMISSION" => "Пользователи с этим доступом" + "ACTIVATE" => "Активировать пользователя", + "CREATE" => "Создать пользователя", + "CREATED" => "Пользователь <strong>{{user_name}}</strong> был успешно создан", + "DELETE" => "Удалить пользователя", + "DELETE_CONFIRM" => "Вы уверены, что вы хотите удалить пользователя <strong>{{name}}</strong>?", + "DELETE_YES" => "Да, удалить пользователя", + "DELETED" => "Пользователь удален", + "DISABLE" => "Отключить пользователя", + "EDIT" => "Изменить пользователя", + "ENABLE" => "Включить пользователя", + "INFO_PAGE" => "Информация о пользователе для {{name}}", + "LATEST" => "Последние пользователи", + "PAGE_DESCRIPTION" => "Список пользователей для вашего сайта. Предоставляет средства управления, включая возможность редактирования сведений о пользователях, ручной активации пользователей, включения/отключения пользователей и многое другое.", + "SUMMARY" => "Сводка аккаунта", + "VIEW_ALL" => "Все пользователи", + "WITH_PERMISSION" => "Пользователи с этим доступом" ], "X_USER" => [ 0 => "Нет пользователей", diff --git a/main/app/sprinkles/admin/locale/th_TH/messages.php b/main/app/sprinkles/admin/locale/th_TH/messages.php index ccc2ca5..51de7c9 100644 --- a/main/app/sprinkles/admin/locale/th_TH/messages.php +++ b/main/app/sprinkles/admin/locale/th_TH/messages.php @@ -16,24 +16,24 @@ return [ 1 => "กิจกรรม", 2 => "กิจกรรม", - "LAST" => "กิจกรรมล่าสุด", - "PAGE" => "รายการกิจกรรมของผู้ใช้", - "TIME" => "เวลาที่ทำกิจกรรม" + "LAST" => "กิจกรรมล่าสุด", + "PAGE" => "รายการกิจกรรมของผู้ใช้", + "TIME" => "เวลาที่ทำกิจกรรม" ], "CACHE" => [ - "CLEAR" => "ล้างแคช", - "CLEAR_CONFIRM" => "คุณแน่ใจหรือที่จะล้างแคชของเว็บ?", + "CLEAR" => "ล้างแคช", + "CLEAR_CONFIRM" => "คุณแน่ใจหรือที่จะล้างแคชของเว็บ?", "CLEAR_CONFIRM_YES" => "ใช่ ล้างแคชเลย", - "CLEARED" => "ล้างแคชเรียบร้อยแล้ว!" + "CLEARED" => "ล้างแคชเรียบร้อยแล้ว!" ], - "DASHBOARD" => "แผงควบคุม", - "DELETE_MASTER" => "คุณไม่สามารถลบบัญชีหลักได้!", - "DELETION_SUCCESSFUL" => "ลบผู้ใช้ <strong>{{user_name}}</strong> เรียบร้อยแล้ว", - "DETAILS_UPDATED" => "ปรับปรุงรายระเอียดบัญชีให้กับ <strong>{{user_name}}</strong> แล้ว", - "DISABLE_MASTER" => "คุณไม่สามารถปิดการใช้งานบัญชีหลัก!", - "DISABLE_SUCCESSFUL" => "ปิดการใช้งานบัญชีของผู้ใช้ <strong>{{user_name}}</strong> เรียบร้อยแล้ว", + "DASHBOARD" => "แผงควบคุม", + "DELETE_MASTER" => "คุณไม่สามารถลบบัญชีหลักได้!", + "DELETION_SUCCESSFUL" => "ลบผู้ใช้ <strong>{{user_name}}</strong> เรียบร้อยแล้ว", + "DETAILS_UPDATED" => "ปรับปรุงรายระเอียดบัญชีให้กับ <strong>{{user_name}}</strong> แล้ว", + "DISABLE_MASTER" => "คุณไม่สามารถปิดการใช้งานบัญชีหลัก!", + "DISABLE_SUCCESSFUL" => "ปิดการใช้งานบัญชีของผู้ใช้ <strong>{{user_name}}</strong> เรียบร้อยแล้ว", "ENABLE_SUCCESSFUL" => "เปิดการใช้งานบัญชีของผู้ใช้ <strong>{{user_name}}</strong> เรียบร้อยแล้ว", @@ -41,66 +41,66 @@ return [ 1 => "กลุ่ม", 2 => "กลุ่ม", - "CREATE" => "สร้างกลุ่ม", - "DELETE" => "ลบกลุ่ม", - "DELETE_CONFIRM" => "คุณแน่ใจหรือที่จะลบกลุ่ม <strong>{{name}}</strong>?", - "DELETE_YES" => "ใช่ ลบกลุ่มนี้เลย", - "EDIT" => "แก้ไขกลุ่ม", - "ICON" => "ไอคอนกลุ่ม", - "ICON_EXPLAIN" => "ไอคอนสำหรับสมาชิกกลุ่ม", - "INFO_PAGE" => "หน้าข้อมูลกลุ่มสำหรับ {{name}}", + "CREATE" => "สร้างกลุ่ม", + "DELETE" => "ลบกลุ่ม", + "DELETE_CONFIRM" => "คุณแน่ใจหรือที่จะลบกลุ่ม <strong>{{name}}</strong>?", + "DELETE_YES" => "ใช่ ลบกลุ่มนี้เลย", + "EDIT" => "แก้ไขกลุ่ม", + "ICON" => "ไอคอนกลุ่ม", + "ICON_EXPLAIN" => "ไอคอนสำหรับสมาชิกกลุ่ม", + "INFO_PAGE" => "หน้าข้อมูลกลุ่มสำหรับ {{name}}", //"MANAGE" => "Manage group", - "NAME" => "ชื่อกลุ่ม", - "NAME_EXPLAIN" => "กรุณาตั้งชื่อสำหรับกลุ่มนี้", + "NAME" => "ชื่อกลุ่ม", + "NAME_EXPLAIN" => "กรุณาตั้งชื่อสำหรับกลุ่มนี้", "PAGE_DESCRIPTION" => "รายชื่อกลุ่มในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับการแก้ไขและลบกลุ่ม" ], - "MANUALLY_ACTIVATED" => "บัญชีของ {{user_name}} ได้เปิดใช้งานเองแล้ว", + "MANUALLY_ACTIVATED" => "บัญชีของ {{user_name}} ได้เปิดใช้งานเองแล้ว", "MASTER_ACCOUNT_EXISTS" => "มีบัญชีหลักอยู่แล้ว!", "MIGRATION" => [ - "REQUIRED" => "ต้องการการปรับปรุงฐานข้อมูล" + "REQUIRED" => "ต้องการการปรับปรุงฐานข้อมูล" ], "PERMISSION" => [ 1 => "สิทธิการเข้าถึง", 2 => "สิทธิการเข้าถึง", - "ASSIGN_NEW" => "กำหนดสิทธิการเข้าถึงใหม่", - "HOOK_CONDITION" => "ข้อกำหนด/เงื่อนไข", - "MANAGE" => "จัดการสิทธิการเข้าถึง", - "PAGE_DESCRIPTION" => "รายการสิทธิการเข้าถึงในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับการแก้ไขและลบสิทธิการเข้าถึง", - "UPDATE" => "ปรับปรุงสิทธิการเข้าถึง" + "ASSIGN_NEW" => "กำหนดสิทธิการเข้าถึงใหม่", + "HOOK_CONDITION" => "ข้อกำหนด/เงื่อนไข", + "MANAGE" => "จัดการสิทธิการเข้าถึง", + "PAGE_DESCRIPTION" => "รายการสิทธิการเข้าถึงในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับการแก้ไขและลบสิทธิการเข้าถึง", + "UPDATE" => "ปรับปรุงสิทธิการเข้าถึง" ], "ROLE" => [ 1 => "ตำแหน่ง", 2 => "ตำแหน่ง", - "ASSIGN_NEW" => "กำหนดตำแหน่งใหม่", - "CREATE" => "สร้างตำแหน่ง", - "DELETE" => "ลบตำแหน่ง", - "DELETE_CONFIRM" => "คุณแน่ใจหรือที่จะลบตำแหน่ง <strong>{{name}}</strong>?", - "DELETE_YES" => "ใช่ ลบตำแหน่งนี้เลย", - "EDIT" => "แก้ไขตำแหน่ง", - "INFO_PAGE" => "หน้าข้อมูลตำแหน่งสำหรับ {{name}}", - "MANAGE" => "จัดการตำแหน่ง", - "NAME" => "ชื่อ", - "NAME_EXPLAIN" => "กรุณาตั้งชื่อสำหรับตำแหน่งนี้", - "PAGE_DESCRIPTION" => "รายชื่อตำแหน่งในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับแก้ไขและลบตำแหน่ง", - "UPDATED" => "ปรับปรุงตำแหน่ง" + "ASSIGN_NEW" => "กำหนดตำแหน่งใหม่", + "CREATE" => "สร้างตำแหน่ง", + "DELETE" => "ลบตำแหน่ง", + "DELETE_CONFIRM" => "คุณแน่ใจหรือที่จะลบตำแหน่ง <strong>{{name}}</strong>?", + "DELETE_YES" => "ใช่ ลบตำแหน่งนี้เลย", + "EDIT" => "แก้ไขตำแหน่ง", + "INFO_PAGE" => "หน้าข้อมูลตำแหน่งสำหรับ {{name}}", + "MANAGE" => "จัดการตำแหน่ง", + "NAME" => "ชื่อ", + "NAME_EXPLAIN" => "กรุณาตั้งชื่อสำหรับตำแหน่งนี้", + "PAGE_DESCRIPTION" => "รายชื่อตำแหน่งในเว็บของคุณ ประกอบไปด้วยเครื่องมือในการจัดการสำหรับแก้ไขและลบตำแหน่ง", + "UPDATED" => "ปรับปรุงตำแหน่ง" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "ข้อมูลระบบ", - - "DB_NAME" => "ชื่อฐานข้อมูล", - "DB_VERSION" => "เวอร์ชั่นฐานข้อมูล", - "DIRECTORY" => "ไดเรกทอรีของโปรเจค", - "PHP_VERSION" => "เวอร์ชั่น PHP", - "SERVER" => "ซอฟต์แวร์เว็บเซิร์ฟเวอร์", - "SPRINKLES" => "Sprinkles ที่ถูกโหลด", - "UF_VERSION" => "เวอร์ชั่น UserFrosting", - "URL" => "URL ของรากเว็บไซต์" + "@TRANSLATION" => "ข้อมูลระบบ", + + "DB_NAME" => "ชื่อฐานข้อมูล", + "DB_VERSION" => "เวอร์ชั่นฐานข้อมูล", + "DIRECTORY" => "ไดเรกทอรีของโปรเจค", + "PHP_VERSION" => "เวอร์ชั่น PHP", + "SERVER" => "ซอฟต์แวร์เว็บเซิร์ฟเวอร์", + "SPRINKLES" => "Sprinkles ที่ถูกโหลด", + "UF_VERSION" => "เวอร์ชั่น UserFrosting", + "URL" => "URL ของรากเว็บไซต์" ], "USER" => [ @@ -113,18 +113,18 @@ return [ "SET_PASSWORD" => "ตั้งรหัสผ่านของผู้ใช้เป็น" ], - "ACTIVATE" => "เปิดใช้งานผู้ใช้", - "CREATE" => "สร้างผู้ใช้", - "DELETE" => "ลบผู้ใช้", - "DELETE_CONFIRM" => "คุณแน่ใจหรือที่จะลบผู้ใช้ <strong>{{name}}</strong>?", - "DELETE_YES" => "ใช่ ลบผู้ใช้นี้เลย", - "DISABLE" => "ปิดการใช้งานผู้ใช้", - "EDIT" => "แก้ไขผู้ใช้", - "ENABLE" => "เปิดการใช้งานผู้ใช้", - "INFO_PAGE" => "หน้าข้อมูลของผู้ใช้ {{name}}", - "PAGE_DESCRIPTION" => "รายชื่อผู้ใช้ในเว็บของคุณ ประกอบไปด้วยเครื่องมือสำหรับการจัดการ รวมทั้งความสามารถในการแก้ไขรายละเอียดผู้ใช้ การเปิดใช้งานผู้ใช้ การเปิด/ปิดบัญชีผู้ใช้และอื่น ๆ", - "LATEST" => "ผู้ใช้ล่าสุด", - "VIEW_ALL" => "ดูผู้ใช้ทั้งหมด" + "ACTIVATE" => "เปิดใช้งานผู้ใช้", + "CREATE" => "สร้างผู้ใช้", + "DELETE" => "ลบผู้ใช้", + "DELETE_CONFIRM" => "คุณแน่ใจหรือที่จะลบผู้ใช้ <strong>{{name}}</strong>?", + "DELETE_YES" => "ใช่ ลบผู้ใช้นี้เลย", + "DISABLE" => "ปิดการใช้งานผู้ใช้", + "EDIT" => "แก้ไขผู้ใช้", + "ENABLE" => "เปิดการใช้งานผู้ใช้", + "INFO_PAGE" => "หน้าข้อมูลของผู้ใช้ {{name}}", + "PAGE_DESCRIPTION" => "รายชื่อผู้ใช้ในเว็บของคุณ ประกอบไปด้วยเครื่องมือสำหรับการจัดการ รวมทั้งความสามารถในการแก้ไขรายละเอียดผู้ใช้ การเปิดใช้งานผู้ใช้ การเปิด/ปิดบัญชีผู้ใช้และอื่น ๆ", + "LATEST" => "ผู้ใช้ล่าสุด", + "VIEW_ALL" => "ดูผู้ใช้ทั้งหมด" ], "X_USER" => [ 0 => "ไม่มีผู้ใช้", diff --git a/main/app/sprinkles/admin/locale/tr/messages.php b/main/app/sprinkles/admin/locale/tr/messages.php index 25d5633..de9f7e3 100644 --- a/main/app/sprinkles/admin/locale/tr/messages.php +++ b/main/app/sprinkles/admin/locale/tr/messages.php @@ -16,26 +16,26 @@ return [ 1 => "Etkinlik", 2 => "Etkinlikler", - "LAST" => "Son Etkinlik", - "PAGE" => "Kullanıcı etkinliklerinin listesi", - "TIME" => "Aktivite zamanı" + "LAST" => "Son Etkinlik", + "PAGE" => "Kullanıcı etkinliklerinin listesi", + "TIME" => "Aktivite zamanı" ], "CACHE" => [ - "CLEAR" => "Önbelleği temizle", - "CLEAR_CONFIRM" => "Site önbelleğini temizlemek istediğine emin misin?", + "CLEAR" => "Önbelleği temizle", + "CLEAR_CONFIRM" => "Site önbelleğini temizlemek istediğine emin misin?", "CLEAR_CONFIRM_YES" => "Evet, önbelleği temizle", - "CLEARED" => "Önbellek temizlenmesi başarıyla tamamlandı!" + "CLEARED" => "Önbellek temizlenmesi başarıyla tamamlandı!" ], - "DASHBOARD" => "Pano", - "NO_FEATURES_YET" => "Bu hesap için herhangi bir özellik ayarlanmış gibi görünmüyor... Henüz. Belki de henüz uygulanmadı, veya belki birisi size erişim vermeyi unutttu. Her iki durumda da sizi aramızda gördüğümüze sevindik!", - "DELETE_MASTER" => "Ana hesabı silemezsiniz!", - "DELETION_SUCCESSFUL" => "Kullanıcı<strong>{{user_name}}</strong> silme işlemi başarıyla tamamlandı.", - "DETAILS_UPDATED" => "Kullanıcı<strong>{{user_name}}</strong> için güncel hesap detayları", - "DISABLE_MASTER" => "Ana hesabı devre dışı bırakamazsınız!", - "DISABLE_SELF" => "Kendi hesabınızın etkinliğini sonlandıramazsınız!", - "DISABLE_SUCCESSFUL" => "Kullanıcı hesabın <strong>{{user_name}}</strong>başarıyla devre dışı bırakıldı.", + "DASHBOARD" => "Pano", + "NO_FEATURES_YET" => "Bu hesap için herhangi bir özellik ayarlanmış gibi görünmüyor... Henüz. Belki de henüz uygulanmadı, veya belki birisi size erişim vermeyi unutttu. Her iki durumda da sizi aramızda gördüğümüze sevindik!", + "DELETE_MASTER" => "Ana hesabı silemezsiniz!", + "DELETION_SUCCESSFUL" => "Kullanıcı<strong>{{user_name}}</strong> silme işlemi başarıyla tamamlandı.", + "DETAILS_UPDATED" => "Kullanıcı<strong>{{user_name}}</strong> için güncel hesap detayları", + "DISABLE_MASTER" => "Ana hesabı devre dışı bırakamazsınız!", + "DISABLE_SELF" => "Kendi hesabınızın etkinliğini sonlandıramazsınız!", + "DISABLE_SUCCESSFUL" => "Kullanıcı hesabın <strong>{{user_name}}</strong>başarıyla devre dışı bırakıldı.", "ENABLE_SUCCESSFUL" => "Kullanıcı hesabın<strong>{{user_name}}</strong>başarıyla etkinleştirildi.", @@ -43,84 +43,84 @@ return [ 1 => "Grup", 2 => "Grıplar", - "CREATE" => "Grup oluşturmak", + "CREATE" => "Grup oluşturmak", "CREATION_SUCCESSFUL" => "Grup oluşturma başarılı<strong>{{name}}</strong>", - "DELETE" => "Grubu sil", - "DELETE_CONFIRM" => "Grubu silmek istediğine emin misin<strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Grubu silemezsin<strong>{{name}}</strong> çünkü o yeni kayıtlanan kullanıcılar için varsayılan grup.", - "DELETE_YES" => "Evet, grubu sil", + "DELETE" => "Grubu sil", + "DELETE_CONFIRM" => "Grubu silmek istediğine emin misin<strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Grubu silemezsin<strong>{{name}}</strong> çünkü o yeni kayıtlanan kullanıcılar için varsayılan grup.", + "DELETE_YES" => "Evet, grubu sil", "DELETION_SUCCESSFUL" => "Grup silme başarılı<strong>{{name}}</strong>", - "EDIT" => "Grubu düzenle", - "ICON" => "Grup ikonu", - "ICON_EXPLAIN" => "Grup iyileri için ikon", - "INFO_PAGE" => "Grup bilgisi sayfası {{name}} için", - "MANAGE" => "Grubu yönet", - "NAME" => "Grup adı", - "NAME_EXPLAIN" => "Lütfen grup için bir isim giriniz", - "NOT_EMPTY" => "Bunu yapamazsınız çünkü hala grupla ilişkili kullanıcılar var<strong>{{name}}</strong>.", + "EDIT" => "Grubu düzenle", + "ICON" => "Grup ikonu", + "ICON_EXPLAIN" => "Grup iyileri için ikon", + "INFO_PAGE" => "Grup bilgisi sayfası {{name}} için", + "MANAGE" => "Grubu yönet", + "NAME" => "Grup adı", + "NAME_EXPLAIN" => "Lütfen grup için bir isim giriniz", + "NOT_EMPTY" => "Bunu yapamazsınız çünkü hala grupla ilişkili kullanıcılar var<strong>{{name}}</strong>.", "PAGE_DESCRIPTION" => "Siten için grupların bir listesi. Grupları silmek ve düzenlemek için yönetim araçları sağlar.", - "SUMMARY" => "Grup özeti", - "UPDATE" => "Grup için detaylar güncellendi<strong>{{name}}</strong>" + "SUMMARY" => "Grup özeti", + "UPDATE" => "Grup için detaylar güncellendi<strong>{{name}}</strong>" ], - "MANUALLY_ACTIVATED" => "{{user_name}}'ın hesabı el ile aktifleştirildi", + "MANUALLY_ACTIVATED" => "{{user_name}}'ın hesabı el ile aktifleştirildi", "MASTER_ACCOUNT_EXISTS" => "Ana hesap zaten mevcut!", "MIGRATION" => [ - "REQUIRED" => "Veritabanını güncellemek gerek" + "REQUIRED" => "Veritabanını güncellemek gerek" ], "PERMISSION" => [ 1 => "İzin", 2 => "İzinler", - "ASSIGN_NEW" => "Yeni izin ata", - "HOOK_CONDITION" => "Kanca/Koşullar", - "ID" => "İzin Kimliği", - "INFO_PAGE" => "{{name}} için izin bilgi sayfası", - "MANAGE" => "İzinleri yönet", - "NOTE_READ_ONLY" => "<strong>Lütfen Dikkat</strong> izinler ''bir kodun parçası'' olarak kabul edilir ve arayüz aracılığıyla değiştirilemez. İzln eklemek, kaldırmak ya da değiştirmek için site bakımcıları bir <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">veritabanı geçişi</a> kullanmalıdır", - "PAGE_DESCRIPTION" => "Siteniz için izinlerin bir listesi. Düzenleme yapmak ve izinleri kaldırmak yönetim araçları temin eder.", - "SUMMARY" => "İzin Özeti", - "UPDATE" => "İzinlerin Güncellenmesi", - "VIA_ROLES" => "Roller ile izin alımı" + "ASSIGN_NEW" => "Yeni izin ata", + "HOOK_CONDITION" => "Kanca/Koşullar", + "ID" => "İzin Kimliği", + "INFO_PAGE" => "{{name}} için izin bilgi sayfası", + "MANAGE" => "İzinleri yönet", + "NOTE_READ_ONLY" => "<strong>Lütfen Dikkat</strong> izinler ''bir kodun parçası'' olarak kabul edilir ve arayüz aracılığıyla değiştirilemez. İzln eklemek, kaldırmak ya da değiştirmek için site bakımcıları bir <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">veritabanı geçişi</a> kullanmalıdır", + "PAGE_DESCRIPTION" => "Siteniz için izinlerin bir listesi. Düzenleme yapmak ve izinleri kaldırmak yönetim araçları temin eder.", + "SUMMARY" => "İzin Özeti", + "UPDATE" => "İzinlerin Güncellenmesi", + "VIA_ROLES" => "Roller ile izin alımı" ], "ROLE" => [ 1 => "Rol", 2 => "Roller", - "ASSIGN_NEW" => "Yeni rol ata", - "CREATE" => "Rol oluştur", + "ASSIGN_NEW" => "Yeni rol ata", + "CREATE" => "Rol oluştur", "CREATION_SUCCESSFUL" => "Rol oluşturma başarılı <strong>{{name}}</strong>", - "DELETE" => "Rolü sil", - "DELETE_CONFIRM" => "Rolü silmek istediğine emin misin <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "Rolü silemezsin <strong>{{name}}</strong> çünkü o kaydolmuş kullanıcılar için varsayılan bir rol.", - "DELETE_YES" => "Evet, rolü sil", + "DELETE" => "Rolü sil", + "DELETE_CONFIRM" => "Rolü silmek istediğine emin misin <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "Rolü silemezsin <strong>{{name}}</strong> çünkü o kaydolmuş kullanıcılar için varsayılan bir rol.", + "DELETE_YES" => "Evet, rolü sil", "DELETION_SUCCESSFUL" => "Rol başarıyla silindi<strong>{{name}}</strong>", - "EDIT" => "Rolü düzenle", - "HAS_USERS" => "Bunu yapamazsın çünkü hala bu rol ile bağlantılı kullanıcılar var<strong>{{name}}</strong>.", - "INFO_PAGE" => "{{name}} için rol bilgi sayfası", - "MANAGE" => "Rolleri yönet", - "NAME" => "Ad", - "NAME_EXPLAIN" => "Lütfen rol için bir ad giriniz", - "NAME_IN_USE" => "<strong>{{name}}</strong> adında bir rol zaten mevcut", - "PAGE_DESCRIPTION" => "Siteniz için rollerin bir listesi. Düzenlemek ve rolleri silmek için yönetim araçları sağlar.", + "EDIT" => "Rolü düzenle", + "HAS_USERS" => "Bunu yapamazsın çünkü hala bu rol ile bağlantılı kullanıcılar var<strong>{{name}}</strong>.", + "INFO_PAGE" => "{{name}} için rol bilgi sayfası", + "MANAGE" => "Rolleri yönet", + "NAME" => "Ad", + "NAME_EXPLAIN" => "Lütfen rol için bir ad giriniz", + "NAME_IN_USE" => "<strong>{{name}}</strong> adında bir rol zaten mevcut", + "PAGE_DESCRIPTION" => "Siteniz için rollerin bir listesi. Düzenlemek ve rolleri silmek için yönetim araçları sağlar.", "PERMISSIONS_UPDATED" => "Rol için izinler güncellendi<strong>{{name}}</strong>", - "SUMMARY" => "Rol özeti", - "UPDATED" => "Rol için detaylar güncellendi<strong>{{name}}</strong>" + "SUMMARY" => "Rol özeti", + "UPDATED" => "Rol için detaylar güncellendi<strong>{{name}}</strong>" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "Sistem bilgisi", - - "DB_NAME" => "Veritabanı adı", - "DB_VERSION" => "Veritabanı sürümü", - "DIRECTORY" => "Proje dizini", - "PHP_VERSION" => "PHP sürümü", - "SERVER" => "Web sunucu yazılımı", - "SPRINKLES" => "Yüklü serpintiler", - "UF_VERSION" => "UserFrosting sürümü", - "URL" => "Site kök url" + "@TRANSLATION" => "Sistem bilgisi", + + "DB_NAME" => "Veritabanı adı", + "DB_VERSION" => "Veritabanı sürümü", + "DIRECTORY" => "Proje dizini", + "PHP_VERSION" => "PHP sürümü", + "SERVER" => "Web sunucu yazılımı", + "SPRINKLES" => "Yüklü serpintiler", + "UF_VERSION" => "UserFrosting sürümü", + "URL" => "Site kök url" ], "TOGGLE_COLUMNS" => "Sütünları değiştirme", @@ -135,22 +135,22 @@ return [ "SET_PASSWORD" => "Kullanıcının şifresi olarak ayarla" ], - "ACTIVATE" => "Aktif Kullanıcı", - "CREATE" => "Kullanıcı oluştur", - "CREATED" => "Kullanıcı <strong>{{user_name}}</strong> başarıyla oluşturuldu", - "DELETE" => "Kullanıcıyı sil", - "DELETE_CONFIRM" => "Kullanıcıyı silmek istediğinden emin misin?<strong>{{name}}</strong>?", - "DELETE_YES" => "Evet, kullanıcıyı sil", - "DELETED" => "Kullanıcı silindi", - "DISABLE" => "Kullanıcı devre dışı", - "EDIT" => "Kullanıcıyı düzenle", - "ENABLE" => "Kullanıcı etkin", - "INFO_PAGE" => "{{name}} için kullanıcı bilgisi", - "LATEST" => "Son Kullanıcılar", - "PAGE_DESCRIPTION" => "Siten için kullanıcıların listesi. Kullanıcı detaylarını düzenlemek, elle kullanıcıları aktifleştirmek, kullanıcıları etkinleştirme/devre dışı bırakma, ve daha fazlası için yönetimsel araçlar sağlar.", - "SUMMARY" => "Hesap özeti", - "VIEW_ALL" => "Tüm kullanıcıları göster", - "WITH_PERMISSION" => "Bu izni olan kullanıcılar" + "ACTIVATE" => "Aktif Kullanıcı", + "CREATE" => "Kullanıcı oluştur", + "CREATED" => "Kullanıcı <strong>{{user_name}}</strong> başarıyla oluşturuldu", + "DELETE" => "Kullanıcıyı sil", + "DELETE_CONFIRM" => "Kullanıcıyı silmek istediğinden emin misin?<strong>{{name}}</strong>?", + "DELETE_YES" => "Evet, kullanıcıyı sil", + "DELETED" => "Kullanıcı silindi", + "DISABLE" => "Kullanıcı devre dışı", + "EDIT" => "Kullanıcıyı düzenle", + "ENABLE" => "Kullanıcı etkin", + "INFO_PAGE" => "{{name}} için kullanıcı bilgisi", + "LATEST" => "Son Kullanıcılar", + "PAGE_DESCRIPTION" => "Siten için kullanıcıların listesi. Kullanıcı detaylarını düzenlemek, elle kullanıcıları aktifleştirmek, kullanıcıları etkinleştirme/devre dışı bırakma, ve daha fazlası için yönetimsel araçlar sağlar.", + "SUMMARY" => "Hesap özeti", + "VIEW_ALL" => "Tüm kullanıcıları göster", + "WITH_PERMISSION" => "Bu izni olan kullanıcılar" ], "X_USER" => [ 0 => "Kullanıcı yok", diff --git a/main/app/sprinkles/admin/locale/zh_CN/messages.php b/main/app/sprinkles/admin/locale/zh_CN/messages.php index 2adc8c8..e84ef6d 100644 --- a/main/app/sprinkles/admin/locale/zh_CN/messages.php +++ b/main/app/sprinkles/admin/locale/zh_CN/messages.php @@ -16,9 +16,9 @@ return [ 1 => "活动", 2 => "活动", - "LAST" => "最后活动", - "PAGE" => "用户活动列表", - "TIME" => "活动时间" + "LAST" => "最后活动", + "PAGE" => "用户活动列表", + "TIME" => "活动时间" ], "ADMIN" => [ @@ -26,19 +26,19 @@ return [ ], "CACHE" => [ - "CLEAR" => "清除缓存", - "CLEAR_CONFIRM" => "你确定要清除此网站的缓存?", + "CLEAR" => "清除缓存", + "CLEAR_CONFIRM" => "你确定要清除此网站的缓存?", "CLEAR_CONFIRM_YES" => "是的, 清除缓存", - "CLEARED" => "缓存成功清除 !" + "CLEARED" => "缓存成功清除 !" ], - "DASHBOARD" => "仪表盘", - "DELETE_MASTER" => "你不能删除超级账户!", - "DELETION_SUCCESSFUL" => "用户 <strong>{{user_name}}</strong> 删除成功.", - "DETAILS_UPDATED" => "用户 <strong>{{user_name}}</strong> 更新成功", - "DISABLE_MASTER" => "你不能禁用超级用户!", - "DISABLE_SELF" => "不能禁用你自己的账户!", - "DISABLE_SUCCESSFUL" => "用户名<strong>{{user_name}}</strong> 成功禁用.", + "DASHBOARD" => "仪表盘", + "DELETE_MASTER" => "你不能删除超级账户!", + "DELETION_SUCCESSFUL" => "用户 <strong>{{user_name}}</strong> 删除成功.", + "DETAILS_UPDATED" => "用户 <strong>{{user_name}}</strong> 更新成功", + "DISABLE_MASTER" => "你不能禁用超级用户!", + "DISABLE_SELF" => "不能禁用你自己的账户!", + "DISABLE_SUCCESSFUL" => "用户名<strong>{{user_name}}</strong> 成功禁用.", "ENABLE_SUCCESSFUL" => "用户名 <strong>{{user_name}}</strong> 启用成功.", @@ -46,83 +46,83 @@ return [ 1 => "组", 2 => "组", - "CREATE" => "新建组", + "CREATE" => "新建组", "CREATION_SUCCESSFUL" => "成功创建组 <strong>{{name}}</strong>", - "DELETE" => "删除组", - "DELETE_CONFIRM" => "确定要删除组 <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "你无法删除组 <strong>{{name}}</strong> 因为这是新注册用户的默认组.", - "DELETE_YES" => "是, 删除组", + "DELETE" => "删除组", + "DELETE_CONFIRM" => "确定要删除组 <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "你无法删除组 <strong>{{name}}</strong> 因为这是新注册用户的默认组.", + "DELETE_YES" => "是, 删除组", "DELETION_SUCCESSFUL" => "成功删除组<strong>{{name}}</strong>", - "EDIT" => "编辑组", - "ICON" => "组图标", - "ICON_EXPLAIN" => "组成员图标", - "INFO_PAGE" => "{{name}} 组的信息页", - "NAME" => "组名", - "NAME_EXPLAIN" => "请为组取一个名字", - "NOT_EMPTY" => "你不能这样做，因为还有用户在组 <strong>{{name}}</strong>.", + "EDIT" => "编辑组", + "ICON" => "组图标", + "ICON_EXPLAIN" => "组成员图标", + "INFO_PAGE" => "{{name}} 组的信息页", + "NAME" => "组名", + "NAME_EXPLAIN" => "请为组取一个名字", + "NOT_EMPTY" => "你不能这样做，因为还有用户在组 <strong>{{name}}</strong>.", "PAGE_DESCRIPTION" => "网站组列表. 请管理编辑和删除组的工具.", - "SUMMARY" => "组简介", - "UPDATE" => "组<strong>{{name}}</strong>的信息已经更新" + "SUMMARY" => "组简介", + "UPDATE" => "组<strong>{{name}}</strong>的信息已经更新" ], - "MANUALLY_ACTIVATED" => "{{user_name}} 账户已手动激活", + "MANUALLY_ACTIVATED" => "{{user_name}} 账户已手动激活", "MASTER_ACCOUNT_EXISTS" => "超级账户已存在!", "MIGRATION" => [ - "REQUIRED" => "数据库需要更新" + "REQUIRED" => "数据库需要更新" ], "PERMISSION" => [ 1 => "权限", 2 => "权限", - "ASSIGN_NEW" => "分配新权限", - "HOOK_CONDITION" => "Hook/条件", - "ID" => "权限ID", - "INFO_PAGE" => "用户 '{{name}}' 的权限页", - "MANAGE" => "管理权限", - "NOTE_READ_ONLY" => "<strong>请注意:</strong> 权限是 \"part of the code\" 不能通过界面修改. 如果要添加、删除、编辑权限, 网站维护者需要 <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">进行数据库迁移.</a>", - "PAGE_DESCRIPTION" => "网站的权限列表. 提供编辑和删除权限的工具.", - "SUMMARY" => "权限概要", - "UPDATE" => "更新权限", - "VIA_ROLES" => "权限通过用户了" + "ASSIGN_NEW" => "分配新权限", + "HOOK_CONDITION" => "Hook/条件", + "ID" => "权限ID", + "INFO_PAGE" => "用户 '{{name}}' 的权限页", + "MANAGE" => "管理权限", + "NOTE_READ_ONLY" => "<strong>请注意:</strong> 权限是 \"part of the code\" 不能通过界面修改. 如果要添加、删除、编辑权限, 网站维护者需要 <a href=\"https://learn.userfrosting.com/database/extending-the-database\" target=\"about:_blank\">进行数据库迁移.</a>", + "PAGE_DESCRIPTION" => "网站的权限列表. 提供编辑和删除权限的工具.", + "SUMMARY" => "权限概要", + "UPDATE" => "更新权限", + "VIA_ROLES" => "权限通过用户了" ], "ROLE" => [ 1 => "角色", 2 => "角色", - "ASSIGN_NEW" => "分配角色", - "CREATE" => "创建角色", + "ASSIGN_NEW" => "分配角色", + "CREATE" => "创建角色", "CREATION_SUCCESSFUL" => "成功创建角色 <strong>{{name}}</strong>", - "DELETE" => "删除角色", - "DELETE_CONFIRM" => "你确定要删除角色 <strong>{{name}}</strong>?", - "DELETE_DEFAULT" => "你无法删除角色<strong>{{name}}</strong> 因为这是新注册用户的默认角色.", - "DELETE_YES" => "是, 删除角色", + "DELETE" => "删除角色", + "DELETE_CONFIRM" => "你确定要删除角色 <strong>{{name}}</strong>?", + "DELETE_DEFAULT" => "你无法删除角色<strong>{{name}}</strong> 因为这是新注册用户的默认角色.", + "DELETE_YES" => "是, 删除角色", "DELETION_SUCCESSFUL" => "成功删除角色 <strong>{{name}}</strong>", - "EDIT" => "编辑角色", - "HAS_USERS" => "你不能这样做，因为还有用户拥有角色 <strong>{{name}}</strong>.", - "INFO_PAGE" => "{{name}}角色的权限页", - "MANAGE" => "管理角色", - "NAME" => "名字", - "NAME_EXPLAIN" => "请为角色输入名字", - "NAME_IN_USE" => "角色名 <strong>{{name}}</strong> 以存在", - "PAGE_DESCRIPTION" => "网站的角色列表. 请管理编辑和删除角色的工具.", + "EDIT" => "编辑角色", + "HAS_USERS" => "你不能这样做，因为还有用户拥有角色 <strong>{{name}}</strong>.", + "INFO_PAGE" => "{{name}}角色的权限页", + "MANAGE" => "管理角色", + "NAME" => "名字", + "NAME_EXPLAIN" => "请为角色输入名字", + "NAME_IN_USE" => "角色名 <strong>{{name}}</strong> 以存在", + "PAGE_DESCRIPTION" => "网站的角色列表. 请管理编辑和删除角色的工具.", "PERMISSIONS_UPDATED" => "角色 <strong>{{name}}</strong> 的权限更新成功", - "SUMMARY" => "角色概要", - "UPDATED" => "角色 <strong>{{name}}</strong> 更新成功" + "SUMMARY" => "角色概要", + "UPDATED" => "角色 <strong>{{name}}</strong> 更新成功" ], "SYSTEM_INFO" => [ - "@TRANSLATION" => "系统信息", - - "DB_NAME" => "数据库", - "DB_VERSION" => "数据库版本", - "DIRECTORY" => "工程目录", - "PHP_VERSION" => "PHP 版本", - "SERVER" => "网站服务器", - "SPRINKLES" => "加载的 sprinkles", - "UF_VERSION" => "UserFrosting 版本", - "URL" => "网站根目录" + "@TRANSLATION" => "系统信息", + + "DB_NAME" => "数据库", + "DB_VERSION" => "数据库版本", + "DIRECTORY" => "工程目录", + "PHP_VERSION" => "PHP 版本", + "SERVER" => "网站服务器", + "SPRINKLES" => "加载的 sprinkles", + "UF_VERSION" => "UserFrosting 版本", + "URL" => "网站根目录" ], "TOGGLE_COLUMNS" => "加载列", @@ -137,21 +137,21 @@ return [ "SET_PASSWORD" => "设置用户的密码为" ], - "ACTIVATE" => "激活用户", - "CREATE" => "新建用户", - "CREATED" => "用户 <strong>{{user_name}}</strong> 新建成功", - "DELETE" => "删除用户", - "DELETE_CONFIRM" => "确定要删除用户 <strong>{{name}}</strong>?", - "DELETE_YES" => "是, 删除用户", - "DISABLE" => "禁用用户", - "EDIT" => "编辑用户", - "ENABLE" => "启用用户", - "INFO_PAGE" => "用户 {{name}} 的信息页", - "LATEST" => "最新用户", - "PAGE_DESCRIPTION" => "网站用户列表. 提供编辑用户信息, 手动激活用户, 启用/禁用 用户等工具.", - "SUMMARY" => "账户概要", - "VIEW_ALL" => "浏览所有用户", - "WITH_PERMISSION" => "有此权限的用户" + "ACTIVATE" => "激活用户", + "CREATE" => "新建用户", + "CREATED" => "用户 <strong>{{user_name}}</strong> 新建成功", + "DELETE" => "删除用户", + "DELETE_CONFIRM" => "确定要删除用户 <strong>{{name}}</strong>?", + "DELETE_YES" => "是, 删除用户", + "DISABLE" => "禁用用户", + "EDIT" => "编辑用户", + "ENABLE" => "启用用户", + "INFO_PAGE" => "用户 {{name}} 的信息页", + "LATEST" => "最新用户", + "PAGE_DESCRIPTION" => "网站用户列表. 提供编辑用户信息, 手动激活用户, 启用/禁用 用户等工具.", + "SUMMARY" => "账户概要", + "VIEW_ALL" => "浏览所有用户", + "WITH_PERMISSION" => "有此权限的用户" ], "X_USER" => [ 0 => "没有用户", diff --git a/main/app/sprinkles/admin/routes/admin.php b/main/app/sprinkles/admin/routes/admin.php index 1a8c31a..e469e4a 100644 --- a/main/app/sprinkles/admin/routes/admin.php +++ b/main/app/sprinkles/admin/routes/admin.php @@ -11,7 +11,7 @@ */ $app->group('/dashboard', function () { $this->get('', 'UserFrosting\Sprinkle\Admin\Controller\AdminController:pageDashboard') - ->setName('dashboard'); + ->setName('dashboard'); })->add('authGuard'); $app->group('/api/dashboard', function () { diff --git a/main/app/sprinkles/admin/src/Admin.php b/main/app/sprinkles/admin/src/Admin.php index 8a6dcc1..3aa21f6 100644 --- a/main/app/sprinkles/admin/src/Admin.php +++ b/main/app/sprinkles/admin/src/Admin.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin; use UserFrosting\System\Sprinkle\Sprinkle; diff --git a/main/app/sprinkles/admin/src/Controller/ActivityController.php b/main/app/sprinkles/admin/src/Controller/ActivityController.php index 2fbe0d9..09675d2 100644 --- a/main/app/sprinkles/admin/src/Controller/ActivityController.php +++ b/main/app/sprinkles/admin/src/Controller/ActivityController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Illuminate\Database\Capsule\Manager as Capsule; @@ -31,8 +32,7 @@ class ActivityController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -67,8 +67,7 @@ class ActivityController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; diff --git a/main/app/sprinkles/admin/src/Controller/GroupController.php b/main/app/sprinkles/admin/src/Controller/GroupController.php index 7ca94b1..2077363 100644 --- a/main/app/sprinkles/admin/src/Controller/GroupController.php +++ b/main/app/sprinkles/admin/src/Controller/GroupController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Carbon\Carbon; @@ -43,8 +44,7 @@ class GroupController extends SimpleController * Request type: POST * @see getModalCreateGroup */ - public function create($request, $response, $args) - { + public function create($request, $response, $args) { // Get POST parameters: name, slug, icon, description $params = $request->getParsedBody(); @@ -69,13 +69,13 @@ class GroupController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ @@ -84,12 +84,12 @@ class GroupController extends SimpleController // Check if name or slug already exists if ($classMapper->staticMethod('group', 'where', 'name', $data['name'])->first()) { $ms->addMessageTranslated('danger', 'GROUP.NAME.IN_USE', $data); - $error = true; + $error = TRUE; } if ($classMapper->staticMethod('group', 'where', 'slug', $data['slug'])->first()) { $ms->addMessageTranslated('danger', 'GROUP.SLUG.IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -101,7 +101,7 @@ class GroupController extends SimpleController // All checks passed! log events/activities and create group // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($classMapper, $data, $ms, $config, $currentUser) { + Capsule::transaction(function () use ($classMapper, $data, $ms, $config, $currentUser) { // Create the group $group = $classMapper->createInstance('group', $data); @@ -132,8 +132,7 @@ class GroupController extends SimpleController * This route requires authentication (and should generally be limited to admins or the root user). * Request type: DELETE */ - public function delete($request, $response, $args) - { + public function delete($request, $response, $args) { $group = $this->getGroupFromParams($args); // If the group doesn't exist, return 404 @@ -179,7 +178,7 @@ class GroupController extends SimpleController $groupName = $group->name; // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($group, $groupName, $currentUser) { + Capsule::transaction(function () use ($group, $groupName, $currentUser) { $group->delete(); unset($group); @@ -206,8 +205,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getInfo($request, $response, $args) - { + public function getInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -246,8 +244,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -272,8 +269,7 @@ class GroupController extends SimpleController return $sprunje->toResponse($response); } - public function getModalConfirmDelete($request, $response, $args) - { + public function getModalConfirmDelete($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -323,8 +319,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalCreate($request, $response, $args) - { + public function getModalCreate($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -369,7 +364,7 @@ class GroupController extends SimpleController 'submit_text' => $translator->translate('CREATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } @@ -381,8 +376,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalEdit($request, $response, $args) - { + public function getModalEdit($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -433,13 +427,12 @@ class GroupController extends SimpleController 'submit_text' => $translator->translate('UPDATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } - public function getUsers($request, $response, $args) - { + public function getUsers($request, $response, $args) { $group = $this->getGroupFromParams($args); // If the group no longer exists, forward to main group listing page @@ -486,8 +479,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageInfo($request, $response, $args) - { + public function pageInfo($request, $response, $args) { $group = $this->getGroupFromParams($args); // If the group no longer exists, forward to main group listing page @@ -504,8 +496,8 @@ class GroupController extends SimpleController // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_group', [ - 'group' => $group - ])) { + 'group' => $group + ])) { throw new ForbiddenException(); } @@ -559,8 +551,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ $authorizer = $this->ci->authorizer; @@ -586,8 +577,7 @@ class GroupController extends SimpleController * Request type: PUT * @see getModalGroupEdit */ - public function updateInfo($request, $response, $args) - { + public function updateInfo($request, $response, $args) { // Get the group based on slug in URL $group = $this->getGroupFromParams($args); @@ -611,13 +601,13 @@ class GroupController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } // Determine targeted fields @@ -650,7 +640,7 @@ class GroupController extends SimpleController $classMapper->staticMethod('group', 'where', 'name', $data['name'])->first() ) { $ms->addMessageTranslated('danger', 'GROUP.NAME.IN_USE', $data); - $error = true; + $error = TRUE; } if ( @@ -659,7 +649,7 @@ class GroupController extends SimpleController $classMapper->staticMethod('group', 'where', 'slug', $data['slug'])->first() ) { $ms->addMessageTranslated('danger', 'GROUP.SLUG.IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -667,7 +657,7 @@ class GroupController extends SimpleController } // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($data, $group, $currentUser) { + Capsule::transaction(function () use ($data, $group, $currentUser) { // Update the group and generate success messages foreach ($data as $name => $value) { if ($value != $group->$name) { @@ -691,8 +681,7 @@ class GroupController extends SimpleController return $response->withStatus(200); } - protected function getGroupFromParams($params) - { + protected function getGroupFromParams($params) { // Load the request schema $schema = new RequestSchema('schema://requests/group/get-by-slug.yaml'); @@ -706,7 +695,7 @@ class GroupController extends SimpleController // TODO: encapsulate the communication of error messages from ServerSideValidator to the BadRequestException $e = new BadRequestException(); foreach ($validator->errors() as $idx => $field) { - foreach($field as $eidx => $error) { + foreach ($field as $eidx => $error) { $e->addUserMessage($error); } } diff --git a/main/app/sprinkles/admin/src/Controller/PermissionController.php b/main/app/sprinkles/admin/src/Controller/PermissionController.php index f3e93ce..e8e542f 100644 --- a/main/app/sprinkles/admin/src/Controller/PermissionController.php +++ b/main/app/sprinkles/admin/src/Controller/PermissionController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Carbon\Carbon; @@ -38,8 +39,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getInfo($request, $response, $args) - { + public function getInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -78,8 +78,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -111,8 +110,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getUsers($request, $response, $args) - { + public function getUsers($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -150,8 +148,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageInfo($request, $response, $args) - { + public function pageInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -188,8 +185,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; diff --git a/main/app/sprinkles/admin/src/Controller/RoleController.php b/main/app/sprinkles/admin/src/Controller/RoleController.php index ab86c88..e4ebd98 100644 --- a/main/app/sprinkles/admin/src/Controller/RoleController.php +++ b/main/app/sprinkles/admin/src/Controller/RoleController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Carbon\Carbon; @@ -43,8 +44,7 @@ class RoleController extends SimpleController * Request type: POST * @see getModalCreateRole */ - public function create($request, $response, $args) - { + public function create($request, $response, $args) { // Get POST parameters: name, slug, description $params = $request->getParsedBody(); @@ -69,13 +69,13 @@ class RoleController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ @@ -84,12 +84,12 @@ class RoleController extends SimpleController // Check if name or slug already exists if ($classMapper->staticMethod('role', 'where', 'name', $data['name'])->first()) { $ms->addMessageTranslated('danger', 'ROLE.NAME_IN_USE', $data); - $error = true; + $error = TRUE; } if ($classMapper->staticMethod('role', 'where', 'slug', $data['slug'])->first()) { $ms->addMessageTranslated('danger', 'SLUG_IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -101,7 +101,7 @@ class RoleController extends SimpleController // All checks passed! log events/activities and create role // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($classMapper, $data, $ms, $config, $currentUser) { + Capsule::transaction(function () use ($classMapper, $data, $ms, $config, $currentUser) { // Create the role $role = $classMapper->createInstance('role', $data); @@ -132,8 +132,7 @@ class RoleController extends SimpleController * This route requires authentication (and should generally be limited to admins or the root user). * Request type: DELETE */ - public function delete($request, $response, $args) - { + public function delete($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role doesn't exist, return 404 @@ -178,7 +177,7 @@ class RoleController extends SimpleController $roleName = $role->name; // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($role, $roleName, $currentUser) { + Capsule::transaction(function () use ($role, $roleName, $currentUser) { $role->delete(); unset($role); @@ -205,8 +204,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getInfo($request, $response, $args) - { + public function getInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -245,8 +243,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -271,8 +268,7 @@ class RoleController extends SimpleController return $sprunje->toResponse($response); } - public function getModalConfirmDelete($request, $response, $args) - { + public function getModalConfirmDelete($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -332,8 +328,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalCreate($request, $response, $args) - { + public function getModalCreate($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -376,7 +371,7 @@ class RoleController extends SimpleController 'submit_text' => $translator->translate('CREATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } @@ -388,8 +383,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalEdit($request, $response, $args) - { + public function getModalEdit($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -440,7 +434,7 @@ class RoleController extends SimpleController 'submit_text' => $translator->translate('UPDATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } @@ -452,8 +446,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalEditPermissions($request, $response, $args) - { + public function getModalEditPermissions($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -490,8 +483,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getPermissions($request, $response, $args) - { + public function getPermissions($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role no longer exists, forward to main role listing page @@ -535,8 +527,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getUsers($request, $response, $args) - { + public function getUsers($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role doesn't exist, return 404 @@ -583,8 +574,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageInfo($request, $response, $args) - { + public function pageInfo($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role no longer exists, forward to main role listing page @@ -601,8 +591,8 @@ class RoleController extends SimpleController // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_role', [ - 'role' => $role - ])) { + 'role' => $role + ])) { throw new ForbiddenException(); } @@ -656,8 +646,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ $authorizer = $this->ci->authorizer; @@ -683,8 +672,7 @@ class RoleController extends SimpleController * Request type: PUT * @see getModalRoleEdit */ - public function updateInfo($request, $response, $args) - { + public function updateInfo($request, $response, $args) { // Get the role based on slug in the URL $role = $this->getRoleFromParams($args); @@ -708,13 +696,13 @@ class RoleController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } // Determine targeted fields @@ -747,7 +735,7 @@ class RoleController extends SimpleController $classMapper->staticMethod('role', 'where', 'name', $data['name'])->first() ) { $ms->addMessageTranslated('danger', 'ROLE.NAME_IN_USE', $data); - $error = true; + $error = TRUE; } if ( @@ -756,7 +744,7 @@ class RoleController extends SimpleController $classMapper->staticMethod('role', 'where', 'slug', $data['slug'])->first() ) { $ms->addMessageTranslated('danger', 'SLUG_IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -764,10 +752,10 @@ class RoleController extends SimpleController } // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($data, $role, $currentUser) { + Capsule::transaction(function () use ($data, $role, $currentUser) { // Update the role and generate success messages foreach ($data as $name => $value) { - if ($value != $role->$name){ + if ($value != $role->$name) { $role->$name = $value; } } @@ -797,8 +785,7 @@ class RoleController extends SimpleController * This route requires authentication. * Request type: PUT */ - public function updateField($request, $response, $args) - { + public function updateField($request, $response, $args) { // Get the username from the URL $role = $this->getRoleFromParams($args); @@ -852,7 +839,7 @@ class RoleController extends SimpleController // TODO: encapsulate the communication of error messages from ServerSideValidator to the BadRequestException $e = new BadRequestException(); foreach ($validator->errors() as $idx => $field) { - foreach($field as $eidx => $error) { + foreach ($field as $eidx => $error) { $e->addUserMessage($error); } } @@ -866,7 +853,7 @@ class RoleController extends SimpleController $ms = $this->ci->alerts; // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($fieldName, $fieldValue, $role, $currentUser) { + Capsule::transaction(function () use ($fieldName, $fieldValue, $role, $currentUser) { if ($fieldName == 'permissions') { $newPermissions = collect($fieldValue)->pluck('permission_id')->all(); $role->permissions()->sync($newPermissions); @@ -896,8 +883,7 @@ class RoleController extends SimpleController return $response->withStatus(200); } - protected function getRoleFromParams($params) - { + protected function getRoleFromParams($params) { // Load the request schema $schema = new RequestSchema('schema://requests/role/get-by-slug.yaml'); @@ -911,7 +897,7 @@ class RoleController extends SimpleController // TODO: encapsulate the communication of error messages from ServerSideValidator to the BadRequestException $e = new BadRequestException(); foreach ($validator->errors() as $idx => $field) { - foreach($field as $eidx => $error) { + foreach ($field as $eidx => $error) { $e->addUserMessage($error); } } diff --git a/main/app/sprinkles/admin/src/Controller/UserController.php b/main/app/sprinkles/admin/src/Controller/UserController.php index ede9523..3621fbc 100644 --- a/main/app/sprinkles/admin/src/Controller/UserController.php +++ b/main/app/sprinkles/admin/src/Controller/UserController.php @@ -1005,8 +1005,8 @@ class UserController extends SimpleController } if ((Capsule::table('public_keys') - ->where('user_id', "=", $requestedUser->id) - ->exists())) { + ->where('user_id', "=", $requestedUser->id) + ->exists())) { $RawPublicKey = Capsule::table('public_keys') ->where('user_id', "=", $requestedUser->id) diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php index e7cd9aa..e40a7e3 100644 --- a/main/app/sprinkles/admin/src/Controller/WormholeController.php +++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php @@ -111,7 +111,7 @@ class WormholeController extends SimpleController ->where('id', 1) ->where('token', '=', $access_token) ->exists()) { - return true; + return TRUE; } else { throw new NotFoundException(); } diff --git a/main/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php b/main/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php index 061d90c..cb4530e 100644 --- a/main/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php +++ b/main/app/sprinkles/admin/src/ServicesProvider/ServicesProvider.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\ServicesProvider; use Psr\Http\Message\ResponseInterface as Response; @@ -25,8 +26,7 @@ class ServicesProvider * * @param Container $container A DI container implementing ArrayAccess and container-interop. */ - public function register($container) - { + public function register($container) { /** * Extend the 'classMapper' service to register sprunje classes. * @@ -53,8 +53,8 @@ class ServicesProvider * This method is invoked when a user completes the login process. * * Returns a callback that handles setting the `UF-Redirect` header after a successful login. - * @param \Psr\Http\Message\ServerRequestInterface $request - * @param \Psr\Http\Message\ResponseInterface $response + * @param \Psr\Http\Message\ServerRequestInterface $request + * @param \Psr\Http\Message\ResponseInterface $response * @param array $args * @return \Psr\Http\Message\ResponseInterface */ @@ -62,7 +62,7 @@ class ServicesProvider // Backwards compatibility for the deprecated determineRedirectOnLogin service if ($c->has('determineRedirectOnLogin')) { $determineRedirectOnLogin = $c->determineRedirectOnLogin; - + return $determineRedirectOnLogin($response)->withStatus(200); } @@ -73,7 +73,7 @@ class ServicesProvider if ($authorizer->checkAccess($currentUser, 'uri_dashboard')) { return $response->withHeader('UF-Redirect', $c->router->pathFor('dashboard')); - } elseif ($authorizer->checkAccess($currentUser, 'uri_account_settings')) { + } else if ($authorizer->checkAccess($currentUser, 'uri_account_settings')) { return $response->withHeader('UF-Redirect', $c->router->pathFor('settings')); } else { return $response->withHeader('UF-Redirect', $c->router->pathFor('index')); diff --git a/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php b/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php index da4f0e3..3af04f0 100644 --- a/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/ActivitySprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -37,8 +38,7 @@ class ActivitySprunje extends Sprunje /** * Set the initial query used by your Sprunje. */ - protected function baseQuery() - { + protected function baseQuery() { $query = $this->classMapper->createInstance('activity'); return $query->joinUser(); @@ -51,8 +51,7 @@ class ActivitySprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterUser($query, $value) - { + protected function filterUser($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { @@ -72,8 +71,7 @@ class ActivitySprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortUser($query, $direction) - { + protected function sortUser($query, $direction) { $query->orderBy('users.last_name', $direction); return $this; } diff --git a/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php b/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php index 7c75691..849673b 100644 --- a/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/GroupSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -35,8 +36,7 @@ class GroupSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { return $this->classMapper->createInstance('group')->newQuery(); } } diff --git a/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php b/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php index c1803f1..0a38ee9 100644 --- a/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/PermissionSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -40,8 +41,7 @@ class PermissionSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { return $this->classMapper->createInstance('permission')->newQuery(); } @@ -52,8 +52,7 @@ class PermissionSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterInfo($query, $value) - { + protected function filterInfo($query, $value) { return $this->filterProperties($query, $value); } @@ -64,15 +63,14 @@ class PermissionSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterProperties($query, $value) - { + protected function filterProperties($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { $query->orLike('slug', $value) - ->orLike('conditions', $value) - ->orLike('description', $value); + ->orLike('conditions', $value) + ->orLike('description', $value); } }); return $this; @@ -85,8 +83,7 @@ class PermissionSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortProperties($query, $direction) - { + protected function sortProperties($query, $direction) { $query->orderBy('slug', $direction); return $this; } diff --git a/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php b/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php index 242681d..3c7b4ea 100644 --- a/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/PermissionUserSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -26,8 +27,7 @@ class PermissionUserSprunje extends UserSprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { // Requires a permission id if (!isset($this->options['permission_id'])) { throw new BadRequestException(); diff --git a/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php b/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php index c5e0f8b..624a1ba 100644 --- a/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/RoleSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -40,8 +41,7 @@ class RoleSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { return $this->classMapper->createInstance('role')->newQuery(); } @@ -52,14 +52,13 @@ class RoleSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterInfo($query, $value) - { + protected function filterInfo($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { $query->orLike('name', $value) - ->orLike('description', $value); + ->orLike('description', $value); } }); return $this; diff --git a/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php b/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php index 6142e74..f3c1734 100644 --- a/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/UserPermissionSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -26,8 +27,7 @@ class UserPermissionSprunje extends PermissionSprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { // Requires a user id if (!isset($this->options['user_id'])) { throw new BadRequestException(); diff --git a/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php b/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php index 12378f9..0837912 100644 --- a/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php +++ b/main/app/sprinkles/admin/src/Sprunje/UserSprunje.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Sprunje; use Illuminate\Database\Capsule\Manager as Capsule; @@ -46,8 +47,7 @@ class UserSprunje extends Sprunje /** * {@inheritDoc} */ - protected function baseQuery() - { + protected function baseQuery() { $query = $this->classMapper->createInstance('user'); // Join user's most recent activity @@ -61,8 +61,7 @@ class UserSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterLastActivity($query, $value) - { + protected function filterLastActivity($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { @@ -80,15 +79,14 @@ class UserSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterName($query, $value) - { + protected function filterName($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { $query->orLike('first_name', $value) - ->orLike('last_name', $value) - ->orLike('email', $value); + ->orLike('last_name', $value) + ->orLike('email', $value); } }); return $this; @@ -101,17 +99,16 @@ class UserSprunje extends Sprunje * @param mixed $value * @return $this */ - protected function filterStatus($query, $value) - { + protected function filterStatus($query, $value) { // Split value on separator for OR queries $values = explode($this->orSeparator, $value); $query->where(function ($query) use ($values) { foreach ($values as $value) { if ($value == 'disabled') { $query->orWhere('flag_enabled', 0); - } elseif ($value == 'unactivated') { + } else if ($value == 'unactivated') { $query->orWhere('flag_verified', 0); - } elseif ($value == 'active') { + } else if ($value == 'active') { $query->orWhere(function ($query) { $query->where('flag_enabled', 1)->where('flag_verified', 1); }); @@ -126,8 +123,7 @@ class UserSprunje extends Sprunje * * @return array */ - protected function listStatus() - { + protected function listStatus() { return [ [ 'value' => 'active', @@ -151,8 +147,7 @@ class UserSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortLastActivity($query, $direction) - { + protected function sortLastActivity($query, $direction) { $query->orderBy('activities.occurred_at', $direction); return $this; } @@ -164,8 +159,7 @@ class UserSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortName($query, $direction) - { + protected function sortName($query, $direction) { $query->orderBy('last_name', $direction); return $this; } @@ -177,8 +171,7 @@ class UserSprunje extends Sprunje * @param string $direction * @return $this */ - protected function sortStatus($query, $direction) - { + protected function sortStatus($query, $direction) { $query->orderBy('flag_enabled', $direction)->orderBy('flag_verified', $direction); return $this; } 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> diff --git a/main/app/sprinkles/admin/tests/Integration/SprunjeTests.php b/main/app/sprinkles/admin/tests/Integration/SprunjeTests.php index 9eb4122..47106e0 100644 --- a/main/app/sprinkles/admin/tests/Integration/SprunjeTests.php +++ b/main/app/sprinkles/admin/tests/Integration/SprunjeTests.php @@ -24,8 +24,7 @@ class SprunjeTests extends TestCase * * @return void */ - public function setUp() - { + public function setUp() { parent::setUp(); $this->classMapper = new ClassMapper(); @@ -34,8 +33,7 @@ class SprunjeTests extends TestCase /** * Tests... */ - public function testUserPermissionSprunje() - { + public function testUserPermissionSprunje() { $fm = $this->ci->factory; // Generate some test models |