From 418eb028ae4e663435044fa0332e1dbf831f043e Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Mon, 18 Jan 2016 11:06:49 +0100
Subject: [PATCH] changed text of newsleetter sweepstake

---
 back-office/app/views/items/import.html.erb   | 34 +++++++++++++++++++
 .../components/about/newsletterSweepstake.js  |  4 +--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 back-office/app/views/items/import.html.erb

diff --git a/back-office/app/views/items/import.html.erb b/back-office/app/views/items/import.html.erb
new file mode 100644
index 0000000..0a1bd6b
--- /dev/null
+++ b/back-office/app/views/items/import.html.erb
@@ -0,0 +1,34 @@
+<%= form_tag('./import') do %>
+  <p><label for="supplier_id">Supplier: </label>
+  <%= select_tag "supplier_id", options_from_collection_for_select(@suppliers, "id", "name", @selected_supplier.try(:id)) %></p>
+
+  <p><label for="codes"> 
+    Codes to check:
+  </label><br />
+  <%= text_area_tag "codes", @codes_to_check, rows: 20, columns: 50 %></p>
+
+  <p><%= submit_tag "Check" %></p>
+<% end %>
+
+<div>
+<h2> In database: <%= @items.length %>, in file: <%= @codes_to_check_array.length %> </h2>
+</div>
+
+<div>
+<h2>Not in database (<%= @missing_from_database.length %>): </h2>
+<br />
+<% @missing_from_database.each do |code| %>
+  <%= code %><br /> 
+<% end %>
+
+</div>
+
+<div>
+<h2>Not in file (<%= @missing_from_codes.length %>): </h2>
+<br />
+<% @missing_from_codes.each do |code| %>
+  <%= code %><br />
+<% end %>
+
+</div>
+
diff --git a/front-ui/app/components/about/newsletterSweepstake.js b/front-ui/app/components/about/newsletterSweepstake.js
index 58e796b..4a8d30b 100644
--- a/front-ui/app/components/about/newsletterSweepstake.js
+++ b/front-ui/app/components/about/newsletterSweepstake.js
@@ -19,9 +19,9 @@ var NewsletterSweepstake = React.createClass({
         <h1 className="normal-message">Novosti i sniženja</h1>
            <p className="normal-message">Prijavite se na naše novosti i saznajte sve o najnovijim sniženjima i ponudama na Ribici!</p>
 
-<p className="normal-message"><strong>I ovaj put - najsretnije očekuju vrijedne Disney Frozen nagrade!</strong> <br /></p>
+<p className="normal-message"><strong>I ovaj put - najsretnije očekuju vrijedne  Lego i Disney Frozen nagrade nagrade!</strong> <br /></p>
 
-<p className="normal-message">Pobjednike objavljujemo u našim email novostima u Ponedjeljak, 7.2.2016. </p>
+<p className="normal-message">Pobjednike objavljujemo u našim email novostima u Nedjelju, 7.2.2016. </p>
 
 
 <p style={{"textAlign": "center"}}>