From 8d149cb2ee82f7c96091d33e1c0667b525d67f55 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 29 Sep 2014 11:27:04 -0400 Subject: [PATCH] moved admin related partials from vanilla into core --- public/src/forum/admin/appearance/skins.js | 2 +- public/src/forum/admin/appearance/themes.js | 2 +- public/src/forum/admin/manage/categories.js | 4 +- src/views/admin/manage/categories.tpl | 8 ++-- src/views/admin/manage/groups.tpl | 2 +- .../admin/partials/categories/groups.tpl | 16 ++++++++ src/views/admin/partials/categories/new.tpl | 41 +++++++++++++++++++ .../admin/partials/categories/permissions.tpl | 32 +++++++++++++++ .../admin/partials/categories/setParent.tpl | 16 ++++++++ src/views/admin/partials/categories/users.tpl | 18 ++++++++ src/views/admin/partials/fontawesome.tpl | 1 + src/views/admin/partials/theme_list.tpl | 18 ++++++++ 12 files changed, 151 insertions(+), 9 deletions(-) create mode 100644 src/views/admin/partials/categories/groups.tpl create mode 100644 src/views/admin/partials/categories/new.tpl create mode 100644 src/views/admin/partials/categories/permissions.tpl create mode 100644 src/views/admin/partials/categories/setParent.tpl create mode 100644 src/views/admin/partials/categories/users.tpl create mode 100644 src/views/admin/partials/fontawesome.tpl create mode 100644 src/views/admin/partials/theme_list.tpl diff --git a/public/src/forum/admin/appearance/skins.js b/public/src/forum/admin/appearance/skins.js index 4353acb2a8..75a57e60e5 100644 --- a/public/src/forum/admin/appearance/skins.js +++ b/public/src/forum/admin/appearance/skins.js @@ -47,7 +47,7 @@ define('forum/admin/appearance/skins', function() { Skins.render = function(bootswatch) { var themeContainer = $('#bootstrap_themes'); - templates.parse('partials/admin/theme_list', { + templates.parse('admin/partials/theme_list', { themes: bootswatch.themes.map(function(theme) { return { type: 'bootswatch', diff --git a/public/src/forum/admin/appearance/themes.js b/public/src/forum/admin/appearance/themes.js index 68f4c2ff65..d61c1061f7 100644 --- a/public/src/forum/admin/appearance/themes.js +++ b/public/src/forum/admin/appearance/themes.js @@ -74,7 +74,7 @@ define('forum/admin/appearance/themes', function() { instListEl.append($('
  • ').addClass('no-themes').html('No installed themes found')); return; } else { - templates.parse('partials/admin/theme_list', { + templates.parse('admin/partials/theme_list', { themes: themes }, function(html) { instListEl.html(html); diff --git a/public/src/forum/admin/manage/categories.js b/public/src/forum/admin/manage/categories.js index 7f6e7fce5c..b613f396fc 100644 --- a/public/src/forum/admin/manage/categories.js +++ b/public/src/forum/admin/manage/categories.js @@ -293,7 +293,7 @@ define('forum/admin/manage/categories', ['uploader', 'forum/admin/iconSelect'], return app.alertError(err.message); } - templates.parse('partials/admin/categories/users', { + templates.parse('admin/partials/categories/users', { users: results }, function(html) { resultsEl.html(html); @@ -336,7 +336,7 @@ define('forum/admin/manage/categories', ['uploader', 'forum/admin/iconSelect'], return app.alertError(err.message); } - templates.parse('partials/admin/categories/groups', { + templates.parse('admin/partials/categories/groups', { groups: results }, function(html) { groupsResultsEl.html(html); diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index a1a6ca960a..2a09128266 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -134,14 +134,14 @@ - - - + + + diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index 5b38e1e3a0..05d0baa554 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -124,7 +124,7 @@
    - +
    diff --git a/src/views/admin/partials/categories/groups.tpl b/src/views/admin/partials/categories/groups.tpl new file mode 100644 index 0000000000..8121d2f1f7 --- /dev/null +++ b/src/views/admin/partials/categories/groups.tpl @@ -0,0 +1,16 @@ + +
  • +
    + + +
    + {groups.name} +
    • + \ No newline at end of file diff --git a/src/views/admin/partials/categories/new.tpl b/src/views/admin/partials/categories/new.tpl new file mode 100644 index 0000000000..e45d87f3bf --- /dev/null +++ b/src/views/admin/partials/categories/new.tpl @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/src/views/admin/partials/categories/permissions.tpl b/src/views/admin/partials/categories/permissions.tpl new file mode 100644 index 0000000000..a8077e2aa4 --- /dev/null +++ b/src/views/admin/partials/categories/permissions.tpl @@ -0,0 +1,32 @@ + \ No newline at end of file diff --git a/src/views/admin/partials/categories/setParent.tpl b/src/views/admin/partials/categories/setParent.tpl new file mode 100644 index 0000000000..805ff97b8f --- /dev/null +++ b/src/views/admin/partials/categories/setParent.tpl @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/src/views/admin/partials/categories/users.tpl b/src/views/admin/partials/categories/users.tpl new file mode 100644 index 0000000000..40991fcf3a --- /dev/null +++ b/src/views/admin/partials/categories/users.tpl @@ -0,0 +1,18 @@ + +
  • +
    + + +
    + {users.username} +
    • + \ No newline at end of file diff --git a/src/views/admin/partials/fontawesome.tpl b/src/views/admin/partials/fontawesome.tpl new file mode 100644 index 0000000000..e534d6cb4f --- /dev/null +++ b/src/views/admin/partials/fontawesome.tpl @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/admin/partials/theme_list.tpl b/src/views/admin/partials/theme_list.tpl new file mode 100644 index 0000000000..e328ec5d59 --- /dev/null +++ b/src/views/admin/partials/theme_list.tpl @@ -0,0 +1,18 @@ + +
  • data-css="{themes.css}"> + +
    +
    + +
    +

    {themes.name}

    +

    + {themes.description} + + (Homepage) + +

    +
    +
    +
    • + \ No newline at end of file