css fixes

Gemfile.lock

@@ -76,6 +76,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
+    combine_pdf (1.0.22)
+      matrix
+      ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     devise (4.6.2)
@@ -170,6 +173,7 @@ GEM
       actionpack (>= 4.2.0, < 6.0)
       railties (>= 4.2.0, < 6.0)
     rexml (3.2.5)
+    ruby-rc4 (0.1.5)
     ruby_dep (1.5.0)
     rubyzip (2.3.2)
     sass (3.7.4)
@@ -220,6 +224,7 @@ GEM
     websocket-extensions (0.1.5)
     wicked_pdf (2.1.0)
       activesupport
+    wkhtmltopdf-binary (0.12.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -233,6 +238,7 @@ DEPENDENCIES
   capybara (>= 2.15)
   chromedriver-helper
   coffee-rails (~> 4.2)
+  combine_pdf
   devise
   friendly_id (~> 5.4.0)
   jbuilder (~> 2.5)
@@ -250,6 +256,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
   wicked_pdf
+  wkhtmltopdf-binary (= 0.12.4)
 
 RUBY VERSION
    ruby 2.6.0p0

app/controllers/home_controller.rb

@@ -88,7 +88,7 @@ class HomeController < ApplicationController
         #
         pdf1b = WickedPdf.new.pdf_from_string(
                render_cover_footer(@dotation, @company_sizes),
-               {pdf: 'cover_header',
+               {pdf: 'cover_footer',
                dpi: 300,
                margin: { top: 0, bottom: 0, left: 0, right: 0 },
                background: true,
@@ -141,7 +141,7 @@ class HomeController < ApplicationController
         #
         pdf1b = WickedPdf.new.pdf_from_string(
                render_cover_footer(dotation, @company_sizes),
-               {pdf: 'cover_header',
+               {pdf: 'cover_footer',
                dpi: 300,
                margin: { top: 0, bottom: 0, left: 0, right: 0 },
                background: true,
@@ -151,7 +151,7 @@ class HomeController < ApplicationController
         combiner << CombinePDF.parse(pdf1a)
         combiner << CombinePDF.parse(pdf1)
         combiner << CombinePDF.parse(pdf1b)
-        send_data combiner.to_pdf
+        send_data combiner.to_pdf, filename: "zestawienie_dotacji_#{Time.now.strftime('%d%m%Y')}.pdf"
       end
     end
   end

app/views/home/_dotation_card.html.erb

@@ -9,11 +9,27 @@
     </div>
   </div>
   <div class="card-body">
+    <div class="row">
+      <div class="col-md-12">
+        <h4><i><%= dotation.formal_name %></i></h4>
+      </div>
+    </div>
     <div class="row">
       <div class="col-md-6">
-        <h4><%= dotation.formal_name %></h4>
+        <h4><strong><%= dotation.localization %></strong></h4>
       </div>
       <div class="col-md-6">
+      <% unless dotation.max_percent.blank? %>
+      <div class="row">
+        <div class="col-sm-6">
+          <h4><strong>Poziom dofinansowania</strong></h4>
+        </div>
+        <div class="col-sm-6">
+          <h4>do <%= dotation.max_percent %>% dotacji</h4>
+        </div>
+      </div>
+      <% end %>
+      <% if !dotation.start_date.blank? || !dotation.end_date.blank? %>
         <div class="row">
           <div class="col-sm-6">
             <h4><strong>Składanie wniosków</strong></h4>
@@ -25,14 +41,11 @@
             </h4>
           </div>
         </div>
+        <% end %>
       </div>
     </div>
     <div class="row">
       <div class="col-md-6">
-        <h4><strong><%= dotation.localization %></strong></h4>
-      </div>
-      <div class="col-md-6">
-
           <% unless dotation.max_amount.blank? %>
           <div class="row">
             <div class="col-sm-6">
@@ -43,16 +56,6 @@
             </div>
           </div>
           <% end %>
-          <% unless dotation.max_percent.blank? %>
-          <div class="row">
-            <div class="col-sm-6">
-              <h5><strong>Poziom dofinansowania</strong></h5>
-            </div>
-            <div class="col-sm-6">
-              <h5>do <%= dotation.max_percent %>% dotacji</h5>
-            </div>
-          </div>
-          <% end %>
       </div>
     </div>
     <div class="row">

app/views/home/_filter_form.html.erb

@@ -1,7 +1,7 @@
 <%= form_tag(home_search_path, method: :get, remote: true, id: 'filter_form') do %>
-<div class="card card-success card-outline">
+<div class="card card-primary card-outline">
   <div class="card-header">
-    <h3 class="card-title" style="font-size: 1.5rem;"><strong>Aktywne filtry</strong></h3>
+    <h4 class="card-title" style="font-size: 1.1rem; text-align: center;">Użyj filtrów, aby szybko odnaleźć interesującą Cię dotację</h4>
   </div>
   <div class="card-body">
     <% unless params[:search].blank? %>

app/views/home/_show.html.erb

@@ -35,10 +35,10 @@
       </thead>
       <tbody>
           <tr>
-            <td style="border-style: none solid none none; border-color: #6c757d; border-width: 1px;">
+            <td style="border-style: none solid none none; border-color: #6c757d; border-width: 1px;" width="25%" valign="top">
               <%= render '/experts/expert_show', expert: @dotation.expert %>
             </td>
-            <td>
+            <td valign="top">
               <div style="margin-left: 5px;">
               <%= raw @dotation.expert_info %>
               </div>
@@ -54,23 +54,34 @@
 <hr />
 <div class="row">
   <div class="col-md-12">
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Ogłoszenie aktualnego/najbliższego naboru: </b><span style='font-weight: normal;'>#{@dotation.ann_date_ret}</span></h3>" unless @dotation.announcement_date.blank? %>
+    <table class="table table-lg table-bordered">
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Rozpoczęcie aktualnego/najbliższego naboru: </b><span style='font-weight: normal;'>#{@dotation.start_date_ret}</span></h3>" unless @dotation.start_date.blank? %>
+      <tbody>
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Zakończenie aktualnego/najbliższego naboru: </b><span style='font-weight: normal;'>#{@dotation.end_date_ret}</span></h3>" unless @dotation.end_date.blank? %>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Ogłoszenie aktualnego/najbliższego naboru</b></td><td>#{@dotation.ann_date_ret}</span></td></tr>" unless @dotation.announcement_date.blank? %>
-    <h3 style='text-transform: uppercase;'><b>Co można dofinansować? </b></h3>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Rozpoczęcie aktualnego/najbliższego naboru</b></td><td>#{@dotation.start_date_ret}</span></td></tr>" unless @dotation.start_date.blank? %>
-    <ul>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Zakończenie aktualnego/najbliższego naboru</b></td><td>#{@dotation.end_date_ret}</span></td></tr>" unless @dotation.end_date.blank? %>
-      <% @dotation.expenses.each do |expense| %>
+        <tr>
-        <li><%= expense.name %></li>
+          <td style='text-transform: uppercase;'><b>Co można dofinansować? </b></td>
-      <% end %>
+          <td>
-    </ul>
+            <ul>
-    <% unless @dotation.localization.blank? %>
+              <% @dotation.expenses.each do |expense| %>
-    <h3 style='text-transform: uppercase;'><b>Miejsce realizacji projektu</b></h3>
+                <li><%= expense.name %></li>
-    <p><%= @dotation.localization %></p>
+              <% end %>
-    <% end %>
+            </ul>
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Minimalna wartość projektu (wydatków): </b><span style='font-weight: normal;'>#{HomeHelper.change_ammount(@dotation.min_amount)} #{@dotation.min_amount_curr.name}</span></h3>" unless @dotation.min_amount.blank? %>
+          </td>
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Maksymalna wartość projektu (wydatków): </b><span style='font-weight: normal;'>#{HomeHelper.change_ammount(@dotation.max_amount)} #{@dotation.max_amount_curr.name}</span></h3>" unless @dotation.max_amount.blank? %>
+        </tr>
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Minimalna wartość dotacji: </b><span style='font-weight: normal;'>#{HomeHelper.change_ammount(@dotation.min_dot_ammount)} #{@dotation.min_dot_amount_curr.name}</span></h3>" unless @dotation.min_dot_ammount.blank? %>
+        <% unless @dotation.localization.blank? %>
-    <%= raw "<h3 style='text-transform: uppercase;'><b>Maksymalna wartość dotacji: </b><span style='font-weight: normal;'>#{HomeHelper.change_ammount(@dotation.max_dot_ammount)} #{@dotation.max_dot_amount_curr.name}</span></h3>" unless @dotation.max_dot_ammount.blank? %>
+          <tr>
+            <td style='text-transform: uppercase;'><b>Miejsce realizacji projektu</b></td>
+            <td><%= @dotation.localization %></td>
+          </tr>
+        <% end %>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Minimalna wartość projektu (wydatków): </b></td><td>#{HomeHelper.change_ammount(@dotation.min_amount)} #{@dotation.min_amount_curr.name}</span></td></tr>" unless @dotation.min_amount.blank? %>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Maksymalna wartość projektu (wydatków): </b></td><td>#{HomeHelper.change_ammount(@dotation.max_amount)} #{@dotation.max_amount_curr.name}</span></td></tr>" unless @dotation.max_amount.blank? %>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Minimalna wartość dotacji: </b></td><td>#{HomeHelper.change_ammount(@dotation.min_dot_ammount)} #{@dotation.min_dot_amount_curr.name}</span></td></tr>" unless @dotation.min_dot_ammount.blank? %>
+        <%= raw "<tr><td><span style='text-transform: uppercase;'><b>Maksymalna wartość dotacji: </b></td><td>#{HomeHelper.change_ammount(@dotation.max_dot_ammount)} #{@dotation.max_dot_amount_curr.name}</span></td></tr>" unless @dotation.max_dot_ammount.blank? %>
+      </tbody>
+    </table>
+    <br />
     <h3 style='text-transform: uppercase;'><b>Szczegółowy opis dotacji</b></h3>
     <div class="row">
       <div class="col-md-12">

app/views/home/_show.pdf.erb

@@ -33,7 +33,7 @@
     <table style="border: none;">
       <tbody>
           <tr>
-            <td style="border-style: none solid none none; border-color: #6c757d; border-width: 1px;">
+            <td style="border-style: none solid none none; border-color: #6c757d; border-width: 1px;" width="25%">
               <%= render '/experts/expert_show', expert: dotation.expert %>
             </td>
             <td style="margin-left: 5px; border-style: none none none solid;">