reskin login, sign in and register page; use recptcha mailhide, prevent user from spam

b6d0bbfe · vulehuan · 92ac3cdc · b6d0bbfe · b6d0bbfe · b6d0bbfe
Commit b6d0bbfe authored Oct 23, 2013 by vulehuan
9 changed files
--- a/venshop_app/Gemfile
+++ b/venshop_app/Gemfile
@@ -53,4 +53,5 @@ group :test do
  gem 'factory_girl_rails'
 end
 gem 'will_paginate', '3.0.4'
-gem 'will_paginate-bootstrap'
\ No newline at end of file
+gem 'will_paginate-bootstrap'
+gem 'recaptcha-mailhide'
\ No newline at end of file
--- a/venshop_app/Gemfile.lock
+++ b/venshop_app/Gemfile.lock
@@ -91,6 +91,7 @@ GEM
    rake (10.1.0)
    rdoc (3.12.2)
      json (~> 1.4)
+    recaptcha-mailhide (0.1.1)
    rspec-core (2.14.6)
    rspec-expectations (2.14.3)
      diff-lcs (>= 1.1.3, < 2.0)
@@ -151,6 +152,7 @@ DEPENDENCIES
  jquery-rails
  mysql2
  rails (= 4.0.0)
+  recaptcha-mailhide
  rspec-rails
  sass-rails (~> 4.0.0)
  sdoc

--- a/venshop_app/app/assets/stylesheets/custom.css.scss
+++ b/venshop_app/app/assets/stylesheets/custom.css.scss
@@ -435,4 +435,15 @@ footer {
  color: #c09853;
  background-color: #fcf8e3;
  border-color: #fbeed5;
+}
+
+.page-one-col {
+  header, .block-search {
+    margin-left: -15px;
+  }
+/*  form {
+    margin: 30px auto;
+    text-align: left;
+    max-width: 460px;
+  }*/
 }
\ No newline at end of file
--- a/venshop_app/app/controllers/sessions_controller.rb
+++ b/venshop_app/app/controllers/sessions_controller.rb
 class SessionsController < ApplicationController
  def new
+    render :layout => "application_one_col"
  end

  def create

--- a/venshop_app/app/controllers/users_controller.rb
+++ b/venshop_app/app/controllers/users_controller.rb
@@ -9,6 +9,7 @@ class UsersController < ApplicationController

  def new
    @user = User.new
+    render :layout => "application_one_col"
  end

  def show
@@ -28,6 +29,7 @@ class UsersController < ApplicationController

  def edit
    @user = User.find(params[:id])
+    render :layout => "application_one_col"
  end

  def update

--- a/venshop_app/app/views/layouts/application_one_col.html.erb
+++ b/venshop_app/app/views/layouts/application_one_col.html.erb
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= full_title(yield(:title)) %></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <%= csrf_meta_tags %>
+  <!-- Bootstrap core CSS -->
+  <link
+    href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"
+    rel="stylesheet">
+  <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> 
+  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.2pre/html5shiv.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.1.0/respond.min.js"></script>
+  <![endif]-->
+</head>
+<body class="page-one-col"> 
+  <div class="container">
+    <!-- header -->
+    <%= render 'layouts/header' %>
+  </div>
+  <div class="container">
+    <nav class="breadcrumb">
+      <span>You are in: </span>
+      <ul>
+        <li><a href="">Home</a></li>
+        <li class="last"><a href="">Lorem Ipsum</a></li>
+      </ul>
+    </nav>
+    <div class="clearfix"></div>
+    <% if flash.any? %>
+      <div id="block-message" class="hidden">
+        <% flash.each do |key, value| %>
+          <%= content_tag(:div, value, class: "alert alert-#{key}") %>
+        <% end %>
+      </div>
+    <% end %>
+    <%= yield %>
+  </div>
+  <%= render 'layouts/footer' %>
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+</body>
+</html>
--- a/venshop_app/app/views/users/_user.html.erb
+++ b/venshop_app/app/views/users/_user.html.erb
@@ -3,7 +3,7 @@
        <img class="media-object" src="<%= gravatar_for(user, { size: 50, out_put_img: false }) %>" alt="<%= user.name %>" /></a>
      <div class="media-body">
        <h4 class="media-heading"><%= user.name %></h4>
-        <b>Email:</b> <a href="mailto:<%= user.email %>"><%= user.email %></a>
+        <a class="btn btn-default" target="_blank" href="<%= RecaptchaMailhide::URL.url_for(user.email) %>"><span class="glyphicon glyphicon-envelope"></span></a>
        <% if current_user.admin? && !current_user?(user) %>
       | <%= link_to "delete", user, method: "delete", dada: { confirm: "You sure?" } %>
        <% end %>

--- a/venshop_app/app/views/users/show.html.erb
+++ b/venshop_app/app/views/users/show.html.erb
@@ -9,7 +9,7 @@
          <img class="media-object" src="<%= gravatar_for(@user, { size: 200, out_put_img: false }) %>" alt="<%= @user.name %>" /></a>
        <div class="media-body">
          <h4 class="media-heading"><%= @user.name %></h4>
-          <b>Email:</b> <a href="mailto:<%= @user.email %>"><%= @user.email %></a>
+          <a class="btn btn-default btn-lg" target="_blank" href="<%= RecaptchaMailhide::URL.url_for(@user.email) %>"><span class="glyphicon glyphicon-envelope"></span></a>
        </div>
      </li>
  </div>

--- a/venshop_app/config/environment.rb
+++ b/venshop_app/config/environment.rb
@@ -3,3 +3,8 @@ require File.expand_path('../application', __FILE__)

 # Initialize the Rails application.
 VenshopApp::Application.initialize!
+
+RecaptchaMailhide.configure do |c|
+  c.private_key = '6LfDL-kSAAAAAFDLOFADJ0GJql1-6tCTo0PlWz7L'
+  c.public_key  = '6LfDL-kSAAAAAG8JuwZhxLaT8X8iHZYpWu-7DAFe'
+end