Skip to content

V
venshop
Commit 436114a7 by vulehuan
Options

fix coding standard

parent 02a83af3
Showing with 44 additions and 44 deletions
venshop_app/app/views/cards/_item_list.html.erb
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<tbody> <tbody>
<% if card_infos.empty? || card_infos[:card_items].empty? %> <% if card_infos.empty? || card_infos[:card_items].empty? %>
<tr><td colspan="6"> <tr><td colspan="6">
<%= link_to 'Click here to order', products_path %> <%= link_to('Click here to order', products_path) %>
</td></tr> </td></tr>
<% <%
else else
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
%> %>
<tr> <tr>
<td><%= $i %></td> <td><%= $i %></td>
<td><%= link_to product.name, product_url(product) %></td> <td><%= link_to(product.name, product_url(product)) %></td>
<% if can_edit %> <% if can_edit %>
<td><input type="text" class="form-control txt-quantity" value="<%= card_item[:quantity] %>" /></td> <td><input type="text" class="form-control txt-quantity" value="<%= card_item[:quantity] %>" /></td>
<% else %> <% else %>
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
<% if can_edit %> <% if can_edit %>
<td> <td>
<div class="text-center"> <div class="text-center">
<%= link_to cards_path(product_id: card_item[:product_id], card_action: 'update'), class: 'btn btn-info btn-update-card-quantity' do %> <%= link_to(cards_path(product_id: card_item[:product_id], card_action: 'update'), class: 'btn btn-info btn-update-card-quantity') do %>
<span class="glyphicon glyphicon-plus"></span> Update quantity <span class="glyphicon glyphicon-plus"></span> Update quantity
<% end %> <% end %>
<%= link_to cards_path(product_id: card_item[:product_id], card_action: 'remove'), class: 'btn btn-danger', dada: '{:confirm=>"Do you want to remove this product?"}' do %> <%= link_to(cards_path(product_id: card_item[:product_id], card_action: 'remove'), class: 'btn btn-danger', dada: '{:confirm=>"Do you want to remove this product?"}') do %>
<span class="glyphicon glyphicon-remove"></span> Remove <span class="glyphicon glyphicon-remove"></span> Remove
<% end %> <% end %>
</div> </div>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<tr> <tr>
<td colspan="6"> <td colspan="6">
<div class="text-center"> <div class="text-center">
<%= link_to 'Check out', { action: 'checkout' }, class: 'btn btn-primary' %> <%= link_to('Check out', { action: 'checkout' }, class: 'btn btn-primary') %>
</div> </div>
</td> </td>
</tr> </tr>
......
venshop_app/app/views/cards/checkout.html.erb
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<%= text_area_tag :note, params[:note], class: "form-control", rows: 10, cols: 25 %> <%= text_area_tag :note, params[:note], class: "form-control", rows: 10, cols: 25 %>
<%= render partial: 'cards/item_list', locals: { card_infos: @card_infos, can_edit: false } %> <%= render partial: 'cards/item_list', locals: { card_infos: @card_infos, can_edit: false } %>
<div class="text-center"> <div class="text-center">
<%= link_to 'Back', cards_path, class: 'btn btn-default' %> <%= link_to('Back', cards_path, class: 'btn btn-default') %>
<%= submit_tag "Continue", class: 'btn btn-primary btn-submit' %> <%= submit_tag "Continue", class: 'btn btn-primary btn-submit' %>
</div> </div>
<% end %> <% end %>
......
venshop_app/app/views/cards/confirm_checkout.html.erb
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<%= form_tag do %> <%= form_tag do %>
<div class="text-center"> <div class="text-center">
The information above The information above
<%= link_to 'Incorrect, edit', { action: 'checkout' }, class: 'btn btn-default' %> <%= link_to('Incorrect, edit', { action: 'checkout' }, class: 'btn btn-default') %>
<%= submit_tag "Correct, click here", class: 'btn btn-primary btn-submit' %> <%= submit_tag "Correct, click here", class: 'btn btn-primary btn-submit' %>
</div> </div>
<% end %> <% end %>
......
venshop_app/app/views/layouts/_advertising.html.erb
...@@ -6,22 +6,22 @@ ...@@ -6,22 +6,22 @@
class="sprite-1 corner-right"></span> class="sprite-1 corner-right"></span>
</h2> </h2>
<div class="block-advertising"> <div class="block-advertising">
<%= link_to '#', class: 'thumbnail' do %> <%= link_to('#', class: 'thumbnail') do %>
<img src="<%= image_path('') %>/images/upload/ads/1.jpg" alt="" /> <img src="<%= image_path('') %>/images/upload/ads/1.jpg" alt="" />
<% end %> <% end %>
<%= link_to '#', class: 'thumbnail' do %> <%= link_to('#', class: 'thumbnail') do %>
<img src="<%= image_path('') %>/images/upload/ads/2.gif" alt="" /> <img src="<%= image_path('') %>/images/upload/ads/2.gif" alt="" />
<% end %> <% end %>
<%= link_to '#', class: 'thumbnail' do %> <%= link_to('#', class: 'thumbnail') do %>
<img src="<%= image_path('') %>/images/upload/ads/3.png" alt="" /> <img src="<%= image_path('') %>/images/upload/ads/3.png" alt="" />
<% end %> <% end %>
<%= link_to '#', class: 'thumbnail' do %> <%= link_to('#', class: 'thumbnail') do %>
<img src="<%= image_path('') %>/images/upload/ads/4.jpg" alt="" /> <img src="<%= image_path('') %>/images/upload/ads/4.jpg" alt="" />
<% end %> <% end %>
<%= link_to '#', class: 'thumbnail' do %> <%= link_to('#', class: 'thumbnail') do %>
<img src="<%= image_path('') %>/images/upload/ads/5.jpg" alt="" /> <img src="<%= image_path('') %>/images/upload/ads/5.jpg" alt="" />
<% end %> <% end %>
<%= link_to '#', class: 'thumbnail' do %> <%= link_to('#', class: 'thumbnail') do %>
<img src="<%= image_path('') %>/images/upload/ads/6.jpg" alt="" /> <img src="<%= image_path('') %>/images/upload/ads/6.jpg" alt="" />
<% end %> <% end %>
</div> </div>
......
venshop_app/app/views/layouts/_footer.html.erb
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<footer> <footer>
<b>Venshop - Huan Vu Le</b><br /> <b>Address</b>: 17 No.2 street, Cu <b>Venshop - Huan Vu Le</b><br /> <b>Address</b>: 17 No.2 street, Cu
Xa Do Thanh, Ward 4 Dist. 3, HCMC, Vietnam <br /> <b>Email</b>: Xa Do Thanh, Ward 4 Dist. 3, HCMC, Vietnam <br /> <b>Email</b>:
<%= link_to 'info@zigexn.vn', 'mailto:info@zigexn.vn' %> <%= link_to('info@zigexn.vn', 'mailto:info@zigexn.vn') %>
<br /> <b>Website</b>: <br /> <b>Website</b>:
<%= link_to 'http://http://zigexn.vn.com', 'http://http://zigexn.vn.com' %> <%= link_to('http://http://zigexn.vn.com', 'http://http://zigexn.vn.com') %>
</footer> </footer>
</div> </div>
venshop_app/app/views/layouts/_header.html.erb
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<div class="row"> <div class="row">
<div class="col-md-2 col-sm-2"> <div class="col-md-2 col-sm-2">
<h1 class="logo pull-left"> <h1 class="logo pull-left">
<%= link_to 'Venshop', root_path %> <%= link_to('Venshop', root_path) %>
</h1> </h1>
</div> </div>
<div class="col-md-10 col-sm-10"> <div class="col-md-10 col-sm-10">
<div class="banner pull-right"> <div class="banner pull-right">
<%= link_to root_path do %> <%= link_to(root_path) do %>
<img src="<%= image_path('') %>/images/upload/banner/1.png" class="img-responsive" alt="" /> <img src="<%= image_path('') %>/images/upload/banner/1.png" class="img-responsive" alt="" />
<% end %> <% end %>
</div> </div>
...@@ -19,42 +19,42 @@ ...@@ -19,42 +19,42 @@
if signed_in? if signed_in?
user = current_user user = current_user
%> %>
<%= link_to cards_path, class: 'btn btn-danger' do %> <%= link_to(cards_path, class: 'btn btn-danger') do %>
<span class="glyphicon glyphicon-shopping-cart"></span> Your cart <span class="glyphicon glyphicon-shopping-cart"></span> Your cart
<% end %> <% end %>
<%= link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do %> <%= link_to('#', class: 'btn btn-default', 'data-toggle' => 'dropdown') do %>
<span class="glyphicon glyphicon-list"></span> My actions <span class="glyphicon glyphicon-list"></span> My actions
<% end %> <% end %>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li> <li>
<%= link_to edit_user_path(current_user) do %> <%= link_to(edit_user_path(current_user)) do %>
<span class="glyphicon glyphicon-edit"></span> Update my profile <span class="glyphicon glyphicon-edit"></span> Update my profile
<% end %> <% end %>
</li> </li>
<li> <li>
<%= link_to url_for(controller: 'products', action:'user_items', user_id: user.id) do %> <%= link_to(url_for(controller: 'products', action:'user_items', user_id: user.id)) do %>
<span class="glyphicon glyphicon-home"></span> My products <span class="glyphicon glyphicon-home"></span> My products
<% end %> <% end %>
</li> </li>
<li> <li>
<%= link_to new_product_path do %> <%= link_to(new_product_path) do %>
<span class="glyphicon glyphicon-plus"></span> Add new product <span class="glyphicon glyphicon-plus"></span> Add new product
<% end %> <% end %>
</li> </li>
<li> <li>
<%= link_to signout_path, method: "delete", dada: { confirm: "Do you want to logout?" } do %> <%= link_to(signout_path, method: "delete", dada: { confirm: "Do you want to logout?" }) do %>
<span class="glyphicon glyphicon-log-out"></span> Logout <span class="glyphicon glyphicon-log-out"></span> Logout
<% end %> <% end %>
</li> </li>
</ul> </ul>
<% else %> <% else %>
<%= link_to signin_path, class: "btn btn-primary" do %> <%= link_to(signin_path, class: "btn btn-primary") do %>
<span class="glyphicon glyphicon-log-in"></span> Login <span class="glyphicon glyphicon-log-in"></span> Login
<% end %> <% end %>
<%= link_to signup_path, class: "btn btn-default" do %> <%= link_to(signup_path, class: "btn btn-default") do %>
<span class="glyphicon glyphicon-user"></span> Register <span class="glyphicon glyphicon-user"></span> Register
<% end %> <% end %>
<%= link_to cards_path, class: 'btn btn-danger last' do %> <%= link_to(cards_path, class: 'btn btn-danger last') do %>
<span class="glyphicon glyphicon-shopping-cart"></span> Your cart <span class="glyphicon glyphicon-shopping-cart"></span> Your cart
<% end %> <% end %>
<% end %> <% end %>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class="input-group block-search"> <div class="input-group block-search">
<input id="txt-keyword" type="text" class="form-control" placeholder="Enter keywords" value="<%= params['keyword'] %>"> <input id="txt-keyword" type="text" class="form-control" placeholder="Enter keywords" value="<%= params['keyword'] %>">
<span class="input-group-btn"> <span class="input-group-btn">
<%= link_to url_for( controller: 'products', action: 'search' ), class: 'btn btn-default', id: 'btn-search' do %> <%= link_to(url_for( controller: 'products', action: 'search' ), class: 'btn btn-default', id: 'btn-search') do %>
<span class="glyphicon glyphicon-search"></span>Search <span class="glyphicon glyphicon-search"></span>Search
<% end %> <% end %>
</span> </span>
......
venshop_app/app/views/layouts/_product_category.html.erb
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
terms.each do |term| terms.each do |term|
%> %>
<li<%= %Q{ class="last">} if i == n %>> <li<%= %Q{ class="last">} if i == n %>>
<%= link_to term.name, product_category_path(term) %> <%= link_to(term.name, product_category_path(term)) %>
</li> </li>
<% <%
i += 1 i += 1
......
venshop_app/app/views/layouts/_slide.html.erb
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
</ol> </ol>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item active"> <div class="item active">
<%= link_to '' do %> <%= link_to('') do %>
<img class="img-responsive" src="<%= image_path('') %>/images/upload/slide/1.png" alt="" /> <img class="img-responsive" src="<%= image_path('') %>/images/upload/slide/1.png" alt="" />
<% end %> <% end %>
</div> </div>
<div class="item"> <div class="item">
<%= link_to '' do %> <%= link_to('') do %>
<img class="img-responsive" src="<%= image_path('') %>/images/upload/slide/2.jpg" alt="" /> <img class="img-responsive" src="<%= image_path('') %>/images/upload/slide/2.jpg" alt="" />
<% end %> <% end %>
</div> </div>
<div class="item"> <div class="item">
<%= link_to '' do %> <%= link_to('') do %>
<img class="img-responsive" src="<%= image_path('') %>/images/upload/slide/3.jpg" alt="" /> <img class="img-responsive" src="<%= image_path('') %>/images/upload/slide/3.jpg" alt="" />
<% end %> <% end %>
</div> </div>
......
venshop_app/app/views/products/show.html.erb
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<% end %> <% end %>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<%= link_to @product.image_medium, class: "thumbnail fancybox", "data-fancybox-type" => "image" do %> <%= link_to(@product.image_medium, class: "thumbnail fancybox", "data-fancybox-type" => "image") do %>
<img src="<%= @product.image_medium %>" alt="" /> <img src="<%= @product.image_medium %>" alt="" />
<% end %> <% end %>
<div class="price"> <div class="price">
<div class="pull-left"><%= number_with_delimiter(@product.price) %> <%= @product.price_currency %></div> <div class="pull-left"><%= number_with_delimiter(@product.price) %> <%= @product.price_currency %></div>
<div class="pull-right"> <div class="pull-right">
<%= link_to cards_path(product_id: @product.id), class: "order btn btn-primary" do %> <%= link_to(cards_path(product_id: @product.id), class: "order btn btn-primary") do %>
<span class="glyphicon glyphicon-shopping-cart"></span> Order <span class="glyphicon glyphicon-shopping-cart"></span> Order
<% end %> <% end %>
</div> </div>
......
venshop_app/app/views/sessions/new.html.erb
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
<%= f.submit "Login", class: "btn btn-large btn-primary btn-submit" %> <%= f.submit "Login", class: "btn btn-large btn-primary btn-submit" %>
<% end %> <% end %>
<p>New user? <%= link_to "Sign up now!", signup_path %></p> <p>New user? <%= link_to("Sign up now!", signup_path) %></p>
</div> </div>
</div> </div>
venshop_app/app/views/shared/_grid.html.erb
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
<div class="col-md-3 col-sm-3"> <div class="col-md-3 col-sm-3">
<div class="item"> <div class="item">
<h4> <h4>
<%= link_to obj.name, product_path(obj) %> <%= link_to(obj.name, product_path(obj)) %>
</h4> </h4>
<%= link_to product_path(obj), class: "thumbnail" do %> <%= link_to(product_path(obj), class: "thumbnail") do %>
<img src="<%= obj.image_medium %>" alt="<%= obj.name %>" /> <img src="<%= obj.image_medium %>" alt="<%= obj.name %>" />
<% end %> <% end %>
<div class="price"> <div class="price">
Price: <span><%= number_with_delimiter(obj.price) %> <%= obj.price_currency %></span> Price: <span><%= number_with_delimiter(obj.price) %> <%= obj.price_currency %></span>
</div> </div>
<div class="action"> <div class="action">
<%= link_to "Detail", product_path(obj), class: "view-detail" %> <%= link_to("Detail", product_path(obj), class: "view-detail") %>
<%= link_to "Order", cards_path(product_id: obj.id), class: "order" %> <%= link_to("Order", cards_path(product_id: obj.id), class: "order") %>
</div> </div>
</div> </div>
</div> </div>
......
venshop_app/app/views/users/_user.html.erb
<li class="media"> <li class="media">
<%= link_to "javascript: void(0)", class: "pull-left" do %> <%= link_to("javascript: void(0)", class: "pull-left") do %>
<img class="media-object" src="<%= gravatar_for(user, { size: 50, out_put_img: false }) %>" alt="<%= user.name %>" /> <img class="media-object" src="<%= gravatar_for(user, { size: 50, out_put_img: false }) %>" alt="<%= user.name %>" />
<% end %> <% end %>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading"><%= user.name %></h4> <h4 class="media-heading"><%= user.name %></h4>
<%= link_to RecaptchaMailhide::URL.url_for(user.email), class: "btn btn-default", target: "_blank" do %> <%= link_to(RecaptchaMailhide::URL.url_for(user.email), class: "btn btn-default", target: "_blank") do %>
<span class="glyphicon glyphicon-envelope"></span> <span class="glyphicon glyphicon-envelope"></span>
<% end %> <% end %>
<% if current_user.admin? && !current_user?(user) %> <% if current_user.admin? && !current_user?(user) %>
| <%= link_to "delete", user, method: "delete", dada: { confirm: "You sure?" } %> | <%= link_to("delete", user, method: "delete", dada: { confirm: "You sure?") } %>
<% end %> <% end %>
</div> </div>
</li> </li>
venshop_app/app/views/users/edit.html.erb
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
<% end %> <% end %>
<%= gravatar_for @user %> <%= gravatar_for @user %>
<%= link_to "change", "http://gravatar.com/emails" %> <%= link_to("change", "http://gravatar.com/emails") %>
</div> </div>
</div> </div>
venshop_app/app/views/users/show.html.erb
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<div id="block-message-visible" class="hidden"></div> <div id="block-message-visible" class="hidden"></div>
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<%= link_to "javascript: void(0)", class: "pull-left" do %> <%= link_to("javascript: void(0)", class: "pull-left") do %>
<img class="media-object" src="<%= gravatar_for(@user, { size: 200, out_put_img: false }) %>" alt="<%= @user.name %>" /> <img class="media-object" src="<%= gravatar_for(@user, { size: 200, out_put_img: false }) %>" alt="<%= @user.name %>" />
<% end %> <% end %>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading"><%= @user.name %></h4> <h4 class="media-heading"><%= @user.name %></h4>
<%= link_to RecaptchaMailhide::URL.url_for(@user.email), class: "btn btn-default btn-lg", target: "_blank" do %> <%= link_to(RecaptchaMailhide::URL.url_for(@user.email), class: "btn btn-default btn-lg", target: "_blank") do %>
<span class="glyphicon glyphicon-envelope"></span> <span class="glyphicon glyphicon-envelope"></span>
<% end %> <% end %>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment