will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating emailer

Browse Source
This commit is contained in:
Will Bradley 2013-10-06 05:51:41 -07:00
parent 15836b4f4e
commit 008ceaed9e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_mailer/email.html.erb
View File

@ -4,7 +4,7 @@
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
</head> </head>
<body> <body>
<p><b>From:</b> <%= link_to @from_user.name, @from_user %></p> <p><b>From:</b> <%= link_to @from_user.name, user_url(@from_user) %></p>
<p> <p>
<%= simple_format @body %> <%= simple_format @body %>
</p> </p>

1
app/views/users/show.html.erb
View File

@ -6,6 +6,7 @@
<%= link_to image_tag('/facebook.png', :class => 'social-icon', :title => "Facebook"), @user.facebook_url, :class => 'social-link' if @user.facebook_url.present? %> <%= link_to image_tag('/facebook.png', :class => 'social-icon', :title => "Facebook"), @user.facebook_url, :class => 'social-link' if @user.facebook_url.present? %>
<%= link_to image_tag('/github.png', :class => 'social-icon', :title => "Github"), @user.github_url, :class => 'social-link' if @user.github_url.present? %> <%= link_to image_tag('/github.png', :class => 'social-icon', :title => "Github"), @user.github_url, :class => 'social-link' if @user.github_url.present? %>
<%= link_to image_tag('/website.png', :class => 'social-icon', :title => "Website"), @user.website_url, :class => 'social-link' if @user.website_url.present? %> <%= link_to image_tag('/website.png', :class => 'social-icon', :title => "Website"), @user.website_url, :class => 'social-link' if @user.website_url.present? %>
<%= link_to "Email User", user_compose_email_path(@user), :class => 'btn' %>
</h2> </h2>

2
config/routes.rb
View File

@ -36,7 +36,7 @@ Dooraccess::Application.routes.draw do
match 'users/merge' => 'users#merge_action', :via => :post # Merge action match 'users/merge' => 'users#merge_action', :via => :post # Merge action
match 'users/inactive' => 'users#inactive' # Inactive users report match 'users/inactive' => 'users#inactive' # Inactive users report
resources :users do resources :users do
get 'email' => 'users#compose_email' get 'email' => 'users#compose_email', :as => "compose_email"
post 'email' => 'users#send_email' post 'email' => 'users#send_email'
end end
match 'users/create' => 'users#create', :via => :post # Use POST users/create instead of POST users to avoid devise conflict match 'users/create' => 'users#create', :via => :post # Use POST users/create instead of POST users to avoid devise conflict