remove rails cruft and basic setup of js assets

cdmwebs · May 22, 2011 · 2259328 · 2259328
1 parent d94db4a
commit 2259328
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 256 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -0,0 +1,2 @@
+$ ->
+  alert 'woop!'
diff --git a/app/controllers/cameras_controller.rb b/app/controllers/cameras_controller.rb
@@ -1,5 +1,5 @@
 class CamerasController < ApplicationController
-  respond_to :json
+  respond_to :json, :html
 
   def index
     @cameras = Camera.all

diff --git a/app/views/cameras/index.html.erb b/app/views/cameras/index.html.erb
@@ -0,0 +1 @@
+<h1>Hi</h1>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,12 +3,10 @@
 <head>
   <title>Artimis</title>
   <%= stylesheet_link_tag    "application" %>
-  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-
-<%= yield %>
-
+  <%= yield %>
+  <%= javascript_include_tag '/assets/vendor.js', '/assets/application.js' %>
 </body>
 </html>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,4 @@
-ArtimisRails::Application.routes.draw do
+Artimis::Application.routes.draw do
   scope '/api' do
     scope '/v1' do
       resources :cameras

diff --git a/public/index.html b/public/index.html
diff --git a/public/javascripts/application.js b/public/javascripts/application.js