Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

changed Radamcher to Mahoney

  • Loading branch information...
commit 05e674111b53e37c61f1e0c2d1d59eb5c33f61de 1 parent d8ac2d2
@thommahoney authored
View
2  Rakefile
@@ -4,4 +4,4 @@
require File.expand_path('../config/application', __FILE__)
-ErinRademacherCom::Application.load_tasks
+ErinMahoneyPhotoCom::Application.load_tasks
View
4 app/assets/javascripts/application.js
@@ -27,8 +27,8 @@
!$tier2.slideUp();
}
});
- $('a#email').attr('href', 'mailto:rademacher.erin@gmail.com');
- $('a#email').text('rademacher.erin@gmail.com');
+ $('a#email').attr('href', 'mailto:erinmahoneyphoto@gmail.com');
+ $('a#email').text('erinmahoneyphoto@gmail.com');
$('a#phone').attr('href', 'tel:1-716-930-4461');
$('a#phone').text('716.930.4461');
})();
View
2  app/views/application/about.html.haml
@@ -2,7 +2,7 @@
%img{ src: "https://s3.amazonaws.com/erinrademacher.com/about.jpg", width: "347", height: "520", alt: "" }
.inline-block.about
%p
- Erin Rademacher graduated with a Bachelor of Fine Arts degree in Professional Photographic Illustration from the Rochester Institute of Technology. She specialized in studio photography and taught photography classes in Rochester, New York before moving out west to sunny San Francisco, California.
+ Erin Mahoney graduated with a Bachelor of Fine Arts degree in Professional Photographic Illustration from the Rochester Institute of Technology. She specialized in studio photography and taught photography classes in Rochester, New York before moving out west to sunny San Francisco, California.
%p
She is now attending the Academy of Art University and dedicating her time to obtaining her Master of Fine Arts degree in Photography. After graduation, she aspires to teach in a university setting. In the meantime, she
%a{ href: "http://www.mistakesandmalarkey.blogspot.com", target: "_blank" } blogs
View
69 app/views/layouts/application.html.haml
@@ -1,53 +1,52 @@
!!!
%html
%head
- %title ErinRademacher.com
+ %title ErinMahoneyPhoto.com
- %link{ rel: "shortcut icon", href: "/images/erinrademacher.com.ico" }
+ %link{ rel: "shortcut icon", href: "/images/erinmahoneyphoto.com.ico" }
= stylesheet_link_tag "http://yui.yahooapis.com/3.4.1/build/cssreset/reset-min.css", :media => "all"
= stylesheet_link_tag "application", :media => "all"
= csrf_meta_tags
-%body
+ %body
- #container
- %h1#logo
- %a{ href: "/" }
- Erin
- %em Rademacher
+ #container
+ %h1#logo
+ %a{ href: "/" }
+ Erin
+ %em Mahoney
- #navigation
- %ul
- %li#portfolio{class: "#{@series ? 'selected' : ''}" }
- = link_to "Portfolio", series_url(@default.name)
+ #navigation
+ %ul
+ %li#portfolio{class: "#{@series ? 'selected' : ''}" }
+ = link_to "Portfolio", series_url(@default.name)
- %ul#portfolio_tier2{style: "display: #{@series ? 'block' : 'none'}" }
- - @all_series.each do |series|
- %li{ id: series.name, class: "#{@series == series ? 'selected' : ''}" }
- = link_to series.display_name, series_url(series.name)
+ %ul#portfolio_tier2{style: "display: #{@series ? 'block' : 'none'}" }
+ - @all_series.each do |series|
+ %li{ id: series.name, class: "#{@series == series ? 'selected' : ''}" }
+ = link_to series.display_name, series_url(series.name)
- %li#about{ class: "#{@about ? 'selected' : ''}" }
- = link_to "About", about_url
+ %li#about{ class: "#{@about ? 'selected' : ''}" }
+ = link_to "About", about_url
- %li#contact{ class: "#{@contact ? 'selected' : ''}" }
- = link_to "Contact", contact_url
+ %li#contact{ class: "#{@contact ? 'selected' : ''}" }
+ = link_to "Contact", contact_url
- #content{class: "#{@series ? 'portfolio' : ''}"}
+ #content{class: "#{@series ? 'portfolio' : ''}"}
- = yield
+ = yield
- #copyright
- ©
- = Time.now.year
- Erin Rademacher
+ #copyright
+ ©
+ = Time.now.year
+ Erin Mahoney
- %script
- = "var portfolio = #{@series ? 'true' : 'false'};"
- = javascript_include_tag "application"
- %script
- - if @series
- = "var imageViewer = new ImageViewer('#{@series.name}', #{@series.image_count});"
-
- - if Rails.env == "production"
- %script{src: "/js/ga.js"}
+ %script
+ = "var portfolio = #{@series ? 'true' : 'false'};"
+ = javascript_include_tag "application"
+ %script
+ - if @series
+ = "var imageViewer = new ImageViewer('#{@series.name}', #{@series.image_count});"
+ - if Rails.env.production?
+ %script{src: "/js/ga.js"}
View
2  config.ru
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
-run ErinRademacherCom::Application
+run ErinMahoneyPhotoCom::Application
View
2  config/application.rb
@@ -9,7 +9,7 @@
# Bundler.require(:default, :assets, Rails.env)
end
-module ErinRademacherCom
+module ErinMahoneyPhotoCom
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
View
6 config/database.yml
@@ -2,16 +2,16 @@ development:
adapter: postgresql
host: localhost
username: tmahoney
- database: erinrademacher_dev
+ database: erinmahoneyphoto_dev
test:
adapter: postgresql
host: localhost
username: tmahoney
- database: erinrademacher_test
+ database: erinmahoneyphoto_test
#production:
#adapter: postgresql
#host: localhost
#username: tmahoney
- #database: erinrademacher_prod
+ #database: erinmahoneyphoto_prod
View
2  config/environment.rb
@@ -2,4 +2,4 @@
require File.expand_path('../application', __FILE__)
# Initialize the rails application
-ErinRademacherCom::Application.initialize!
+ErinMahoneyPhotoCom::Application.initialize!
View
2  config/environments/development.rb
@@ -1,4 +1,4 @@
-ErinRademacherCom::Application.configure do
+ErinMahoneyPhotoCom::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on
View
2  config/environments/production.rb
@@ -1,4 +1,4 @@
-ErinRademacherCom::Application.configure do
+ErinMahoneyPhotoCom::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# Code is not reloaded between requests
View
2  config/environments/test.rb
@@ -1,4 +1,4 @@
-ErinRademacherCom::Application.configure do
+ErinMahoneyPhotoCom::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's
View
2  config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-ErinRademacherCom::Application.config.secret_token = '4d595f3728d5b9ec448cf9d8e8101f81b61cc81ca4b24911c03742e768618448b0df156d0a7d9053f1a7eb7c7a72bb4540049b88e81b7822dfa30d064d27cc64'
+ErinMahoneyPhotoCom::Application.config.secret_token = '4d595f3728d5b9ec448cf9d8e8101f81b61cc81ca4b24911c03742e768618448b0df156d0a7d9053f1a7eb7c7a72bb4540049b88e81b7822dfa30d064d27cc64'
View
4 config/initializers/session_store.rb
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-ErinRademacherCom::Application.config.session_store :cookie_store, key: '_erinrademacher.com_session'
+ErinMahoneyPhotoCom::Application.config.session_store :cookie_store, key: '_erinrademacher.com_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rails generate session_migration")
-# ErinRademacherCom::Application.config.session_store :active_record_store
+# ErinMahoneyPhotoCom::Application.config.session_store :active_record_store
View
2  config/routes.rb
@@ -1,4 +1,4 @@
-ErinRademacherCom::Application.routes.draw do
+ErinMahoneyPhotoCom::Application.routes.draw do
get "/series/:name" => "series#show", as: :series
get "/about" => "application#about", as: :about
get "/contact" => "application#contact", as: :contact
View
2  old/about.php
@@ -15,4 +15,4 @@
She is now attending the Academy of Art University and dedicating her time to obtaining her Master of Fine Arts degree in Photography. After graduation, she aspires to teach in a university setting. In the meantime, she <a href="http://www.mistakesandmalarkey.blogspot.com" target="_blank">blogs</a> on matters of the heart and on her cat, Connor.
</p>
</div>
-<?php include_once('body_end.php'); ?>
+<?php include_once('body_end.php'); ?>
Please sign in to comment.
Something went wrong with that request. Please try again.