Merge server and rails_3_1

app/views/admin/purchases/index.html.erb

@@ -0,0 +1,10 @@
+<% @purchases.each do |purchase| %>
+	<%= purchase.title %> |
+	<%= purchase.intro %> |
+	<%= purchase.author %> |
+	<% if purchase.downloaded %>
+		Downloaded
+	<% else %>	
+		<%= link_to 'Download', download_admin_purchase_path(purchase) %>
+	<% end %>
+<% end %>

app/views/layouts/admin.html.erb

@@ -51,12 +51,6 @@
       <p>Rulingcom</p>
   </div>
 </div>
-
-<%= javascript_include_tag "jquery",
-                           "jquery-ui",
-                           "rails",
-                           "easy",
-                           "application", :cache => 'all' %>
 <%= yield :page_specific_javascript %>
 </body>
 </html>

app/views/layouts/application.html.erb

@@ -5,12 +5,8 @@
   <title>R4</title>
   <link rel="shortcut icon" href="/favicon.ico">
   <%= yield :page_specific_link %>
-  <%= stylesheet_link_tag "easy", "main", "devise", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "easyprint", :media => "print" %>
-  <!--[if IE]>
-    <%= stylesheet_link_tag "ie", :media => "screen, projection" %>
-  <![endif]-->
-  <%= yield :page_specific_css %>
+  <%= stylesheet_link_tag "application" %>
+  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>
 </head>
 <body>
@@ -36,12 +32,6 @@
       <p>Rulingcom</p>
   </div>
 </div>
-
-<%#= javascript_include_tag "jquery",
-                           "jquery-ui",
-                           "rails",
-                           "easy",
-                           "application", :cache => 'all' %>
 <%= yield :page_specific_javascript %>
 </body>
 </html>

app/views/layouts/panel.html.erb

@@ -5,13 +5,8 @@
   <title>R4</title>
   <link rel="shortcut icon" href="/favicon.ico">
   <%= yield :page_specific_link %>
-  <%= stylesheet_link_tag "rulingcom/easy", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "rulingcom/easyprint", :media => "print" %>
-  <%= stylesheet_link_tag "application", :media => "screen, projection" %>
-  <!--[if IE]>
-    <%= stylesheet_link_tag "ie", :media => "screen, projection" %>
-  <![endif]-->
-  <%= yield :page_specific_css %>
+  <%= stylesheet_link_tag "application" %>
+  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>
 </head>
 <body>
@@ -46,12 +41,6 @@
       <p>Rulingcom</p>
   </div>
 </div>
-
-<%= javascript_include_tag "jquery",
-                           "jquery-ui",
-                           "rails",
-                           "easy",
-                           "application", :cache => 'all' %>
 <%= yield :page_specific_javascript %>
 </body>
 </html>

app/views/sites/index.html.erb

@@ -1 +1,7 @@
-<%= @title %>
+<% if @site && @site.registered? %>
+	registered
+<% else %>
+	<%= link_to 'register', 'http://localhost:3001/user/sites/register?' + 
+			{:site => {:school => @site.school, :department => @site.department}}.to_query,
+			:target => '_blank' %>
+<% end %>