Merge branch 'master' into PHRAS-2661_help_menu

templates/web/prod/WorkZone/Browser/Browser.html.twig

@@ -102,4 +102,22 @@
   transform: translate(-50%, -50%);
 }
 </style>
+<script>
+    //load the next result page
+    jQuery(document).ready(function(){
+        jQuery('.next_res').click(function(){
+            jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
+            jQuery('.results').load($(this).attr('href'));
+            return false;
+        });
+    });
+    //load the prev result page
+    jQuery(document).ready(function(){
+        jQuery('.prev_res').click(function(){
+            jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
+            jQuery('.results').load($(this).attr('href'));
+            return false;
+        });
+    });
+</script>
 

templates/web/prod/WorkZone/Browser/Results.html.twig

@@ -14,35 +14,30 @@
 <div class="PNB datas">
   <div class="PNB" style="right:10px">
   {% for Basket in Baskets %}
-    <div class="result {% if loop.index is odd %}odd{% endif %}">
+    <div class="result {{ Basket.getArchived ? '' : 'unarchived' }}">
-      <a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px">×</a>
+      <a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close icon-baseline-close-24px" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px">&nbsp;</a>
       <div class="PNB10 rightBrowserInner">
-        <table>
+        <div class="item-table">
-          <tr>
+
-            <td class="thumbnail">
+            <div class="thumbnail">
               {% set BasketElement = Basket.getElements().first() %}
               {% if BasketElement %}
                 {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}}
               {% endif %}
-            </td>
+            </div>
-            <td class="" width="12" style="font-size: 0">&nbsp;</td>
+            <div class="content">
-            <td class="content">
               <h1 class="title">
                 <img class="loader" src="/assets/prod/images/Basket/Browser/loader.gif" />
                 {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app.getAuthenticatedUser()) %}
                 <a href="{{ path('prod_baskets_basket_archive', { 'basket' : Basket.getId(), 'archive' : 1 }) }}" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
-                  <span>
+                  &nbsp;
-                    <img src="/assets/prod/images/Basket/Browser/archive.png"/>
-                  </span>
                 </a>
                 <a href="{{ path('prod_baskets_basket_archive', { 'basket' : Basket.getId(), 'archive' : 0 }) }}" class="unarchiver archive_toggler" style="display:{{ Basket.getArchived ? '' : 'none' }};">
-                  <span>
+                 &nbsp;
-                    <img src="/assets/prod/images/Basket/Browser/archived.png"/>
-                  </span>
                 </a>
                 {% endif %}
                 <a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
-                  {{ Basket.getName() }}
+                    <span>{{ Basket.getName() }}</span>
                 <br><span class="basketCount">
                         {{ Basket.getElements().count() }} {{ ' records' }}
                   </span></a>
@@ -74,12 +69,11 @@
               </p>
               {% endif %}
 
-            </td>
+            </div>
             <td>
 
             </td>
-          </tr>
+        </div>
-        </table>
       </div>
     </div>
     {% endfor %}
@@ -99,37 +93,16 @@
         </td>
         <td class="paginator">
           {% if Page - 1  > 0 %}
-          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res">
+          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res icon-round-chevron_left-24px">&nbsp;</a>
-            <
-          </a>
           {% endif %}
           <span>
             Page {{ Page }} / {{ MaxPage }}
           </span>
           {% if Page + 1  <= MaxPage %}
-          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res">
+          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res icon-round-chevron_right-24px">&nbsp;</a>
-            >
-          </a>
           {% endif %}
         </td>
       </tr>
     </table>
   </div>
-<script>
+
-  //load the next result page
-    jQuery(document).ready(function(){
-        jQuery('.next_res').click(function(){
-            jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
-            jQuery('.results').load($(this).attr('href'));
-            return false;
-        });
-    });
-  //load the prev result page
-    jQuery(document).ready(function(){
-        jQuery('.prev_res').click(function(){
-            jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
-            jQuery('.results').load($(this).attr('href'));
-            return false;
-        });
-    });
-</script>