Merge pull request #427 from appirio-tech/dev

Fix to move js includes to proper spot

Author: ajefts

src/web/WEB-INF/admin/copilot-feedback-admin.jsp

@@ -253,7 +253,7 @@
 
 </div>
 <!-- End #wrapper -->
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/asset/project/batchEditAssets.jsp

@@ -236,7 +236,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../../includes/popups.jsp"/>
-
+<jsp:include page="../../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/asset/project/projectAssetUpload.jsp

@@ -392,7 +392,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/asset/project/projectAssetVersions.jsp

@@ -246,7 +246,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/asset/project/projectAssets.jsp

@@ -1259,7 +1259,7 @@ mind that some features are not implemented yet.  For a full description of what
 <!-- End #wrapper -->
 
 <jsp:include page="../../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/billing/billing_account_contest_fee.jsp

@@ -244,7 +244,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/billing/billing_account_create_fees_list.jsp

@@ -248,7 +248,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/billing/billing_account_list.jsp

@@ -196,7 +196,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/billing/client_invoice.jsp

@@ -139,7 +139,7 @@
 
 <jsp:include page="/WEB-INF/includes/popups.jsp"/>
 
-
+<jsp:include page="/WEB-INF/includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/billing/customer_platform_fee.jsp

@@ -178,7 +178,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/billing/customer_platform_fee_list.jsp

@@ -200,7 +200,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="../includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/calendar.jsp

@@ -137,7 +137,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/contest-details.jsp

@@ -413,7 +413,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/contest-details2.jsp

@@ -196,6 +196,7 @@
   <!-- End .tooltipContainer -->
 </div>
 <jsp:include page="includes/popups.jsp"/>
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/contest-draft-batch-edit.jsp

@@ -154,7 +154,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/contest-receipt.jsp

@@ -1 +1 @@
-<%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %><%--  - Author: Ghost_141, TCSDEVELOPER, duxiaoyang  - Version 1.3  - Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.  -  - Description: This page renders the contest receipt page.  -  - Version 1.1 (TC Direct Contest Dashboard Update Assembly) change Notes:  - 1.Add dashboard header.  -  - Version 1.2 (Release Assembly - TopCoder Cockpit Direct UI Text and Layout Bugs Termination 1.0) change notes:  - - Fix a text inconsistency bug.  - - Remove the container2BottomLeft and container2BottomRight in pagination part.  -  - Version 1.3 (Topcoder - Migrate Struts 2.3 to 2.5 For Direct App)  - - Replace name attribute for s:set with var attribute--%><%@ page contentType="text/html;charset=UTF-8" language="java" %><%@ include file="/WEB-INF/includes/taglibs.jsp" %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head>    <jsp:include page="includes/htmlhead.jsp"/>    <ui:projectPageType tab="gameplan"/>    <ui:contestPageType tab="receipt"/>    <script type="text/javascript">    //<![CDATA[        <s:if test="software">          var paramContestId = ${param.projectId};        </s:if>        <s:else>           var paramContestId = ${param.contestId};        </s:else>    //]]>    </script></head><body id="page"><a name="top" style="width:0px;height:0px;"></a><div id="wrapper">    <div id="wrapperInner">        <div id="container">            <div id="content">                <jsp:include page="includes/header.jsp"/>                <div id="mainContent" class="newSidebarCollapse">                    <jsp:include page="includes/right.jsp"/>                    <div id="area1"><!-- the main area -->                    <div class="area1Content">                    <div class="currentPage">                        <a href="<s:url action="dashboardActive" namespace="/"/>" class="home">Dashboard</a> &gt;                        <a href="<s:url action="currentProjectDetails" namespace="/">                                    <s:param name="formData.projectId" value="sessionData.currentProjectContext.id"/>                                    </s:url>"><s:property value="sessionData.currentProjectContext.name"/></a> &gt;                                    <strong><s:property value="viewData.contestStats.contest.title"/></strong>                    </div>                        <s:if test="viewData.contestStats.isStudio">                            <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_NEW_SERVER_NAME'] + '/challenge-details/' + viewData.contestStats.contest.id + '/?type=design&noncache=true'"/>                        </s:if>                        <s:elseif test="marathon">                            <s:if test="viewData.active">                                <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_SERVER_NAME'] + '/tc?module=MatchDetails&rd=' + viewData.roundId"/>                            </s:if>                            <s:else>                                <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_SERVER_NAME'] + '/tc?module=MatchDetails&rd=' + viewData.roundId"/>                            </s:else>                        </s:elseif>                        <s:else>                            <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_NEW_SERVER_NAME'] +'/challenge-details/' + viewData.contestStats.contest.id + '/?type=develop&noncache=true'"/>                        </s:else>                    <div class="areaHeader">                        <h2 class="title contestTitle" style="background:url('/images/<s:property value="viewData.contest.contestType.letter"/>.png') no-repeat scroll left center transparent">                        <s:property value="viewData.contestStats.contest.title"/>                        <a href="<s:property value='#contestLink'/>" target="_blank" class="button5" style="float:right;text-align:center;">VIEW CHALLENGE</a>                        </h2>                    </div><!-- End .areaHeader -->					<jsp:include page="includes/contest/dashboard.jsp"/>                    <div class="container2 tabs3Container">                        <jsp:include page="includes/contest/tabs.jsp"/>                        <div class="container2Left"><div class="container2Right"><div class="container2Bottom" style="background: url(../../images/container2_bottom.png) repeat-x bottom;">                            <div><div>                            <div class="container2Content">                                <jsp:include page="includes/contest/receiptTab.jsp"/>                            </div><!-- End .container2Content_det -->                            </div></div>                        </div></div></div>                    </div><!-- End .container2 -->                    <a href="#top" class="button1 backToTop"><span>Back To Top</span></a>                    </div>                    </div>                </div>                <!-- End #mainContent -->                <jsp:include page="includes/footer.jsp"/>            </div>            <!-- End #content -->        </div>        <!-- End #container -->    </div></div><!-- End #wrapper --><jsp:include page="includes/popups.jsp"/></body><!-- End #page --></html>
+<%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %><%--  - Author: Ghost_141, TCSDEVELOPER, duxiaoyang  - Version 1.3  - Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.  -  - Description: This page renders the contest receipt page.  -  - Version 1.1 (TC Direct Contest Dashboard Update Assembly) change Notes:  - 1.Add dashboard header.  -  - Version 1.2 (Release Assembly - TopCoder Cockpit Direct UI Text and Layout Bugs Termination 1.0) change notes:  - - Fix a text inconsistency bug.  - - Remove the container2BottomLeft and container2BottomRight in pagination part.  -  - Version 1.3 (Topcoder - Migrate Struts 2.3 to 2.5 For Direct App)  - - Replace name attribute for s:set with var attribute--%><%@ page contentType="text/html;charset=UTF-8" language="java" %><%@ include file="/WEB-INF/includes/taglibs.jsp" %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head>    <jsp:include page="includes/htmlhead.jsp"/>    <ui:projectPageType tab="gameplan"/>    <ui:contestPageType tab="receipt"/>    <script type="text/javascript">    //<![CDATA[        <s:if test="software">          var paramContestId = ${param.projectId};        </s:if>        <s:else>           var paramContestId = ${param.contestId};        </s:else>    //]]>    </script></head><body id="page"><a name="top" style="width:0px;height:0px;"></a><div id="wrapper">    <div id="wrapperInner">        <div id="container">            <div id="content">                <jsp:include page="includes/header.jsp"/>                <div id="mainContent" class="newSidebarCollapse">                    <jsp:include page="includes/right.jsp"/>                    <div id="area1"><!-- the main area -->                    <div class="area1Content">                    <div class="currentPage">                        <a href="<s:url action="dashboardActive" namespace="/"/>" class="home">Dashboard</a> &gt;                        <a href="<s:url action="currentProjectDetails" namespace="/">                                    <s:param name="formData.projectId" value="sessionData.currentProjectContext.id"/>                                    </s:url>"><s:property value="sessionData.currentProjectContext.name"/></a> &gt;                                    <strong><s:property value="viewData.contestStats.contest.title"/></strong>                    </div>                        <s:if test="viewData.contestStats.isStudio">                            <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_NEW_SERVER_NAME'] + '/challenge-details/' + viewData.contestStats.contest.id + '/?type=design&noncache=true'"/>                        </s:if>                        <s:elseif test="marathon">                            <s:if test="viewData.active">                                <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_SERVER_NAME'] + '/tc?module=MatchDetails&rd=' + viewData.roundId"/>                            </s:if>                            <s:else>                                <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_SERVER_NAME'] + '/tc?module=MatchDetails&rd=' + viewData.roundId"/>                            </s:else>                        </s:elseif>                        <s:else>                            <s:set var="contestLink" value="'http://' + #application['SERVER_CONFIG_NEW_SERVER_NAME'] +'/challenge-details/' + viewData.contestStats.contest.id + '/?type=develop&noncache=true'"/>                        </s:else>                    <div class="areaHeader">                        <h2 class="title contestTitle" style="background:url('/images/<s:property value="viewData.contest.contestType.letter"/>.png') no-repeat scroll left center transparent">                        <s:property value="viewData.contestStats.contest.title"/>                        <a href="<s:property value='#contestLink'/>" target="_blank" class="button5" style="float:right;text-align:center;">VIEW CHALLENGE</a>                        </h2>                    </div><!-- End .areaHeader -->					<jsp:include page="includes/contest/dashboard.jsp"/>                    <div class="container2 tabs3Container">                        <jsp:include page="includes/contest/tabs.jsp"/>                        <div class="container2Left"><div class="container2Right"><div class="container2Bottom" style="background: url(../../images/container2_bottom.png) repeat-x bottom;">                            <div><div>                            <div class="container2Content">                                <jsp:include page="includes/contest/receiptTab.jsp"/>                            </div><!-- End .container2Content_det -->                            </div></div>                        </div></div></div>                    </div><!-- End .container2 -->                    <a href="#top" class="button1 backToTop"><span>Back To Top</span></a>                    </div>                    </div>                </div>                <!-- End #mainContent -->                <jsp:include page="includes/footer.jsp"/>            </div>            <!-- End #content -->        </div>        <!-- End #container -->    </div></div><!-- End #wrapper --><jsp:include page="includes/popups.jsp"/><jsp:include page="includes/footerScripts.jsp"/></body><!-- End #page --></html>

src/web/WEB-INF/contest-registrants.jsp

@@ -165,6 +165,8 @@
     <s:hidden name="contestId"/>
     <s:hidden name="projectId"/>
 </s:form>
+
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/contest-view.jsp

@@ -435,7 +435,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/contests-calendar-view.jsp

@@ -96,7 +96,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/copilot-contests-comparison.jsp

@@ -524,7 +524,7 @@
 
 <!-- End .popups -->
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/copilot-contests-details.jsp

@@ -836,6 +836,7 @@
 
 <!-- End .popups -->
 <jsp:include page="includes/popups.jsp"/>
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/copilot-contests-registrants.jsp

@@ -450,6 +450,8 @@
 </div>
 <!-- End .popups -->
 <jsp:include page="includes/popups.jsp"/>
+
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/copilot-contests-submissions.jsp

@@ -842,7 +842,7 @@
     </div>
 
 </div>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/copilot-contests.jsp

@@ -288,6 +288,7 @@
 </div>
 <!-- End .popups -->
 <jsp:include page="includes/popups.jsp"/>
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/copilot-pool.jsp

@@ -269,7 +269,7 @@
         </div></div></div>
     </div>    
 </div>	
-    
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/copilot-receipt.jsp

@@ -120,6 +120,7 @@
 </div>
 <!-- End .popups -->
 <jsp:include page="includes/popups.jsp"/>
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/dashboard-active.jsp

@@ -452,7 +452,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/dashboard-create-new-project.jsp

@@ -172,7 +172,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/dashboard-create-project.jsp

@@ -110,7 +110,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/dashboard-enterprise.jsp

@@ -2177,6 +2177,7 @@
         </div>
         <!-- End .tooltipFooter -->
 </div>
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/dashboard-latest.jsp

@@ -92,7 +92,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/dashboard-search.jsp

@@ -290,7 +290,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/dashboard.jsp

@@ -51,7 +51,7 @@
 <!-- End #wrapper -->
 
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/editCockpitProject.jsp

@@ -670,7 +670,7 @@
 
 <jsp:include page="groups/tooltip.jsp"/>
 <jsp:include page="includes/popups.jsp"/>
-
+<jsp:include page="includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/enterpriseDashboard/active-contests.jsp

@@ -384,6 +384,7 @@
 </div>
 <!-- End #wrapper -->
 
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/enterpriseDashboard/analysis.jsp

@@ -737,7 +737,7 @@
 </div>
 </div>
 <!-- End #wrapper -->
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/enterpriseDashboard/financial.jsp

@@ -241,7 +241,7 @@
          </tbody>
      </table>
 </span>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/enterpriseDashboard/health.jsp

@@ -161,7 +161,7 @@
          </tfoot>
      </table>
 </span>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/enterpriseDashboard/overview.jsp

@@ -438,7 +438,7 @@
     </div>
     <!-- End #wrapper -->
     <jsp:include page="../includes/enterpriseDashboard/filterPopup.jsp"/>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/enterpriseDashboard/pipeline.jsp

@@ -253,7 +253,7 @@
         <a href="#" id="projectPipelineViewHandler"></a>
     </div>
 </div>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/enterpriseDashboard/roadmap.jsp

@@ -309,6 +309,7 @@
         </div>
     </div>
 </span>
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 

src/web/WEB-INF/groups/auditing-info.jsp

@@ -202,7 +202,7 @@
 <div id="modalBackground"></div>
 <div id="new-modal"></div>
 <%@ include file="tooltip.jsp" %>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/groups/create-administrator.jsp

@@ -128,6 +128,7 @@
 	<!-- end #createAdminModal -->
 </div>
 <!-- end modal -->
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/groups/create-group.jsp

@@ -497,7 +497,7 @@
 
 <!-- tooltips -->
 <%@ include file="tooltip.jsp" %>
-
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/groups/send-invitation.jsp

@@ -191,6 +191,7 @@
 	<!-- end #sendInvitationWarnModal -->
 </div>
 <!-- end modal -->
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>

src/web/WEB-INF/groups/view-invitations.jsp

@@ -258,6 +258,7 @@
 		<!-- end .modalFooter -->
 	</div>
 </div>
+<jsp:include page="../includes/footerScripts.jsp"/>
 </body>
 <!-- End #page -->
 </html>