1
0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00

Update hashes to 1.9 style.

This commit is contained in:
Dan Barber 2014-12-12 15:31:00 +00:00
parent 3574d7a338
commit a68671ce45
23 changed files with 37 additions and 37 deletions

View File

@ -4,4 +4,4 @@
%td= admin_user.last_sign_in_ip %td= admin_user.last_sign_in_ip
%td{ :class => :actions } %td{ :class => :actions }
- unless admin_user == current_admin_user - unless admin_user == current_admin_user
= link_to "Delete", admin_admin_user_path(admin_user), :method => :delete, :confirm => "Are you sure you wish to delete this Admin User?" = link_to "Delete", admin_admin_user_path(admin_user), method: :delete, confirm: "Are you sure you wish to delete this Admin User?"

View File

@ -1,2 +1,2 @@
%h2 Edit Admin User %h2 Edit Admin User
= render :partial => "form", :locals => { :admin_user => @admin_user } = render partial: "form", locals: { admin_user: @admin_user }

View File

@ -1,11 +1,11 @@
%h3 Change your password %h3 Change your password
= simple_form_for(@admin_user, :url => update_password_admin_admin_user_path, :html => { :method => :put }) do |f| = simple_form_for(@admin_user, :url => update_password_admin_admin_user_path, html: { method: :put }) do |f|
= inputs_field_set do = inputs_field_set do
= f.input :current_password = f.input :current_password
= inputs_field_set do = inputs_field_set do
= f.input :password, :label => "New Password" = f.input :password, label: "New Password"
= f.input :password_confirmation, :label => "Confirm Password" = f.input :password_confirmation, label: "Confirm Password"
= actions_field_set do = actions_field_set do
= f.submit "Change my password" = f.submit "Change my password"

View File

@ -8,9 +8,9 @@
%th IP Address %th IP Address
%th %th
%tbody %tbody
= render :partial => "admin_user", :collection => @admin_users = render partial: "admin_user", collection: @admin_users
%tfoot %tfoot
%tr %tr
%td{:colspan => 4} %td{ colspan: 4 }
%br/ %br/
= link_to 'New Admin User', new_admin_admin_user_path, :class => [:button, :new] = link_to 'New Admin User', new_admin_admin_user_path, class: [:button, :new]

View File

@ -1,2 +1,2 @@
%h2 New Admin User %h2 New Admin User
= render :partial => "form", :locals => { :admin_user => @admin_user } = render partial: "form", locals: { admin_user: @admin_user }

View File

@ -2,7 +2,7 @@
%td= category.name %td= category.name
%td= category.slug %td= category.slug
%td= category.base_colour %td= category.base_colour
%td{ :class => :actions } %td{ class: :actions }
= link_to 'Show', [:admin, category] = link_to 'Show', [:admin, category]
= link_to 'Edit', edit_admin_category_path(category) = link_to 'Edit', edit_admin_category_path(category)
= link_to 'Destroy', [:admin, category], confirm: 'Are you sure?', method: :delete = link_to 'Destroy', [:admin, category], confirm: 'Are you sure?', method: :delete

View File

@ -1,2 +1,2 @@
%h2 Edit Category %h2 Edit Category
= render :partial => "form", :locals => { :category => @category } = render partial: "form", locals: { category: @category }

View File

@ -11,6 +11,6 @@
= render @categories = render @categories
%tfoot %tfoot
%tr %tr
%td{:colspan => 5} %td{ colspan: 5 }
%br/ %br/
= link_to 'New Category', new_admin_category_path, :class => [:button, :new] = link_to 'New Category', new_admin_category_path, class: [:button, :new]

View File

@ -1,2 +1,2 @@
%h2 New Category %h2 New Category
= render :partial => "form", :locals => { :category => @category } = render partial: "form", locals: { category: @category }

View File

@ -8,7 +8,7 @@
%body %body
#page #page
%header{ :role => "banner" }= render :partial => "admin/shared/header" %header{ role: "banner" }= render partial: "admin/shared/header"
= render :partial => "shared/flash_messages" = render partial: "shared/flash_messages"
= yield = yield
%footer{ :role => "footer" }= render :partial => "admin/shared/footer" %footer{ role: "footer" }= render partial: "admin/shared/footer"

View File

@ -8,6 +8,6 @@
%body %body
#login #login
%header{ :role => "banner" }= render :partial => "admin/shared/login_header" %header{ role: "banner" }= render partial: "admin/shared/login_header"
= render :partial => "shared/flash_messages" = render partial: "shared/flash_messages"
= yield = yield

View File

@ -1,7 +1,7 @@
%tr %tr
%td= page.name %td= page.name
%td= page.title %td= page.title
%td{ :class => :actions } %td{ class: :actions }
= link_to 'Show', [:admin, page] = link_to 'Show', [:admin, page]
= link_to 'Edit', edit_admin_page_path(page) = link_to 'Edit', edit_admin_page_path(page)
= link_to 'Destroy', [:admin, page], confirm: 'Are you sure?', method: :delete = link_to 'Destroy', [:admin, page], confirm: 'Are you sure?', method: :delete

View File

@ -7,9 +7,9 @@
%th Title %th Title
%th %th
%tbody %tbody
= render :partial => "page", :collection => @pages = render partial: "page", collection: @pages
%tfoot %tfoot
%tr %tr
%td{:colspan => 4} %td{ colspan: 4 }
%br/ %br/
= link_to 'New Page', new_admin_page_path, :class => [:button, :new] = link_to 'New Page', new_admin_page_path, class: [:button, :new]

View File

@ -1,2 +1,2 @@
%h2 New Page %h2 New Page
= render :partial => "form", :locals => { :page => @page } = render partial: "form", locals: { page: @page }

View File

@ -2,7 +2,7 @@
%ul.categories %ul.categories
- @categories.each do |photo_category| - @categories.each do |photo_category|
%li %li
= check_box_tag "photo[category_ids][]", photo_category.id, @photo.categories.include?(photo_category), :id => "photo_category_ids_#{photo_category.id}" = check_box_tag "photo[category_ids][]", photo_category.id, @photo.categories.include?(photo_category), id: "photo_category_ids_#{photo_category.id}"
= label_tag "photo_category_ids_#{photo_category.id}", photo_category.name = label_tag "photo_category_ids_#{photo_category.id}", photo_category.name
= inputs_field_set do = inputs_field_set do

View File

@ -1,5 +1,5 @@
.photo .photo
= link_to image_tag(photo.image.admin.url, :title => photo.title), photo.image.url = link_to image_tag(photo.image.admin.url, title: photo.title), photo.image.url
.actions .actions
= link_to 'Edit', edit_admin_photo_path(photo) = link_to 'Edit', edit_admin_photo_path(photo)
= link_to 'Destroy', [:admin, photo], confirm: 'Are you sure?', method: :delete = link_to 'Destroy', [:admin, photo], confirm: 'Are you sure?', method: :delete

View File

@ -1,2 +1,2 @@
%h2 Edit Photo %h2 Edit Photo
= render :partial => "form", :locals => { :photo => @photo } = render partial: "form", locals: { photo: @photo }

View File

@ -1,11 +1,11 @@
%h2 Photos %h2 Photos
= will_paginate @photos, :remote => true = will_paginate @photos, remote: true
.photos .photos
= render :partial => "photo", :collection => @photos = render partial: "photo", collection: @photos
= will_paginate @products, :remote => true = will_paginate @products, remote: true
%br/ %br/
= link_to 'New Photo', new_admin_photo_path, :class => [:button, :new] = link_to 'New Photo', new_admin_photo_path, class: [:button, :new]

View File

@ -1,2 +1,2 @@
%h2 New Photo %h2 New Photo
= render :partial => "form", :locals => { :photo => @photo } = render partial: "form", locals: { photo: @photo }

View File

@ -1,3 +1,3 @@
%h1= link_to APP_CONFIG['name'], admin_dashboard_path %h1= link_to APP_CONFIG['name'], admin_dashboard_path
= render :partial => "admin/shared/user" = render "admin/shared/user"
= render :partial => "admin/shared/menu" = render "admin/shared/menu"

View File

@ -1,4 +1,4 @@
%nav %nav
%ul %ul
- @admin_menu.each do |key, value| - @admin_menu.each do |key, value|
= render :partial => "admin/shared/menu_item", :locals => { :menu_item => key } = render partial: "admin/shared/menu_item", locals: { menu_item: key }

View File

@ -1 +1 @@
%li= link_to menu_item.to_s.gsub(/_/, ' ').titleize, { :controller => menu_item }, :class => (params[:controller] == "admin/" + menu_item.to_s ? "selected" : nil) %li= link_to menu_item.to_s.gsub(/_/, ' ').titleize, { controller: menu_item }, class: (params[:controller] == "admin/" + menu_item.to_s ? "selected" : nil)

View File

@ -3,4 +3,4 @@
| |
= link_to "Change Password", edit_password_admin_admin_user_path = link_to "Change Password", edit_password_admin_admin_user_path
| |
= link_to "Logout", destroy_admin_user_session_path, :method => :delete = link_to "Logout", destroy_admin_user_session_path, method: :delete