From e2b72628a8027aaf1a08083d479f5533abdde1ef Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Thu, 10 Oct 2019 13:54:18 +0200 Subject: [PATCH] move navbar outside of the container --- app/controllers/welcome.js | 3 +-- app/views/gardenSize.ejs | 5 +---- app/views/goAgain.ejs | 7 ++----- app/views/layout.ejs | 8 ++++++++ app/views/location.ejs | 4 +--- app/views/notFound.ejs | 3 --- app/views/partials/navBar.ejs | 7 ------- app/views/price.ejs | 5 +---- app/views/queryReview.ejs | 3 --- app/views/realEstateType.ejs | 3 --- app/views/realEstates.ejs | 5 +---- app/views/redirect.ejs | 3 --- app/views/size.ejs | 5 +---- app/views/unsubscribe.ejs | 2 -- app/views/welcome.ejs | 1 - 15 files changed, 16 insertions(+), 48 deletions(-) delete mode 100644 app/views/partials/navBar.ejs diff --git a/app/controllers/welcome.js b/app/controllers/welcome.js index fe62105..4ae84d4 100644 --- a/app/controllers/welcome.js +++ b/app/controllers/welcome.js @@ -1,6 +1,5 @@ const getWelcome = (req, res) => { - const title = "Koju nekretninu tražite?"; - res.render("welcome", { nextStep: "/vrstanekretnine", title }); + res.render("welcome", { nextStep: "/vrstanekretnine", title: false }); }; module.exports = { diff --git a/app/views/gardenSize.ejs b/app/views/gardenSize.ejs index c0c1b91..ce68925 100644 --- a/app/views/gardenSize.ejs +++ b/app/views/gardenSize.ejs @@ -1,4 +1 @@ - -<% include partials/navBar %> - -<% include partials/range %> +<% include partials/range %> diff --git a/app/views/goAgain.ejs b/app/views/goAgain.ejs index dc925cf..6cc4a5d 100644 --- a/app/views/goAgain.ejs +++ b/app/views/goAgain.ejs @@ -1,9 +1,6 @@ - -<% include partials/navBar %> -
- Super. Poslali smo Vam potvrdni email na Vašu email adresu. - Poslije tog emaila, svaki put kada nađemo nove nekretnine koje Vam odgovaraju + Super. Poslali smo Vam potvrdni email na Vašu email adresu. + Poslije tog emaila, svaki put kada nađemo nove nekretnine koje Vam odgovaraju javićemo Vam emailom.

diff --git a/app/views/layout.ejs b/app/views/layout.ejs index 1b8ff32..166cb66 100644 --- a/app/views/layout.ejs +++ b/app/views/layout.ejs @@ -22,6 +22,14 @@ + <%if (title) { %> + + <% } %> +
<%-body%>
diff --git a/app/views/location.ejs b/app/views/location.ejs index 67d8abe..cceff60 100644 --- a/app/views/location.ejs +++ b/app/views/location.ejs @@ -1,8 +1,6 @@ -<% include partials/navBar %> -
Područje na mapi će biti uključeno u pretragu. Namjestite mapu na ulice - koje želite da budu vidljive. + koje želite da budu vidljive.
diff --git a/app/views/notFound.ejs b/app/views/notFound.ejs index e66b342..ee4db97 100644 --- a/app/views/notFound.ejs +++ b/app/views/notFound.ejs @@ -1,6 +1,3 @@ - -<% include partials/navBar %> -

Ups...stranica ne postoji

diff --git a/app/views/partials/navBar.ejs b/app/views/partials/navBar.ejs deleted file mode 100644 index 0ec9f3f..0000000 --- a/app/views/partials/navBar.ejs +++ /dev/null @@ -1,7 +0,0 @@ -
- -
\ No newline at end of file diff --git a/app/views/price.ejs b/app/views/price.ejs index c0c1b91..ce68925 100644 --- a/app/views/price.ejs +++ b/app/views/price.ejs @@ -1,4 +1 @@ - -<% include partials/navBar %> - -<% include partials/range %> +<% include partials/range %> diff --git a/app/views/queryReview.ejs b/app/views/queryReview.ejs index 1e914d6..b587d41 100644 --- a/app/views/queryReview.ejs +++ b/app/views/queryReview.ejs @@ -1,6 +1,3 @@ - -<% include partials/navBar %> -
    diff --git a/app/views/realEstateType.ejs b/app/views/realEstateType.ejs index cf14b03..086612a 100644 --- a/app/views/realEstateType.ejs +++ b/app/views/realEstateType.ejs @@ -1,6 +1,3 @@ - -<% include partials/navBar %> -
      diff --git a/app/views/realEstates.ejs b/app/views/realEstates.ejs index 9dc5fb6..84a4caf 100644 --- a/app/views/realEstates.ejs +++ b/app/views/realEstates.ejs @@ -1,6 +1,3 @@ - -<% include partials/navBar %> -
        <% for(const realEstate of realEstates) { %> @@ -13,4 +10,4 @@ <% } %>
      -
      \ No newline at end of file +
    diff --git a/app/views/redirect.ejs b/app/views/redirect.ejs index db97191..5567a8d 100644 --- a/app/views/redirect.ejs +++ b/app/views/redirect.ejs @@ -1,6 +1,3 @@ - -<% include partials/navBar %> -