tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #41 from open-sausages/webpack 

Webpack compat
This commit is contained in:
Damian Mooyman 2016-09-16 14:18:04 +12:00 committed by GitHub
parent 81d4b73c2a 79552d2667
commit a9223ab1ba
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/TestSessionController.php
View File

@ -74,7 +74,7 @@ class TestSessionController extends Controller
return; 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'); Requirements::javascript('testsession/javascript/testsession.js');
} }

4
templates/TestSession_end.ss
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<% base_tag %> <% base_tag %>
$MetaTags $MetaTags
<% require css('framework/css/debug.css') %> <% require css('framework/client/dist/styles/debug.css') %>
<% require css('testsession/css/styles.css') %> <% require css('testsession/css/styles.css') %>
</head> </head>
<body> <body>
@ -23,4 +23,4 @@
</ul> </ul>
</div> </div>
</body> </body>
</html> </html>

2
templates/TestSession_inprogress.ss
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<% base_tag %> <% base_tag %>
$MetaTags $MetaTags
<% require css('framework/css/debug.css') %> <% require css('framework/client/dist/styles/debug.css') %>
<% require css('testsession/css/styles.css') %> <% require css('testsession/css/styles.css') %>
</head> </head>
<body> <body>

4
templates/TestSession_start.ss
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<% base_tag %> <% base_tag %>
$MetaTags $MetaTags
<% require css('framework/css/debug.css') %> <% require css('framework/client/dist/styles/debug.css') %>
<% require css('testsession/css/styles.css') %> <% require css('testsession/css/styles.css') %>
</head> </head>
<body> <body>
@ -16,4 +16,4 @@
$StartForm $StartForm
</div> </div>
</body> </body>
</html> </html>