From a54ddb5513871d5a302f85d617a5d8f9fbc1dd7b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 15 Sep 2016 11:30:43 +1200 Subject: [PATCH 1/2] Changed debug.css paths See https://github.com/silverstripe/silverstripe-framework/pull/5918 --- templates/TestSession_end.ss | 4 ++-- templates/TestSession_inprogress.ss | 2 +- templates/TestSession_start.ss | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/TestSession_end.ss b/templates/TestSession_end.ss index 85df4fd..d3c3516 100644 --- a/templates/TestSession_end.ss +++ b/templates/TestSession_end.ss @@ -4,7 +4,7 @@ <% base_tag %> $MetaTags - <% require css('framework/css/debug.css') %> + <% require css('framework/client/dist/styles/debug.css') %> <% require css('testsession/css/styles.css') %> @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/templates/TestSession_inprogress.ss b/templates/TestSession_inprogress.ss index 4c343a7..31d78f1 100644 --- a/templates/TestSession_inprogress.ss +++ b/templates/TestSession_inprogress.ss @@ -4,7 +4,7 @@ <% base_tag %> $MetaTags - <% require css('framework/css/debug.css') %> + <% require css('framework/client/dist/styles/debug.css') %> <% require css('testsession/css/styles.css') %> diff --git a/templates/TestSession_start.ss b/templates/TestSession_start.ss index fde3206..2498c0b 100644 --- a/templates/TestSession_start.ss +++ b/templates/TestSession_start.ss @@ -4,7 +4,7 @@ <% base_tag %> $MetaTags - <% require css('framework/css/debug.css') %> + <% require css('framework/client/dist/styles/debug.css') %> <% require css('testsession/css/styles.css') %> @@ -16,4 +16,4 @@ $StartForm - \ No newline at end of file + From 79552d266746a23efe5a6beaf250c499c6d54884 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 15 Sep 2016 15:16:37 +1200 Subject: [PATCH 2/2] Use CDN jQuery for TestSessionController We shouldn't hotlink to static asset files in other modules since these paths aren't a "public api", and tend to move around. --- code/TestSessionController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/TestSessionController.php b/code/TestSessionController.php index 46fa667..d3770ac 100644 --- a/code/TestSessionController.php +++ b/code/TestSessionController.php @@ -74,7 +74,7 @@ class TestSessionController extends Controller return; } - Requirements::javascript('framework/thirdparty/jquery/jquery.js'); + Requirements::javascript('http://code.jquery.com/jquery-1.7.2.min.js'); Requirements::javascript('testsession/javascript/testsession.js'); }