Update admin and button styles.

hmans · Feb 12, 2012 · 1678651 · 1678651
1 parent 1bc8608
commit 1678651
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/lib/schreihals/helpers.rb b/lib/schreihals/helpers.rb
@@ -21,8 +21,10 @@ def set_page_title(title)
       @page_title = title
     end
 
-    def link_to(title, thing)
-      haml "%a{href: '#{url_for thing}'} #{title}"
+    def link_to(title, thing, link_options = {})
+      link_options.merge(href: url_for(thing))
+      # TODO: use some kind of content_tag helper. HALP!
+      haml "%a{href: '#{link_options[:href]}'} #{title}"
     end
 
     def url_for(thing, options = {})

diff --git a/lib/views/admin/admin.haml b/lib/views/admin/admin.haml
@@ -3,8 +3,9 @@
   %p
     You're logged in as #{session[:user]}.
   %ul.admin
-    %li= link_to "Create new Post", '/admin/new'
-    %li= link_to "Logout", '/logout'
+    %li
+      %a.green.button{href: '/admin/new'} Create new Post
+      %a.red.button{href: '/logout'} Logout
 
   = partial "admin_post_list", posts: @drafts, title: "Drafts"
   = partial "admin_post_list", posts: @posts,  title: "Published Posts"

diff --git a/lib/views/partials/_admin_post_list.haml b/lib/views/partials/_admin_post_list.haml
@@ -3,6 +3,9 @@
   %ul.admin-post-list
     - posts.each do |post|
       %ul.admin
-        %li= link_to "edit", "/admin/edit/#{post.id}"
-        %li= link_to "view", url_for(post)
-        %li= post.title
+        %li
+          %a.button{href: "/admin/edit/#{post.id}"} edit
+        %li
+          %a.button{href: url_for(post)} view
+        %li
+          = post.title
diff --git a/lib/views/schreihals.scss b/lib/views/schreihals.scss
@@ -44,6 +44,7 @@ article.post {
 /* admin post lists */
 ul.admin-post-list {
   max-height: 300px;
+  padding-bottom: 5px;
   overflow: auto;
 }
 
@@ -58,10 +59,6 @@ ul.admin {
     display: inline;
     margin-right: 0.5em;
   }
-
-  a {
-    @include button;
-  }
 }
 
 /* disqus */