danbarber/danbarberphoto
1
0
Fork 0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00
Code Issues Releases Wiki Activity

Refactor views to make more sense.

Browse Source
This commit is contained in:
Dan Barber 2013-05-30 19:11:13 +01:00
parent e143f120ab
commit 3b44ea18ff
5 changed files with 91 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/views/categories/index.html.erb
View File

@ -1,36 +1,31 @@
<div class="sg-5 page-links"> <% content_for :navigation do %>
<% if @categories.previous_page -%> <div class="sg-5 page-links">
<%= link_to raw('<div>&larr;</div>'), { :page => @categories.previous_page }, :class => 'prev-link' %> <% if @categories.previous_page -%>
<% end %> <%= link_to raw('<div>&larr;</div>'), { :page => @categories.previous_page }, :class => 'prev-link' %>
</div> <% end %>
<div class="sg-5 page-links"> </div>
<% if @categories.next_page -%> <div class="sg-5 page-links">
<%= link_to raw('<div>&rarr;</div>'), { :page => @categories.next_page }, :class => 'next-link' %> <% if @categories.next_page -%>
<% end %> <%= link_to raw('<div>&rarr;</div>'), { :page => @categories.next_page }, :class => 'next-link' %>
</div> <% end %>
</div> </div>
<% end %>
<% @num_blank = 4 - @categories.length -%> <% @num_blank = 4 - @categories.length -%>
<div class="sg-24 sgParent"> <% @photos.each do |photo| %>
<div class="sg-11 photo" style="background: url('<%= photo.photo.url(:size11) %>')">
<%= link_to_photo photo %>
</div>
<% end %>
<% @photos.each do |photo| %> <% @categories.each do |category| %>
<div class="category sg-5" style="background: <%= category.base_colour %>">
<%= link_to raw('<h3>'+h(category.name.downcase)+'</h3>'), category_photos_path(category) %>
</div>
<% end %>
<div class="sg-11 photo" style="background: url('<%= photo.photo.url(:size11) %>')"> <% @num_blank.times do %>
<%= link_to_photo photo %> <div class="sg-5 photo blank-photo">
</div> </div>
<% end %>
<% end %>
<% @categories.each do |category| %>
<div class="category sg-5" style="background: <%= category.base_colour %>">
<%= link_to raw('<h3>'+h(category.name.downcase)+'</h3>'), category_photos_path(category) %>
</div>
<% end %>
<% @num_blank.times do %>
<div class="sg-5 photo blank-photo">
</div>
<% end %>
</div>

15
app/views/home/index.html.erb
View File

@ -1,10 +1,11 @@
<div class="sg-5 about"> <% content_for :navigation do %>
<%= link_to raw('<span>about</span>'), page_path(:about) %> <div class="sg-5 about">
</div> <%= link_to raw('<span>about</span>'), page_path(:about) %>
<div class="sg-5 portfolio"> </div>
<%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %> <div class="sg-5 portfolio">
</div> <%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %>
</div> </div>
<% end %>
<% if @photo %> <% if @photo %>
<div class="sg-17 photo" style="background: url('<%= @photo.photo.url(:size17) %>')"> <div class="sg-17 photo" style="background: url('<%= @photo.photo.url(:size17) %>')">

5
app/views/layouts/application.html.erb
View File

@ -21,17 +21,18 @@
<div id="container"> <div id="container">
<div class="sgParent sg-12"> <div class="sgParent sg-12">
<header class="sg-11"> <header class="sg-11">
<%= link_to image_tag('/assets/title.png', :alt => 'Dan Barber Photography', :width => 236), '/' %> <%= link_to image_tag('/assets/title.png', :alt => 'Dan Barber Photography', :width => 236), '/' %>
</header> </header>
<%= yield :navigation %>
</div>
<div class="sg-24 sgParent">
<%= yield %> <%= yield %>
<footer class="sg-35"> <footer class="sg-35">
&copy;2013 Dan Barber &copy;2013 Dan Barber
</footer> </footer>
</div> </div>
</div> </div>

49
app/views/pages/show.html.erb
View File

@ -1,29 +1,26 @@
<div class="sg-5 about"> <% content_for :navigation do %>
</div> <div class="sg-5 about">
<div class="sg-5 portfolio"> </div>
<%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %> <div class="sg-5 portfolio">
</div> <%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %>
</div>
<% end %>
<div class="sg-11 about-content">
<div>
<%= raw(@page.content.to_html) %>
</div>
</div> </div>
<div class="sg-24 sgParent"> <div class="sg-11" style="background: url(/assets/me.jpg);">
</div>
<div class="sg-11 about-content">
<div> <div class="sg-5" style="background: #222;">
<%= raw(@page.content.to_html) %> </div>
</div> <div class="sg-5" style="background: #333;">
</div> </div>
<div class="sg-5" style="background: #555;">
<div class="sg-11" style="background: url(/assets/me.jpg);"> </div>
</div> <div class="sg-5 contact">
<%= link_to raw('<span>contact</span>'), new_contact_path %>
<div class="sg-5" style="background: #222;">
</div>
<div class="sg-5" style="background: #333;">
</div>
<div class="sg-5" style="background: #555;">
</div>
<div class="sg-5 contact">
<%= link_to raw('<span>contact</span>'), new_contact_path %>
</div>
</div> </div>

67
app/views/photos/index.html.erb
View File

@ -1,40 +1,35 @@
<div class="sg-5 page-links"> <% content_for :navigation do %>
<% if @photos.previous_page -%> <div class="sg-5 page-links">
<%= link_to raw('<div>&larr;</div>'), { :page => @photos.previous_page }, :class => 'prev-link' %> <% if @photos.previous_page -%>
<% end %> <%= link_to raw('<div>&larr;</div>'), { :page => @photos.previous_page }, :class => 'prev-link' %>
</div> <% end %>
<div class="sg-5 page-links"> </div>
<% if @photos.next_page -%> <div class="sg-5 page-links">
<%= link_to raw('<div>&rarr;</div>'), { :page => @photos.next_page }, :class => 'next-link' %> <% if @photos.next_page -%>
<% end %> <%= link_to raw('<div>&rarr;</div>'), { :page => @photos.next_page }, :class => 'next-link' %>
</div> <% end %>
</div> </div>
<% end %>
<div class="sg-24 sgParent"> <% if @category %>
<div class="sg-5 category" style="background: <%= @category.base_colour %>">
<%= link_to raw('<h3>'+h(@category.name.downcase)+'</h3><div class="arrow">&uarr;</div>'), categories_path %>
</div>
<% else %>
<div class="sg-5 category" style="background: #333;">
<h3>all photos</h3>
</div>
<% end %>
<% if @category %> <% @num_blank = 11 - @photos.length -%>
<div class="sg-5 category" style="background: <%= @category.base_colour %>">
<%= link_to raw('<h3>'+h(@category.name.downcase)+'</h3><div class="arrow">&uarr;</div>'), categories_path %>
</div>
<% else %>
<div class="sg-5 category" style="background: #333;">
<h3>all photos</h3>
</div>
<% end %>
<% @num_blank = 11 - @photos.length -%> <% @photos.each do |photo| %>
<div class="sg-5 photo" style="background: url('<%= photo.photo.url(:size5) %>')">
<%= link_to_photo photo %>
</div>
<% end %>
<% @photos.each do |photo| %> <% @num_blank.times do %>
<div class="sg-5 photo blank-photo">
<div class="sg-5 photo" style="background: url('<%= photo.photo.url(:size5) %>')"> </div>
<%= link_to_photo photo %> <% end %>
</div>
<% end %>
<% @num_blank.times do %>
<div class="sg-5 photo blank-photo">
</div>
<% end %>
</div>