registered-users group is granted a specific privilege, all other groups receive an implicit privilege, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the registered-users user group, and so, privileges for additional groups need not be explicitly granted.",
+
+ "analytics.back": "Back to Categories List",
+ "analytics.title": "Analytics for \"%1\" category",
+ "analytics.pageviews-hourly": "Figure 1 – Hourly page views for this category",
+ "analytics.pageviews-daily": "Figure 2 – Daily page views for this category",
+ "analytics.topics-daily": "Figure 3 – Daily topics created in this category",
+ "analytics.posts-daily": "Figure 4 – Daily posts made in this category",
+
+ "alert.created": "Created",
+ "alert.create-success": "Category successfully created!",
+ "alert.none-active": "You have no active categories.",
+ "alert.create": "Create a Category",
+ "alert.confirm-moderate": "Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.",
+ "alert.confirm-purge": "Do you really want to purge this category \"%1\"?
Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you'll want to \"disable\" the category instead.
", + "alert.purge-success": "Category purged!", + "alert.copy-success": "Settings Copied!", + "alert.set-parent-category": "Set Parent Category", + "alert.updated": "Updated Categories", + "alert.updated-success": "Category IDs %1 was successfully updated.", + "alert.upload-image": "Upload category image", + "alert.find-user": "Find a User", + "alert.user-search": "Search for a user here...", + "alert.find-group": "Find a Group", + "alert.group-search": "Search for a group here..." +} \ No newline at end of file diff --git a/public/less/admin/manage/categories.less b/public/less/admin/manage/categories.less index 0f13af4deb..c0c0a544dc 100644 --- a/public/less/admin/manage/categories.less +++ b/public/less/admin/manage/categories.less @@ -103,6 +103,7 @@ div.categories { border-top: 0; text-transform: uppercase; font-size: 9px; + vertical-align: bottom; } .arrowed:after { diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index 217438e146..1c44a7e78d 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -87,7 +87,7 @@ url = url .replace(/\/\d+$/, '') .split('/').slice(0, 3).join('/') - .split('?')[0]; + .split('?')[0].replace(/(\/+$)|(^\/+)/, ''); // If index is requested, load the dashboard if (url === 'admin') { diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 1042c723e6..acb55b82e9 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -40,31 +40,29 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri templates.parse('admin/partials/categories/create', { categories: categories }, function (html) { - translator.translate(html, function (html) { - function submit() { - var formData = modal.find('form').serializeObject(); - formData.description = ''; - formData.icon = 'fa-comments'; - - Categories.create(formData); - modal.modal('hide'); - return false; - } + function submit() { + var formData = modal.find('form').serializeObject(); + formData.description = ''; + formData.icon = 'fa-comments'; + + Categories.create(formData); + modal.modal('hide'); + return false; + } - var modal = bootbox.dialog({ - title: 'Create a Category', - message: html, - buttons: { - save: { - label: 'Save', - className: 'btn-primary', - callback: submit - } + var modal = bootbox.dialog({ + title: '[[admin/manage/categories:alert.create]]', + message: html, + buttons: { + save: { + label: '[[global:save]]', + className: 'btn-primary', + callback: submit } - }); - - modal.find('form').on('submit', submit); + } }); + + modal.find('form').on('submit', submit); }); }); }; @@ -77,8 +75,8 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri app.alert({ alert_id: 'category_created', - title: 'Created', - message: 'Category successfully created!', + title: '[[admin/manage/categories:alert.created]]', + message: '[[admin/manage/categories:alert.create-success]]', type: 'success', timeout: 2000 }); @@ -91,10 +89,12 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri var container = $('.categories'); if (!categories || !categories.length) { - $('') - .addClass('alert alert-info text-center') - .text('You have no active categories.') - .appendTo(container); + translator.translate('[[admin/manage/categories:alert.none-active]]', function (text) { + $('') + .addClass('alert alert-info text-center') + .text(text) + .appendTo(container); + }); } else { sortables = {}; renderList(categories, container, 0); diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js index 32da35b007..351c7a624b 100644 --- a/public/src/admin/manage/category.js +++ b/public/src/admin/manage/category.js @@ -12,6 +12,45 @@ define('admin/manage/category', [ var modified_categories = {}; Category.init = function () { + var modified_categories = {}; + + function modified(el) { + var cid = $(el).parents('form').attr('data-cid'); + + if (cid) { + modified_categories[cid] = modified_categories[cid] || {}; + modified_categories[cid][$(el).attr('data-name')] = $(el).val(); + + app.flags = app.flags || {}; + app.flags._unsaved = true; + } + } + + function save(e) { + e.preventDefault(); + + if(Object.keys(modified_categories).length) { + socket.emit('admin.categories.update', modified_categories, function (err, results) { + if (err) { + return app.alertError(err.message); + } + + if (results && results.length) { + app.flags._unsaved = false; + app.alert({ + title: '[[admin/manage/categories:alert.updated]]', + message: translator.compile( + 'admin/manage/categories:alert.updated-success', + results.join(', ') + ), + type: 'success', + timeout: 2000 + }); + } + }); + modified_categories = {}; + } + } $('.blockclass, form.category select').each(function () { var $this = $(this); @@ -76,7 +115,10 @@ define('admin/manage/category', [ $('.purge').on('click', function (e) { e.preventDefault(); - bootbox.confirm('Do you really want to purge this category "' + $('form.category').find('input[data-name="name"]').val() + '"?
Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you\'ll want to "disable" the category instead.
', function (confirm) { + bootbox.confirm(translator.compile( + 'admin/manage/categories:alert.confirm-purge', + $('form.category').find('input[data-name="name"]').val() + ), function (confirm) { if (!confirm) { return; } @@ -84,7 +126,7 @@ define('admin/manage/category', [ if (err) { return app.alertError(err.message); } - app.alertSuccess('Category purged!'); + app.alertSuccess('[[admin/manage/categories:alert.purge-success]]'); ajaxify.go('admin/manage/categories'); }); }); @@ -96,7 +138,7 @@ define('admin/manage/category', [ if (err) { return app.alertError(err.message); } - app.alertSuccess('Settings Copied!'); + app.alertSuccess('[[admin/manage/categories:alert.copy-success]]'); ajaxify.refresh(); }); }); @@ -108,7 +150,7 @@ define('admin/manage/category', [ var cid = inputEl.attr('data-cid'); uploader.show({ - title: 'Upload category image', + title: '[[admin/manage/categories:alert.upload-image]]', route: config.relative_path + '/api/admin/category/uploadpicture', params: {cid: cid} }, function (imageUrlOnServer) { @@ -201,7 +243,7 @@ define('admin/manage/category', [ if (member) { if (isGroup && privilege === 'groups:moderate' && !isPrivate && state) { - bootbox.confirm('Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.', function (confirm) { + bootbox.confirm('[[admin/manage/categories:alert.confirm-moderate]]', function (confirm) { if (confirm) { Category.setPrivilege(member, privilege, state, checkboxEl); } else { @@ -292,35 +334,33 @@ define('admin/manage/category', [ templates.parse('partials/category_list', { categories: categories }, function (html) { - translator.translate(html, function (html) { - var modal = bootbox.dialog({ - message: html, - title: 'Set Parent Category' - }); + var modal = bootbox.dialog({ + message: html, + title: '[[admin/manage/categories:alert.set-parent-category]]' + }); - modal.find('li[data-cid]').on('click', function () { - var parentCid = $(this).attr('data-cid'), - payload = {}; + modal.find('li[data-cid]').on('click', function () { + var parentCid = $(this).attr('data-cid'), + payload = {}; - payload[ajaxify.data.category.cid] = { - parentCid: parentCid - }; + payload[ajaxify.data.category.cid] = { + parentCid: parentCid + }; - socket.emit('admin.categories.update', payload, function (err) { - if (err) { - return app.alertError(err.message); - } - var parent = categories.filter(function (category) { - return category && parseInt(category.cid, 10) === parseInt(parentCid, 10); - }); - parent = parent[0]; - - modal.modal('hide'); - $('button[data-action="removeParent"]').parent().removeClass('hide'); - $('button[data-action="setParent"]').addClass('hide'); - var buttonHtml = ' ' + parent.name; - $('button[data-action="changeParent"]').html(buttonHtml).parent().removeClass('hide'); + socket.emit('admin.categories.update', payload, function (err) { + if (err) { + return app.alertError(err.message); + } + var parent = categories.filter(function (category) { + return category && parseInt(category.cid, 10) === parseInt(parentCid, 10); }); + parent = parent[0]; + + modal.modal('hide'); + $('button[data-action="removeParent"]').parent().removeClass('hide'); + $('button[data-action="setParent"]').addClass('hide'); + var buttonHtml = ' ' + parent.name; + $('button[data-action="changeParent"]').html(buttonHtml).parent().removeClass('hide'); }); }); }); @@ -329,8 +369,8 @@ define('admin/manage/category', [ Category.addUserToPrivilegeTable = function () { var modal = bootbox.dialog({ - title: 'Find a User', - message: '', + title: '[[admin/manage/categories:alert.find-user]]', + message: '', show: true }); @@ -357,8 +397,8 @@ define('admin/manage/category', [ Category.addGroupToPrivilegeTable = function () { var modal = bootbox.dialog({ - title: 'Find a Group', - message: '', + title: '[[admin/manage/categories:alert.find-group]]', + message: '', show: true }); diff --git a/public/vendor/bootbox/wrapper.js b/public/vendor/bootbox/wrapper.js index bfc9457241..8e54e0e7db 100644 --- a/public/vendor/bootbox/wrapper.js +++ b/public/vendor/bootbox/wrapper.js @@ -30,15 +30,15 @@ require(['translator'], function (shim) { $elem = dialog.call(bootbox, options); - if (/\[\[[a-zA-Z0-9\-_.\/:]+\]\]/.test($elem[0].outerHTML)) { + if (/\[\[.+\]\]/.test($elem[0].outerHTML)) { nodes = descendantTextNodes($elem[0]); text = nodes.map(function (node) { return node.nodeValue; }).join(' || '); translator.translate(text).then(function (translated) { - translated.split(' || ').forEach(function (str, i) { - nodes[i].nodeValue = str; + translated.split(' || ').forEach(function (html, i) { + $(nodes[i]).replaceWith(html); }); if (show) { $elem.modal('show'); diff --git a/src/views/admin/manage/category-analytics.tpl b/src/views/admin/manage/category-analytics.tpl index eb02abd141..a582a3599e 100644 --- a/src/views/admin/manage/category-analytics.tpl +++ b/src/views/admin/manage/category-analytics.tpl @@ -1,6 +1,8 @@ - Back to Categories List + + [[admin/manage/categories:analytics.back]] + -