Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Submitted Project

  • Loading branch information...
commit f06ee274dfdc49bfd98407970ea1b23467867e30 1 parent 5f4fcd8
@florida authored
Showing with 15 additions and 9 deletions.
  1. +0 −4 Gemfile.lock
  2. BIN  app/assets/images/products/amplifier_1.png
  3. BIN  app/assets/images/products/amplifier_2.png
  4. BIN  app/assets/images/products/amplifier_3.png
  5. BIN  app/assets/images/products/amplifier_4.png
  6. BIN  app/assets/images/products/amplifier_5.png
  7. BIN  app/assets/images/products/amplifier_6.png
  8. BIN  app/assets/images/products/guitar_1.png
  9. BIN  app/assets/images/products/guitar_2.png
  10. BIN  app/assets/images/products/guitar_3.png
  11. +1 −2  app/assets/stylesheets/store.css.scss
  12. +2 −0  app/controllers/page_controller.rb
  13. +4 −1 app/helpers/application_helper.rb
  14. +6 −1 app/views/layouts/application.html.erb
  15. +2 −1  app/views/store/shoppingcart.html.erb
  16. BIN  public/system/products/images/000/000/001/medium/guitar_2.png
  17. BIN  public/system/products/images/000/000/001/original/guitar_2.png
  18. BIN  public/system/products/images/000/000/001/thumb/guitar_2.png
  19. BIN  public/system/products/images/000/000/002/medium/amplifier_3.png
  20. BIN  public/system/products/images/000/000/002/original/amplifier_3.png
  21. BIN  public/system/products/images/000/000/002/thumb/amplifier_3.png
  22. BIN  public/system/products/images/000/000/004/medium/guitar_1.png
  23. BIN  public/system/products/images/000/000/004/original/guitar_1.png
  24. BIN  public/system/products/images/000/000/004/thumb/guitar_1.png
  25. BIN  public/system/products/images/000/000/005/medium/amplifier_1.png
  26. BIN  public/system/products/images/000/000/005/original/amplifier_1.png
  27. BIN  public/system/products/images/000/000/005/thumb/amplifier_1.png
  28. BIN  public/system/products/images/000/000/006/medium/amplifier_2.png
  29. BIN  public/system/products/images/000/000/006/original/amplifier_2.png
  30. BIN  public/system/products/images/000/000/006/thumb/amplifier_2.png
  31. BIN  public/system/products/images/000/000/007/medium/amplifier_6.png
  32. BIN  public/system/products/images/000/000/007/original/amplifier_6.png
  33. BIN  public/system/products/images/000/000/007/thumb/amplifier_6.png
  34. BIN  public/system/products/images/000/000/008/medium/amplifier_5.png
  35. BIN  public/system/products/images/000/000/008/original/amplifier_5.png
  36. BIN  public/system/products/images/000/000/008/thumb/amplifier_5.png
  37. BIN  public/system/products/images/000/000/009/medium/guitar_3.png
  38. BIN  public/system/products/images/000/000/009/original/guitar_3.png
  39. BIN  public/system/products/images/000/000/009/thumb/guitar_3.png
View
4 Gemfile.lock
@@ -48,9 +48,6 @@ GEM
sass (>= 3.2)
thor
builder (3.0.4)
- ckeditor (3.7.3)
- mime-types
- orm_adapter
cocaine (0.4.2)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -160,7 +157,6 @@ PLATFORMS
DEPENDENCIES
activeadmin
bcrypt-ruby
- ckeditor (= 3.7.3)
coffee-rails (~> 3.2.1)
jquery-rails
paperclip (~> 3.0)
View
BIN  app/assets/images/products/amplifier_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/amplifier_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/amplifier_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/amplifier_4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/amplifier_5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/amplifier_6.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/guitar_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/guitar_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/products/guitar_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3  app/assets/stylesheets/store.css.scss
@@ -16,7 +16,7 @@ section.product{
width: 22%;
border-radius: 10px;
padding: 10px;
- min-height: 500px;
+ min-height: 320px;
position: relative;
header{
a{
@@ -31,7 +31,6 @@ section.product{
section.product_image{
background: #FFF;
- min-height: 300px;
border-radius: 10px;
padding: 10px;
}
View
2  app/controllers/page_controller.rb
@@ -2,4 +2,6 @@ class PageController < ApplicationController
def show
@page = Page.find(params[:id])
end
+
+
end
View
5 app/helpers/application_helper.rb
@@ -6,5 +6,8 @@ def round_in_customers_favour amount
def tax_percent amount
sprintf("%.2f", amount * 100) + "%"
end
-
+
+ def title(page_title)
+ content_for(:title) { page_title }
+ end
end
View
7 app/views/layouts/application.html.erb
@@ -1,7 +1,12 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
- <title>Elmorfstore - <%= yield :title %></title>
+ <title>
+ Elmorfstore
+ <% if(yield(:title) != "")%>
+ <%= " - " + yield(:title) %>
+ <% end %>
+ </title>
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
View
3  app/views/store/shoppingcart.html.erb
@@ -1,4 +1,5 @@
-<% content_for :title do %>Shopping Cart<% end %>
+<% title "Shopping Cart" %>
+
<header class="shoppingcart">
<h1>Display Cart Check</h1>
</header>
View
BIN  public/system/products/images/000/000/001/medium/guitar_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/001/original/guitar_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/001/thumb/guitar_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/002/medium/amplifier_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/002/original/amplifier_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/002/thumb/amplifier_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/004/medium/guitar_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/004/original/guitar_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/004/thumb/guitar_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/005/medium/amplifier_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/005/original/amplifier_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/005/thumb/amplifier_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/006/medium/amplifier_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/006/original/amplifier_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/006/thumb/amplifier_2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/007/medium/amplifier_6.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/system/products/images/000/000/007/original/amplifier_6.png
Diff not rendered
View
BIN  public/system/products/images/000/000/007/thumb/amplifier_6.png
Diff not rendered
View
BIN  public/system/products/images/000/000/008/medium/amplifier_5.png
Diff not rendered
View
BIN  public/system/products/images/000/000/008/original/amplifier_5.png
Diff not rendered
View
BIN  public/system/products/images/000/000/008/thumb/amplifier_5.png
Diff not rendered
View
BIN  public/system/products/images/000/000/009/medium/guitar_3.png
Diff not rendered
View
BIN  public/system/products/images/000/000/009/original/guitar_3.png
Diff not rendered
View
BIN  public/system/products/images/000/000/009/thumb/guitar_3.png
Diff not rendered
Please sign in to comment.
Something went wrong with that request. Please try again.