Permalink
Browse files

Merge branch 'release/2011-07-11'

  • Loading branch information...
2 parents 92b826a + 5f8827f commit 9c3381cf33cf16015d7e8178e05487cdda68f547 @sdball committed Jul 12, 2011
@@ -0,0 +1,5 @@
+class HomepageController < ApplicationController
+ layout 'homepage'
+ def show
+ end
+end
@@ -0,0 +1,2 @@
+module HomepageHelper
+end
@@ -0,0 +1,7 @@
+<footer>
+ <section class="container_12">
+ <div class="grid_12">
+ <%= enki_config[:title] %> &#169; <%= enki_config[:author, :name] %> 2011. Powered by <a href="http://www.enkiblog.com" title="A Ruby on Rails blogging app for the fashionable developer">Enki</a>.
+ </div>
+ </section>
+</footer>
@@ -0,0 +1,8 @@
+<section class="grid_6 suffix_6 homepage logo">
+ <h1>XyzzyB</h1>
+ <ul>
+ <li>
+ <a href="/blog">Blog</a>
+ </li>
+ </ul>
+</section>
@@ -4,21 +4,30 @@
<meta charset="utf-8">
<title><%= html_title yield(:page_title) %></title>
<%= csrf_meta_tag %>
- <link href="//fonts.googleapis.com/css?family=Vollkorn:regular,italic,bold,bolditalic&amp;subset=latin" rel="stylesheet" type="text/css" >
- <link href="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic" rel="stylesheet" type="text/css" >
+ <link href='http://fonts.googleapis.com/css?family=Limelight|Playfair+Display&amp;v2' rel='stylesheet' type='text/css'>
<%= stylesheet_link_tag 'reset', '960', 'text', 'xyzzyb' %>
<%= javascript_include_tag 'jquery' %>
<%= javascript_include_tag 'rails' %>
<%= open_id_delegation_link_tags(enki_config[:open_id_delegation, :server], enki_config[:open_id_delegation, :delegate]) if enki_config[:open_id_delegation] %>
<%= yield(:head) %>
</head>
-<body>
- <div id="page_container" class="container_16">
- <div id="layout" class="grid_10 prefix_3 suffix_3">
- <header>
+<body class="blog">
+
+ <header class="blog">
+ <section class="container_12">
+ <section class="grid_12">
<h1><a href="<%= root_url %>"><%= enki_config[:title] %></a></h1>
- <ul>
- <li><a href="/archives">Archives</a></li>
+ </section>
+ </section>
+ </header>
+
+ <nav class="blog">
+ <div class="container_12 clearfix">
+ <div class="grid_12">
+ <ul class="topmenu">
+ <% page_links_for_navigation.each do |link| -%>
+ <li><%= link_to(link.name, link.url) %></li>
+ <% end -%>
<li>
<form method="get" id="sform" action="http://www.google.com/search">
<label for="q">Search</label>
@@ -27,34 +36,29 @@
</form>
</li>
</ul>
- </header>
- <div id="main">
- <%= yield %>
</div>
</div>
- </div>
- <footer>
- <div class="container_16">
- <nav class="grid_8 prefix_2">
- <h2>Pages</h2>
- <ul>
- <% page_links_for_navigation.each do |link| -%>
- <li><%= link_to(link.name, link.url) %></li>
- <% end -%>
- </ul>
- </nav>
- <nav class="grid_6">
- <h2>Tags</h2>
- <ul>
- <% category_links_for_navigation.each do |link| -%>
- <li><%= link_to(link.name, link.url) %></li>
- <% end -%>
- </ul>
- </nav>
- <div class="grid_14 prefix_2">
+ </nav>
+
+ <section class="container_12">
+ <section class="grid_9">
+ <%= yield %>
+ </section>
+ <section class="grid_3">
+ <h2>Tags</h2>
+ <ul>
+ <% category_links_for_navigation.each do |link| -%>
+ <li><%= link_to(link.name, link.url) %></li>
+ <% end -%>
+ </ul>
+ </section>
+ </section>
+ <footer class="clearfix">
+ <section class="container_12">
+ <section class="grid_12">
<%= enki_config[:title] %> &#169; <%= enki_config[:author, :name] %>. Powered by <a href="http://www.enkiblog.com" title="A Ruby on Rails blogging app for the fashionable developer">Enki</a>.
- </div>
- </div>
+ </section>
+ </section>
</footer>
<script type="text/javascript">
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html dir="ltr" lang="en-US">
+<head>
+ <meta charset="utf-8">
+ <title><%= html_title yield(:page_title) %></title>
+ <%= csrf_meta_tag %>
+ <link href='http://fonts.googleapis.com/css?family=Limelight|Playfair+Display&amp;v2' rel='stylesheet' type='text/css'>
+ <%= stylesheet_link_tag 'reset', '960', 'text', 'xyzzyb' %>
+ <%= javascript_include_tag 'jquery' %>
+ <%= javascript_include_tag 'rails' %>
+ <%= javascript_include_tag 'jquery.lettering-0.6.1.min.js' %>
+ <%= javascript_include_tag 'homepage' %>
+ <%= open_id_delegation_link_tags(enki_config[:open_id_delegation, :server], enki_config[:open_id_delegation, :delegate]) if enki_config[:open_id_delegation] %>
+ <%= yield(:head) %>
+</head>
+<body>
+ <section class="container_12">
+ <%= yield %>
+ </section>
+ <%= render :partial => 'application/footer' %>
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-8937103-1']);
+ _gaq.push(['_setDomainName', '.xyzzyb.com']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
+</body>
+</html>
View
@@ -14,20 +14,22 @@
root :to => 'dashboard#show'
end
+
+ scope "/blog" do
+ resources :archives, :only => [:index]
+ resources :pages, :only => [:show]
- resources :archives, :only => [:index]
- resources :pages, :only => [:show]
-
- constraints :year => /\d{4}/, :month => /\d{2}/, :day => /\d{2}/ do
- post ':year/:month/:day/:slug/comments' => 'comments#index'
- get ':year/:month/:day/:slug/comments/new' => 'comments#new'
- get ':year/:month/:day/:slug' => 'posts#show'
- end
+ constraints :year => /\d{4}/, :month => /\d{2}/, :day => /\d{2}/ do
+ post ':year/:month/:day/:slug/comments' => 'comments#index'
+ get ':year/:month/:day/:slug/comments/new' => 'comments#new'
+ get ':year/:month/:day/:slug' => 'posts#show'
+ end
- scope :to => 'posts#index' do
- get 'posts.:format', :as => :formatted_posts
- get '(:tag)', :as => :posts
+ scope :to => 'posts#index' do
+ get 'posts.:format', :as => :formatted_posts
+ get '(:tag)', :as => :posts
+ end
end
-
- root :to => 'posts#index'
+
+ root :to => 'homepage#show'
end
@@ -0,0 +1,3 @@
+jQuery(document).ready(function($) {
+ $('.homepage.logo h1').lettering();
+});
Oops, something went wrong.
@@ -2,7 +2,6 @@
body
{
color: black;
-
font: normal 12px verdana, arial, helvetica, sans-serif;
line-height: 1.5;
padding: 0px;
Oops, something went wrong.

0 comments on commit 9c3381c

Please sign in to comment.