diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb deleted file mode 100644 index 4e7a083..0000000 --- a/app/views/categories/edit.html.erb +++ /dev/null @@ -1,28 +0,0 @@ -

Editing category

- -<% form_for(@category) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

-

- <%= f.label :description %>
- <%= f.text_area :description %> -

-

- <%= f.label :photo_id %>
- <%= f.text_field :photo_id %> -

-

- <%= f.label :base_colour %>
- <%= f.text_field :base_colour %> -

-

- <%= f.submit 'Update' %> -

-<% end %> - -<%= link_to 'Show', @category %> | -<%= link_to 'Back', categories_path %> diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb index 487c54b..759e9ff 100644 --- a/app/views/categories/index.html.erb +++ b/app/views/categories/index.html.erb @@ -1,36 +1,36 @@ -
- <% if @categories.previous_page -%> - <%= link_to raw('
←
'), { :page => @categories.previous_page }, :class => 'prev-link' %> - <% end %> -
-
- <% if @categories.next_page -%> - <%= link_to raw('
→
'), { :page => @categories.next_page }, :class => 'next-link' %> - <% end %> -
+
+ <% if @categories.previous_page -%> + <%= link_to raw('
←
'), { :page => @categories.previous_page }, :class => 'prev-link' %> + <% end %> +
+
+ <% if @categories.next_page -%> + <%= link_to raw('
→
'), { :page => @categories.next_page }, :class => 'next-link' %> + <% end %> +
<% @num_blank = 4 - @categories.count -%>
- -<% @photos.each do |photo| %> -
- <%= link_to_photo photo %> -
+ <% @photos.each do |photo| %> -<% end %> +
+ <%= link_to_photo photo %> +
-<% @categories.each do |category| %> -
- <%= link_to raw('

'+h(category.name.downcase)+'

'), category_photos_path(category) %> -
-<% end %> + <% end %> -<% @num_blank.times do %> -
-
-<% end %> + <% @categories.each do |category| %> +
+ <%= link_to raw('

'+h(category.name.downcase)+'

'), category_photos_path(category) %> +
+ <% end %> + + <% @num_blank.times do %> +
+
+ <% end %>
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb deleted file mode 100644 index b336283..0000000 --- a/app/views/categories/new.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

New category

- -<% form_for(@category) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

-

- <%= f.label :description %>
- <%= f.text_area :description %> -

-

- <%= f.label :photo_id %>
- <%= f.text_field :photo_id %> -

-

- <%= f.label :base_colour %>
- <%= f.text_field :base_colour %> -

-

- <%= f.submit 'Create' %> -

-<% end %> - -<%= link_to 'Back', categories_path %> diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb deleted file mode 100644 index 56aeefd..0000000 --- a/app/views/categories/show.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -

- Name: - <%=h @category.name %> -

- -

- Description: - <%=h @category.description %> -

- -

- Photo: - <%=h @category.photo_id %> -

- - -<%= link_to 'Edit', edit_category_path(@category) %> | -<%= link_to 'Back', categories_path %> \ No newline at end of file diff --git a/app/views/contacts/index.html.erb b/app/views/contacts/index.html.erb index e2f349d..d0c4405 100644 --- a/app/views/contacts/index.html.erb +++ b/app/views/contacts/index.html.erb @@ -1,14 +1,14 @@ -
- <%= link_to raw('about'), about_path %> -
-
- <%= link_to raw('portfolio'), :controller => 'categories' %> -
+
+ <%= link_to raw('about'), about_path %> +
+
+ <%= link_to raw('portfolio'), :controller => 'categories' %> +
- <% if flash[:notice] -%> -
<%= flash[:notice] %>
- <% end -%> -

Tel: 01752 546981

-
\ No newline at end of file + <% if flash[:notice] -%> +
<%= flash[:notice] %>
+ <% end -%> +

Tel: 01752 546981

+ diff --git a/app/views/contacts/new.html.erb b/app/views/contacts/new.html.erb index c42a906..d1f8176 100644 --- a/app/views/contacts/new.html.erb +++ b/app/views/contacts/new.html.erb @@ -1,41 +1,41 @@ -
- <%= link_to raw('about'), about_path %> -
-
- <%= link_to raw('portfolio'), :controller => 'categories' %> -
+
+ <%= link_to raw('about'), about_path %> +
+
+ <%= link_to raw('portfolio'), :controller => 'categories' %> +
- <%= form_for :contact, :url => { :action => 'create' }, :html => { :id => 'contact_form' } do |f| %> - <% if flash[:notice] -%> -
<%= flash[:notice] %>
- <% end -%> - <% if flash[:alert] -%> -
<%= flash[:alert] %>
- <% end -%> -

Please use the form below to contact me.

-

- <%= f.label :name %> - <%= f.text_field :name %> -

-

- <%= f.label :email %> - <%= f.text_field :email %> -

-

- <%= f.label :subject %> - <%= f.text_field :subject %> -

-

- <%= f.label :message %> - <%= f.text_area :message %> -

-

- <%= f.label "-", :style => "opacity: 0;" %> - <%= f.submit 'Send Message' %> -

- <% end %> + <%= form_for :contact, :url => { :action => 'create' }, :html => { :id => 'contact_form' } do |f| %> + <% if flash[:notice] -%> +
<%= flash[:notice] %>
+ <% end -%> + <% if flash[:alert] -%> +
<%= flash[:alert] %>
+ <% end -%> +

Please use the form below to contact me.

+

+ <%= f.label :name %> + <%= f.text_field :name %> +

+

+ <%= f.label :email %> + <%= f.text_field :email %> +

+

+ <%= f.label :subject %> + <%= f.text_field :subject %> +

+

+ <%= f.label :message %> + <%= f.text_area :message %> +

+

+ <%= f.label "-", :style => "opacity: 0;" %> + <%= f.submit 'Send Message' %> +

+ <% end %>
diff --git a/app/views/layouts/photos.html.erb b/app/views/layouts/photos.html.erb index 55594c6..4f15a97 100644 --- a/app/views/layouts/photos.html.erb +++ b/app/views/layouts/photos.html.erb @@ -1,38 +1,38 @@ - - <%= @page_title + ' - ' unless @page_title.blank? %> Dan Barber Photography - - - - - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag 'application' %> - <%= render :partial => "shared/typekit" %> - + + <%= @page_title + ' - ' unless @page_title.blank? %> Dan Barber Photography + + + + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag 'application' %> + <%= render :partial => "shared/typekit" %> + - - -
+ -
-
- -
+
- - - <%= yield %> - - +
+
-
-
+
+ + + + <%= yield %> + + + +
+
@@ -40,4 +40,4 @@ - + diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index 78c2c5c..89d8132 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -1,29 +1,29 @@ -
-
-
- <%= link_to raw('portfolio'), :controller => 'categories' %> -
+
+
+
+ <%= link_to raw('portfolio'), :controller => 'categories' %> +
-
-
- <%= raw(@content.to_html) %> -
-
+
+
+ <%= raw(@content.to_html) %> +
+
-
-
- -
-
-
-
-
-
-
- <%= link_to raw('contact'), new_contact_path %> -
+
+
+ +
+
+
+
+
+
+
+ <%= link_to raw('contact'), new_contact_path %> +
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 3a99d44..4b58f0b 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -1,15 +1,15 @@ -
- <%= link_to raw('about'), about_path %> -
-
- <%= link_to raw('portfolio'), :controller => 'categories' %> -
+
+ <%= link_to raw('about'), about_path %> +
+
+ <%= link_to raw('portfolio'), :controller => 'categories' %> +
<% if @photo %> -
- <%= link_to_photo @photo %> -
+
+ <%= link_to_photo @photo %> +
<% end %>
@@ -17,5 +17,5 @@
- <%= link_to raw('contact'), new_contact_path %> + <%= link_to raw('contact'), new_contact_path %>
diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb index fc39033..afabdd1 100644 --- a/app/views/photos/index.html.erb +++ b/app/views/photos/index.html.erb @@ -1,40 +1,40 @@ -
- <% if @photos.previous_page -%> - <%= link_to raw('
←
'), { :page => @photos.previous_page }, :class => 'prev-link' %> - <% end %> -
-
- <% if @photos.next_page -%> - <%= link_to raw('
→
'), { :page => @photos.next_page }, :class => 'next-link' %> - <% end %> -
+
+ <% if @photos.previous_page -%> + <%= link_to raw('
←
'), { :page => @photos.previous_page }, :class => 'prev-link' %> + <% end %> +
+
+ <% if @photos.next_page -%> + <%= link_to raw('
→
'), { :page => @photos.next_page }, :class => 'next-link' %> + <% end %> +
-<% if @category %> -
- <%= link_to raw('

'+h(@category.name.downcase)+'

↑
'), categories_path %> -
-<% else %> -
-

all photos

-
-<% end %> + <% if @category %> +
+ <%= link_to raw('

'+h(@category.name.downcase)+'

↑
'), categories_path %> +
+ <% else %> +
+

all photos

+
+ <% end %> -<% @num_blank = 11 - @photos.count -%> + <% @num_blank = 11 - @photos.count -%> -<% @photos.each do |photo| %> + <% @photos.each do |photo| %> -
- <%= link_to_photo photo %> -
+
+ <%= link_to_photo photo %> +
-<% end %> + <% end %> -<% @num_blank.times do %> -
-
-<% end %> + <% @num_blank.times do %> +
+
+ <% end %>
diff --git a/app/views/photos/new.html.erb b/app/views/photos/new.html.erb deleted file mode 100644 index 757fff7..0000000 --- a/app/views/photos/new.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<%= error_messages_for :photo %> - -<% form_for(:photo, :url => :photos, :html => { :multipart => true }) do |f| -%> - -

- <%= f.label :image_file %>:
- <%= f.file_field :photo %> -

-

- <%= submit_tag 'Upload' %> -

- -<% end -%> diff --git a/app/views/shared/_banner.html.haml b/app/views/shared/_banner.html.haml deleted file mode 100644 index 2597466..0000000 --- a/app/views/shared/_banner.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -%header{:role => :banner} - %h1 Abiquo Downloads \ No newline at end of file