pwb 1.2.0 → 1.3.0

data/app/views/pwb/_footer.html.erb

@@ -34,12 +34,8 @@
     <hr>
     <div class="row">
       <div class="col-sm-6 copyright">
-        <% @sections.each do |section| %>
-          <%= footer_link(section) %>
-        <% end %>
-        <%# link_to I18n.t("legalAdvice"), pwb.legal_path(locale: locale)  %>
-        <%# link_to I18n.t("privacyPolicy"), pwb.privacy_policy_path(locale: locale)  %>
-        <%= link_to I18n.t("navbar.admin"), pwb.admin_with_locale_path(locale: locale)  %>.
+        <%= render_footer_links %>
+        <%# link_to I18n.t("navbar.admin"), pwb.admin_with_locale_path(locale: locale)  %>
       </div>
       <div class="col-sm-6">
         <p  style="float: right;">Powered by <a href="http://propertywebbuilder.com">PropertyWebBuilder</a></p>

data/app/views/pwb/_header.html.erb

@@ -47,32 +47,30 @@
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav navbar-right">
-            <% @sections.each do |section| %>
-              <%= top_nav_link(section) %>
-            <% end %>
+            <%# top_navigation %>
+            <%= render_top_navigation_links %>
             <% if @show_admin_link  %>
-              <% if current_user %>
-                <li class="<%= 'selected' if current_page?(pwb.admin_with_locale_path(locale: locale)) %>">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                    <%= t "navbar.admin" %>
-                  </a>
-                  <ul class="dropdown-menu">
-                    <li>
-                      <%= link_to I18n.t("navbar.admin"), pwb.admin_with_locale_path(locale: locale)  %>
-                    </li>
-                    <li>
-                      <%= link_to I18n.t("changePassword"), pwb.edit_user_registration_path() %>
-                    </li>
-                    <li>
-                      <%= link_to I18n.t("signOut"), pwb.destroy_user_session_path(), method: :delete %>
-                    </li>
-                  </ul>
-                </li>
-              <% else %>
-                <li class="">
-                  <%= link_to I18n.t("navbar.admin"), pwb.admin_with_locale_path(locale: locale)  %>
-                </li>
-              <% end %>
+              <li class="">
+                <%= link_to I18n.t("navbar.admin"), pwb.admin_with_locale_path(locale: locale)  %>
+              </li>
+            <% end %>
+            <% if current_user %>
+              <li class="<%= 'selected' if current_page?(pwb.admin_with_locale_path(locale: locale)) %>">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                  <%= t "navbar.admin" %>
+                </a>
+                <ul class="dropdown-menu">
+                  <li>
+                    <%= link_to I18n.t("navbar.admin"), pwb.admin_with_locale_path(locale: locale)  %>
+                  </li>
+                  <li>
+                    <%= link_to I18n.t("changePassword"), pwb.edit_user_registration_path() %>
+                  </li>
+                  <li>
+                    <%= link_to I18n.t("signOut"), pwb.destroy_user_session_path(), method: :delete %>
+                  </li>
+                </ul>
+              </li>
             <% end %>
           </ul>
         </div>

data/app/views/pwb/admin_panel/show_legacy_1.html.erb

@@ -0,0 +1,3 @@
+<noscript>
+<h5>You need javascript to be enabled to be able to view this page correctly.</h5>
+</noscript>

data/app/views/pwb/custom_css/_berlin.css.erb

@@ -58,18 +58,15 @@ h2 {
 #aa-slider .aa-slider-area .aa-top-slider .aa-top-slider-btn:hover, #aa-slider .aa-slider-area .aa-top-slider .aa-top-slider-btn:focus {
   color: <%= @current_website.style_variables["primary_color"] %>;
 }
-
 #aa-advance-search .aa-advance-search-area .aa-advance-search-top .aa-single-advance-search .aa-search-btn {
   background-color: <%= @current_website.style_variables["primary_color"] %>;
 }
-
 .aa-single-filter-search .noUi-connect {
   background-color: <%= @current_website.style_variables["primary_color"] %>;
 }
 .aa-single-filter-search .noUi-handle {
   background-color: <%= @current_website.style_variables["primary_color"] %>;
 }
-
 .aa-title span {
   background-color: <%= @current_website.style_variables["secondary_color"] %>;
 }
@@ -271,85 +268,21 @@ h2 {
   background-color: <%= @current_website.style_variables["primary_color"] %>;
 }
 
-
 #aa-footer {
   background-color: <%= @current_website.style_variables["footer_bg_color"] || "#333" %>;
 }
 
-
-
 #aa-footer .aa-footer-area .aa-footer-left a,
 #aa-footer .aa-footer-area .aa-footer-right a,
 #aa-footer .aa-footer-area .aa-footer-left,
 #aa-footer .aa-footer-area .aa-footer-right{
   color: <%= @current_website.style_variables["footer_main_text_color"] || "#fff" %>;  
 }
-
-
-
 <%= render :partial => '/pwb/custom_css/shared.css', :locals => {}  %>
 
-
-
-
-/*below for button on contact form*/
 .btn-base:hover, .btn-base:focus, .btn-base:active, .btn-base.active, .open .dropdown-toggle.btn-base {
     color: #fff;
     background-color: <%= @current_website.style_variables["action_color"] %>;
     border-color: <%= @current_website.style_variables["action_color"] %>;
 }
 
-
-/*
-.fondo_accion {
-  background: <%= @current_website.style_variables["action_color"] %>;
-  color: #fff;
-}
-
-
-
-ul.list-listings>li.featured {
-  border: 1px solid <%= @current_website.style_variables["primary_color"] %>;
-}
-
-.fondo_principal {
-  background: <%= @current_website.style_variables["primary_color"] %>;
-  color: #fff;
-}
-
-.fondo_secundario {
-  background: <%= @current_website.style_variables["secondary_color"] %>;
-  color: #fff;
-}
-
-.color_principal,
-.color_principal:hover,
-.social a:hover,
-ul.mega-nav-ul li a i,
-nav.venta_alquiler a.selected,
-nav.venta_alquiler a:hover {
-  color: <%= @current_website.style_variables["primary_color"] %> !important;
-}
-
-.contact-info h5 i,
-.color_secundario,
-.color_secundario:hover {
-  color: <%= @current_website.style_variables["secondary_color"] %> !important;
-}
-
-.navbar-wp .navbar-nav>li>a:hover,
-.navbar-wp .navbar-nav>li>a:focus,
-.navbar-wp .navbar-nav>li.selected > a,
-.form-base .cuselFrameRight,
-.panel-base .panel-heading,
-.primary-image:hover,
-.thumbnail-images a:hover {
-  background: <%= @current_website.style_variables["primary_color"] %> !important;
-  color: #fff;
-}*/
-
-/*.tabs li.active a {
-  border-bottom: 3px solid <%= @current_website.style_variables["primary_color"] %>;
-}
-*/
-

data/app/views/pwb/custom_css/_default.css.erb

@@ -1,25 +1,9 @@
-/*header.top_header{
-  min-height: 25px;
-}
-*/
-/*below for button on contact form*/
-/*.btn-base {
-  color: #fff !important;
-  background-color: #3498db;
-  border: 1px solid;
-  border-color: #258cd1
-}*/
 .btn-base:hover, .btn-base:focus, .btn-base:active, .btn-base.active, .open .dropdown-toggle.btn-base {
     color: #fff;
     background-color: <%= @current_website.style_variables["action_color"] %>;
     border-color: <%= @current_website.style_variables["action_color"] %>;
 }
 
-/*.btn-alt:before {
-  background-color: <%= @current_website.style_variables["action_color"] %>;  
-}*/
-
-
 .fondo_footer {
   background: <%= @current_website.style_variables["footer_bg_color"] || "#333" %>;
   color: <%= @current_website.style_variables["footer_main_text_color"] || "#fff" %>;  
@@ -76,12 +60,6 @@ nav.venta_alquiler a:hover {
   border-top: 4px solid <%= @current_website.style_variables["primary_color"] %>;
 }
 
-/*.navbar-toggle:hover,
-.navbar-toggle:focus {
-  background-color: #3498db;
-  border-color: #3498db;
-}*/
-
 header .text-navbar-brand {
   color: <%= @current_website.style_variables["secondary_color"] %>
 }

data/app/views/pwb/custom_css/_shared.css.erb

@@ -1,3 +1,4 @@
+body { font-family: 'Open Sans', sans-serif;}
 footer .col h5 {
   color: <%= @current_website.style_variables["footer_sec_text_color"] || "#ccc" %>;  
 }
@@ -20,14 +21,14 @@ footer .col ul li {
 }
 
 
-.services-section .container .services-wrapper .single-service .bordered {
+.services-section .bst-container .services-wrapper .single-service .bordered {
   border: 2px solid <%= @current_website.style_variables["primary_color"] %>;
 }
-.services-section .container .services-wrapper .single-service .icon-service {
+.services-section .bst-container .services-wrapper .single-service .icon-service {
   color: <%= @current_website.style_variables["primary_color"] %>;
   border-color: <%= @current_website.style_variables["primary_color"] %>;
 }
-.services-section .container .services-wrapper .single-service:hover h4 {
+.services-section .bst-container .services-wrapper .single-service:hover h4 {
   color: <%= @current_website.style_variables["primary_color"] %>;
 }
 

data/app/views/pwb/custom_css/_vic.css.erb

@@ -0,0 +1,10 @@
+<% @text_color_style_vars.each do |style_var| %>
+  .<%= "#{style_var}" %> {
+    color: <%= @current_website.get_style_var(style_var) || "#fff" %>;  
+  }
+<% end  %>
+<% @bg_style_vars.each do |style_var| %>
+  .<%= "#{style_var}" %> {
+    background: <%= @current_website.get_style_var(style_var) || "#fff" %>;  
+  }
+<% end  %>

data/app/views/pwb/props/_images_section_carousel.html.erb

@@ -40,7 +40,7 @@
           <li><i class="fa fa-bed"></i>
             <%= @property_details.count_bedrooms %>
           </li>
-          <li><i class="fa fa-tint"></i>
+          <li><i class="fa fa-shower"></i>
             <%= @property_details.count_bathrooms %>
           </li>
           <li>

data/app/views/pwb/search/_search_result_item.html.erb

@@ -42,7 +42,7 @@
         <li class=""><i class="fa fa-bed"></i> <small>
             <%= property.count_bedrooms %>
           </small></li>
-        <li class=""><i class="fa fa-tint"></i> <small>
+        <li class=""><i class="fa fa-shower"></i> <small>
             <%= property.count_bathrooms %>
           </small></li>
         <li class=""><i class="fa fa-arrows-alt"></i> <small>

data/app/views/pwb/squares/show_client.html.erb

@@ -0,0 +1,26 @@
+<div class="row">
+  <div class="col-sm-12">
+    <h3 style="margin: 20px 0px">
+      View prop
+    </h3>
+    <div>
+      <div>
+          <% @prop["data"].each do |prop_item| %>
+            <div>
+              <div>
+                Name: <%= prop_item["name"].to_s %>
+              </div>
+              <div>
+                Value: <%= prop_item["value"].to_s %>
+              </div>
+              <div>
+                parseinfo: <%= prop_item["parseInfo"].to_s %>
+              </div>
+            </div>
+            <hr>
+          <% end %>
+      </div>
+      ttt
+    </div>
+  </div>
+</div>

data/app/views/pwb/squares/show_prop.html.erb

@@ -0,0 +1,26 @@
+<div class="row">
+  <div class="col-sm-12">
+    <h3 style="margin: 20px 0px">
+      View prop
+    </h3>
+    <div>
+      <div>
+          <% @prop["data"].each do |prop_item| %>
+            <div>
+              <div>
+                Name: <%= prop_item["name"].to_s %>
+              </div>
+              <div>
+                Value: <%= prop_item["value"].to_s %>
+              </div>
+              <div>
+                parseinfo: <%= prop_item["parseInfo"].to_s %>
+              </div>
+            </div>
+            <hr>
+          <% end %>
+      </div>
+      ttt
+    </div>
+  </div>
+</div>

data/app/views/pwb/squares/vue.html.erb

@@ -0,0 +1 @@
+<div></div>

data/config/client_setups/default.json

@@ -73,34 +73,40 @@
       "fieldName": "de",
       "localeVariants": ["de-DE"]
     },
+    {
+      "labelTextTKey": "it",
+      "fieldName": "it",
+      "localeVariants": ["it-IT"]
+    },
     {
       "labelTextTKey": "pt",
       "fieldName": "pt",
       "localeVariants": ["pt-PT", "pt-BR"],
       "isNotComplete": true
     },
-    {
-      "labelTextTKey": "es",
-      "fieldName": "es",
-      "localeVariants": ["es-ES", "es-MX", "es-CL"]
-    },
     {
       "labelTextTKey": "ru",
       "fieldName": "ru",
       "localeVariants": ["ru-RU"]
     },
     {
-      "labelTextTKey": "vi",
-      "fieldName": "vi",
-      "localeVariants": ["vi-VI"],
-      "isNotComplete": true
+      "labelTextTKey": "es",
+      "fieldName": "es",
+      "localeVariants": ["es-ES", "es-MX", "es-CL"]
     },
     {
       "labelTextTKey": "tr",
       "fieldName": "tr",
       "localeVariants": ["tr-TR"],
       "isNotComplete": true
+    },
+    {
+      "labelTextTKey": "vi",
+      "fieldName": "vi",
+      "localeVariants": ["vi-VI"],
+      "isNotComplete": true
     }
+
     // }, {
     //   "labelTextTKey": "hi",
     //   "fieldName": "hi",
@@ -254,24 +260,19 @@
   //   "importLabelKey": "btnLabels.importProperties",
   //   "importUrl": "/import/properties"
   // }],
-  "websiteContentTabsList": [
-  {
-    "tabValue": "landing-carousel",
-    "tabTitleKey": "webContentSections.landingCarousel"
-  },
-  {
-    "tabValue": "content-area-cols",
-    "tabTitleKey": "webContentSections.contentAreaCols"
-  },
-  {
-    "tabValue": "about-us",
-    "tabTitleKey": "webContentSections.aboutUs"
-  },
-  {
-    "tabValue": "legal",
-    "tabTitleKey": "webContentSections.legal"
-  },
-  {
+  "websiteContentTabsList": [{
+  //   "tabValue": "landing-carousel",
+  //   "tabTitleKey": "webContentSections.landingCarousel"
+  // }, {
+  //   "tabValue": "content-area-cols",
+  //   "tabTitleKey": "webContentSections.contentAreaCols"
+  // }, {
+  //   "tabValue": "about-us",
+  //   "tabTitleKey": "webContentSections.aboutUs"
+  // }, {
+  //   "tabValue": "legal",
+  //   "tabTitleKey": "webContentSections.legal"
+  // }, {
     "tabValue": "footer",
     "tabTitleKey": "webContentSections.footer"
   }]

data/config/initializers/i18n_globalise.rb

@@ -0,0 +1,4 @@
+I18n.available_locales = [:en, :ca, :es, :fr, :ar, :de, :ru, :pt, :vi, :tr, :it, :nl]
+# I18n.available_locales = [:en, :es, :fr, :de, :ru, :pt]
+
+Globalize.fallbacks = {:de => [:en],:es => [:en], :ru => [:en]}

data/config/locales/admin.en.yml

@@ -61,14 +61,45 @@ en:
       landing: Landing
       legal: Legal
     pageSections:
+      notEditable:
+        This section cannot be edited
+      contactUsFormAndMap: 
+        title: Form and Map
+        info: Contact us form and map
+      pageTitle: Page title
       services: 
         title: Services you offer
         info: An overview of the services you offer
       people: 
         title: Your team
         info: Summary info about your team
+      # landingCarousel: 
+      #   title: Home page carousel
+      #   info: Main section displaying images and text
+      rawHtml: 
+        title: HTML Content
+        info: You can add extra HTML here
+      topRentals: 
+        title: Top Rentals
+        info: Summary list of properties to rent
+      topSales: 
+        title: Top Sales
+        info: Summary list of properties for sale
+      contactUsForm: 
+        title: Contact us form
+        info: Form to allow visitors to send you a message
+      # aboutUs:
+      #   title: Text and photo
+      #   info: A little bit about your business
+      ourAgency:
+        title: About our agency
+        info: A little bit about your business
+      landingHero:
+        title: Main header
+        info: Large image and text highlighting your busi
     editor:
       pickPhoto: Pick photo
+      uploadPhoto: Upload photo
     inTabLabels:
       topNav: Top Navigation
       footer: Footer
@@ -140,12 +171,12 @@ en:
       suffixTr: in Turkish
       privacyPolicy: Privacy Policy
       legalAdvice: Legal Notice
-      landingcarousel: Text for carousel image
-      cac1: Column 1
-      cac2: Column 2
-      cac3: Column 3
-      landingPageHero: Content for the main page
-      tagLine: Tag Line
+      # landingcarousel: Text for carousel image
+      # cac1: Column 1
+      # cac2: Column 2
+      # cac3: Column 3
+      # landingPageHero: Content for the main page
+      # tagLine: Tag Line
       aboutUs: About us
       footerInfo: Extra footer content
 
@@ -168,7 +199,7 @@ en:
       aboutUs: About us
       contactInformation: Contact information 
       sell: Sell
-      tagLine: Tag Line
+      # tagLine: Tag Line
       legal: Legal
       general: General
       landingCarousel: Landing Page Carousel