Skip to content

Commit

Permalink
Stripping content
Browse files Browse the repository at this point in the history
  • Loading branch information
kilianSweeney committed Feb 3, 2011
1 parent f8fa7d1 commit 624c3bd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions app/controllers/geronimo_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ class GeronimoController < ApplicationController

def everything
@page_name = "Everything"
render :layout => 'g_application'
render 'example_site/everything', :layout => 'g_application'
end


def index
blog = Blog.latest_for_frontpage
@latest_front_page_blogpost = blog ? blog.blogtext : "Nothing to say"
@next_show = Show.next_show
render :layout => false
@next_show = Show.next_show
render 'example_site/index', :layout => false
end

def shows
@page_name = "Shows"
@upcoming_shows = Show.upcoming_shows
@past_shows = Show.past_shows
render :layout => 'g_application'
render 'example_site/shows', :layout => 'g_application'
end

def blogs
@page_name = "Says Things"
@blogs = Blog.order("created_at DESC")
render :layout => 'g_application'
render 'example_site/blogs', :layout => 'g_application'
end
end
2 changes: 1 addition & 1 deletion app/views/layouts/_g_header.html.erb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="BandName"><a href="/" class="BandName">Geronimo!</a></div>
<div><a href="/">Your Band!</a></div>
2 changes: 1 addition & 1 deletion app/views/layouts/_g_stylesheets.html.erb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= stylesheet_link_tag 'geronimo', :media => 'screen' %>
<%= stylesheet_link_tag 'your_band', :media => 'screen' %>
4 changes: 2 additions & 2 deletions app/views/layouts/g_application.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>Geronimo! <%= @page_name %></title>
<title>Your Band! <%= @page_name %></title>
<%= csrf_meta_tag %>
<%= render 'layouts/g_stylesheets' %>
<%= javascript_include_tag :defaults %>
</head>
</head>
<body>
<div class="container">
<div class="PageName"><%= @page_name%></div>
Expand Down

0 comments on commit 624c3bd

Please sign in to comment.