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

Re-indent and remove redundant views.

Browse Source
This commit is contained in:
Dan Barber 2013-02-02 17:02:15 +00:00
parent 2d4004764e
commit 235b341f5a
12 changed files with 161 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/views/categories/edit.html.erb
View File

@ -1,28 +0,0 @@
<h1>Editing category</h1>
<% form_for(@category) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :name %><br />
<%= f.text_field :name %>
</p>
<p>
<%= f.label :description %><br />
<%= f.text_area :description %>
</p>
<p>
<%= f.label :photo_id %><br />
<%= f.text_field :photo_id %>
</p>
<p>
<%= f.label :base_colour %><br />
<%= f.text_field :base_colour %>
</p>
<p>
<%= f.submit 'Update' %>
</p>
<% end %>
<%= link_to 'Show', @category %> |
<%= link_to 'Back', categories_path %>

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

@ -1,36 +1,36 @@
<div class="sg-5 page-links">
<div class="sg-5 page-links">
<% if @categories.previous_page -%>
<%= link_to raw('<div>&larr;</div>'), { :page => @categories.previous_page }, :class => 'prev-link' %>
<% end %>
</div>
<div class="sg-5 page-links">
</div>
<div class="sg-5 page-links">
<% if @categories.next_page -%>
<%= link_to raw('<div>&rarr;</div>'), { :page => @categories.next_page }, :class => 'next-link' %>
<% end %>
</div>
</div>
</div>
<% @num_blank = 4 - @categories.count -%>
<div class="sg-24 sgParent">
<% @photos.each do |photo| %>
<% @photos.each do |photo| %>
<div class="sg-11 photo" style="background: url('<%= photo.photo.url(:size11) %>')">
<%= link_to_photo photo %>
</div>
<% end %>
<% end %>
<% @categories.each do |category| %>
<% @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 %>
<% end %>
<% @num_blank.times do %>
<% @num_blank.times do %>
<div class="sg-5 photo blank-photo">
</div>
<% end %>
<% end %>
</div>

27
app/views/categories/new.html.erb
View File

@ -1,27 +0,0 @@
<h1>New category</h1>
<% form_for(@category) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :name %><br />
<%= f.text_field :name %>
</p>
<p>
<%= f.label :description %><br />
<%= f.text_area :description %>
</p>
<p>
<%= f.label :photo_id %><br />
<%= f.text_field :photo_id %>
</p>
<p>
<%= f.label :base_colour %><br />
<%= f.text_field :base_colour %>
</p>
<p>
<%= f.submit 'Create' %>
</p>
<% end %>
<%= link_to 'Back', categories_path %>

18
app/views/categories/show.html.erb
View File

@ -1,18 +0,0 @@
<p>
<b>Name:</b>
<%=h @category.name %>
</p>
<p>
<b>Description:</b>
<%=h @category.description %>
</p>
<p>
<b>Photo:</b>
<%=h @category.photo_id %>
</p>
<%= link_to 'Edit', edit_category_path(@category) %> |
<%= link_to 'Back', categories_path %>

8
app/views/contacts/index.html.erb
View File

@ -1,9 +1,9 @@
<div class="sg-5 about">
<div class="sg-5 about">
<%= link_to raw('<span>about</span>'), about_path %>
</div>
<div class="sg-5 portfolio">
</div>
<div class="sg-5 portfolio">
<%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %>
</div>
</div>
</div>
<div class="sg-17 contact-form">

8
app/views/contacts/new.html.erb
View File

@ -1,9 +1,9 @@
<div class="sg-5 about">
<div class="sg-5 about">
<%= link_to raw('<span>about</span>'), about_path %>
</div>
<div class="sg-5 portfolio">
</div>
<div class="sg-5 portfolio">
<%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %>
</div>
</div>
</div>
<div class="sg-17 contact-form">

2
app/views/layouts/photos.html.erb
View File

@ -40,4 +40,4 @@
</body>
</html>
</html>

8
app/views/pages/about.html.erb
View File

@ -1,8 +1,8 @@
<div class="sg-5 about">
</div>
<div class="sg-5 portfolio">
<div class="sg-5 about">
</div>
<div class="sg-5 portfolio">
<%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %>
</div>
</div>
</div>
<div class="sg-24 sgParent">

12
app/views/pages/index.html.erb
View File

@ -1,15 +1,15 @@
<div class="sg-5 about">
<div class="sg-5 about">
<%= link_to raw('<span>about</span>'), about_path %>
</div>
<div class="sg-5 portfolio">
</div>
<div class="sg-5 portfolio">
<%= link_to raw('<span>portfolio</span>'), :controller => 'categories' %>
</div>
</div>
</div>
<% 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) %>')">
<%= link_to_photo @photo %>
</div>
</div>
<% end %>
<div class="sg-5" style="background: #333;">

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

@ -1,40 +1,40 @@
<div class="sg-5 page-links">
<div class="sg-5 page-links">
<% if @photos.previous_page -%>
<%= link_to raw('<div>&larr;</div>'), { :page => @photos.previous_page }, :class => 'prev-link' %>
<% end %>
</div>
<div class="sg-5 page-links">
</div>
<div class="sg-5 page-links">
<% if @photos.next_page -%>
<%= link_to raw('<div>&rarr;</div>'), { :page => @photos.next_page }, :class => 'next-link' %>
<% end %>
</div>
</div>
</div>
<div class="sg-24 sgParent">
<% if @category %>
<% 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 %>
<% else %>
<div class="sg-5 category" style="background: #333;">
<h3>all photos</h3>
</div>
<% end %>
<% end %>
<% @num_blank = 11 - @photos.count -%>
<% @num_blank = 11 - @photos.count -%>
<% @photos.each do |photo| %>
<% @photos.each do |photo| %>
<div class="sg-5 photo" style="background: url('<%= photo.photo.url(:size5) %>')">
<%= link_to_photo photo %>
</div>
<% end %>
<% end %>
<% @num_blank.times do %>
<% @num_blank.times do %>
<div class="sg-5 photo blank-photo">
</div>
<% end %>
<% end %>
</div>

13
app/views/photos/new.html.erb
View File

@ -1,13 +0,0 @@
<%= error_messages_for :photo %>
<% form_for(:photo, :url => :photos, :html => { :multipart => true }) do |f| -%>
<p>
<%= f.label :image_file %>:<br />
<%= f.file_field :photo %>
</p>
<p>
<%= submit_tag 'Upload' %>
</p>
<% end -%>

2
app/views/shared/_banner.html.haml
View File

@ -1,2 +0,0 @@
%header{:role => :banner}
%h1 Abiquo Downloads