feat: apply new resource layout (resolves #141) (#190)

* feat: apply new resource layout * feat: add date added to cards * fix: classname for date added * fix: remove extraneous div in resource header * fix: count issue
platform-coop-toolkit · Feb 20, 2020 · 2adb07b · 2adb07b
1 parent b95a394
commit 2adb07b
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 22 deletions.
diff --git a/app/Controllers/Partials/Resource.php b/app/Controllers/Partials/Resource.php
@@ -1,6 +1,7 @@
 <?php namespace App\Controllers\Partials;
 
 use function App\maybe_swap_term;
+use function App\natural_language_join;
 
 trait Resource
 {
@@ -54,16 +55,19 @@ public static function getWaybackMachineLinks()
         return false;
     }
 
-    public static function getPublicationDate()
+    public static function getPublicationDate($format = false)
     {
         global $post;
 
         if ($post->post_type == 'lc_resource') {
+            if (!$format) {
+                $format = get_option('date_format');
+            }
             $y = get_post_meta($post->ID, 'lc_resource_publication_year', true);
             $m = get_post_meta($post->ID, 'lc_resource_publication_month', true);
             $d = get_post_meta($post->ID, 'lc_resource_publication_day', true);
             return date_i18n(
-                get_option('date_format'),
+                $format,
                 strtotime(implode('-', [$y, $m, $d]))
             );
         }
@@ -106,9 +110,9 @@ public static function getAuthors()
     {
         global $post;
         if ($post->post_type == 'lc_resource') {
-            $authors = get_post_meta($post->ID, 'lc_resource_authors', true);
+            $authors = get_post_meta($post->ID, 'lc_resource_author', true);
             if ($authors) {
-                return $authors;
+                return natural_language_join($authors);
             }
         }
         return false;

diff --git a/app/helpers.php b/app/helpers.php
@@ -153,3 +153,30 @@ function maybe_swap_term($term, $lang = false)
     }
     return $term;
 }
+
+
+/**
+ * Join a string with a natural language conjunction at the end.
+ * Based on https://gist.github.com/angry-dan/e01b8712d6538510dd9c
+ *
+ * @param array $list
+ * @param string $conjunction
+ * @param bool $oxford
+ *
+ * @return string
+ */
+function natural_language_join(array $list, $conjunction = 'and', $oxford = true)
+{
+    if (count($list) > 2) {
+        $last_item = array_pop($list);
+        if ($oxford) {
+            $final_separator = ", $conjunction ";
+        } else {
+            $final_separator = " $conjunction ";
+        }
+        return implode(', ', $list) . $final_separator . $last_item;
+    } elseif (count($list) === 2) {
+        return implode(" $conjunction ", $list);
+    }
+    return array_pop($list);
+}
diff --git a/resources/views/partials/content-lc_resource.blade.php b/resources/views/partials/content-lc_resource.blade.php
@@ -28,7 +28,7 @@
       <span class="separator">.</span>
       @endif
       @if(Archive::getPublicationDate())
-      <span class="card__date"><span class="screen-reader-text">{{ __('date published', 'coop-library') }}: </span>2016</span>
+      <span class="card__date"><span class="screen-reader-text">{{ __('date published', 'coop-library') }}: </span>{{ Archive::getPublicationDate('Y') }}</span>
       @endif
     </div>
     @endif
@@ -43,10 +43,13 @@
     @endif
   </div>
   @endif
-  @if(Archive::isFavorited())
-  <div class="card__favorite">
-    @svg('favorite-filled', 'icon--favorite-filled', ['focusable' => 'false', 'aria-hidden' => 'true'])
-    {{ __('Favorited', 'coop-library') }}
+  <div class="card__meta">
+    <span class="card__added">{{ sprintf(__('Added %s', 'coop-library'), get_the_date()) }}</span>
+    @if(Archive::isFavorited())
+    <span class="card__favorite">
+      @svg('favorite-filled', 'icon--favorite-filled', ['focusable' => 'false', 'aria-hidden' => 'true'])
+      {{ __('Favorited', 'coop-library') }}
+    </span>
+    @endif
   </div>
-  @endif
 </article>
diff --git a/resources/views/partials/content-single-lc_resource.blade.php b/resources/views/partials/content-single-lc_resource.blade.php
@@ -1,19 +1,33 @@
 <article @php post_class() @endphp>
   <div class="page-header resource__header">
-    <p class="resource__format">
-      @svg(Single::getFormatIcon(), 'icon--' . Single::getFormatIcon(), ['focusable' => 'false', 'aria-hidden' => 'true']) <span class="screen-reader-text">{{ __('resource format', 'coop-library') }}: </span>{{ Single::getFormat() }}
-    </p>
     <h1 class="resource__title">{!! get_the_title() !!}</h1>
-    @if(Single::getPublisher() || Single::getRegion())
-    <p class="resource__meta">
-    @if(Single::getPublisher())
-      <span class="resource__publisher byline vcard">{{ __('By', 'coop-library') }} {!! Single::getPublisher(true) !!}</span>
-    @endif
-    @if(Single::getRegion())
-      <span class="resource__locality">@svg('location', 'icon--location', ['focusable' => 'false', 'aria-hidden' => 'true']) {{ Archive::getRegion() }}</span>
-    @endif
-    </p>
+    @if(Single::getAuthors())
+    <div class="resource__meta resource__byline">@svg('author', 'icon--author', ['focusable' => 'false', 'aria-hidden' => 'true']) {{ sprintf(__('By %s', 'coop-library'), Single::getAuthors()) }}</div>
     @endif
+    <div class="resource__meta">
+      <div class="resource__meta-group">
+          <span class="resource__format">@svg(Single::getFormatIcon(), 'icon--' . Single::getFormatIcon(), ['focusable' => 'false', 'aria-hidden' => 'true']) <span class="screen-reader-text">{{ __('resource format', 'coop-library') }}: </span>{{ Single::getFormat() }}</span>@if(Single::getPublisher())<span class="separator">.</span>
+          <span class="resource__publisher">{!! sprintf(__('Published by %s', 'coop-library'), Single::getPublisher()) !!}</span>
+          @endif
+      </div>
+      @if(Single::getRegion())
+      <div class="resource__meta-group">
+        <span class="resource__locality">@svg('location', 'icon--location', ['focusable' => 'false', 'aria-hidden' => 'true']) <span class="screen-reader-text">{{ __('location of relevance', 'coop-library') }}: </span>{{ Single::getRegion() }}</span>
+      </div>
+      @endif
+      @if($current_language !== Single::getLanguage() || Single::getPublicationDate())
+      <div class="resource__meta-group">
+        @svg('info', 'icon--info', ['focusable' => 'false', 'aria-hidden' => 'true'])
+        @if($current_language !== Single::getLanguage())
+        <span class="resource__language"><span class="screen-reader-text">{{ __('language', 'coop-library') }}: </span>{{ $languages[Single::getLanguage()] }}</span>
+        <span class="separator">.</span>
+        @endif
+        @if(Single::getPublicationDate())
+        <span class="resource__date"><span class="screen-reader-text">{{ __('date published', 'coop-library') }}: </span>{{ Single::getPublicationDate() }}</span>
+        @endif
+      </div>
+      @endif
+    </div>
   </div>
   <div class="resource__abstract">
     <h2>{{ __('Summary', 'coop-library') }}</h2>
@@ -92,5 +106,8 @@
     </div>
     @endif
   </div>
+  <div class="resource__meta">
+    <span class="date__added">{{ sprintf(__('Added %s', 'coop-library'), get_the_date()) }}</span>
+  </div>
   @php comments_template('/partials/comments.blade.php') @endphp
 </article>