From 5e7b304359fc15fd627ff1f3e05afd102dbcce69 Mon Sep 17 00:00:00 2001
From: Adrian Hinz <adhinz@gmail.com>
Date: Sun, 21 Jan 2018 18:39:41 +0100
Subject: [PATCH] 404 i zmiana strony glownej

---
 app/controllers/site_controller.rb  | 17 +++++++++++++----
 app/helpers/application_helper.rb   |  5 +++--
 app/views/admin/home/index.html.erb |  4 +---
 app/views/site/index.html.erb       |  5 ++---
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index a4fa067..8d98b76 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -6,7 +6,10 @@ class SiteController < ApplicationController
 
   def show
     pages_get
-    @page = PublishedPage.friendly.find(params[:id])
+    @page = PublishedPage.where('id = ? OR slug = ?',params[:id],params[:id]).first
+    if @page.blank?
+      redirect_to '/404.html'
+    end
   end
 
   def kontakt
@@ -16,12 +19,18 @@ class SiteController < ApplicationController
   def preview
     pages_get
     if params[:id]
-      @page = AllPage.friendly.find(params[:id])
-    else
-      @page = AllPage.first
+      @page = AllPage.where('id = ? OR slug = ?',params[:id],params[:id]).first
+    end
+    if @page.blank?
+      redirect_to '/404.html'
     end
   end
 
+  def send_email
+
+  end
+
+
   def pages_get
     @pages = PublishedPage.where('type_of != 3').order('priority ASC')
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c9ca63b..01b2c4a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,8 +7,9 @@ module ApplicationHelper
     ret += '<ul class="navbar-nav ml-auto">'
     friendly_id = nil
     if params[:id]
-      pp = PublishedPage.friendly.find(params[:id])
-      friendly_id = pp.type_of == 3 ? pp.article_friendly : params[:id]
+      if pp = PublishedPage.where('id = ? OR slug = ?',params[:id],params[:id]).first
+        friendly_id = pp.type_of == 3 ? pp.article_friendly : params[:id]
+      end
     end
     for page in pages
       ret += '<li class="nav-item">'
diff --git a/app/views/admin/home/index.html.erb b/app/views/admin/home/index.html.erb
index 9e633cf..60cf235 100644
--- a/app/views/admin/home/index.html.erb
+++ b/app/views/admin/home/index.html.erb
@@ -1,3 +1 @@
-<h1>Home#index in admin</h1>
-<%= current_admin.email %>
-<p>Find me in app/views/home/index.html.erb</p>
+<p>ToDo - Zmiana hasła, do logowania</p>
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 204611f..bcdaf56 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -8,10 +8,9 @@
         <h1 class="text-uppercase">
           &nbsp;<strong style="display:none" id="line2">Pieniądze są najważniejsze</strong>
         </h1>
-        &nbsp;<hr class="mini" style="visibility:hidden" id="line3">
       </div>
       <div class="col-lg-8 mx-auto" >
-        &nbsp;<p class="text-faded mb-5" style="visibility:hidden" id="line4">czyli dlaczego warto ubezpieczać należności</p>
+        &nbsp;<h3 class="text-faded mb-5" style="visibility:hidden" id="line4"><strong>czyli dlaczego warto ubezpieczać należności</strong></h3>
       </div>
     </div>
   </div>
@@ -20,7 +19,7 @@
 $( document ).ready(function() {
     $('#line1').fadeIn(2000, function() {
       $('#line2').fadeIn(2000, function() {
-        $('#line3').css("visibility","visible");
+        //$('#line3').css("visibility","visible");
         $('#line4').css("visibility","visible");
       });
     });