Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: penso/heritage
base: a3d06fd58e
...
head fork: penso/heritage
compare: 16e15145e0
  • 7 commits
  • 16 files changed
  • 0 commit comments
  • 1 contributor
View
3  Gemfile
@@ -19,6 +19,8 @@ group :assets do
gem 'therubyracer', :platforms => :ruby
gem 'uglifier', '>= 1.0.3'
+
+ gem 'turbo-sprockets-rails3'
end
gem 'jquery-rails'
@@ -78,3 +80,4 @@ gem 'acts-as-taggable-on'
gem "has_permalink"
gem "lograge"
gem 'gravatar-ultimate'
+gem 'redcarpet'
View
6 Gemfile.lock
@@ -171,6 +171,7 @@ GEM
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
+ redcarpet (2.2.2)
ref (1.0.2)
rmagick (2.13.1)
rspec (2.12.0)
@@ -228,6 +229,9 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
+ turbo-sprockets-rails3 (0.3.6)
+ railties (> 3.2.8, < 4.0.0)
+ sprockets (>= 2.0.0)
twitter-bootstrap-rails (2.2.0)
actionpack (>= 3.1)
execjs
@@ -281,6 +285,7 @@ DEPENDENCIES
mysql2
rails
rainbow
+ redcarpet
rmagick
rspec
rspec-rails
@@ -290,6 +295,7 @@ DEPENDENCIES
sqlite3
tabulous
therubyracer
+ turbo-sprockets-rails3
twitter-bootstrap-rails
uglifier (>= 1.0.3)
unicorn
View
4 app/assets/stylesheets/admin.css
@@ -5,3 +5,7 @@
#photos {
text-align: center;
}
+.centered {
+ width: 500px;
+ margin: auto;
+}
View
3  app/assets/stylesheets/admin.css.scss
@@ -1,3 +0,0 @@
-// Place all the styles related to the admin controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
View
3  app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -33,3 +33,6 @@
#modal {
width: 800px;
}
+small {
+ font-size: 45%;
+}
View
3  app/controllers/photographers_controller.rb
@@ -64,6 +64,9 @@ def get_photographer
end
def set_title
+ @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+ :autolink => true,
+ :space_after_headers => true)
@title ||= @photographer.name if @photographer
end
end
View
1  app/views/accounts/edit.html.erb
@@ -19,6 +19,7 @@
<% end %>
<%= f.input :name, :input_html => { :size => 40 } %>
<%= f.input :description, :input_html => { :class => 'autogrow', :rows => 10, :cols => 40 } %>
+ Use <%= link_to "the markdown", "http://daringfireball.net/projects/markdown/basics" %> syntax.
<% end %>
<%= f.actions do %>
View
27 app/views/devise/sessions/new.html.erb
@@ -1,17 +1,20 @@
-<h2>Sign in</h2>
+<div class="centered">
+ <h2>Sign in</h2>
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
- <div><%= f.label :email %><br />
- <%= f.email_field :email %></div>
+ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+ <div><%= f.label :email %><br />
+ <%= f.email_field :email %></div>
- <div><%= f.label :password %><br />
- <%= f.password_field :password %></div>
+ <div><%= f.label :password %><br />
+ <%= f.password_field :password %></div>
- <% if devise_mapping.rememberable? -%>
- <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
- <% end -%>
+ <% if devise_mapping.rememberable? -%>
+ <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+ <% end -%>
- <div><%= f.submit "Sign in" %></div>
-<% end %>
+ <div><%= f.submit "Sign in" %></div>
+ <% end %>
-<%= render "devise/shared/links" %>
+ <%= render "devise/shared/links" %>
+
+</div>
View
2  app/views/emails/create.js.erb
@@ -3,7 +3,7 @@
$('#newsletter_modal').prepend("<p><%= escape_javascript @email.email %></p>");
$('#newsletter_modal').modal();
<% else %>
- $('#new_email_submit').val("Receive my newsletter");
+ $('#new_email_submit').val("Stay in touch");
$('#newsletter_modal_error').html('<%= escape_javascript @email.errors.full_messages.to_sentence %> :(');
$('#newsletter_modal_error').modal();
<% end %>
View
3  app/views/layouts/adminfixed.html.erb
@@ -58,6 +58,9 @@
<%= nav_link "Your account", edit_account_path %>
<%= nav_link "Your audience", emails_path %>
+ <% if @photographer && @photographer.specific_url %>
+ <%= nav_link "Your Public Website", "http://#{@photographer.specific_url}" %>
+ <% end %>
</ul>
<div class="pull-right">
View
2  app/views/layouts/story.html.erb
@@ -5,6 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta property="fb:app_id" content="143622885792396" />
+ <meta property="fb:admins" content="689541045" />
<%= yield :facebook_meta %>
<title><%= @title ? @title : "Heritage" %></title>
View
2  app/views/photographers/_about.html.erb
@@ -4,7 +4,7 @@
<h2 class="about-heading"><%= @photographer.name %></h2>
<p class="lead">
- <%= @photographer.description %>
+ <%= @markdown.render(@photographer.description).html_safe %>
</p>
<p class="lead">
View
7 app/views/photographers/about.html.erb
@@ -1,3 +1,10 @@
+<%= content_for :facebook_meta do %>
+ <meta property="og:url" content="<%= about_url %>" />
+ <meta property="og:image" content="<%= full_image_link @photographer.user_avatar.image_url(:thumb) %>" />
+ <meta property="og:title" content="<%= @photographer.name %> - Photography" />
+ <meta property="og:description" content="<%= @photographer.description %>" />
+ <meta property="og:site_name" content="<%= @photographer.name %>"/>
+<% end %>
<%= render :partial => 'photographers/about' %>
<h2 class="about-heading">Stories</h2>
View
7 app/views/photographers/contact.html.erb
@@ -1,3 +1,10 @@
+<%= content_for :facebook_meta do %>
+ <meta property="og:url" content="<%= contact_url %>" />
+ <meta property="og:image" content="<%= full_image_link @photographer.user_avatar.image_url(:thumb) %>" />
+ <meta property="og:title" content="<%= @photographer.name %> - Photography" />
+ <meta property="og:description" content="<%= @photographer.description %>" />
+ <meta property="og:site_name" content="<%= @photographer.name %>"/>
+<% end %>
<%= render :partial => 'photographers/about' %>
<p>
View
3  app/views/photographers/show.html.erb
@@ -2,7 +2,8 @@
<%= content_for :facebook_meta do %>
<meta property="og:url" content="<%= root_url %>" />
<meta property="og:image" content="<%= full_image_link @photographer.stories.first.photos.first.image_url(:web) %>" />
- <meta property="og:title" content="<%= @photographer.name %>" />
+ <meta property="og:title" content="<%= @photographer.name %> - Photography" />
+ <meta property="og:description" content="<%= @photographer.description %>" />
<meta property="og:site_name" content="<%= @photographer.name %>"/>
<% end %>
<% end %>
View
6 app/views/shared/_footer.html.erb
@@ -40,10 +40,14 @@
<div class="controls">
<%= f.text_field :email, :placeholder => "Email Address" %>
</div>
+ <div class="controls">
+ <small>A single email a month at most</small>
+ </div>
+
</div>
<div class="control-group">
<div class="controls">
- <%= f.submit "Receive my newsletter", :class => "btn", :id => "new_email_submit" %>
+ <%= f.submit "Stay in touch", :class => "btn", :id => "new_email_submit" %>
</div>
</div>
<% end %>

No commit comments for this range

Something went wrong with that request. Please try again.