Merge pull request #1569 from weerd/11-facts--sources-output

11 facts  sources output

Author: weerd

lib/modules/dosomething/dosomething_fact_page/dosomething_fact_page.features.field_instance.inc

@@ -42,7 +42,7 @@ function dosomething_fact_page_field_default_field_instances() {
     'label' => 'Sources',
     'required' => 0,
     'settings' => array(
-      'text_processing' => 0,
+      'text_processing' => 1,
       'user_register_form' => FALSE,
     ),
     'widget' => array(

lib/themes/dosomething/paraneue_dosomething/scss/content/_fact-page.scss

@@ -98,11 +98,10 @@
     }
   }
 
-  .sources {
-    // @TODO: I just made sources small for now, need to revisit their structure
-    p {
-      font-size: $font-small;
+  .sources { margin-bottom: 1rem;
+    li {
       color: $med-gray;
+      font-size: $font-small;
     }
   }
 }

lib/themes/dosomething/paraneue_dosomething/templates/node--fact_page.tpl.php

@@ -11,7 +11,7 @@
       </header>
     </div>
 
-    
+
     <?php if (isset($intro)): ?>
       <div class="intro-wrapper">
         <div class="intro">
@@ -39,30 +39,22 @@
             <p class="fact">
               <?php print ($key + 1) . '. ' . $fact['fact']; ?>
 
-              <?php // @TODO: Temporarily commented out until the new 'sources' solution in campaigns is implemented and we can use it here! ?>
+              <?php // @TODO: Sources reinstated, but not sure if the facts need to have numbers associated with their respective source? Need to clarify. ?>
               <?php //<sup></?php print $fact['footnotes']; ?/></sup> ?>
             </p>
           <?php endforeach; ?>
         </div>
       </div>
     <?php endif; ?>
-  
-    <?php // @TODO: Temporarily commented out until the new 'sources' solution in campaigns is implemented and we can use it here! ?>
-    <?php /*
+
     <?php if (isset($sources)): ?>
       <div class="sources-wrapper">
         <div class="sources">
           <h4>Sources</h4>
-          <?php foreach ($sources as $key => $source): ?>
-            <div class="source">
-              <?php // @TODO: Need <sup> to print within the $source's <p> tag. Source markup needs a rework. ?>
-              <sup><?php print ($key + 1); ?></sup><?php print $source; ?>
-            </div>
-          <?php endforeach; ?>
-        </div>
+          <?php print $sources; ?>
+         </div>
       </div>
     <?php endif; ?>
-    */ ?>
 
     <?php if (isset($call_to_action)): ?>
       <div class="cta-wrapper">
@@ -73,4 +65,4 @@
       </div>
     <?php endif; ?>
   </article>
-</section>
+</section>