API Use themedCSS and update javascript to new theme paths. Rename in…

…staller-name
silverstripe · Oct 31, 2017 · 3a3a831 · 3a3a831
1 parent 313b45c
commit 3a3a831
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     }
   ],
   "extra": {
-    "installer-name": "starter_watea",
+    "installer-name": "watea",
     "branch-alias": {
       "dev-master": "2.x-dev"
     }

diff --git a/templates/Page.ss b/templates/Page.ss
@@ -8,7 +8,7 @@
         <% if $RSSLink %>
         <link rel='alternate' type='application/rss+xml' title='RSS' href='$RSSLink'>
         <% end_if %>
-        <link rel="stylesheet" href="$ThemeDir(watea)/dist/css/main.css">
+        <% require themedCss('dist/css/main.css') %>
         <% include Favicon %>
     </head>
     <body class="$ClassName">
@@ -23,9 +23,9 @@
         <footer class="footer-site">
             <% include Footer %>
         </footer>
-        <% require javascript('framework/thirdparty/jquery/jquery.js') %>
-        <script src="{$ThemeDir}/dist/js/main.js"></script>
-        <script src="$ThemeDir(watea)/dist/js/main.js"></script>
+        <% require javascript('//code.jquery.com/jquery-1.7.2.min.js') %>
+        <% require javascript('themes/starter/dist/js/main.js') %>
+        <% require javascript('themes/watea/dist/js/main.js') %>
         <% if $SiteConfig.GACode %>
             <script>
                 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){