pwb 1.0.0 → 1.1.1

data/app/themes/default/views/layouts/pwb/application.html.erb

@@ -5,10 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="index, follow">
     <%# display_meta_tags site: @current_website.tenant_display_name %>
-    <link href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" rel="stylesheet">
     <%= stylesheet_link_tag    "pwb/themes/default", media: "all" %>
-    <link rel="stylesheet" media="all" href="/custom_css.css" data-turbolinks-track="true" />
-    <%= javascript_include_tag "pwb/application" %>
+    <style>
+      <%= custom_styles "default" %>
+    </style>
+    <%= javascript_include_tag "pwb/application", async: false %>
     <%= csrf_meta_tags %>
     <title><%= yield(:page_title) %></title>
   </head>
@@ -21,7 +22,27 @@
         <%= yield %>
       </div>
       <%= render :partial => '/pwb/footer', :locals => {}  %>
+      <%= render :partial => '/pwb/analytics', :locals => {}  %>
     </div>
     <%= insert_paloma_hook %>
+    <noscript id="deferred-styles">
+      <link href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" rel="stylesheet">
+      <!-- Google Font -->
+      <link href='https://fonts.googleapis.com/css?family=Vollkorn' rel='stylesheet' type='text/css'>
+      <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    </noscript>
+    <script>
+      var loadDeferredStyles = function() {
+        var addStylesNode = document.getElementById("deferred-styles");
+        var replacement = document.createElement("div");
+        replacement.innerHTML = addStylesNode.textContent;
+        document.body.appendChild(replacement)
+        addStylesNode.parentElement.removeChild(addStylesNode);
+      };
+      var raf = requestAnimationFrame || mozRequestAnimationFrame ||
+          webkitRequestAnimationFrame || msRequestAnimationFrame;
+      if (raf) raf(function() { window.setTimeout(loadDeferredStyles, 0); });
+      else window.addEventListener('load', loadDeferredStyles);
+    </script>
   </body>
 </html>

data/app/themes/default/views/pwb/sections/about_us.html.erb

@@ -28,8 +28,7 @@
     <div class="container">
       <div class="row">
         <div class="col-md-6">
-          <img src="<%= @content.default_photo_url%>"  alt=""
-          class="img-responsive about-us-img">
+          <%= opt_image_tag(@content.default_photo, :quality => "auto", height: 600, crop: "scale", class: "img-responsive about-us-img", alt: "") %>
         </div>
         <div class="col-md-6">
           <div class="section-title-wr mt-40">

data/app/themes/default/views/pwb/sections/cms.html.erb

@@ -0,0 +1,30 @@
+<% page_title @current_agency.company_name  %>
+<!-- MAIN CONTENT -->
+<div class="pg-opt">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-6">
+        <h2>
+          <%= I18n.t(@title_key) %>
+        </h2>
+      </div>
+      <div class="col-md-6" style="">
+        <ol class="breadcrumb">
+          <li><a href="/">
+              <%= I18n.t("webContentSections.home") %>
+            </a></li>
+          <li class="active">
+            <%= I18n.t(@title_key) %>
+          </li>
+        </ol>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="comfy-content-panel">
+  <%# render '/pwb/welcome/content_area_cols' %>
+  <% @cms_pages.each do |cms_page| %>
+    <%== cms_page.content_cache %>
+  <% end %>
+</div>
+<!-- FOOTER -->

data/app/themes/default/views/pwb/welcome/_single_property_row.html.erb

@@ -10,7 +10,8 @@
             <div class="wp-block white property list">
               <div class="figure">
                 <%= link_to property.contextual_show_path(rent_or_sale) do %>
-                  <%= image_tag("#{property.ordered_photo_url 1}", class: 'img-responsive') %>
+                  <%= opt_image_tag((property.ordered_photo 1), quality: "auto",
+                    height: 300, crop: "scale", class: "img-responsive") %>
                 <% end %>
               </div>
               <div class="wp-block-body">

data/app/themes/default/views/pwb/welcome/index.html.erb

@@ -11,7 +11,9 @@
         <div class="carousel-inner">
 
           <% @carousel_items.each.with_index do |carousel_item, index| %>
-            <div class="item item-dark <%= " active " if index == 0 %>" style="background-image:linear-gradient( rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.1) ),url(<%= carousel_item.default_photo_url %>);">
+            <div class="item item-dark <%= " active " if index == 0 %>"
+            style="<%= bg_image carousel_item.default_photo, quality: "auto",
+        height: 800, crop: "fit", gradient: "rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.1)" %>">
               <div class="container">
                 <div class="carousel-content">
                   <%== carousel_item.raw %>

data/app/views/layouts/pwb/devise.html.erb

@@ -18,6 +18,7 @@
       <%= render :partial => '/pwb/header', :locals => { not_devise: false }  %>
       <%= yield %>
       <%= render :partial => '/pwb/footer', :locals => {}  %>
+      <%= render :partial => '/pwb/analytics', :locals => {}  %>
     </div>
     <%= insert_paloma_hook %>
   </body>

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

@@ -0,0 +1,15 @@
+<% if @current_website.render_google_analytics  %>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '<%= @current_website.analytics_id %>']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+<% end %>

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

@@ -30,16 +30,13 @@
           <%== @footer_content.raw %>
         </div>
       </div>
-
     </div>
     <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)  %>.
@@ -47,15 +44,6 @@
       <div class="col-sm-6">
         <p  style="float: right;">Powered by <a href="http://propertywebbuilder.com">PropertyWebBuilder</a></p>
       </div>
-<!--       <div class="col-lg-9 copyright">
-        2014 © Web Pixels. All rights reserved.
-        <a href="#">Terms and conditions</a>
-      </div>
-      <div class="col-lg-3">
-        <a href="http://www.webpixels.ro" title="Made with love by Web Pixels" target="_blank" class="">
-          <img src="images/webpixels-footer-logo.png" alt="Web Pixels - Designing Forward | Logo" class="pull-right">
-        </a>
-      </div> -->
     </div>
   </div>
 </div>

data/app/views/pwb/custom_css/{berlin.css.erb → _berlin.css.erb}

@@ -352,5 +352,4 @@ nav.venta_alquiler a:hover {
   border-bottom: 3px solid <%= @current_website.style_variables["primary_color"] %>;
 }
 */
-<%# @current_website.raw_css %>
 

data/app/views/pwb/custom_css/{default.css.erb → _default.css.erb}

@@ -100,5 +100,4 @@ header .text-navbar-brand {
 
 <%= render :partial => '/pwb/custom_css/shared.css', :locals => {}  %>
 
-<%# @current_website.raw_css %>
 

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

@@ -32,4 +32,5 @@ footer .col ul li {
 }
 
 
+<%= @current_website.raw_css %>
 

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

@@ -1,22 +1,22 @@
 <div class="product-gallery">
   <div id="propCarousel" class="carousel carousel-1 slide" data-ride="carousel" data-interval="<%= @carousel_speed %>">
-      <ol class="carousel-indicators">
+    <ol class="carousel-indicators">
       <% @property_details.prop_photos.each.with_index do |photo, index| %>
         <li data-target="#propCarousel" data-slide-to="<%= index %>" class=""></li>
       <% end %>
-      </ol>
+    </ol>
     <div class="carousel-inner">
       <% @property_details.prop_photos.each.with_index do |photo, index| %>
         <div class="item item-dark <%= "active" if index == 0 %>">
-          <img src="<%= photo.image.url %>" style="height: 100%;" />
-            <% if @property_details.contextual_price_with_currency @operation_type %>
+          <%= opt_image_tag((photo ), :quality => "auto", height: 600, crop: "scale", class: "", alt: "") %>
+          <% if @property_details.contextual_price_with_currency @operation_type %>
             <div class="ribbon dark fondo_accion">
               <span>
                 <%= @property_details.contextual_price_with_currency @operation_type %>
               </span>
             </div>
-            <% end %>
-        </div>        
+          <% end %>
+        </div>
       <% end %>
     </div>
     <!-- Controls -->
@@ -28,29 +28,15 @@
     </a>
   </div>
   <div class="thumbnail-images" style="display:none;">
-    <a href="#" class="theater" rel="group" hidefocus="true">
-                    <img src="<%= @property_details.ordered_photo_url 2 %>"  alt="">
-                  </a>
-    <a href="#" class="theater" rel="group" hidefocus="true">
-                    <img src="<%= @property_details.ordered_photo_url 3 %>"  alt="">
-                  </a>
-    <a href="#" class="theater" rel="group" hidefocus="true">
-                    <img src="<%= @property_details.ordered_photo_url 4 %>"  alt="">
-                  </a>
-    <a href="#" class="theater" rel="group" hidefocus="true">
-                    <img src="<%= @property_details.ordered_photo_url 5 %>"  alt="">
-                  </a>
+    <%# properties_carousel_footer @property_details.prop_photos %>
   </div>
-
-
-
   <div class="wp-block property list no-border">
     <div class="wp-block-content clearfix">
       <div class="wp-block-footer style2">
         <ul class="aux-info">
           <li><i class="fa fa-arrows-alt"></i>
             <%= @property_details.constructed_area %><%= area_unit @property_details %>
-</li>
+          </li>
           <li><i class="fa fa-bed"></i>
             <%= @property_details.count_bedrooms %>
           </li>
@@ -58,13 +44,13 @@
             <%= @property_details.count_bathrooms %>
           </li>
           <li>
-          <% if @property_details.has_garage %>
-            <i class="fa fa-car"></i>
-            <%= @property_details.count_garages %>            
-          <% end %>
+            <% if @property_details.has_garage %>
+              <i class="fa fa-car"></i>
+              <%= @property_details.count_garages %>
+            <% end %>
           </li>
         </ul>
       </div>
     </div>
   </div>
-</div>
+</div>

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

@@ -50,7 +50,7 @@
           <tr>
             <td><strong><%= t "property.operationType" %>:</strong></td>
             <td>
-              <%= t @operation_type %>
+              <%= t @operation_type_key %>
             </td>
           </tr>
           <tr>

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

@@ -1,66 +1,64 @@
-
-      <li class="property-item row <%= 'featured' if property.highlighted %> cuadro_inmueble" 
+<li class="property-item row <%= 'featured' if property.highlighted %> cuadro_inmueble" 
     data-price="<%= property.contextual_price @operation_type  %>" >
-        <!-- data-price above used for client side sorting with paloma -->
-        <% if property.highlighted %>
-          <div class="prop-listing-header fondo_secundario">
-            <%= t "property.highlightedProperty" %>
-          </div>
+  <!-- data-price above used for client side sorting with paloma -->
+  <% if property.highlighted %>
+    <div class="prop-listing-header fondo_secundario">
+      <%= t "property.highlightedProperty" %>
+    </div>
+  <% end %>
+  <div class="prop-listing-image col-xs-12 col-sm-5 col-md-4">
+    <div class="prop-figure">
+      <%= link_to property.contextual_show_path( @operation_type ) do %>
+        <%= opt_image_tag((property.ordered_photo 1), quality: "auto",
+            height: 240, crop: "scale", class: "img-responsive") %>
+      <% end %>
+    </div>
+  </div>
+  <div class="prop-listing-body col-xs-12 col-sm-7 col-md-8" style="padding-bottom:0;">
+    <div class="prop-listing-text">
+      <h3>
+        <%= link_to property.contextual_show_path( @operation_type ), class: "action_link" do %>
+          <%= property.title %>
         <% end %>
-        <div class="prop-listing-image col-xs-12 col-sm-5 col-md-4">
-        <div class="prop-figure">
-          <%= link_to property.contextual_show_path( @operation_type ) do %>
-            <img src="<%= property.ordered_photo_url 1 %>" class="img-responsive" alt="">
-          <% end %>
-        </div>
-        </div>
-        <div class="prop-listing-body col-xs-12 col-sm-7 col-md-8" style="padding-bottom:0;">
-          <div class="prop-listing-text">
-            <h3>
-              <%= link_to property.contextual_show_path( @operation_type ), class: "action_link" do %>
-                <%= property.title %>
-              <% end %>
-            </h3>
-            <div>
-              <%= property.reference %>
-            </div>
-            <div class="truncated_description" style="display:none;">
-              <%# property.description %>
-            </div>
-          </div>
-          <div class="meta-info">
-            <div>
-             <%= link_to property.contextual_show_path( @operation_type ), :class => "ver_inmueble" do %>
-              <i class="fa fa-chevron-right"></i>
-              <%= t "property.goToProperty" %>
-            <% end %>
-
-            </div>
-            <ul>
-              <li><span class="precio negrita">
-                  <%= property.contextual_price_with_currency @operation_type  %>
-                </span></li>
-              <li class=""><i class="fa fa-bed"></i> <small>
-                  <%= property.count_bedrooms %>
-                </small></li>
-              <li class=""><i class="fa fa-tint"></i> <small>
-                  <%= property.count_bathrooms %>
-                </small></li>
-              <li class=""><i class="fa fa-arrows-alt"></i> <small>
-                  <%= property.constructed_area %> <%= area_unit property %>
-                </small></li>
-              <li class=""><i class="fa fa-car"></i> <small>
-                  <%= property.count_garages %>
-                </small>
-              </li>
-              <!-- <li class="hidden text-right">&nbsp;</li> -->
-            </ul>
-            </div>
-
-          <% if property.highlighted && (property.contextual_price_with_currency @operation_type) %>
-            <div style="" class="ribbon dark fondo_accion"><span>
-                <%= property.contextual_price_with_currency @operation_type  %>
-              </span></div>
-          <% end %>
-        </div>
-      </li>
+      </h3>
+      <div>
+        <%= property.reference %>
+      </div>
+      <div class="truncated_description" style="display:none;">
+        <%# property.description %>
+      </div>
+    </div>
+    <div class="meta-info">
+      <div>
+        <%= link_to property.contextual_show_path( @operation_type ), :class => "ver_inmueble" do %>
+          <i class="fa fa-chevron-right"></i>
+          <%= t "property.goToProperty" %>
+        <% end %>
+      </div>
+      <ul>
+        <li><span class="precio negrita">
+            <%= property.contextual_price_with_currency @operation_type  %>
+          </span></li>
+        <li class=""><i class="fa fa-bed"></i> <small>
+            <%= property.count_bedrooms %>
+          </small></li>
+        <li class=""><i class="fa fa-tint"></i> <small>
+            <%= property.count_bathrooms %>
+          </small></li>
+        <li class=""><i class="fa fa-arrows-alt"></i> <small>
+            <%= property.constructed_area %> <%= area_unit property %>
+          </small></li>
+        <li class=""><i class="fa fa-car"></i> <small>
+            <%= property.count_garages %>
+          </small>
+        </li>
+        <!-- <li class="hidden text-right">&nbsp;</li> -->
+      </ul>
+    </div>
+    <% if property.highlighted && (property.contextual_price_with_currency @operation_type) %>
+      <div style="" class="ribbon dark fondo_accion"><span>
+          <%= property.contextual_price_with_currency @operation_type  %>
+        </span></div>
+    <% end %>
+  </div>
+</li>

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

@@ -1,7 +1,6 @@
-<!-- TODO - delete - not in use from may 2017 -->
+<!-- TODO - delete - not in use from may 2017 
       <li class="property-item <%= 'featured' if property.highlighted %> cuadro_inmueble" 
     data-price="<%= property.contextual_price @operation_type  %>" >
-        <!-- data-price above used for client side sorting with paloma -->
         <% if property.highlighted %>
           <div class="listing-header fondo_principal">
             <%= t "property.highlightedProperty" %>
@@ -53,4 +52,5 @@
               </span></div>
           <% end %>
         </div>
-      </li>
+      </li>
+      -->

data/config/client_setups/default.json

@@ -1,6 +1,60 @@
 [{
   "name": "default",
   "id": "default",
+  // "cmsSections": [{
+  //   "tabValue": "about-us",
+  //   "tabTitleKey": "webContentSections.aboutUs",
+  //   "cmsPartsList": [{
+  //     "tabValue": "services",
+  //     "tabTitleKey": "webContentSections.services",
+  //     "label": "about_us_services",
+  //     "editorBlocks": [
+  //       [{
+  //         "label": "title_a",
+  //         "isSingleLineText": "true"
+  //       }, {
+  //         "label": "content_a",
+  //         "isMultipleLineText": "true"
+  //       }],
+  //       [{
+  //         "label": "title_b",
+  //         "isSingleLineText": "true"
+  //       }, {
+  //         "label": "content_b",
+  //         "isMultipleLineText": "true"
+  //       }],
+  //       [{
+  //         "label": "title_c",
+  //         "isSingleLineText": "true"
+  //       }, {
+  //         "label": "content_c",
+  //         "isMultipleLineText": "true"
+  //       }]
+  //     ]
+  //   }, {
+  //     "tabValue": "people",
+  //     "tabTitleKey": "webContentSections.people",
+  //     "label": "about_us_people",
+  //     "editorBlocks": [
+  //       [
+  //         "title_a",
+  //         "content_a"
+  //       ],
+  //       [
+  //         "title_b",
+  //         "content_b"
+  //       ],
+  //       [
+  //         "title_c",
+  //         "content_c"
+  //       ]
+
+  //     ]
+  //   }]
+  // }, {
+  //   "tabValue": "legal",
+  //   "tabTitleKey": "webContentSections.legal"
+  // }],
   // https://msdn.microsoft.com/en-us/library/ee825488(v=cs.20).aspx
   "availableLocaleFields": [{
       "labelTextTKey": "es",
@@ -22,7 +76,7 @@
     }, {
       "labelTextTKey": "pt",
       "fieldName": "pt",
-      "localeVariants": ["pt-PT","pt-BR"],
+      "localeVariants": ["pt-PT", "pt-BR"],
       "isNotComplete": true
     }, {
       "labelTextTKey": "ru",
@@ -31,10 +85,6 @@
       "isNotComplete": true
     }
     // }, {
-    //   "labelTextTKey": "de",
-    //   "fieldName": "de",
-    //   "localeVariants": ["de-DE"]
-    // }, {
     //   "labelTextTKey": "hi",
     //   "fieldName": "hi",
     //   "localeVariants": ["hi-IN"]
@@ -42,18 +92,6 @@
     //   "labelTextTKey": "it",
     //   "fieldName": "it",
     //   "localeVariants": ["it-IT"]
-    // }, {
-    //   "labelTextTKey": "pt",
-    //   "fieldName": "pt",
-    //   "localeVariants": ["pt-PT"]
-    // }, {
-    //   "labelTextTKey": "ru",
-    //   "fieldName": "ru",
-    //   "localeVariants": ["ru-RU"]
-    // , {
-    //   "labelTextTKey": "fr",
-    //   "fieldName": "fr",
-    //   "localeVariants": ["fr-FR"]
     // }
   ],
   // http://www.xe.com/iso4217.php
@@ -81,16 +119,16 @@
   },{
     "value": "CLP",
     "labelTextTKey": "clp"
-  },{
+  }, {
     "value": "CNY",
     "labelTextTKey": "cny"
-  },{
+  }, {
     "value": "EUR",
     "labelTextTKey": "eur"
   }, {
     "value": "USD",
     "labelTextTKey": "usd"
-  },{
+  }, {
     "value": "INR",
     "labelTextTKey": "inr"
   }, {
@@ -139,7 +177,7 @@
   "importPropertiesTabsList": [{
     "tabValue": "from_upload",
     "tabTitleKey": "ioSections.fromUpload"
-    // "importLabelKey": "btnLabels.importTranslations"
+      // "importLabelKey": "btnLabels.importTranslations"
   }, {
     "tabValue": "from_mls",
     "tabTitleKey": "ioSections.fromMls"