[Rt-commit] rt branch, 4.4/search-results-header-order-indicator, repushed

[? sunnavy]

The branch 4.4/search-results-header-order-indicator was deleted and repushed:
       was 3f9bed3fbc013fa469ea3955bb75ff26ad0263ac
       now fea44e765a92c2a33534fa7cf93e9cf4d2d5dcff

1: 2c27f4854 ! 1: 6ad62dacc Add order indicator to search results header
    @@ -1,6 +1,26 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
         Add order indicator to search results header
    +
    +diff --git a/devel/third-party/README b/devel/third-party/README
    +--- a/devel/third-party/README
    ++++ b/devel/third-party/README
    +@@
    + Origin: https://github.com/ccampbell/mousetrap
    + License: Apache
    + 
    ++* noun_arrow_1920806.svg
    ++Description: arrow
    ++Origin: https://thenounproject.com/search/?q=arrow&i=1920806 (Arrow by Rose Alice Design from the Noun Project)
    ++License: CC BY 3.0
    +
    +diff --git a/devel/third-party/noun_arrow_1920806.svg b/devel/third-party/noun_arrow_1920806.svg
    +new file mode 100644
    +--- /dev/null
    ++++ b/devel/third-party/noun_arrow_1920806.svg
    +@@
    ++<svg xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 125" style="enable-background:new 0 0 100 100;" xml:space="preserve"><switch><foreignObject requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" x="0" y="0" width="1" height="1"/><g i:extraneous="self"><path d="M95.4,45L66.1,15.7c-2.7-2.7-7.2-2.7-9.9,0c-2.7,2.7-2.7,7.2,0,9.9L73.5,43h-64c-3.9,0-7,3.1-7,7s3.1,7,7,7h64L56.2,74.3    c-2.7,2.7-2.7,7.2,0,9.9c1.4,1.4,3.2,2.1,5,2.1s3.6-0.7,5-2.1L95.4,55c1.3-1.3,2.1-3.1,2.1-5C97.5,48.1,96.8,46.3,95.4,45z"/></g></switch><text x="0" y="115" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">Created by Rose Alice Design</text><text x="0" y="120" fill="#000000" font-size="5px" font-w
 eight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">from the Noun Project</text></svg>
    +\ No newline at end of file
     
     diff --git a/share/html/Elements/CollectionAsTable/Header b/share/html/Elements/CollectionAsTable/Header
     --- a/share/html/Elements/CollectionAsTable/Header
    @@ -38,7 +58,7 @@
     +                loc( $attr ),
     +                $order_by{$attr}{class} eq 'asc' ? loc('ascending') : loc('descending')
     +            );
    -+            $m->out( qq{ <span class="order" title="$title">($order_by{$attr}{index} <i class="$order_by{$attr}{class}"></i> )</span>} );
    ++            $m->out( qq! <span class="order" title="$title">($order_by{$attr}{index}<i class="$order_by{$attr}{class}"></i>)</span>! );
     +        }
          }
          else {
    @@ -52,24 +72,26 @@
          content: '\a0\a0\a0\a0';
      }
     +
    -+th.collection-as-table span.order {
    -+    padding: 0 2px;
    -+}
    -+
     +th.collection-as-table span.order i {
    -+    border: solid black;
    -+    border-width: 0 2px 2px 0;
     +    display: inline-block;
    -+    padding: 2px;
    ++    background-size: 6px;
    ++    width: 6px;
    ++    height: 8px;
     +}
     +
     +th.collection-as-table span.order i.asc {
    -+    transform: rotate(-135deg);
    -+    -webkit-transform: rotate(-135deg);
    ++    background-image: url(../../../static/images/css/arrow-up.png);
     +}
     +
     +th.collection-as-table span.order i.desc {
    -+    transform: rotate(45deg);
    -+    -webkit-transform: rotate(45deg);
    ++    background-image: url(../../../static/images/css/arrow-down.png);
     +}
     
    +diff --git a/share/static/images/css/arrow-down.png b/share/static/images/css/arrow-down.png
    +new file mode 100644
    +Binary files /dev/null and b/share/static/images/css/arrow-down.png differ
    +
    +diff --git a/share/static/images/css/arrow-up.png b/share/static/images/css/arrow-up.png
    +new file mode 100644
    +Binary files /dev/null and b/share/static/images/css/arrow-up.png differ
    +
2: 3f9bed3fb ! 2: fea44e765 Test order indicator in search results header
    @@ -18,9 +18,9 @@
      
          $agent->follow_link_ok({id => 'page-results'});
     +    $agent->text_contains('# (1', 'order number 1');
    -+    $agent->content_contains('1 <i class="desc"></i>', 'arrow 1');
    ++    $agent->content_contains('1<i class="desc"></i>', 'arrow 1');
     +    $agent->text_contains('Requestor (2', 'order number 2');
    -+    $agent->content_contains('2 <i class="asc"></i>', 'arrow 2');
    ++    $agent->content_contains('2<i class="asc"></i>', 'arrow 2');
     +
          ok( $agent->find_link(
              text      => $t->id,