From 99ce81d476eba4b21240494f9f0501ea4441491b Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Wed, 9 Jul 2014 11:59:06 -0400
Subject: [PATCH] Record tab fixes for syndetics plus.
---
themes/bootprint3/css/icons.css | 2 +-
themes/bootprint3/less/icons.less | 1 +
themes/bootstrap3/js/record.js | 3 +++
.../templates/RecordDriver/SolrDefault/toolbar.phtml | 2 +-
themes/bootstrap3/templates/RecordTab/description.phtml | 5 -----
themes/bootstrap3/templates/RecordTab/excerpt.phtml | 5 -----
themes/bootstrap3/templates/RecordTab/reviews.phtml | 5 -----
themes/bootstrap3/templates/collection/view.phtml | 4 ++++
themes/bootstrap3/templates/record/view.phtml | 6 +++++-
9 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/themes/bootprint3/css/icons.css b/themes/bootprint3/css/icons.css
index e27ea0e1830..d5add24139b 100644
--- a/themes/bootprint3/css/icons.css
+++ b/themes/bootprint3/css/icons.css
@@ -1 +1 @@
-.bp-icon,i.fa-archive,i.fa-asterisk,i.fa-bell,i.fa-book,i.fa-bookbag-add,i.fa-bookbag-delete,i.fa-bookbag-empty,i.fa-bookmark,i.fa-cancel-all-holds,i.fa-cancel-all-storage-retrieval-requests,i.fa-cancel-holds,i.fa-cancel-storage-retrieval-requests,i.fa-edit,i.fa-email,i.fa-envelope,i.fa-envelope-alt,i.fa-exchange,i.fa-external-link,i.fa-flag,i.fa-flag,i.fa-grid,i.fa-heart,i.fa-home,i.fa-inbox,i.fa-leaf,.fa-sitemap,i.fa-list,i.fa-list-alt,i.fa-export,i.fa-lock,i.fa-minus-circle,i.fa-minus-sign,i.fa-ok,i.fa-phone,i.fa-plus,i.fa-plus-sign,i.fa-print,i.fa-qrcode,i.fa-remove,i.fa-renew,i.fa-renew-all,i.fa-report,i.fa-rss,i.fa-search,i.fa-shopping-cart,i.fa-sign-in,i.fa-sign-out,i.fa-spinner,i.fa-star,i.fa-suitcase,i.fa-trash-o,i.fa-tree,i.fa-tree-muted,i.fa-usd,i.fa-user{background-position: center center;background-repeat: no-repeat;color: transparent;content: '';display: inline-block;height: 16px;margin: 0;padding: 0;text-shadow: none;vertical-align: text-bottom;width: 16px}i.fa-archive{background-image: url('../../../themes/bootprint3/images/icons/package.png')}i.fa-asterisk{background-image: url('../../../themes/bootprint3/images/icons/list.png')}i.fa-bell{background-image: url('../../../themes/bootprint3/images/icons/bell.png')}i.fa-book{background-image: url('../../../themes/bootprint3/images/icons/book.png')}i.fa-bookbag-add{background-image: url('../../../themes/bootprint3/images/icons/bookbag_add.png')}i.fa-bookbag-delete{background-image: url('../../../themes/bootprint3/images/icons/bookbag_delete.png')}i.fa-bookbag-empty{background-image: url('../../../themes/bootprint3/images/icons/bookbag_empty.png')}i.fa-bookmark{background-image: url('../../../themes/bootprint3/images/icons/bookmark_add.png')}i.fa-cancel-all-holds{background-image: url('../../../themes/bootprint3/images/icons/holdCancelAll.png')}i.fa-cancel-all-storage-retrieval-requests{background-image: url('../../../themes/bootprint3/images/icons/holdCancelAll.png')}i.fa-cancel-holds{background-image: url('../../../themes/bootprint3/images/icons/holdCancel.png')}i.fa-cancel-storage-retrieval-requests{background-image: url('../../../themes/bootprint3/images/icons/holdCancel.png')}i.fa-edit{background-image: url('../../../themes/bootprint3/images/icons/edit.png')}i.fa-email,i.fa-envelope,i.fa-envelope-alt{background-image: url('../../../themes/bootprint3/images/icons/email.png')}i.fa-exchange{background-image: url('../../../themes/bootprint3/images/icons/arrow_refresh.png')}i.fa-external-link{background-image: url('../../../themes/bootprint3/images/icons/link_go.png')}i.fa-flag{background-image: url('../../../themes/bootprint3/images/icons/flag_red.png')}i.fa-grid{background-image: url('../../../themes/bootprint3/images/icons/view_grid.png')}i.fa-heart{background-image: url('../../../themes/bootprint3/images/icons/heart.png')}i.fa-home{background-image: url('../../../themes/bootprint3/images/icons/house.png')}i.fa-inbox{background-image: url('../../../themes/bootprint3/images/icons/box.png')}i.fa-leaf,.fa-sitemap{background-image: url('../../../themes/bootprint3/images/icons/treeCurrent.png')}i.fa-list{background-image: url('../../../themes/bootprint3/images/icons/view_list.png')}i.fa-list-alt,i.fa-export{background-image: url('../../../themes/bootprint3/images/icons/application_add.png')}i.fa-lock{background-image: url('../../../themes/bootprint3/images/icons/lock.png')}i.fa-minus-circle,i.fa-minus-sign{background-image: url('../../../themes/bootprint3/images/icons/delete.png')}i.fa-ok{background-image: url('../../../themes/bootprint3/images/icons/tick.png')}i.fa-phone{background-image: url('../../../themes/bootprint3/images/icons/phone.png')}i.fa-plus{background-image: url('../../../themes/bootprint3/images/icons/add.png')}i.fa-plus-sign{background-image: url('../../../themes/bootprint3/images/icons/add.png')}i.fa-print{background-image: url('../../../themes/bootprint3/images/icons/printer.png')}i.fa-qrcode{background-image: url('../../../themes/bootprint3/images/icons/qrcode.png')}i.fa-remove{background-image: url('../../../themes/bootprint3/images/icons/delete.png')}i.fa-renew{background-image: url('../../../themes/bootprint3/images/icons/renew.png')}i.fa-renew-all{background-image: url('../../../themes/bootprint3/images/icons/renewAll.png')}i.fa-report{background-image: url('../../../themes/bootprint3/images/icons/report.png')}i.fa-rss{background-image: url('../../../themes/bootprint3/images/icons/feed.png')}i.fa-search{background-image: url('../../../themes/bootprint3/images/icons/magnifier.png')}i.fa-shopping-cart{background-image: url('../../../themes/bootprint3/images/icons/cart.png')}i.fa-sign-in{background-image: url('../../../themes/bootprint3/images/icons/door_in.png')}i.fa-sign-out{background-image: url('../../../themes/bootprint3/images/icons/door_out.png')}i.fa-spinner{background-image: url('../../../themes/bootprint3/images/icons/ajax_loading.gif')}i.fa-star{background-image: url('../../../themes/bootprint3/images/icons/star.png')}i.fa-suitcase{background-image: url('../../../themes/bootprint3/images/icons/bookbag.png')}i.fa-trash-o{background-image: url('../../../themes/bootprint3/images/icons/bin.png')}i.fa-tree{background-image: url('../../../themes/bootprint3/images/icons/treeCurrent.png')}i.fa-tree-muted{background-image: url('../../../themes/bootprint3/images/icons/treeMuted.png')}i.fa-usd{background-image: url('../../../themes/bootprint3/images/icons/money_dollar.png')}i.fa-user{background-image: url('../../../themes/bootprint3/images/icons/user.png')}
\ No newline at end of file
+.bp-icon,i.fa-archive,i.fa-asterisk,i.fa-bell,i.fa-book,i.fa-bookbag-add,i.fa-bookbag-delete,i.fa-bookbag-empty,i.fa-bookmark,i.fa-cancel-all-holds,i.fa-cancel-all-storage-retrieval-requests,i.fa-cancel-holds,i.fa-cancel-storage-retrieval-requests,i.fa-edit,i.fa-email,i.fa-envelope,i.fa-envelope-alt,i.fa-exchange,i.fa-external-link,i.fa-flag,i.fa-flag,i.fa-grid,i.fa-heart,i.fa-home,i.fa-inbox,i.fa-leaf,.fa-sitemap,i.fa-list,i.fa-list-alt,i.fa-export,i.fa-lock,i.fa-minus-circle,i.fa-minus-sign,i.fa-ok,i.fa-phone,i.fa-plus,i.fa-plus-sign,i.fa-print,i.fa-qrcode,i.fa-remove,i.fa-renew,i.fa-renew-all,i.fa-report,i.fa-rss,i.fa-search,i.fa-shopping-cart,i.fa-sign-in,i.fa-sign-out,i.fa-spinner,i.fa-star,i.fa-suitcase,i.fa-trash-o,i.fa-tree,i.fa-tree-muted,i.fa-usd,i.fa-user,i.fa-visual{background-position: center center;background-repeat: no-repeat;color: transparent;content: '';display: inline-block;height: 16px;margin: 0;padding: 0;text-shadow: none;vertical-align: text-bottom;width: 16px}i.fa-archive{background-image: url('../../../themes/bootprint3/images/icons/package.png')}i.fa-asterisk{background-image: url('../../../themes/bootprint3/images/icons/list.png')}i.fa-bell{background-image: url('../../../themes/bootprint3/images/icons/bell.png')}i.fa-book{background-image: url('../../../themes/bootprint3/images/icons/book.png')}i.fa-bookbag-add{background-image: url('../../../themes/bootprint3/images/icons/bookbag_add.png')}i.fa-bookbag-delete{background-image: url('../../../themes/bootprint3/images/icons/bookbag_delete.png')}i.fa-bookbag-empty{background-image: url('../../../themes/bootprint3/images/icons/bookbag_empty.png')}i.fa-bookmark{background-image: url('../../../themes/bootprint3/images/icons/bookmark_add.png')}i.fa-cancel-all-holds{background-image: url('../../../themes/bootprint3/images/icons/holdCancelAll.png')}i.fa-cancel-all-storage-retrieval-requests{background-image: url('../../../themes/bootprint3/images/icons/holdCancelAll.png')}i.fa-cancel-holds{background-image: url('../../../themes/bootprint3/images/icons/holdCancel.png')}i.fa-cancel-storage-retrieval-requests{background-image: url('../../../themes/bootprint3/images/icons/holdCancel.png')}i.fa-edit{background-image: url('../../../themes/bootprint3/images/icons/edit.png')}i.fa-email,i.fa-envelope,i.fa-envelope-alt{background-image: url('../../../themes/bootprint3/images/icons/email.png')}i.fa-exchange{background-image: url('../../../themes/bootprint3/images/icons/arrow_refresh.png')}i.fa-external-link{background-image: url('../../../themes/bootprint3/images/icons/link_go.png')}i.fa-flag{background-image: url('../../../themes/bootprint3/images/icons/flag_red.png')}i.fa-grid{background-image: url('../../../themes/bootprint3/images/icons/view_grid.png')}i.fa-heart{background-image: url('../../../themes/bootprint3/images/icons/heart.png')}i.fa-home{background-image: url('../../../themes/bootprint3/images/icons/house.png')}i.fa-inbox{background-image: url('../../../themes/bootprint3/images/icons/box.png')}i.fa-leaf,.fa-sitemap{background-image: url('../../../themes/bootprint3/images/icons/treeCurrent.png')}i.fa-list{background-image: url('../../../themes/bootprint3/images/icons/view_list.png')}i.fa-list-alt,i.fa-export{background-image: url('../../../themes/bootprint3/images/icons/application_add.png')}i.fa-lock{background-image: url('../../../themes/bootprint3/images/icons/lock.png')}i.fa-minus-circle,i.fa-minus-sign{background-image: url('../../../themes/bootprint3/images/icons/delete.png')}i.fa-ok{background-image: url('../../../themes/bootprint3/images/icons/tick.png')}i.fa-phone{background-image: url('../../../themes/bootprint3/images/icons/phone.png')}i.fa-plus{background-image: url('../../../themes/bootprint3/images/icons/add.png')}i.fa-plus-sign{background-image: url('../../../themes/bootprint3/images/icons/add.png')}i.fa-print{background-image: url('../../../themes/bootprint3/images/icons/printer.png')}i.fa-qrcode{background-image: url('../../../themes/bootprint3/images/icons/qrcode.png')}i.fa-remove{background-image: url('../../../themes/bootprint3/images/icons/delete.png')}i.fa-renew{background-image: url('../../../themes/bootprint3/images/icons/renew.png')}i.fa-renew-all{background-image: url('../../../themes/bootprint3/images/icons/renewAll.png')}i.fa-report{background-image: url('../../../themes/bootprint3/images/icons/report.png')}i.fa-rss{background-image: url('../../../themes/bootprint3/images/icons/feed.png')}i.fa-search{background-image: url('../../../themes/bootprint3/images/icons/magnifier.png')}i.fa-shopping-cart{background-image: url('../../../themes/bootprint3/images/icons/cart.png')}i.fa-sign-in{background-image: url('../../../themes/bootprint3/images/icons/door_in.png')}i.fa-sign-out{background-image: url('../../../themes/bootprint3/images/icons/door_out.png')}i.fa-spinner{background-image: url('../../../themes/bootprint3/images/icons/ajax_loading.gif')}i.fa-star{background-image: url('../../../themes/bootprint3/images/icons/star.png')}i.fa-suitcase{background-image: url('../../../themes/bootprint3/images/icons/bookbag.png')}i.fa-trash-o{background-image: url('../../../themes/bootprint3/images/icons/bin.png')}i.fa-tree{background-image: url('../../../themes/bootprint3/images/icons/treeCurrent.png')}i.fa-tree-muted{background-image: url('../../../themes/bootprint3/images/icons/treeMuted.png')}i.fa-usd{background-image: url('../../../themes/bootprint3/images/icons/money_dollar.png')}i.fa-user{background-image: url('../../../themes/bootprint3/images/icons/user.png')}i.fa-visual{background-image: url('../../../themes/bootprint3/images/icons/view_visual.png')}
\ No newline at end of file
diff --git a/themes/bootprint3/less/icons.less b/themes/bootprint3/less/icons.less
index 3680baf209a..47f27f1f888 100644
--- a/themes/bootprint3/less/icons.less
+++ b/themes/bootprint3/less/icons.less
@@ -62,3 +62,4 @@ i.fa-tree {background-image:url('../../images/icons/treeCurrent.png'); &:extend(
i.fa-tree-muted {background-image:url('../../images/icons/treeMuted.png'); &:extend(.bp-icon);}
i.fa-usd {background-image:url('../../images/icons/money_dollar.png'); &:extend(.bp-icon);}
i.fa-user {background-image:url('../../images/icons/user.png'); &:extend(.bp-icon);}
+i.fa-visual {background-image:url('../../images/icons/view_visual.png'); &:extend(.bp-icon);}
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index 1199d3cea9d..9f111b1feba 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -175,6 +175,9 @@ function ajaxLoadTab(tabid) {
$('#'+tabid+'-tab').html(data).addClass('active');
$('#'+tabid).tab('show');
registerTabEvents();
+ if(typeof syn_get_widget === "function") {
+ syn_get_widget();
+ }
}
});
}
diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml
index f1aa66af2b6..e3b74989055 100644
--- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml
@@ -14,7 +14,7 @@
<? if (count($this->driver->getCitationFormats()) > 0): ?>
<li><a id="cite-record" class="modal-link <?=$controllerClass?>" href="<?=$this->url('record-cite', array('id'=>$id)) ?>" title="<?=$this->transEsc('Cite this')?>"><i class="fa fa-asterisk"></i> <?=$this->transEsc('Cite this')?></a></li>
<? endif; ?>
- <li><a id="sms-record" class="modal-link <?=$controllerClass?>" href="<?=$this->url('record-sms', array('id'=>$id)) ?>" title="<?=$this->transEsc('Text this')?>"><i class="fa fa-phone"></i> <?=$this->transEsc('Text this')?></a></li>
+ <li><a id="sms-record" class="modal-link <?=$controllerClass?>" href="<?=$this->url('record-sms', array('id'=>$id)) ?>" title="<?=$this->transEsc('Text this')?>"><i class="fa fa-mobile"></i> <?=$this->transEsc('Text this')?></a></li>
<li><a id="mail-record" class="modal-link <?=$controllerClass?>" href="<?=$this->url('record-email', array('id'=>$id)) ?>" title="<?=$this->transEsc('Email this')?>"><i class="fa fa-envelope"></i> <?=$this->transEsc('Email this')?></a></li>
<? $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
diff --git a/themes/bootstrap3/templates/RecordTab/description.phtml b/themes/bootstrap3/templates/RecordTab/description.phtml
index 4e13a9afd30..6eb8af2e21f 100644
--- a/themes/bootstrap3/templates/RecordTab/description.phtml
+++ b/themes/bootstrap3/templates/RecordTab/description.phtml
@@ -4,11 +4,6 @@
// Grab clean ISBN for convenience:
$isbn = $this->driver->getCleanISBN();
-
- // Activate Syndetics Plus if necessary:
- if ($this->syndeticsPlus()->isActive()) {
- $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
- }
?>
<table class="table table-striped" summary="<?=$this->transEsc('Description')?>">
<? $summ = $this->driver->getSummary(); if (!empty($summ)): ?>
diff --git a/themes/bootstrap3/templates/RecordTab/excerpt.phtml b/themes/bootstrap3/templates/RecordTab/excerpt.phtml
index 8a2db24288f..751181034a7 100644
--- a/themes/bootstrap3/templates/RecordTab/excerpt.phtml
+++ b/themes/bootstrap3/templates/RecordTab/excerpt.phtml
@@ -4,11 +4,6 @@
// Grab excerpt data:
$excerpts = $this->tab->getContent($isbn);
-
- // Activate Syndetics Plus if necessary:
- if ($this->syndeticsPlus()->isActive()) {
- $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
- }
?>
<? if (count($excerpts) > 0): ?>
<? foreach ($excerpts as $provider => $list): ?>
diff --git a/themes/bootstrap3/templates/RecordTab/reviews.phtml b/themes/bootstrap3/templates/RecordTab/reviews.phtml
index c9c769a4dcb..3bdd4331732 100644
--- a/themes/bootstrap3/templates/RecordTab/reviews.phtml
+++ b/themes/bootstrap3/templates/RecordTab/reviews.phtml
@@ -4,11 +4,6 @@
// Grab review data:
$reviews = $this->tab->getContent($isbn);
-
- // Activate Syndetics Plus if necessary:
- if ($this->syndeticsPlus()->isActive()) {
- $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
- }
?>
<? if (count($reviews) > 0): ?>
<? foreach ($reviews as $provider => $list): ?>
diff --git a/themes/bootstrap3/templates/collection/view.phtml b/themes/bootstrap3/templates/collection/view.phtml
index 8d8b9601340..44535875d6d 100644
--- a/themes/bootstrap3/templates/collection/view.phtml
+++ b/themes/bootstrap3/templates/collection/view.phtml
@@ -2,6 +2,10 @@
// Set up standard record scripts:
$this->headScript()->appendFile("record.js");
$this->headScript()->appendFile("check_save_statuses.js");
+ // Activate Syndetics Plus if necessary:
+ if ($this->syndeticsPlus()->isActive()) {
+ echo $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
+ }
// Add RDF header link if applicable:
if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
diff --git a/themes/bootstrap3/templates/record/view.phtml b/themes/bootstrap3/templates/record/view.phtml
index 9d6d1456a73..0d6d78c0b41 100644
--- a/themes/bootstrap3/templates/record/view.phtml
+++ b/themes/bootstrap3/templates/record/view.phtml
@@ -2,10 +2,14 @@
// Set up standard record scripts:
$this->headScript()->appendFile("record.js");
$this->headScript()->appendFile("check_save_statuses.js");
+ // Activate Syndetics Plus if necessary:
+ if ($this->syndeticsPlus()->isActive()) {
+ echo $this->headScript()->appendFile($this->syndeticsPlus()->getScript());
+ }
// Add RDF header link if applicable:
if ($this->export()->recordSupportsFormat($this->driver, 'RDF')) {
- $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
+ $this->headLink()->appendAlternate($this->recordLink()->getActionUrl($this->driver, 'RDF'), 'application/rdf+xml', 'RDF Representation');
}
// Set up breadcrumbs:
--
GitLab