Merge branch 'develop'

Author: cableman

modules/loop_search_node/js/loopSearchBoxController.js

@@ -471,30 +471,6 @@ angular.module('searchBoxApp').controller('loopSearchBoxController', ['CONFIG',
       $scope.searchClicked(false);
     };
 
-    /**
-     * Resets the current search to default.
-     */
-    $scope.reset = function reset() {
-      // Reset pager.
-      if (CONFIG.provider.hasOwnProperty('pager')) {
-        $scope.query.pager = angular.copy(CONFIG.provider.pager);
-      }
-
-      // Check if initial query exists.
-      if (CONFIG.hasOwnProperty('initialQueryText')) {
-        $scope.query.text = angular.copy(CONFIG.initialQueryText);
-
-        search(true);
-      }
-      else {
-        // No initial query.
-        $scope.query.text = '';
-
-        // Remove hits.
-        communicatorService.$emit('hits', {"hits" : {}});
-      }
-    };
-
     // Get the show on the road.
     init();
   }

themes/loop/css/styles.css

@@ -3687,7 +3687,6 @@ a.question--term {
 /* Search node results
    ========================================================================== */
 .search-node-result--item {
-  
   padding: 20px 0;
   border-top: 1px solid #cccccc; }
   .search-node-result--item-content {
@@ -3697,7 +3696,6 @@ a.question--term {
 .search-node-result--link {
   display: block;
   font-size: 18px;
-  font-weight: bold;
   text-decoration: none;
   margin-bottom: 1em;
   line-height: 1em; }
@@ -3707,7 +3705,6 @@ a.question--term {
 .search-node-result--data-wrapper {
   flex: 0 0 100%;
   padding-right: 36px; }
-
   @media only screen and (min-width: 43em) {
     .search-node-result--data-wrapper {
       flex: 0 0 auto; } }
@@ -3720,6 +3717,7 @@ a.question--term {
   @media only screen and (min-width: 43em) {
     .search-node-result--data-wrapper-subject {
       flex: 0 0 auto; } }
+
 .search-node-result--meta-data-date {
   color: #b3b3b3;
   font-size: .9em;

themes/loop/sass/modules/_search-node-result.scss

@@ -22,11 +22,10 @@
   &--link {
     display: block;
     font-size: 18px;
-    font-weight: bold;
     text-decoration: none;
     margin-bottom: 1em;
     line-height: 1em;
-    
+
     &:hover {
       color: $green;
     }

themes/loop/templates/search/angular/pager.html

@@ -5,7 +5,7 @@
        hide-if-empty="true"
        page="pager.page + 1"
        page-size="pager.size"
-       total="pager.max"
+       total="hits.hits"
        show-prev-next="true"
        show-first-last="true"
        text-first="« {{ Drupal.t('first', { }, { 'context': 'angular' }) }}"

themes/loop/templates/search/angular/result.html

@@ -16,12 +16,12 @@ <h1 class="page-title">{{ Drupal.t('Search results', {}, { 'context': 'angular'
   <div data-ng-repeat="hit in hits.results" class="search-node-result--item">
     <a href="{{ hit.url }}" class="search-node-result--link" data-ng-bind-html="hit.title"></a>
     <div class="search-node-result--item-content">
-      <div class="search-node-result--meta-data-date">{{ hit.created*1000 | date : 'd. MMMM yyyy' }}</div>
       <div class="search-node-result--data-wrapper"><div class="search-node-result--meta-data-type is-{{ hit.type }}">{{ Drupal.t(hit.type, { }, { 'context': 'angular' }) }}</div></div>
-      <div class="search-node-result--data-wrapper"><a href="{{ hit.url }}" class="search-node-result--comments">{{ hit.comment_count }} {{ Drupal.t('Reply', { }, { 'context': 'angular' }) }}</a></div>
       <div class="search-node-result--data-wrapper-subject">{{ Drupal.t('Subject', { }, { 'context': 'angular' }) }}:
         <div class="search-node-result--subject" data-ng-click="filterUpdate('field_subject', hit.field_subject['0'])">{{ hit.field_subject['0'] }}</div>
       </div>
+      <div class="search-node-result--meta-data-date">{{ hit.created*1000 | date : 'd. MMMM yyyy' }}</div>
+      <div class="search-node-result--data-wrapper"><a href="{{ hit.url }}" class="search-node-result--comments">{{ hit.comment_count }} {{ Drupal.t('Reply', { }, { 'context': 'angular' }) }}</a></div>
     </div>
   </div>