Extra files removed, js issue fixes

cmsWebApp/webroot/dynamic_content_core.jsp

@@ -2,7 +2,6 @@
 <%@ page extends="oneit.servlets.jsp.FormJSP" %>
 
 <%@ include file="/inc/stdimports50.jsp" %>
-<%@ include file="/extensions/adminportal/inc/stdimports.jsp" %>
 
 <%
     ORMProcessState     process             = (ORMProcessState)(ProcessDecorator.getDefaultProcess(request));

cmsWebApp/webroot/extensions/adminportal/inc/stdimports.jsp

-<%@ page import="performa.orm.* , performa.orm.types.* , performa.orm.search.*, performa.reports.*, performa.utils.*, oneit.security.oauth.orm.*" %>
-<%@ page import="oneit.security.jsp.PasswordDIHandler" %>
-   
+
 <script>
-    $(document).ready(function(){
-	$('select').select2({
-		minimumResultsForSearch: Infinity
-	});
-	$('.navbar-toggle').click(function(){
-		$('.main-menu ul').slideToggle();
-	});
+    $(document).ready(function () {
+        $('select').select2({
+            minimumResultsForSearch: Infinity
+        });
+        $('.navbar-toggle').click(function () {
+            $('.main-menu ul').slideToggle();
+        });
     });
-</script>
\ No newline at end of file
+</script>

cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp

 <%@ page extends="oneit.servlets.jsp.JSPInclude" %>
 <%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
 <%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
-<%@ include file="inc/stdimports.jsp" %>
  
 <oneit:dynIncluded>
     ADMIN-HOME

cmsWebApp/webroot/home.jsp

-<%! protected String getName (ServletConfig config) { return "dynamic_content_form"; } %>
-
-<%@ include file="dynamic_content_core.jsp" %>
\ No newline at end of file

cmsWebApp/webroot/inc/std_imports.jsp

 <%@page import="oneit.servlets.jsp.ui.JQueryVersion"%>
-
+<%@ page import="performa.orm.* , performa.orm.types.*, performa.utils.*"%>
+<%@ page import="oneit.security.oauth.orm.OAuthUserExtension"%>
+         
 <%
     JQueryVersion jqueryVersion = (JQueryVersion) oneit.appservices.config.ConfigMgr.getConfigObject("CONFIG.EXTENSIONS", "JQueryVersion", JQueryVersion.v1_11);
 %>
 
 <oneit:css>
-    <oneit:css href="/css/bootstrap-theme.css" />
-    <oneit:css href="/css/bootstrap-theme.min.css" />
-    <oneit:css href="/css/bootstrap.css" />
     <oneit:css href="/css/bootstrap.min.css" />
+    <oneit:css href="/css/select2.min.css" />
     <oneit:css href="/css/style-admin.css" />
 </oneit:css>
 
 <oneit:script>
-    <oneit:script src="/scripts/bootstrap.js" />
-    <oneit:script src="/scripts/bootstrap.min.js" />
-    <oneit:script src="/scripts/npm.js" />
-    <oneit:script src="/scripts/bootstrap-select.min.js"/>    
     <oneit:script src="/scripts/jquery-1.12.4.min.js"/>
+    <oneit:script src="/scripts/bootstrap.min.js" />
+    <oneit:script src="/scripts/select2.min.js"/>
+    <oneit:script src="/scripts/utils.js" />
+    <oneit:script src="/scripts/recalc.js" />
 </oneit:script>
 
 <script>

cmsWebApp/webroot/scripts/npm.js

-// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
-require('../../js/transition.js')
-require('../../js/alert.js')
-require('../../js/button.js')
-require('../../js/carousel.js')
-require('../../js/collapse.js')
-require('../../js/dropdown.js')
-require('../../js/modal.js')
-require('../../js/tooltip.js')
-require('../../js/popover.js')
-require('../../js/scrollspy.js')
-require('../../js/tab.js')
-require('../../js/affix.js')
\ No newline at end of file