Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch admin t.js usage to Benchpress

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-08-30 10:50:28 -06:00
parent 60e0f4ced9
commit 5885e37127
12 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/admin/appearance/skins.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/appearance/skins', ['translator'], function (translator) { define('admin/appearance/skins', ['translator', 'benchpress'], function (translator, Benchpress) {
var Skins = {}; var Skins = {};
Skins.init = function () { Skins.init = function () {
@@ -52,7 +52,7 @@ define('admin/appearance/skins', ['translator'], function (translator) {
Skins.render = function (bootswatch) { Skins.render = function (bootswatch) {
var themeContainer = $('#bootstrap_themes'); var themeContainer = $('#bootstrap_themes');
templates.parse('admin/partials/theme_list', { Benchpress.parse('admin/partials/theme_list', {
themes: bootswatch.themes.map(function (theme) { themes: bootswatch.themes.map(function (theme) {
return { return {
type: 'bootswatch', type: 'bootswatch',

4
public/src/admin/appearance/themes.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/appearance/themes', ['translator'], function (translator) { define('admin/appearance/themes', ['translator', 'benchpress'], function (translator, Benchpress) {
var Themes = {}; var Themes = {};
Themes.init = function () { Themes.init = function () {
@@ -73,7 +73,7 @@ define('admin/appearance/themes', ['translator'], function (translator) {
if (!themes.length) { if (!themes.length) {
instListEl.append($('<li/ >').addClass('no-themes').translateHtml('[[admin/appearance/themes:no-themes]]')); instListEl.append($('<li/ >').addClass('no-themes').translateHtml('[[admin/appearance/themes:no-themes]]'));
} else { } else {
templates.parse('admin/partials/theme_list', { Benchpress.parse('admin/partials/theme_list', {
themes: themes, themes: themes,
}, function (html) { }, function (html) {
translator.translate(html, function (html) { translator.translate(html, function (html) {

4
public/src/admin/extend/plugins.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, translator) { define('admin/extend/plugins', ['jqueryui', 'translator', 'benchpress'], function (jqueryui, translator, Benchpress) {
var Plugins = {}; var Plugins = {};
Plugins.init = function () { Plugins.init = function () {
var pluginsList = $('.plugins'); var pluginsList = $('.plugins');
@@ -58,7 +58,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t
} }
if (pluginData.license && pluginData.active !== true) { if (pluginData.license && pluginData.active !== true) {
templates.parse('admin/partials/plugins/license', pluginData, function (html) { Benchpress.parse('admin/partials/plugins/license', pluginData, function (html) {
bootbox.dialog({ bootbox.dialog({
title: '[[admin/extend/plugins:license.title]]', title: '[[admin/extend/plugins:license.title]]',
message: html, message: html,

4
public/src/admin/extend/rewards.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/extend/rewards', ['translator'], function (translator) { define('admin/extend/rewards', ['translator', 'benchpress'], function (translator, Benchpress) {
var rewards = {}; var rewards = {};
@@ -139,7 +139,7 @@ define('admin/extend/rewards', ['translator'], function (translator) {
rewards: available, rewards: available,
}; };
templates.parse('admin/extend/rewards', 'active', data, function (li) { Benchpress.parse('admin/extend/rewards', 'active', data, function (li) {
translator.translate(li, function (li) { translator.translate(li, function (li) {
li = $(li); li = $(li);
ul.append(li); ul.append(li);

4
public/src/admin/general/dashboard.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (semver, Chart, translator) { define('admin/general/dashboard', ['semver', 'Chart', 'translator', 'benchpress'], function (semver, Chart, translator, Benchpress) {
var Admin = {}; var Admin = {};
var intervals = { var intervals = {
rooms: false, rooms: false,
@@ -317,7 +317,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
$('[data-action="updateGraph"][data-units="custom"]').on('click', function () { $('[data-action="updateGraph"][data-units="custom"]').on('click', function () {
var targetEl = $(this); var targetEl = $(this);
templates.parse('admin/partials/pageviews-range-select', {}, function (html) { Benchpress.parse('admin/partials/pageviews-range-select', {}, function (html) {
var modal = bootbox.dialog({ var modal = bootbox.dialog({
title: '[[admin/general/dashboard:page-views-custom]]', title: '[[admin/general/dashboard:page-views-custom]]',
message: html, message: html,

6
public/src/admin/general/navigation.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], function (translator, iconSelect) { define('admin/general/navigation', ['translator', 'iconSelect', 'benchpress', 'jqueryui'], function (translator, iconSelect, Benchpress) {
var navigation = {}; var navigation = {};
var available; var available;
@@ -68,7 +68,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
data.enabled = false; data.enabled = false;
data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1; data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1;
templates.parse('admin/general/navigation', 'navigation', { navigation: [data] }, function (li) { Benchpress.parse('admin/general/navigation', 'navigation', { navigation: [data] }, function (li) {
translator.translate(li, function (li) { translator.translate(li, function (li) {
li = $(translator.unescape(li)); li = $(translator.unescape(li));
el.after(li); el.after(li);
@@ -76,7 +76,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
}); });
}); });
templates.parse('admin/general/navigation', 'enabled', { enabled: [data] }, function (li) { Benchpress.parse('admin/general/navigation', 'enabled', { enabled: [data] }, function (li) {
translator.translate(li, function (li) { translator.translate(li, function (li) {
li = $(translator.unescape(li)); li = $(translator.unescape(li));
$('#enabled').append(li); $('#enabled').append(li);

6
public/src/admin/manage/categories.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator'], function (serialize, translator) { define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator', 'benchpress'], function (serialize, translator, Benchpress) {
var Categories = {}; var Categories = {};
var newCategoryId = -1; var newCategoryId = -1;
var sortables; var sortables;
@@ -45,7 +45,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
return app.alertError(err.message); return app.alertError(err.message);
} }
templates.parse('admin/partials/categories/create', { Benchpress.parse('admin/partials/categories/create', {
categories: categories, categories: categories,
}, function (html) { }, function (html) {
var modal = bootbox.dialog({ var modal = bootbox.dialog({
@@ -185,7 +185,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
} }
function continueRender() { function continueRender() {
templates.parse('admin/partials/categories/category-rows', { Benchpress.parse('admin/partials/categories/category-rows', {
cid: parentId, cid: parentId,
categories: categories, categories: categories,
}, function (html) { }, function (html) {

7
public/src/admin/manage/category.js
View File

@@ -8,7 +8,8 @@ define('admin/manage/category', [
'autocomplete', 'autocomplete',
'translator', 'translator',
'categorySelector', 'categorySelector',
], function (uploader, iconSelect, colorpicker, autocomplete, translator, categorySelector) { 'benchpress',
], function (uploader, iconSelect, colorpicker, autocomplete, translator, categorySelector, Benchpress) {
var Category = {}; var Category = {};
var modified_categories = {}; var modified_categories = {};
@@ -248,7 +249,7 @@ define('admin/manage/category', [
return app.alertError(err.message); return app.alertError(err.message);
} }
templates.parse('admin/partials/categories/privileges', { Benchpress.parse('admin/partials/categories/privileges', {
privileges: privileges, privileges: privileges,
}, function (html) { }, function (html) {
translator.translate(html, function (html) { translator.translate(html, function (html) {
@@ -407,7 +408,7 @@ define('admin/manage/category', [
callback = categories; callback = categories;
categories = ajaxify.data.allCategories; categories = ajaxify.data.allCategories;
} }
templates.parse('admin/partials/categories/select-category', { Benchpress.parse('admin/partials/categories/select-category', {
categories: categories, categories: categories,
}, function (html) { }, function (html) {
translator.translate(html, function (html) { translator.translate(html, function (html) {

5
public/src/admin/manage/group.js
View File

@@ -6,7 +6,8 @@ define('admin/manage/group', [
'iconSelect', 'iconSelect',
'admin/modules/colorpicker', 'admin/modules/colorpicker',
'translator', 'translator',
], function (memberList, iconSelect, colorpicker, translator) { 'benchpress',
], function (memberList, iconSelect, colorpicker, translator, Benchpress) {
var Groups = {}; var Groups = {};
Groups.init = function () { Groups.init = function () {
@@ -103,7 +104,7 @@ define('admin/manage/group', [
'icon:text': userLabel.attr('data-usericon-text'), 'icon:text': userLabel.attr('data-usericon-text'),
}; };
templates.parse('admin/partials/groups/memberlist', 'members', { Benchpress.parse('admin/partials/groups/memberlist', 'members', {
group: { group: {
isOwner: ajaxify.data.group.isOwner, isOwner: ajaxify.data.group.isOwner,
members: [member], members: [member],

4
public/src/admin/manage/groups.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/manage/groups', ['translator'], function (translator) { define('admin/manage/groups', ['translator', 'benchpress'], function (translator, Benchpress) {
var Groups = {}; var Groups = {};
var intervalId = 0; var intervalId = 0;
@@ -94,7 +94,7 @@ define('admin/manage/groups', ['translator'], function (translator) {
return app.alertError(err.message); return app.alertError(err.message);
} }
templates.parse('admin/manage/groups', 'groups', { Benchpress.parse('admin/manage/groups', 'groups', {
groups: groups, groups: groups,
}, function (html) { }, function (html) {
translator.translate(html, function (html) { translator.translate(html, function (html) {

4
public/src/admin/manage/ip-blacklist.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/manage/ip-blacklist', ['Chart'], function (Chart) { define('admin/manage/ip-blacklist', ['Chart', 'benchpress'], function (Chart, Benchpress) {
var Blacklist = {}; var Blacklist = {};
Blacklist.init = function () { Blacklist.init = function () {
@@ -32,7 +32,7 @@ define('admin/manage/ip-blacklist', ['Chart'], function (Chart) {
return app.alertError(err.message); return app.alertError(err.message);
} }
templates.parse('admin/partials/blacklist-validate', data, function (html) { Benchpress.parse('admin/partials/blacklist-validate', data, function (html) {
bootbox.alert(html); bootbox.alert(html);
}); });
}); });

8
public/src/admin/manage/users.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/manage/users', ['translator'], function (translator) { define('admin/manage/users', ['translator', 'benchpress'], function (translator, Benchpress) {
var Users = {}; var Users = {};
Users.init = function () { Users.init = function () {
@@ -81,7 +81,7 @@ define('admin/manage/users', ['translator'], function (translator) {
return false; // specifically to keep the menu open return false; // specifically to keep the menu open
} }
templates.parse('admin/partials/temporary-ban', {}, function (html) { Benchpress.parse('admin/partials/temporary-ban', {}, function (html) {
bootbox.dialog({ bootbox.dialog({
className: 'ban-modal', className: 'ban-modal',
title: '[[user:ban_account]]', title: '[[user:ban_account]]',
@@ -248,7 +248,7 @@ define('admin/manage/users', ['translator'], function (translator) {
function handleUserCreate() { function handleUserCreate() {
$('#createUser').on('click', function () { $('#createUser').on('click', function () {
templates.parse('admin/partials/create_user_modal', {}, function (html) { Benchpress.parse('admin/partials/create_user_modal', {}, function (html) {
bootbox.dialog({ bootbox.dialog({
message: html, message: html,
title: '[[admin/manage/users:alerts.create]]', title: '[[admin/manage/users:alerts.create]]',
@@ -323,7 +323,7 @@ define('admin/manage/users', ['translator'], function (translator) {
return app.alertError(err.message); return app.alertError(err.message);
} }
templates.parse('admin/manage/users', 'users', data, function (html) { Benchpress.parse('admin/manage/users', 'users', data, function (html) {
translator.translate(html, function (html) { translator.translate(html, function (html) {
html = $(html); html = $(html);
$('.users-table tr').not(':first').remove(); $('.users-table tr').not(':first').remove();