Permalink
Browse files

- don't use a layout for the public interface

- refactor the layout for the admin interface
- s/photoblogr/Flickr Portfolio/g
  • Loading branch information...
timriley committed Dec 30, 2008
1 parent 757fccc commit d59f7f2c79359a1e0da20b6a89416e2ec3bd93aa
View
2 TODO
@@ -6,3 +6,5 @@
from a sync using the previous tag.
- need to verify that sync order is still correct (it looks like it is oldest first after a recent test)
+
+- max says make it browse flickr sets
@@ -12,4 +12,6 @@ class ApplicationController < ActionController::Base
# Uncomment this to filter the contents of submitted sensitive data parameters
# from your application log (in this case, all fields with names like "password").
# filter_parameter_logging :password
-end
+
+ layout nil
+end
@@ -1,5 +1,5 @@
#header
- %h1 photoblogr admin
+ %h1 Flickr Portfolio Admin
#login.container
@@ -1,15 +1,27 @@
-- content_for(:content) do
- #header
- %h1 photoblogr admin
- - if logged_in?
- %ul#navigation
- / need a different call for a route that is the root for the namespace
- %li= link_to_unless(current_page?(:controller => 'admin/updates') || controller.request.request_uri =~ /\/admin$/, 'photo updates', admin_updates_path)
- %li= link_to_unless_current 'theme', admin_theme_path
- %li= link_to_unless_current 'settings', admin_settings_path
- %li= link_to 'logout', admin_logout_path
-
- #admin.container
- = yield
-
-= render 'layouts/admin_wrapper'
+!!! Strict
+%html
+ %head
+ %meta{'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8'}
+ %title= "Flickr Portfolio - #{@title}"
+ = stylesheet_link_tag 'reset', :media => 'all'
+ = stylesheet_link_tag 'admin', :media => 'all'
+ = yield :stylesheet_includes
+ = javascript_include_tag 'jquery', 'jquery.livequery', :cache => false
+ = yield :javascript_library_includes
+ = javascript_include_tag 'application', :cache => false
+ = yield :javascript_includes
+ = yield :rss_includes
+
+ %body
+ #header
+ %h1 Flickr Portfolio
+ - if logged_in?
+ %ul#navigation
+ / need a different call for a route that is the root for the namespace
+ %li= link_to_unless(current_page?(:controller => 'admin/updates') || controller.request.request_uri =~ /\/admin$/, 'photo updates', admin_updates_path)
+ %li= link_to_unless_current 'theme', admin_theme_path
+ %li= link_to_unless_current 'settings', admin_settings_path
+ %li= link_to 'logout', admin_logout_path
+
+ #admin.container
+ = yield
@@ -1,17 +0,0 @@
-!!! Strict
-%html
- %head
- %meta{'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8'}
- %title= "Photoblogr - #{@title}"
- = stylesheet_link_tag 'reset', :media => 'all'
- = stylesheet_link_tag 'admin', :media => 'all'
- = yield :stylesheet_includes
- = javascript_include_tag 'jquery', 'jquery.livequery', :cache => false
- = yield :javascript_library_includes
- = javascript_include_tag 'application', :cache => false
- = yield :javascript_includes
- = yield :rss_includes
-
- %body
- / this allow the layout to be used by another layout or included directly
- = yield(:content) || yield
@@ -1 +0,0 @@
-= Liquid::Template.parse(Theme.instance.template).render('photo' => @photo)
View
@@ -1,9 +1 @@
-%h1= @photo.title
-
-%img{:src => @photo.medium_source_url}
-
-- if @photo.previous
- %p= link_to 'previous', photo_path(@photo.previous)
-
-- if @photo.next
- %p= link_to 'next', photo_path(@photo.next)
+= Liquid::Template.parse(Theme.instance.template).render('photo' => @photo)
View
@@ -2,7 +2,7 @@
<html>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
- <title>Flickr Portfolio</title>
+ <title>Flickr Portfolio: {{ page }}</title>
</head>
<body>
<h1>{{ photo.title }}</h1>

0 comments on commit d59f7f2

Please sign in to comment.