fixed ACP from previous commit

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() {		

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() {

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() {

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'),

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() {		

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() {

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,

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();
 	});

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() {

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() {

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() {

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() {

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;
 

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() {

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() {

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();
 				}

src/views/admin/advanced/events.tpl

@@ -28,4 +28,4 @@ require(['forum/infinitescroll'], function(infinitescroll) {
 	});
 });
 
-</script
+</script>

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);
 		});
 	};

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>

src/views/admin/footer.tpl

@@ -48,7 +48,7 @@
 	</div>
 
 <script type="text/javascript">
-	require(['forum/admin/footer']);
+	require(['admin/footer']);
 </script>
 
 </body>

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 -->

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>