diff --git a/public/src/admin/appearance/customise.js b/public/src/admin/appearance/customise.js index 482dd7fb6d..97dd77290b 100644 --- a/public/src/admin/appearance/customise.js +++ b/public/src/admin/appearance/customise.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, socket */ -define('forum/admin/appearance/customise', ['forum/admin/settings'], function(Settings) { +define('admin/appearance/customise', ['admin/settings'], function(Settings) { var Customise = {}; Customise.init = function() { diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index 75a57e60e5..8fd9208c7e 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, socket */ -define('forum/admin/appearance/skins', function() { +define('admin/appearance/skins', function() { var Skins = {}; Skins.init = function() { diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.js index d61c1061f7..cc1dc09c56 100644 --- a/public/src/admin/appearance/themes.js +++ b/public/src/admin/appearance/themes.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, socket */ -define('forum/admin/appearance/themes', function() { +define('admin/appearance/themes', function() { var Themes = {}; Themes.init = function() { diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 22c178e2e8..974e394ea6 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, socket */ -define('forum/admin/extend/plugins', function() { +define('admin/extend/plugins', function() { var Plugins = { init: function() { var pluginsList = $('.plugins'), diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 393a58df4b..2546258d5c 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, socket */ -define('forum/admin/extend/widgets', function() { +define('admin/extend/widgets', function() { var Widgets = {}; Widgets.init = function() { diff --git a/public/src/admin/footer.js b/public/src/admin/footer.js index 062b7ed7e8..76f1d9dd4d 100644 --- a/public/src/admin/footer.js +++ b/public/src/admin/footer.js @@ -1,7 +1,7 @@ "use strict"; /*global define, app, socket, Hammer, RELATIVE_PATH */ -define('forum/admin/footer', ['forum/admin/settings'], function(Settings) { +define('admin/footer', ['admin/settings'], function(Settings) { var acpIndex; $(document).ready(function() { diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js index 4f9868ac34..f1e9c02267 100644 --- a/public/src/admin/general/dashboard.js +++ b/public/src/admin/general/dashboard.js @@ -1,7 +1,7 @@ "use strict"; /*global define, ajaxify, app, socket, RELATIVE_PATH*/ -define('forum/admin/general/dashboard', ['semver'], function(semver) { +define('admin/general/dashboard', ['semver'], function(semver) { var Admin = {}, intervals = { rooms: false, diff --git a/public/src/admin/general/languages.js b/public/src/admin/general/languages.js index 0d3b4ddf6e..8720f96df2 100644 --- a/public/src/admin/general/languages.js +++ b/public/src/admin/general/languages.js @@ -1,7 +1,7 @@ "use strict"; /*global define*/ -define('forum/admin/general/languages', ['forum/admin/settings'], function(Settings) { +define('admin/general/languages', ['admin/settings'], function(Settings) { $(function() { Settings.prepare(); }); diff --git a/public/src/admin/general/sounds.js b/public/src/admin/general/sounds.js index 63d83789f4..9ec9708df5 100644 --- a/public/src/admin/general/sounds.js +++ b/public/src/admin/general/sounds.js @@ -1,7 +1,7 @@ "use strict"; /* global define, socket */ -define('forum/admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) { +define('admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) { var SoundsAdmin = {}; SoundsAdmin.init = function() { diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index c5d97212ec..91277c9c14 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -1,7 +1,7 @@ "use strict"; /*global define, socket, app, bootbox, templates, ajaxify, RELATIVE_PATH*/ -define('forum/admin/manage/categories', ['uploader', 'forum/admin/iconSelect'], function(uploader, iconSelect) { +define('admin/manage/categories', ['uploader', 'admin/iconSelect'], function(uploader, iconSelect) { var Categories = {}; Categories.init = function() { diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js index fc2e300d74..405b45441c 100644 --- a/public/src/admin/manage/flags.js +++ b/public/src/admin/manage/flags.js @@ -1,7 +1,7 @@ "use strict"; /*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/ -define('forum/admin/manage/flags', ['forum/infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { +define('admin/manage/flags', ['infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { var Flags = {}; Flags.init = function() { diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index b0b5d282c7..7ebf7d01de 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -1,7 +1,7 @@ "use strict"; /*global define, templates, socket, ajaxify, app, bootbox*/ -define('forum/admin/manage/groups', ['forum/admin/iconSelect'], function(iconSelect) { +define('admin/manage/groups', ['admin/iconSelect'], function(iconSelect) { var Groups = {}; Groups.init = function() { diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.js index 97ba2bcd6a..609306a7f7 100644 --- a/public/src/admin/manage/tags.js +++ b/public/src/admin/manage/tags.js @@ -1,7 +1,7 @@ "use strict"; /*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/ -define('forum/admin/manage/tags', ['forum/infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { +define('admin/manage/tags', ['infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { var Tags = {}, timeoutId = 0; diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index 26ccada4d6..72a9344a9d 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -1,6 +1,6 @@ "use strict"; /* global socket, define, templates, bootbox, app, ajaxify, */ -define('forum/admin/manage/users', ['admin/selectable'], function(selectable) { +define('admin/manage/users', ['admin/selectable'], function(selectable) { var Users = {}; Users.init = function() { diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index a2c32f7f7f..3dca037514 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -1,7 +1,7 @@ "use strict"; /*global define, app, socket, ajaxify, RELATIVE_PATH */ -define('forum/admin/settings', ['uploader', 'sounds'], function(uploader, sounds) { +define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) { var Settings = {}; Settings.init = function() { diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 33fa498c81..23d874087b 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -145,7 +145,9 @@ $(document).ready(function() { }; ajaxify.loadScript = function(tpl_url, callback) { - require(['forum/' + tpl_url], function(script) { + var location = !app.inAdmin ? 'forum/' : ''; + + require([location + tpl_url], function(script) { if (script && script.init) { script.init(); } diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index e37bec912d..e125fb190f 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -28,4 +28,4 @@ require(['forum/infinitescroll'], function(infinitescroll) { }); }); -</script +</script> \ No newline at end of file diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl index 2b74899879..e3e91680af 100644 --- a/src/views/admin/appearance/skins.tpl +++ b/src/views/admin/appearance/skins.tpl @@ -25,7 +25,7 @@ <script> var bootswatchListener = function(data) { - require(['forum/admin/appearance/skins'], function(t) { + require(['admin/appearance/skins'], function(t) { t.render(data); }); }; diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl index 19f29fba31..4d23da5313 100644 --- a/src/views/admin/development/logger.tpl +++ b/src/views/admin/development/logger.tpl @@ -45,7 +45,7 @@ <script> - require(['forum/admin/settings'], function(Settings) { + require(['admin/settings'], function(Settings) { Settings.prepare(); }); </script> diff --git a/src/views/admin/footer.tpl b/src/views/admin/footer.tpl index df590eb6f9..03f801603c 100644 --- a/src/views/admin/footer.tpl +++ b/src/views/admin/footer.tpl @@ -48,7 +48,7 @@ </div> <script type="text/javascript"> - require(['forum/admin/footer']); + require(['admin/footer']); </script> </body> diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index ea0484edfe..7f1bada31d 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -37,11 +37,13 @@ waitSeconds: 3, urlArgs: "{cache-buster}", paths: { - 'forum': '../forum', + 'admin': '../admin', 'vendor': '../../vendor', 'buzz': '../../vendor/buzz/buzz.min' } }); + + app.inAdmin = true; </script> <!-- BEGIN scripts --> diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl index 5251b3b124..8e9185ef8d 100644 --- a/src/views/admin/settings/footer.tpl +++ b/src/views/admin/settings/footer.tpl @@ -12,7 +12,7 @@ </div> <script> - require(['forum/admin/settings'], function(Settings) { + require(['admin/settings'], function(Settings) { Settings.prepare(); }); </script> \ No newline at end of file