Merge branch 'master' of https://github.com/openclassify/openclassify

addons/default/visiosoft/advs-module/resources/css/list.css

@@ -6,16 +6,16 @@
     height: 500px;
 }
 
-.table-ads .img-thumbnail {
+.table-classified .img-thumbnail {
     max-height: 70px;
 }
 
-.table-ads .td-image {
+.table-classified .td-image {
     max-width: 200px;
     max-height: 100px;
 }
 
-.list-ads .bg-light {
+.list-classified .bg-light {
     height: 100px;
 }
 

addons/default/visiosoft/advs-module/resources/views/list/list.twig

@@ -16,7 +16,7 @@
                     {% include "visiosoft.module.advs::list/partials/list-filter" %}
                 </div>
                 <div class="col-md-9">
-                    <div class="section recommended-ads">
+                    <div class="section recommended-classified">
 
                         <div class="row breadcrumb list-header">
 

addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig

@@ -1,6 +1,6 @@
 {{ addBlock('ad-list/partials/ads',{'featured_advs':featured_advs})|raw }}
 {% for adv in advs %}
-    <div class="col-md-12 mb-2 list-ads">
+    <div class="col-md-12 mb-2 list-classified">
         <a href="{{ adv.detail_url }}" class="text-dark">
             <div class="row bg-light">
                 <div class="col-md-2 justify-content-center align-self-center border-right border-white">

addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig

@@ -9,9 +9,12 @@
         <div class="row">
             <div class="col-md-3 col-xs-3">
                 <div class="card m-4">
-                    <img src="{{ img('visiosoft.module.advs::images/sample-logo.jpg').url }}"
-                         class="card-img-top">
-                    {#                    <img src="{{ user.file.url }}" class="card-img-top">#}
+                    {% if user.file is null %}
+                        <img src="{{ img('visiosoft.module.advs::images/sample-logo.jpg').url }}"
+                             class="card-img-top">
+                    {% else %}
+                        <img src="{{ user.file.url }}" class="card-img-top">
+                    {% endif %}
                     <div class="card-body">
                         <h5 class="card-title">{{ user.first_name }} {{ user.last_name }}</h5>
                     </div>

addons/default/visiosoft/advs-module/resources/views/list/table.twig

@@ -1,8 +1,8 @@
 {% extends "visiosoft.module.advs::list/list" %}
 {% block listContent %}
-    <div class="table-responsive table-ads">
+    <div class="table-responsive table-classified">
 
-        <table class="table ads-list-table">
+        <table class="table classified-list-table">
             <thead>
             <tr>
                 <th scope="col" colspan="2"

addons/default/visiosoft/base-theme/resources/views/partials/assets.twig

@@ -22,6 +22,12 @@
     {% endfor %}
 </script>
 
+<script type="text/javascript">
+    {% for script in asset_inlines("customjs.js") %}
+    {{ script|raw }}
+    {% endfor %}
+</script>
+
 {# Include Styles Loaded From Outside #}
 <style type="text/css">
     {% for style in asset_inlines("styles.css", ["min"]) %}