Add new footer section. Stub out "about" page. New "sign in" link in …

…the top nav.
aaronpk · Jan 5, 2012 · 3e05a2f · 3e05a2f
1 parent 30ee74e
commit 3e05a2f
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 22 deletions.
diff --git a/controllers/main.rb b/controllers/main.rb
@@ -26,26 +26,15 @@
   end
 end
 
-get '/:username/search' do
-  erb :search
+get '/about/?' do
+  erb :about
 end
 
-post '/:username/search' do 
+get '/:username/search' do
   erb :search
 end
 
-get '/me' do
-  puts "##############"
-  puts session
-  puts @me
-  puts "##############"
-  # begin
-  #   login = @flickr.test.login
-  #   puts "You are authenticated as #{login.username}"
-  #   @username = login.username
-  #   erb :me
-  # rescue FlickRaw::FailedResponse => e
-  #   puts "Authentication Failed : #{e.msg}"
-  #   redirect '/'
-  # end
+post '/:username/search' do
+  #@search_sets = Photoset.all(:user_id => @user.id, )
+  erb :search
 end
diff --git a/public/css/site.css b/public/css/site.css
@@ -6,6 +6,21 @@ body {
   margin-bottom: 10px;
 }
 
+.footer {
+  background-color: #EEE;
+  padding: 30px 0;
+  text-shadow: 0 1px 0 white;
+  border-top: 1px solid #E5E5E5;
+}
+.footer .container {
+  color: #777;
+  font-size: 9pt;
+}
+.footer a {
+  text-decoration: underline;
+  color: #666;
+}
+
 /**
  * Sidebar
  */

diff --git a/views/about.erb b/views/about.erb
@@ -0,0 +1,12 @@
+<div class="container">
+
+  <section id="home" style="margin-top: 30px;">
+    <div class="hero-unit" style="text-align: center;">
+      <h2>Flickr Archivr</h2>
+      <p>Back up your entire Flickr photostream!</p>
+    </div>
+  </section>
+
+  <p></p>
+
+</div><!-- container -->
diff --git a/views/layout.erb b/views/layout.erb
@@ -67,7 +67,7 @@
                 </ul>
               </li>
             </ul>
-          <% end %>
+          <% end #if looking at a user's photos %>
 
           <% if @me %>
             <ul class="nav secondary-nav pull-right">
@@ -77,12 +77,17 @@
                   <li><a href="/<%= @me.username %>">Photos</a></li>
                   <li><a href="/<%= @me.username %>/sets">Sets</a></li>
                   <li><a href="/<%= @me.username %>/tags">Tags</a></li>
+                  <li><a href="/<%= @me.username %>/people">People</a></li>
                   <li class="divider"></li>
                   <li><a href="/auth/signout">Sign Out</a></li>
                 </ul>
               </li>
             </ul>
-          <% end %>
+          <% else %>
+            <ul class="nav secondary-nav pull-right">
+              <li><a href="/auth/flickr">Sign In</a></li>
+            </ul>
+          <% end #if logged in %>
 
           <% if @user %>
             <form class="pull-right" action="/<%= @user.username %>/search" method="post">
@@ -96,9 +101,17 @@
 
       <%= yield %>
 
-    <div style="font-size: 9pt; color: #ccc; text-align: center; margin-top: 40px;">
-      made by <a style="color: #ccc; text-decoration: underline;" href="http://aaronparecki.com/">aaronpk</a>
-    </div>
+    <footer class="footer">
+      <div class="container">
+        <p class="pull-right">
+          <a href="/about">About this site</a>
+        </p>
+        <p>
+          Built by <a href="http://aaronparecki.com/Flickr_Archiver">aaronpk</a>.<br />
+          <a href="https://github.com/aaronpk/Flickr-Archivr">Source code</a> licensed under the GPLv2 license.
+        </p>
+      </div>
+    </footer>
 
     <script src="/js/libs/bootstrap-dropdown.js" type="text/javascript"></script>
     <script src="/js/site.js" type="text/javascript"></script>