Apply requirecss to platform templates.

vispa/static/js/sites/login.js

-define(["jclass", "vispa/common/url", "jquery"], function(JClass, UrlHandler, $) {
+define([
+  "jclass",
+  "vispa/common/url",
+  "jquery",
+  "css!styles/login.css"
+], function(JClass, UrlHandler, $) {
 
   var Vispa = JClass._extend({
 

vispa/static/js/sites/password.js

-define(["jclass", "vispa/common/url", "vispa/common/dialog", "jquery"],
-       function(JClass, UrlHandler, Dialog, $) {
+define([
+  "jclass",
+  "vispa/common/url",
+  "vispa/common/dialog",
+  "jquery",
+  "css!styles/password.css"
+], function(JClass, UrlHandler, Dialog, $) {
 
   var Vispa = JClass._extend({
 

vispa/static/js/vispa.js

@@ -15,17 +15,17 @@ define([
   "vispa/workspaces",
   "vispa/extensions",
   "vispa/preferences",
-  "vispa/ui"
+  "vispa/ui",
+  "vendor/jquery/plugins/logger/jquery.logger",
+  "vendor/jquery/plugins/hotkeys/jquery.hotkeys",
+  "vendor/jquery/plugins/shortcuts/jquery.shortcuts",
+  "vendor/jquery/plugins/localesorter/jquery.localesorter",
+  "vendor/jquery/plugins/polling/jquery.polling",
+  "vendor/jquery/plugins/lightbox/jquery.lightbox",
+  "vendor/jquery/plugins/ellipsis2/jquery.ellipsis2",
+  "css!styles/index.css"
 ], function($, Emitter, UrlHandler, Socket, Messenger, Ws, Ext, Pref, VispaUI) {
-  // return function(){};
-  /**
-   * .. js:class:: Vispa
-   *
-   *    :param object preferences: TODO
-   *    :param object shortcuts: TODO
-   *    :param object extensionPreferences: TODO
-   *
-   */
+
   var Vispa = Emitter._extend({
 
     init: function init(args) {

vispa/templates/sites/index.mako

@@ -11,30 +11,11 @@
   <meta name="apple-mobile-web-app-status-bar-style" content="black" />
 </%block>
 
-<%block name="css_imports">
-  <%
-    parent.css_imports()
-
-    base.import_css(url.static("css/index.css"))
-  %>
-</%block>
-
 <%block name="js_inline_post">
   <%
     parent.js_inline_post()
   %>
 
-  deps = [
-    "vispa/vispa",
-    "vendor/jquery/plugins/logger/jquery.logger",
-    "vendor/jquery/plugins/hotkeys/jquery.hotkeys",
-    "vendor/jquery/plugins/shortcuts/jquery.shortcuts",
-    "vendor/jquery/plugins/localesorter/jquery.localesorter",
-    "vendor/jquery/plugins/polling/jquery.polling",
-    "vendor/jquery/plugins/lightbox/jquery.lightbox",
-    "vendor/jquery/plugins/ellipsis2/jquery.ellipsis2"
-  ].concat(deps);
-
   // use template variables to create the template data object
   var socketUrl = window.location.protocol == "https:" ? "wss" : "ws";
   socketUrl += "://" + window.location.host + "${url.dynamic('bus/index')}";
@@ -46,7 +27,7 @@
       useFeedback    : ${"true" if use_feedback else "false"},
       workspaceAction: "${workspace_action}",
       url: {
-        dynamicBase: "${base_dynamic}",
+        dynamicBase : "${base_dynamic}",
         staticBase  : "${base_static}"
       },
       socket: {
@@ -73,7 +54,7 @@
     }
   };
 
-  require(deps, function(Vispa) {
+  require(["vispa/vispa"].concat(deps), function(Vispa) {
     window.vispa = new Vispa(templateData);
   });
 </%block>

vispa/templates/sites/login.mako

@@ -6,24 +6,12 @@
 <%inherit file="/vispa.mako" />
 <%namespace name="base" file="/base.mako" />
 
-<%block name="css_imports">
-  <%
-    parent.css_imports()
-
-    base.import_css(url.static("css/login.css"))
-  %>
-</%block>
-
 <%block name="js_inline_post">
   <%
     parent.js_inline_post()
   %>
 
-  deps = [
-    "vispa/sites/login"
-  ].concat(deps);
-
-  require(deps, function(Vispa) {
+  require(["vispa/sites/login"].concat(deps), function(Vispa) {
     // use template variables to create the vispa config
     var vispaConfig = {
       url: {

vispa/templates/sites/password.mako

@@ -6,24 +6,12 @@
 <%inherit file="/vispa.mako" />
 <%namespace name="base" file="/base.mako" />
 
-<%block name="css_imports">
-  <%
-    parent.css_imports()
-
-    base.import_css(url.static("css/password.css"))
-  %>
-</%block>
-
 <%block name="js_inline_post">
   <%
     parent.js_inline_post()
   %>
 
-  deps = [
-    "vispa/sites/password"
-  ].concat(deps);
-
-  require(deps, function(Vispa) {
+  require(["vispa/sites/password"].concat(deps), function(Vispa) {
     // use template variables to create the vispa config
     var vispaConfig = {
       url: {

vispa/templates/vispa.mako

@@ -14,25 +14,6 @@
   <link rel="shortcut icon" href="${url.static('img/ico/favicon.ico')}">
 </%block>
 
-<%block name="css_imports">
-  <%
-    base.import_css(url.static("css/icons.css"));
-
-    vendor_files = [
-      "jquery/plugins/lightbox/jquery.lightbox.css",
-      "bootstrap/css/bootstrap.css",
-      "bootstrap/plugins/select/bootstrap.select.css",
-      "bootstrap/plugins/slider/bootstrap.slider.css",
-      "bootstrap/plugins/fileinput/bootstrap.fileinput.css",
-      "fuelux/css/fuelux.css",
-      "fontawesome/css/font-awesome.css"
-    ]
-
-    for f in vendor_files:
-      base.import_css(url.static("vendor/" + f))
-  %>
-</%block>
-
 <%block name="js_imports_pre">
   <script src="${base_static}/vendor/requirejs/require.js"></script>
 </%block>
@@ -48,7 +29,8 @@
       jquery    : "vendor/jquery/js/jquery",
       bootstrap : "vendor/bootstrap/js/bootstrap",
       ace       : "vendor/ace",
-      extensions: "../extensions"
+      extensions: "../extensions",
+      "styles"  : "css"
     },
     shim: {
       "vendor/jquery/plugins/touchpunch/jquery.touchpunch": ["jquery"],
@@ -80,7 +62,15 @@
     "vendor/jquery/plugins/history/jquery.history",
     "vendor/bootstrap/plugins/select/bootstrap.select",
     "vendor/bootstrap/plugins/slider/bootstrap.slider",
-    "vendor/bootstrap/plugins/fileinput/bootstrap.fileinput"
+    "vendor/bootstrap/plugins/fileinput/bootstrap.fileinput",
+    "css!styles/icons.css",
+    "css!vendor/jquery/plugins/lightbox/jquery.lightbox.css",
+    "css!vendor/bootstrap/css/bootstrap.css",
+    "css!vendor/bootstrap/plugins/select/bootstrap.select.css",
+    "css!vendor/bootstrap/plugins/slider/bootstrap.slider.css",
+    "css!vendor/bootstrap/plugins/fileinput/bootstrap.fileinput.css",
+    "css!vendor/fuelux/css/fuelux.css",
+    "css!vendor/fontawesome/css/font-awesome.css"
   ];
 
   require(["jquery", "vendor/transparency/transparency"], function($, Transparency) {