Restore the admin interface JS

RequireJS was not being loaded/configured correctly for the admin interface because it is not in the framework

plugins/unl_theme/start.php

@@ -51,10 +51,11 @@ function unl_theme_init() {
         // 'src' => "{$bower}fuelux/dist/js/fuelux.js",
     // ));
 
+    if (elgg_get_context() != "admin") {
         /**
          * Elgg has its own requireJS, and expects a different baseURL than the UNL framework. Reset back to the framework.
+         * Only do this for the main interface, the admin interface requires requirejs.
          */
-    
         $base_url = elgg_get_site_url();
 
         //Add paths stuff to the requirejs config
@@ -65,16 +66,10 @@ function unl_theme_init() {
         _elgg_services()->amdConfig->addPath('bootstrap', $base_url.'mod/unl_theme/vendors/bower_components/bootstrap/dist/js/bootstrap');
         _elgg_services()->amdConfig->addPath('moment', $base_url.'mod/unl_theme/vendors/bower_components/moment/moment');
         
-
-
-    //Reset the base_url
-    //_elgg_services()->amdConfig->setBaseUrl('//unlcms.unl.edu/wdn/templates_4.1/scripts/compressed/');
-
         //Tell elgg not to load its own version of require
         elgg_unregister_js('require');
         elgg_unregister_js('jquery-ui');
         
-    if (elgg_get_context() != "admin") {
         //elgg_load_js("agency");
         elgg_load_js('respond');
         elgg_load_js("bootstrap");

plugins/unl_theme/views/default/elgg/require_config.js.php

@@ -9,10 +9,16 @@ unset($amdConfig['deps']);
 ?>
 // <script>
 
+var elgg_require_config = <?php echo json_encode($amdConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); ?>;
+<?php unset($amdConfig['baseUrl']); ?>
+var unl_require_config = <?php echo json_encode($amdConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); ?>;
+
 //load jquery-ui ourselves from the framework and override the global $ variable.
+if (typeof WDN !== 'undefined') {
     require(['jquery', 'jqueryui'], function($) {
         window.$ = $;
     });
+
     <?php
     /**
      * Elgg ships with is own baseUrl, which conflicts with the framework baseUrl.
@@ -20,12 +26,12 @@ require(['jquery', 'jqueryui'], function($) {
      * 1) remove Elgg's base url (in favor of the framework's)
      * 2) define absolute paths to elgg's modules (see start.php)
      */
-unset($amdConfig['baseUrl']);
-?>
    
-//Merge the framework require config with elgg's require config (prefer UNL's settings)
-require.config(<?php echo json_encode($amdConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); ?>);
+    ?>
+    require.config(unl_require_config);
+} else {
+    require = elgg_require_config;
+}
 
-<?php
 // Note we don't process the require() queue yet because it may require('elgg')
 // and we have to load that synchronously a little later