Merge pull request #545 from rentonsa/LUC023A-117

rentonsa · web-flow · commit 3e710bf2a73c · 2019-04-01T10:18:55.000+01:00
Luc023 a 117
diff --git a/config/art.php b/config/art.php
@@ -54,7 +54,8 @@
     'Link' => 'dc.identifier.uri',
     'Tags' => 'dc.subject.crowdsourced.en',
     'ImageUri' => 'dc.identifier.imageUri.en',
-    'Permalink' => 'dc.contributor.authorpermalink.en'
+    'Permalink' => 'dc.contributor.authorpermalink.en',
+	'SketchFabURI' => 'dc.identifier.sketchuri.en'
 );
 
 $config['skylight_schema_links'] = array(
diff --git a/config/geddes.php b/config/geddes.php
@@ -27,10 +27,9 @@
 $config['skylight_sitemap_type'] = 'external';
 
 $config['skylight_fields'] = array('Title' => 'dc.title.en',
-    'Author' => 'dc.creator.en',
+    'Creator' => 'dc.creator.en',
     'Description' => 'dc.description.en',
-    'Extent' => 'dc.format.extent.en',
-    'Related Work' => 'dc.relation.en',
+    'Extent and Media' => 'dc.format.en',
     'Places' => 'dc.coverage.spatial.en',
     'Identifier' => 'dc.identifier.en',
     'Publisher' => 'dc.publisher.en',
@@ -40,16 +39,24 @@
     'Rights' => 'dc.rights.en',
     'Source' => 'dc.source.en',
     'Parent' => 'dc.relation.ispartof.en',
-    'ImageUri' => 'dc.identifier.imageUri.en'
+    'ImageUri' => 'dc.identifier.imageUri.en',
+    'Language' => 'dc.language.en'
 
 );
 
 $config['skylight_schema_links'] = array(
-    'Title'=>'name'
+    'Title'=> 'name',
+    'Creator'=> 'creator',
+    'Description'=> 'description',
+    'Date'=>'dateCreated',
+    'ImageUri'=>'thumbnailUrl',
+    'Rights'=>'copyrightHolder',
+    'Subject'=> 'about',
+    'Places'=> 'locationCreated'
 );
 
 $config['skylight_date_filters'] = array();
-$config['skylight_filters'] = array('Author' => 'creator_filter', 'Subject' => 'subject_filter', 'Collection' => 'publisher_filter','Date' => 'datetemporal_filter');
+$config['skylight_filters'] = array('Author' => 'creator_filter', 'Subject' => 'subject_filter', 'Place'=> 'place_filter', 'Collection' => 'publisher_filter','Date' => 'datetemporal_filter');
 $config['skylight_filter_delimiter'] = ':';
 
 $config['skylight_meta_fields'] = array('Title' => 'dc.title.en',
@@ -59,16 +66,17 @@
     'Type' => 'dc.type');
 
 $config['skylight_recorddisplay'] = array('Title',
-    'Author' ,
+    'Creator' ,
     'Description',
-    'Extent',
-    'Related Work',
+    'Identifier',
+    'Extent and Media',
     'Places',
     'Publisher',
     'Subject',
     'Date',
     'Rights',
-    'Source');
+    'Source',
+    'Language');
 
 $config['skylight_searchresult_display'] = array('Title',
     'Author' ,    'Subject',
@@ -81,12 +89,11 @@
     'Collection' => 'dc.relation.ispartof.en',
 );
 
-$config['skylight_sort_fields'] = array('Author' => 'dc.contributor.authorza_sort ',
-    'Title' => 'dc.title_sort',
-    'Date' => 'dc.date.issued_dt'
+$config['skylight_sort_fields'] = array(
+    'Title' => 'dc.title_sort'
 );
 
-$config['skylight_related_fields'] = array('Type' => 'dc.type.en', 'Author' => 'dc.creator.en', 'Subject' => 'dc.subject.en', 'Title' => 'dc.title.en', );
+$config['skylight_related_fields'] = array('Creator' => 'dc.creator.en', 'Subject' => 'dc.subject.en', 'Title' => 'dc.title.en', );
 
 $config['skylight_feed_fields'] = array('Title' => 'Title',
     'Author' => 'Author',
@@ -121,6 +128,7 @@
 $config['skylight_homepage_recentitems'] = false;
 $config['skylight_homepage_randomitems'] = false;
 $config['skylight_homepage_fullwidth'] = true;
+$config['skylight_facet_limit'] = 5;
 
 
 ?>
diff --git a/theme-local/art/css/style.css b/theme-local/art/css/style.css
@@ -662,6 +662,7 @@ div[id^="openseadragon"] {
 
 
 .iiiflogo                        { display: inline-block; width: 50px; height: 50px;  background: url(../images/iiiflogo.png) no-repeat 0px 0px;}
+/*.iiifdndlogo                        { display: inline-block; width: 50px; height: 50px;  background: url(../images/iiifdnd.jpg) no-repeat 0px 0px;}*/
 .lunalogo                        { display: inline-block; width: 50px; height: 50px;  background: url(../images/LUNAIIIF.png) no-repeat 0px 0px;}
 .uvlogo                          { display: inline-block; width: 50px; height: 50px;  background: url(../images/uv.png) no-repeat 0px 0px;}
 .miradorlogo                     { display: inline-block; width: 50px; height: 50px;  background: url(../images/mirador-logo.png) no-repeat 0px 0px;}
diff --git a/theme-local/geddes/css/style.css b/theme-local/geddes/css/style.css
@@ -90,7 +90,7 @@ input:valid, textarea:valid   								{  } /* Colors for form validity */
 input:invalid, textarea:invalid 							{ border-radius: 1px; -moz-box-shadow: 0 0 5px red; -webkit-box-shadow: 0 0 5px red; box-shadow: 0 0 5px red; }
 .no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
 
-::-moz-selection 	{ background: #3e541f;  color: #fff; text-shadow: none; } /* These selection declarations have to be separate No text-shadow: twitter.com/miketaylr/status/12228805301 Also: hot pink! */
+::-moz-selection 	{ background: #3e541f;  color: #fff; text-shadow: none;font-weight:normal; } /* These selection declarations have to be separate No text-shadow: twitter.com/miketaylr/status/12228805301 Also: hot pink! */
 ::selection 		{ background: #3e541f;  color: #fff; text-shadow: none; }
 a:link 				{ -webkit-tap-highlight-color: #3e541f; } /* j.mp/webkit-tap-highlight-color */
 
@@ -164,13 +164,21 @@ header .container   { padding: 0;}
 .content a:visited              { color: #3e541f;}
 .content a:hover                { color: #3a8f44;}
 
-.btn-info                       { background-color: #3e541f; color: #FFFFFF; letter-spacing: 1px; margin-bottom: 5px;}
+/*.content a                      { color: #3e541f}
+.content a:visited              { color: #ffffff;}
+.content a:hover                { color: #ffffff;}*/
+
+.btn-info                       { background-color: #3e541f; border-color: #3e541f;color: #FFFFFF;  margin-bottom: 5px;font-weight: normal;}
 .btn-info:hover                 { background-color: #3a8f44; color: #FFFFFF;}
+.btn-primary                    { background-color: #3e541f; border-color: #3e541f;color: #FFFFFF;  margin-bottom: 5px;font-weight: normal;}
+.btn-primary:hover                 { background-color: #3a8f44; color: #FFFFFF;}
 
 .btn-info a                     { color: #FFFFFF; letter-spacing: 1px;}
 .btn-info a:active              { color: #FFFFFF; letter-spacing: 1px;}
 .btn-info a:visited             { color: #FFFFFF; letter-spacing: 1px;}
 
+
+
 .item-div                       { width: 660px; text-align: left; display: block; }
 .iteminfo                       { display: block; min-height:40px; text-align: left; width: 100%; float:left; }
 .iteminfo h3                    { font-size: 20px; margin-top: 5px; }
@@ -679,3 +687,4 @@ tr:nth-child(odd) { background: #e6e6e6; }
 .search-row  { background: #f7f7f7 }
 .search-row:nth-child(odd) { background: #e6e6e6; }
 .search-row .text {padding-left:5px;width:90%; float:left;}
+.warning {color:red;}
diff --git a/theme/art/views/record.php b/theme/art/views/record.php
@@ -11,6 +11,7 @@
 $media_uri = $this->config->item("skylight_media_url_prefix");
 $image_uri_field = $this->skylight_utilities->getField('ImageUri');
 $permalink_field = $this->skylight_utilities->getField('Permalink');
+$sketchfab_field = $this->skylight_utilities->getField('SketchFabURI');
 $type = 'Unknown';
 $mainImage = false;
 $mainImageTest = false;
@@ -125,7 +126,8 @@
             $jsonLink  = '<span class ="json-link-item"><a href="https://librarylabs.ed.ac.uk/iiif/uv/?manifest='.$manifest.'" target="_blank" class="uvlogo" title="View in UV"></a></span>';
             $jsonLink .= '<span class ="json-link-item"><a target="_blank" href="https://librarylabs.ed.ac.uk/iiif/mirador/?manifest='.$manifest.'" class="miradorlogo" title="View in Mirador"></a></span>';
             $jsonLink .= '<span class ="json-link-item"><a href="https://images.is.ed.ac.uk/luna/servlet/view/search?search=SUBMIT&q='.$accno.'" class="lunalogo" title="View in LUNA"></a></span>';
-            $jsonLink .= '<span class ="json-link-item"><a href="'.$manifest.'" target="_blank"  class="iiiflogo" title="IIIF manifest"></a></span>';
+            $jsonLink .= '<span class ="json-link-item"><a href="'.$manifest.'" target="_blank"  class="iiiflogo" title="View IIIF manifest"></a></span>';
+            //$jsonLink .= '<span class ="json-link-item"><a href="http://www.example.com/'.$manifest.'" target="_blank"  class="iiifdndlogo" title="Drag and drop IIIF manifest"></a></span>'; $jsonLink .= '<span class ="json-link-item"><a href="http://www.example.com/'.$manifest.'" target="_blank"  class="iiifdndlogo" title="Drag and drop IIIF manifest"></a></span>';
         }
 
     }
@@ -155,8 +157,9 @@
             ?>
         </div>
     </div>
+      <?php
+
 
-    <?php
     $numThumbnails = 0;
     $imageCounter = 0;
     if (isset($solr[$image_uri_field])) {
@@ -543,6 +546,22 @@
     <div class="clearfix"></div>
     <!-- print out crowdsourced tags -->
     <?php
+    if (isset($solr[$sketchfab_field]))
+    {
+        $sketchfab_hash = substr($solr[$sketchfab_field][0],-32);
+        $sketchfab_embed = "https://sketchfab.com/models/" . $sketchfab_hash. "/embed";
+        ?>
+        <br>
+        <div class="sketchfab-embed-wrapper"><iframe width="660" height="480" src="<?php echo $sketchfab_embed?>" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+            <p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+                <a href="<?php echo $solr[$sketchfab_field][0]?>" target="blank">See <?php echo $record_title?> at Sketchfab</a>
+                <!--<a href="https://sketchfab.com/openededinburgh?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">The University of Edinburgh</a>
+                <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>-->
+            </p>
+        </div>
+        <?php
+    }
     if(isset($solr[$tags_field])) {?>
         <div class="crowd-tags"><span class="crowd-title" title="User generated tags created through crowd sourcing games"><i class="fa fa-users fa-lg" >&nbsp;</i>Tags:</span>
             <?php foreach($solr[$tags_field] as $tag) {
@@ -595,6 +614,7 @@
         echo '<!--</div>-->
     <div class="clearfix"></div>';
     }
+
     ?>
 
     <input type="button" value="Back to Search Results" class="backbtn" onClick="history.go(-1);">
diff --git a/theme/geddes/views/index.php b/theme/geddes/views/index.php
@@ -1,5 +1,6 @@
 <!--<div class="col-lg-12 col-md-10 col-sm-12 col-xs-12">-->
 <div class="col-xl">
+    <h1 class="warning">THIS SITE IS IN BETA TESTING AND IS NOT YET AN AUTHORITATIVE RESOURCE</h1>
     <h1 class="itemtitle">An online portal to the Patrick Geddes Archives.</h1>
     <div id="cf">
         <img src="https://images.is.ed.ac.uk/luna/servlet/iiif/UoEhal~2~2~99338~100004/1696,226,4475,1959/1074,/0/default.jpg"/>
diff --git a/theme/geddes/views/record.php b/theme/geddes/views/record.php
@@ -10,6 +10,9 @@
 $link_uri_field = $this->skylight_utilities->getField("Link");
 $image_uri_field = $this->skylight_utilities->getField("ImageUri");
 $id = $this->skylight_utilities->getField("Id");
+//Insert Schema.org
+$schema = $this->config->item("skylight_schema_links");
+
 
 $link_uri_prefix  = $this->config->item("skylight_link_url");
 
@@ -20,15 +23,18 @@
 ?>
 
 <div class="col-md-9 col-sm-9 col-xs-12" xmlns="http://www.w3.org/1999/html">
+
+    <div itemscope itemtype ="http://schema.org/CreativeWork">
     <div class="row">
         <h1 class="itemtitle"><?php echo strip_tags($record_title) ?></h1>
     </div>
 
     <div class="row">
-            <button class="btn btn-info"><a href ="<?php echo $solr[$link_uri_field][0]?>" target="_blank"><b>View item in context</b></a></button>
+            <div class="btn btn-info"><a href ="<?php echo $solr[$link_uri_field][0]?>" target="_blank">View in context</a></div>
     </div>
 
     <div class="row full-metadata">
+
         <table class="table">
             <tbody>
 
@@ -42,39 +48,61 @@
 
             <?php $excludes = array("");
             $idset = false;
+            $nullid = false;
             foreach($recorddisplay as $key) {
                 $element = $this->skylight_utilities->getField($key);
 
                 if(isset($solr[$element])) {
-                    if(!in_array($key, $excludes)) {
-                        echo '<tr><th>'.$key.'</th><td>';
-                        foreach($solr[$element] as $index => $metadatavalue) {
+                    if (!in_array($key, $excludes)) {
+                        echo '<tr><th>' . $key . '</th><td>';
+                        foreach ($solr[$element] as $index => $metadatavalue) {
                             // if it's a facet search
                             // make it a clickable search link
 
-                            if(in_array($key, $filters)) {
+                            if (in_array($key, $filters)) {
 
                                 $orig_filter = urlencode($metadatavalue);
 
-                                echo '<a href="./search/*:*/' . $key . ':%22'.$orig_filter.'%22">'.$metadatavalue.'</a>';
-                            }
-                            else {
+                                echo '<a href="./search/*:*/' . $key . ':%22' . $orig_filter . '%22">' . $metadatavalue . '</a>';
+                            } else
+                            {/*
                                 if ($key == 'Identifier' || $key == 'Link' || $key == 'Parent') {
                                     if (strpos($metadatavalue, "http:") !== null) {
                                         echo '<a href="'.$metadatavalue.'" target="_blank">'.$metadatavalue.'</a>';
                                         $idset = true;
                                     }
-                                    else{
+                                    else*/
+                                if ($key == 'Identifier')
+                                {
+                                  /*  if (ctype_digit($metadatavalue))
+                                    {
+                                        echo $metadatavalue . " is a number";
+                                    }
+                                    else
+                                    {
+                                        echo $metadatavalue . " is not a number";
+                                    }*/
+
+                                    $nullid = false;
+                                    if ((!ctype_digit($metadatavalue)) and (strpos($metadatavalue, "oai:") !== 0) and (strpos($metadatavalue, "http:") !== 0))
+                                    {
                                         echo $metadatavalue;
                                     }
+                                    else
+                                    {
+                                        $nullid = true;
+                                    }
                                 }
-                                else{
-                                    echo $metadatavalue;
+                                else
+                                {
+                                    echo '<span itemprop="'.$schema[$key].'">'. $metadatavalue. "</span>";
                                 }
                             }
 
-                            if($index < sizeof($solr[$element]) - 1) {
-                                echo '<br/>';
+                            if ($index < sizeof($solr[$element]) - 1) {
+                                if(!$nullid) {
+                                    echo '<br/>';
+                                }
                             }
                         }
                         echo '</td></tr>';
@@ -85,6 +113,7 @@
 
             </tbody>
         </table>
+
     </div>
 
     <?php
@@ -178,6 +207,7 @@
                 // if there are thumbnails
                 if (isset($solr[$thumbnail_field])) {
                     foreach ($solr[$thumbnail_field] as $thumbnail) {
+
                         $t_segments = explode("##", $thumbnail);
                         $t_filename = $t_segments[1];
                         if ($t_filename === $b_filename . ".jpg") {
@@ -239,6 +269,7 @@
 
         if ($mainImage) { ?>
             <div class="main-image">
+                <?php echo '<span itemprop="thumbnailUrl" style="display:none;">'. $image_filename. '</span>';?>
                 <!--<img src = "<?php //echo $image_filename ;?>"/>-->
                 <div id="openseadragon"> <!--style = "width:600px; height= 450px;">-->
                     <script src="<?php echo base_url() ?>assets/openseadragon/openseadragon.min.js"></script>
@@ -260,8 +291,10 @@
                             }]
                         });
                     </script>
+
                 </div>
             </div>
+            <br>
             <?php
             if (!$image_title == '') {
                 ?>
@@ -280,4 +313,5 @@
     <div class="row">
         <button class="btn btn-info" onClick="history.go(-1);"><span class="glyphicon glyphicon-menu-left" aria-hidden="true"></span>Back to Search Results</button>
     </div>
-</div>
+</div>
+    </div>
diff --git a/theme/geddes/views/search_facets.php b/theme/geddes/views/search_facets.php
@@ -79,7 +79,8 @@
                         <li class="list-group-item">No matches</li>
                     <?php }
                     else {
-                        if($numterms == $this->config->item('skylight_results_per_page')) { ?>
+                        if($numterms == $this->config->item('skylight_facet_limit')) { ?>
+
                             <li class="list-group-item"><a href="./browse/<?php echo $facet['name']; ?>">More ...</a></li>
                         <?php }
                     } ?>
diff --git a/theme/geddes/views/search_results.php b/theme/geddes/views/search_results.php
@@ -85,7 +85,7 @@
                 foreach ($doc[$author_field] as $author) {
                     $orig_filter = urlencode($author);
 
-                    echo '<a class="agent" href="./search/*:*/Agent:%22'.$orig_filter.'%22">'.$author.'</a>';
+                   // echo '<a class="agent" href="./search/*:*/Agent:%22'.$orig_filter.'%22">'.$author.'</a>';
                     $num_authors++;
                     if($num_authors < sizeof($doc[$author_field])) {
                         echo ' ';
@@ -102,7 +102,7 @@
                     foreach ($doc[$subject_field] as $subject) {
 
                         $orig_filter = urlencode($subject);
-                        echo '<a class="subject" href="./search/*:*/Subject:%22'.$orig_filter.'%22">'.$subject.'</a>';
+                      //  echo '<a class="subject" href="./search/*:*/Subject:%22'.$orig_filter.'%22">'.$subject.'</a>';
                         $num_subject++;
                         if($num_subject < sizeof($doc[$subject_field])) {
                             echo ' ';
diff --git a/theme/stcecilia/views/search_facets.php b/theme/stcecilia/views/search_facets.php
@@ -80,7 +80,7 @@
                         No matches<br><br>
                     <?php }
                     else {
-                        if($numterms == $this->config->item('skylight_results_per_page')) { ?>
+                        if($numterms == $this->config->item('skylight_facet_limit')) { ?>
                             <a href="./browse/<?php echo $facet['name']; ?>">More ...</a><br><br>
                         <?php }
                     } ?>
