diff --git a/themes/finc/images/headerlogo.png b/themes/finc/images/headerlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8f2483a48ea5a883570513a282a7e15cb251f22
Binary files /dev/null and b/themes/finc/images/headerlogo.png differ
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 96970325bc641dc5def2151f623af80394fe730e..144e187bf794aa3cea13176fc76967945a8c9c71 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -164,7 +164,7 @@ $content-top-padding: $grid-gutter-width / 4 !default;
// BREADCRUMBS
-//// Separator between breadcrumb elements, use this variable to change it
+//// Separator between breadcrumb elements, use this variable to change it
//// $breadcrumb-separator: '/' !default;
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index e134e6b0b94c26c1d34bf490c55658e50d4e34a0..1cbd36c51504dd96ba657f3cbf47d63032e60dbd 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -3,14 +3,10 @@
// which includes finc plus all subsequent customizations
// i.e. finc's compiled.scss imports bootstrap3/scss/compiled - the house-specific branches such as
// de_15 then import finc/scss/compiled
-
// 0. Note for developers
// Do NOT EDIT compiled.css
-
// 1. Define or re-define KEY VARIABLES and MIXINS (see 1.1 ff below) OR import your own
-
@import 'customVariables';
-
//@import 'customMixins';
// 1.1 Unless imported, define standard colour variables here which are used in variables below prior to finc.scss import
// e.g. $brand-primary: #008CBA !default; // bondi-blue
@@ -20,7 +16,6 @@
// $brand-success: #43AC6A !default; // sea-green
// $brand-warning: #f08a24 !default; // carrot
// 1.2 DO NOT define site-specific colours in finc - this will be done in site-specific themes
-
// 2. For Media queries use:
// Extra small screen / phone: '$screen-xs-min' (480px);
// Small screen / tablet: '$screen-sm-min' (768px);
@@ -29,8 +24,6 @@
// The maximum ranges are defined as the next higher element minus 1px, so:
// '$screen-xs-max' = $screen-sm-min - 1
// etc: you can use '$screen-xs-max', '$screen-sm-max' and '$screen-md-max'
-
-
// 3. import entire BS or (instances) finc compiled.scss to have variables and mixins defined above applied to it
@import 'bootstrap';
// @import '../../finc/scss/compiled.scss'
@@ -283,7 +276,6 @@ select {
// FORMS - END
-
// IMAGES
//// img {}
@@ -307,7 +299,6 @@ select {
// IDs
-
// CLASSES (Elements that are used in several places)
//// DROPDOWNS
//// remove padding as it creates space above/below menu items (e.g. language selector)
@@ -315,6 +306,7 @@ select {
padding-bottom: 0;
padding-top: 0;
}
+
//// HOVERABLE DROPDOWNS -- make DDs hoverable as in FNDTN
// Add the dropdown-on-hover class to the parent li container! OR use on all (see commented-out part below)
// Menu will show on hover
@@ -322,6 +314,11 @@ select {
display: block;
}
+//// OR use on ALL dropdowns like so
+//.dropdown:hover .dropdown-menu {
+// display: block;
+//}
+
//// ALERTS
////// Light Text on Dark BG
.alert a {
@@ -402,6 +399,7 @@ select {
}
+
//// Source-id branding (WISO etc)
.branding {
display: none;
@@ -989,6 +987,11 @@ header,
font-size: $font-size-breadcrumbs;
padding-left: ($grid-gutter-width / 2 - 2px); // take 2 px off for borders
+ // Divider:
+ > li + li::before {
+ color: inherit;
+ }
+
//// color of links in breadcrumbs
a,
> .active a {
@@ -1000,11 +1003,16 @@ header,
// MAIN CONTENT (SIDEBAR BELOW, ADVANCED SEARCH BELOW)
#content {
- //// push content a little lower to allow for height of navbar/header, same needs to be applied to .sidebar, below!
+ // push content a little lower to allow for height of navbar/header, same needs to be applied to .sidebar, below!
.row:first-of-type {
padding-top: $content-top-padding;
- //// for all widths that use Offcanvas (767px) ($screen-xs-max)
+ // correct content padding on subsequent rows
+ .row .row {
+ padding-top: 0;
+ }
+
+ // for all widths that use Offcanvas (767px) ($screen-xs-max)
@media only screen and (max-width: $screen-xs-max) {
padding-top: $content-top-padding * 4;
}
@@ -1072,7 +1080,7 @@ footer .container {
.savedLists {
&.alert {
- color: $state-light-text-on-dark;}
+ color: $state-light-text-on-dark; }
ul {
list-style: none;
@@ -1222,16 +1230,14 @@ footer .container {
// Remove dotted lines around items when hovering over
.close {
&:hover,
- &:focus {
- outline: none;
- }
+ &:focus {outline: none;}
}
}
+
//// Advanced Search - END
// MAIN CONTENT - END
-
// SIDEBAR
//// Add top padding to sidebar for better looks -- same as for #content, above
.sidebar {
diff --git a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
index f3b57d8d7c976642c8efdd9bd506536e58304dc6..e8ddd45f3b811c6c2d0eaa6ae81311bf2069cd3e 100644
--- a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
+++ b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
@@ -12,31 +12,31 @@ $this->headTitle($this->translate('Reset Password'));
<div class="row">
<label class="col-xs-5 col-sm-2"><?=$this->transEsc('First Name') ?>:</label>
- <div class="col-xs-7 col-sm-4 columns end">
+ <div class="col-xs-7 col-sm-4">
<input type="text" name="firstname" <?=isset($firstname) ? 'value="'.$firstname.'" ' : ''?>required />
</div>
</div>
<div class="row">
<label class="col-xs-5 col-sm-2"><?=$this->transEsc('Last Name') ?>:</label>
- <div class="col-xs-7 col-sm-4 columns end">
+ <div class="col-xs-7 col-sm-4">
<input type="text" name="lastname" <?=isset($lastname) ? 'value="'.$lastname.'" ' : ''?>required/>
</div>
</div>
<div class="row">
<label class="col-xs-5 col-sm-2"><?=$this->transEsc('Username') ?>:</label>
- <div class="col-xs-7 col-sm-4 columns end">
+ <div class="col-xs-7 col-sm-4">
<input type="text" name="username" <?=isset($username) ? 'value="'.$username.'" ' : ''?>required/>
</div>
</div>
<div class="row">
<label class="col-xs-5 col-sm-2"><?=$this->transEsc('Email') ?>:</label>
- <div class="col-xs-7 col-sm-4 columns end">
+ <div class="col-xs-7 col-sm-4">
<input type="email" name="email" <?=isset($email) ? 'value="'.$email.'" ' : ''?>required/>
</div>
</div>
<?=$this->recaptcha()->html($this->useRecaptcha) ?>
<div class="row">
- <div class="col-sm-10 offset-sm-2 columns">
+ <div class="col-sm-10 offset-sm-2">
<input class="btn btn-transparent" name="submit" type="submit" aria-label="submit form" value="<?=$this->transEsc('recovery_title') ?>"/>
</div>
</div>
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/collection-record.phtml b/themes/finc/templates/RecordDriver/SolrDefault/collection-record.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..480dc26d79aeacd89ad276305fe620063a631e86
--- /dev/null
+++ b/themes/finc/templates/RecordDriver/SolrDefault/collection-record.phtml
@@ -0,0 +1,70 @@
+<h2><?=$this->escapeHtml($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection())?></h2>
+<a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc('View Full ' . ($this->driver->isCollection() ? 'Collection' : 'Record'))?></a>
+
+<table class="table table-striped">
+ <caption class="sr-only">
+ <?=$this->transEsc('Bibliographic Details')?>
+ </caption>
+ <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $summary[0] : false; ?>
+ <? if ($summary): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc('Description')?>: </th>
+ <td><?=$this->escapeHtml($summary)?></td>
+ </tr>
+ <? endif; ?>
+
+ <? $authors = $this->driver->getDeduplicatedAuthors(); ?>
+ <? if (isset($authors['main']) && !empty($authors['main'])): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc(count($authors['main']) > 1 ? 'Main Authors' : 'Main Author')?>: </th>
+ <td>
+ <? $i = 0; foreach ($authors['main'] as $author => $roles): ?><?=($i++ == 0)?'':', '?><a href="<?=$this->record($this->driver)->getLink('author', $author)?>"><?=$this->escapeHtml($author)?></a><? if (count($roles) > 0): ?> (<? $j = 0; foreach ($roles as $role): ?><?=($j++ == 0)?'':', '?><?=$this->transEsc("CreatorRoles::" . $role)?><? endforeach; ?>)<? endif; ?><? endforeach; ?>
+ </td>
+ </tr>
+ <? endif; ?>
+
+ <? if (isset($authors['corporate']) && !empty($authors['corporate'])): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc(count($authors['corporate']) > 1 ? 'Corporate Author' : 'Corporate Authors')?>: </th>
+ <td>
+ <? $i = 0; foreach ($authors['corporate'] as $corporate => $roles): ?><?=($i++ == 0)?'':', '?><a href="<?=$this->record($this->driver)->getLink('author', $corporate)?>"><?=$this->escapeHtml($corporate)?></a><? if (count($roles) > 0): ?> (<? $j = 0; foreach ($roles as $role): ?><?=($j++ == 0)?'':', '?><?=$this->transEsc("CreatorRoles::" . $role)?><? endforeach; ?>)<? endif; ?><? endforeach; ?>
+ </td>
+ </tr>
+ <? endif; ?>
+
+ <? $langs = $this->driver->getLanguages(); if (!empty($langs)): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc('Language')?>: </th>
+ <td><? foreach ($langs as $lang): ?><?= $this->escapeHtml($lang)?><br/><? endforeach; ?></td>
+ </tr>
+ <? endif; ?>
+
+ <? $formats = $this->driver->getFormats(); if (!empty($formats)): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc('Format')?>: </th>
+ <td><?=$this->record($this->driver)->getFormatList()?></td>
+ </tr>
+ <? endif; ?>
+
+ <? $access = $this->driver->getAccessRestrictions(); if (!empty($access)): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc('Access')?>: </th>
+ <td>
+ <? foreach ($access as $field): ?>
+ <?=$this->escapeHtml($field)?><br/>
+ <? endforeach; ?>
+ </td>
+ </tr>
+ <? endif; ?>
+
+ <? $related = $this->driver->getRelationshipNotes(); if (!empty($related)): ?>
+ <tr valign="top">
+ <th><?=$this->transEsc('Related Items')?>: </th>
+ <td>
+ <? foreach ($related as $field): ?>
+ <?=$this->escapeHtml($field)?><br/>
+ <? endforeach; ?>
+ </td>
+ </tr>
+ <? endif; ?>
+</table>
diff --git a/themes/finc/templates/RecordDriver/SolrLido/core.phtml b/themes/finc/templates/RecordDriver/SolrLido/core.phtml
index c27e6bae14bf5dcbb1e76f908f0fab0973eaa455..5368b178a3cfe203b268589538d6579d56271f1b 100644
--- a/themes/finc/templates/RecordDriver/SolrLido/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrLido/core.phtml
@@ -1,4 +1,4 @@
-<!-- recordDriver - solrLido - CORE.phtml -->
+<!-- recordDriver - solrLido - CORE -->
<?
if($loggedin = $this->auth()->isLoggedIn()) {
$user_id = $loggedin->id;
@@ -12,7 +12,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
$cover = $this->record($this->driver)->getCover('core', 'medium', $this->record($this->driver)->getThumbnail('large'));
$preview = $this->record($this->driver)->getPreviews(); ?>
<? if ($QRCode || $cover || $preview): ?>
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<div class="text-center">
<? /* Display thumbnail if appropriate: */ ?>
<? if($cover): ?>
@@ -25,7 +25,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? /* Display qrcode if appropriate: */ ?>
<? if($QRCode): ?>
- <span class="hide-for-small">
+ <span class="hidden-xs">
<br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
</span>
<? endif; ?>
@@ -58,9 +58,9 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? if ($preview): ?><?=$preview?><? endif; ?>
</div>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<? else: ?>
- <div class="medium-12 columns">
+ <div class="col-sm-12">
<? endif; ?>
<? /* This following line is a finc-specific change */ ?>
<h3 property="name"><?=$this->escapeHtml($this->driver->getTitle())?></h3>
@@ -76,13 +76,13 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Display the lists that this record is saved to */ ?>
- <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
+ <div class="savedLists hidden alert alert-info">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
<?/* Display Main Details */?>
- <table class="table">
+ <table class="table table-striped">
<caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
<? $journalTitle = $this->driver->getContainerTitle(); if (!empty($journalTitle)): ?>
<tr>
@@ -402,7 +402,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<tr>
<th><?=$this->transEsc('Tags')?>: </th>
<td>
- <span class="right hide-for-print">
+ <span class="right hidden-print">
<a class="tagRecord right" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" data-lightbox><i class="fa fa-plus"></i><?=$this->transEsc('Add Tag')?></a>
</span>
<?=$this->context($this)->renderInContext('record/taglist', array('tagList'=>$tagList, 'loggedin'=>$loggedin)) ?>
@@ -413,4 +413,4 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<?/* End Main Details */?>
</div>
</div>
-<!-- recordDriver - solrLido - CORE.phtml end -->
\ No newline at end of file
+<!-- recordDriver - solrLido - CORE - END -->
diff --git a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
index 328f63a5c485dcaf5e1e31e0dd3b30a8163d1548..5c135bbcfc955badae53148044e68413192de938 100644
--- a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
@@ -1,4 +1,4 @@
-<!-- recordDriver - solrMarc - CORE.phtml -->
+<!-- recordDriver - solrMarc - CORE -->
<?
if($loggedin = $this->auth()->isLoggedIn()) {
$user_id = $loggedin->id;
@@ -57,7 +57,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Display the lists that this record is saved to */ ?>
- <div class="savedLists hide alert alert-info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
+ <div class="savedLists hidden alert alert-info">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
@@ -392,4 +392,4 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<?/* End Main Details */?>
</div>
</div>
-<!-- recordDriver - solrMarc - CORE.phtml end -->
+<!-- recordDriver - solrMarc - CORE - END -->
diff --git a/themes/finc/templates/RecordTab/hierarchytree.phtml b/themes/finc/templates/RecordTab/hierarchytree.phtml
index 26546c10c414a9aafc919f3c929ddef719b9b9c7..8730329881dc2415564f7ee1628d61b2666a5cd3 100644
--- a/themes/finc/templates/RecordTab/hierarchytree.phtml
+++ b/themes/finc/templates/RecordTab/hierarchytree.phtml
@@ -45,7 +45,7 @@
<div id="treeSearchNoResults" class="alert alert-danger hidden"><?=$this->translate('nohit_heading')?></div>
<div id="treeSearchLimitReached" class="alert alert-danger hidden"><?=$this->translate('tree_search_limit_reached_html', array('%%url%%' => $this->url('search-results'), '%%limit%%' => $this->tab->getSearchLimit()))?></div>
<? endif; ?>
- <div id="hierarchyLoading" class="hide"><i class="fa fa-spinner fa-spin"></i> <?=$this->transEsc("Loading")?>...</div>
+ <div id="hierarchyLoading" class="hidden"><i class="fa fa-spinner fa-spin"></i> <?=$this->transEsc("Loading")?>...</div>
<div id="hierarchyTree" class="hierarchy-tree">
<input type="hidden" value="<?=$this->escapeHtml($this->driver->getUniqueId())?>" class="hiddenRecordId" />
<input type="hidden" value="<?=$this->escapeHtml($activeTree)?>" class="hiddenHierarchyId" />
diff --git a/themes/finc/templates/RecordTab/topics.phtml b/themes/finc/templates/RecordTab/topics.phtml
index 7cc51f5571f817778216a9cf60e82dd9de31acca..8dcb569409643aa689fd15eedb3c6b31094a2280 100644
--- a/themes/finc/templates/RecordTab/topics.phtml
+++ b/themes/finc/templates/RecordTab/topics.phtml
@@ -4,7 +4,10 @@
$this->headTitle($this->translate('Topics') . ': ' . $this->driver->getBreadcrumb());
?>
-<table class="table table-striped" summary="<?=$this->transEsc('Topics')?>">
+<table class="table table-striped">
+ <caption class="sr-only">
+ <?=$this->transEsc('Topics')?>
+ </caption>
<? if ($rvk = $this->driver->tryMethod('getRvkWithMetadata')): ?>
<? $contentDisplayed = true; ?>
<tr>
diff --git a/themes/finc/templates/documentdeliveryservice/form.phtml b/themes/finc/templates/documentdeliveryservice/form.phtml
index d586715fd341bf7018b3cbb7504704de162cf0e2..d2bc7385958e8cc5efa70c6c29343ed45251a849 100644
--- a/themes/finc/templates/documentdeliveryservice/form.phtml
+++ b/themes/finc/templates/documentdeliveryservice/form.phtml
@@ -24,57 +24,57 @@
</div>
<!-- phone -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sphone"><?=$this->transEsc("DDS::form_field_phone")?>:</label>
</div>
<? if (isset($this->error->phone)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->phone;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="sphone" name="subito[phone]" class="w-100" <?=(!empty($this->phone) ? 'value="' . $this->phone . '"' : '')?>/>
</div>
</div>
<!-- email -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="semail"><?=$this->transEsc("DDS::form_field_email")?>:*</label>
</div>
<? if (isset($this->error->email)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->email;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="semail" name="subito[email]" class="w-100" <?=(!empty($this->email) ? 'value="' . $this->email . '"' : '')?>/>
</div>
</div>
<!-- user id -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="suserid"><?=$this->transEsc("DDS::form_field_library_id")?>:*</label>
</div>
<? if (isset($this->error->userid)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->userid;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="suserid" name="subito[userid]" class="w-100" <?=(!empty($this->userid) ? 'value="' . $this->userid . '"' : '')?>/>
</div>
</div>
<!-- division -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sdivision"><?=$this->transEsc("DDS::form_field_division")?>:*</label>
</div>
<? if (isset($this->error->division)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->division;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<select id="sdivision" name="subito[division]" size="1" class="w-100"/>
<option value=""></option>
<? foreach ($this->divisions as $cat => $division): ?>
@@ -85,15 +85,15 @@
</div>
<!-- department -->
<div class="row input-sdepartment">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sdepartment"><?=$this->transEsc("DDS::form_field_department")?>:*</label>
</div>
<? if (isset($this->error->department)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->department;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<select id="sdepartment" name="subito[department]" size="1" class="w-100"/>
<option value=""></option>
</select>
@@ -101,10 +101,10 @@
</div>
<!-- department medicine -->
<div class="row input-department">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="smdepartment"><?=$this->transEsc("DDS::form_field_department")?>:*</label>
</div>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="smdepartment" name="subito[inputdepartment]" class="w-100" <?=(!empty($this->inputdepartment) ? 'value="' . $this->inputdepartment . '"' : '')?>/>
</div>
</div>
@@ -116,118 +116,118 @@
<!-- author -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sauthor"><?=$this->transEsc("DDS::form_field_author")?>:*</label>
</div>
<? if (isset($this->error->author)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->author;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="sauthor" name="subito[author]" class="w-100" <?=(!empty($this->author) ? 'value="' . $this->author . '"' : '')?>/>
</div>
</div>
<!-- title of issue -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sarticle"><?=$this->transEsc("DDS::form_field_title")?>:</label>
</div>
<? if (isset($this->error->article)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->article;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="sarticle" name="subito[article]" class="w-100" <?=(!empty($this->article) ? 'value="' . $this->article . '"' : '')?>/>
</div>
</div>
<!-- title of journal -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sjournal"><?=$this->transEsc("DDS::form_field_journal")?>:*</label>
</div>
<? if (isset($this->error->journal)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->journal;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="sjournal" name="subito[journal]" class="w-100" <?=(!empty($this->journal) ? 'value="' . $this->journal . '"' : '')?>/>
</div>
</div>
<!-- issn -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sjournal"><?=$this->transEsc("ISSN")?>:</label>
</div>
<? if (isset($this->error->issn)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->issn;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="sissn" name="subito[issn]" class="w-100" <?=(!empty($this->issn) ? 'value="' . $this->issn . '"' : '')?>/>
</div>
</div>
<!-- publish date -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="spublishdate"><?=$this->transEsc("DDS::form_field_publishing_date")?>:*</label>
</div>
<? if (isset($this->error->publishdate)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->publishdate;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="spublishdate" name="subito[publishdate]" class="w-100" <?=(!empty($this->publishdate) ? 'value="' . $this->publishdate . '"' : '')?>/>
</div>
</div>
<!-- journal number -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="snumber"><?=$this->transEsc("DDS::form_field_volume")?>:*</label>
</div>
<? if (isset($this->error->number)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->number;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="snumber" name="subito[number]" class="w-100" <?=(!empty($this->number) ? 'value="' . $this->number . '"' : '')?>/>
</div>
</div>
<!-- pages -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="spages"><?=$this->transEsc("DDS::form_field_pages")?>:*</label>
</div>
<? if (isset($this->error->pages)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->pages;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<input type="text" id="spages" name="subito[pages]" class="w-100" <?=(!empty($this->pages) ? 'value="' . $this->pages . '"' : '')?>/>
</div>
</div>
<!-- remarks -->
<div class="row">
- <div class="medium-3 columns">
+ <div class="col-sm-3">
<label class="inline" for="sremarks"><?=$this->transEsc("DDS::form_fields_remarks")?>:</label>
</div>
<? if (isset($this->error->remarks)): ?>
- <div class="medium-9 columns error-field">
+ <div class="col-sm-9 error-field">
<?=$this->error->remarks;?>
</div>
<? endif; ?>
- <div class="medium-9 columns">
+ <div class="col-sm-9">
<textarea id="sremarks" name="subito[remarks]" class="w-100"><?=(!empty($this->remarks) ? $this->remarks : '')?></textarea>
</div>
</div>
<div class="row">
- <div class="medium-9 columns medium-offset-3">
+ <div class="col-sm-9 offset-sm-3">
<input role="button" type="submit" class="btn btn-primary" value="<?=$this->transEsc("DDS::form_button_submit")?>"/>
</div>
</div>
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index de2d32d0423e4e58dfd2815978f82359b2565336..b87bc8ec86562182351ae6cffe63d66113221a3f 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -1,4 +1,4 @@
-<!-- HEADER.PHTML begin -->
+<!-- HEADER begin -->
<? $account = $this->auth()->getManager(); ?>
<? /* This nav element is the sticky element in the header - CK */ ?>
@@ -124,8 +124,6 @@
</nav>
</div>
<? endif; ?>
-
-
+ </div>
</nav>
-</div>
-<!-- HEADER.PHTML end -->
\ No newline at end of file
+<!-- HEADER - END -->
\ No newline at end of file
diff --git a/themes/finc/templates/layout/layout.phtml b/themes/finc/templates/layout/layout.phtml
index 28ce76f251d351203796ef4ed3366f0f7dc6889c..67475c65c0f02f06841cedf7fb6b8fd2928cf01a 100644
--- a/themes/finc/templates/layout/layout.phtml
+++ b/themes/finc/templates/layout/layout.phtml
@@ -2,7 +2,9 @@
<html lang="<?=$this->layout()->userLang?>">
<head>
<? $this->headThemeResources() ?>
- <meta charset="utf-8">
+ <? /* remove meta because of Validator error - CK */
+ /* <meta charset="utf-8"> */
+ ?>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
<?=$this->headMeta()?>
diff --git a/themes/finc/templates/librarycards/home.phtml b/themes/finc/templates/librarycards/home.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..1891c2f7ad860fcac763dacf2a3f607dd6901e91
--- /dev/null
+++ b/themes/finc/templates/librarycards/home.phtml
@@ -0,0 +1,66 @@
+<?
+ // Set up page title:
+ $this->headTitle($this->translate('Library Cards'));
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Library Cards') . '</li>';
+?>
+<div class="row">
+ <div class="<?=$this->layoutClass('mainbody')?>">
+
+ <?=$this->flashmessages()?>
+
+ <h2><?=$this->transEsc('Library Cards')?></h2>
+ <? if ($this->libraryCards->count() == 0): ?>
+ <div><?=$this->transEsc('You do not have any library cards')?></div>
+ <? else: ?>
+ <table class="table table-striped">
+ <caption class="sr-only">
+ <?=$this->transEsc('Library Cards')?>
+ </caption>
+ <tr>
+ <th><?=$this->transEsc('Library Card Name')?></th>
+ <? if ($this->multipleTargets): ?>
+ <th><?=$this->transEsc('login_target')?></th>
+ <? endif; ?>
+ <th><?=$this->transEsc('Username')?></th>
+ <th> </th>
+ </tr>
+ <? foreach ($this->libraryCards as $record): ?>
+ <tr>
+ <td><?=$this->escapeHtml($record['card_name'])?></td>
+ <? $username = $record['cat_username']; if ($this->multipleTargets): ?>
+ <? $target = ''; ?>
+ <? if (strstr($username, '.')): ?>
+ <? list($target, $username) = explode('.', $username, 2); ?>
+ <? endif; ?>
+ <td><?=$target ? $this->transEsc("source_$target", null, $target) : ' ' ?></td>
+ <? endif; ?>
+ <td><?=$this->escapeHtml($username)?></td>
+ <td>
+ <div class="btn-group">
+ <a class="btn btn-link" href="<?=$this->url('editLibraryCard') . $this->escapeHtmlAttr($record['id']) ?>" title="<?=$this->transEsc('Edit Library Card')?>"><i class="fa fa-edit"></i> <?=$this->transEsc('Edit')?></a>
+ <a class="btn btn-link dropdown-toggle" data-toggle="dropdown" href="<?=$this->url('librarycards-deletecard') ?>?cardID=<?=urlencode($record['id'])?>">
+ <i class="fa fa-trash-o"></i> <?=$this->transEsc('Delete')?>
+ </a>
+ <ul class="dropdown-menu">
+ <li><a href="<?=$this->url('librarycards-deletecard') ?>?cardID=<?=urlencode($record['id'])?>&confirm=1"><?=$this->transEsc('confirm_dialog_yes') ?></a></li>
+ <li><a href="#"><?=$this->transEsc('confirm_dialog_no')?></a></li>
+ </ul>
+ </div>
+ </td>
+ </tr>
+ <? endforeach; ?>
+ </table>
+ <? endif; ?>
+
+ <div class="btn-group">
+ <a href="<?=$this->url('editLibraryCard') ?>NEW" class="btn btn-link"><i class="fa fa-edit"></i> <?=$this->transEsc('Add a Library Card')?></a>
+ </div>
+ </div>
+
+ <div class="<?=$this->layoutClass('sidebar')?>">
+ <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'librarycards'))?>
+ </div>
+
+</div>
diff --git a/themes/finc/templates/myresearch/fines.phtml b/themes/finc/templates/myresearch/fines.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..a1fe30686dfab9a64fde94ddc354275299d0df47
--- /dev/null
+++ b/themes/finc/templates/myresearch/fines.phtml
@@ -0,0 +1,56 @@
+<?
+ // Set up page title:
+ $this->headTitle($this->translate('My Fines'));
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Fines') . '</li>';
+?>
+<div class="<?=$this->layoutClass('mainbody')?>">
+ <h2><?=$this->transEsc('Your Fines')?></h2>
+ <?=$this->flashmessages()?>
+
+ <?=$this->context($this)->renderInContext('librarycards/selectcard.phtml', array('user' => $this->auth()->isLoggedIn())); ?>
+
+ <? if (empty($this->fines)): ?>
+ <?=$this->transEsc('You do not have any fines')?>
+ <? else: ?>
+ <table class="table table-striped">
+ <caption class="sr-only">
+ <?=$this->transEsc('Your Fines')?>
+ </caption>
+ <tr>
+ <th><?=$this->transEsc('Title')?></th>
+ <th><?=$this->transEsc('Checked Out')?></th>
+ <th><?=$this->transEsc('Due Date')?></th>
+ <th><?=$this->transEsc('Fine')?></th>
+ <th><?=$this->transEsc('Fee')?></th>
+ <th><?=$this->transEsc('Balance')?></th>
+ </tr>
+ <? $totalDue = 0; ?>
+ <? foreach ($this->fines as $record): ?>
+ <tr>
+ <td>
+ <? if (empty($record['title'])): ?>
+ <?=$this->transEsc('not_applicable')?>
+ <? elseif (!isset($record['driver']) || !is_object($record['driver'])): ?>
+ <?=$this->escapeHtml(trim($record['title'], '/:'))?>
+ <? else: ?>
+ <a href="<?=$this->recordLink()->getUrl($record['driver'])?>"><?=$this->escapeHtml(trim($record['title'], '/:'))?></a>
+ <? endif; ?>
+ </td>
+ <td><?=isset($record['checkout']) ? $this->escapeHtml($record['checkout']) : ''?></td>
+ <td><?=isset($record['duedate']) ? $this->escapeHtml($record['duedate']) : ''?></td>
+ <td><?=isset($record['fine']) ? $this->escapeHtml($record['fine']) : ''?></td>
+ <td><?=isset($record['amount']) ? $this->safeMoneyFormat($record['amount']/100.00) : ''?></td>
+ <td><?=isset($record['balance']) ? $this->safeMoneyFormat($record['balance']/100.00) : ''?></td>
+ </tr>
+ <? $totalDue += $record['balance']; ?>
+ <? endforeach; ?>
+ <tr style="font-weight:bold"><td colspan="5"><?=$this->transEsc('Total Balance Due')?></td><td><?=$this->safeMoneyFormat($totalDue/100.00) ?></td></tr>
+ </table>
+ <? endif; ?>
+</div>
+
+<div class="<?=$this->layoutClass('sidebar')?>">
+ <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'fines'))?>
+</div>
diff --git a/themes/finc/templates/record/emailhold.phtml b/themes/finc/templates/record/emailhold.phtml
index 18556f62e1fe3dcb7aad1a7dc16ca5c39ee85d61..24b17785b1de43cdb30bcff7461697092f9a2e52 100644
--- a/themes/finc/templates/record/emailhold.phtml
+++ b/themes/finc/templates/record/emailhold.phtml
@@ -66,7 +66,7 @@
</option>
<? endif; ?>
<? foreach ($this->pickup as $lib): ?>
- <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID']) ? ' selected="selected"' : ''?>>
+ <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>" <?=($selected == $lib['locationID']) ? ' selected="selected"' : ''?>>
<?=$this->escapeHtml($lib['locationDisplay'])?>
</option>
<? endforeach; ?>
diff --git a/themes/finc/templates/search/advanced/limit.phtml b/themes/finc/templates/search/advanced/limit.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..2158c668cb3e8c396a65d332db05db347065cf61
--- /dev/null
+++ b/themes/finc/templates/search/advanced/limit.phtml
@@ -0,0 +1,20 @@
+<!-- Search - advanced - limit -->
+<?
+ // Set up convenience variables:
+ $limitList = $this->options->getLimitOptions();
+
+ // If a previous limit was used, make that the default; otherwise, use the "default default"
+ $lastLimit = $this->searchMemory()->getLastLimit($this->options->getSearchClassId());
+ $defaultLimit = empty($lastLimit) ? $this->options->getDefaultLimit() : $lastLimit;
+?>
+<? if (count($limitList) > 1): ?>
+ <fieldset class="col-sm-4">
+ <legend><?=$this->transEsc('Results per page')?></legend>
+ <select id="limit" name="limit" class="form-control">
+ <? foreach ($limitList as $limitVal): ?>
+ <option value="<?=$this->escapeHtmlAttr($limitVal)?>" <?=($limitVal == $defaultLimit) ? 'selected="selected"' : ''?>><?=$this->escapeHtml($limitVal)?></option>
+ <? endforeach; ?>
+ </select>
+ </fieldset>
+<? endif; ?>
+<!-- Search - advanced - limit - END -->
diff --git a/themes/finc/templates/search/controls/limit.phtml b/themes/finc/templates/search/controls/limit.phtml
index acf3855fbe769cf89c72211158e30949f507220c..aba8023d5ce94a55ecc6b2a7dba9d1f94ac58d3c 100644
--- a/themes/finc/templates/search/controls/limit.phtml
+++ b/themes/finc/templates/search/controls/limit.phtml
@@ -1,4 +1,4 @@
-<!-- search - controls - LIMIT.phtml -->
+<!-- search - controls - LIMIT -->
<? $limitList = $this->params->getLimitList(); ?>
<? if (count($limitList) > 1): ?>
<? /* Do not use form-inline as it messes up the select box */ ?>
@@ -7,10 +7,10 @@
<? /* Do not use form-control as it messes up the select box */ ?>
<select id="limit" name="limit" class="jumpMenu">
<? foreach ($limitList as $limitVal => $limitData): ?>
- <option value="<?=$this->escapeHtmlAttr($limitVal)?>"<?=$limitData['selected']?' selected="selected"':''?>><?=$this->escapeHtml($limitData['desc'])?></option>
+ <option value="<?=$this->escapeHtmlAttr($limitVal)?>" <?=$limitData['selected']? ' selected="selected" ':'' ?>><?=$this->escapeHtml($limitData['desc'])?></option>
<? endforeach; ?>
</select>
<noscript><input type="submit" value="<?=$this->transEsc("Set")?>" /></noscript>
</form>
<? endif; ?>
-<!-- search - controls - LIMIT.phtml - end -->
+<!-- search - controls - LIMIT - END -->
diff --git a/themes/finc/templates/search/controls/sort.phtml b/themes/finc/templates/search/controls/sort.phtml
index 9eb01a7d84c0a1a571249905e70142edd9bc7134..750694385553019a4c7cca3e125437ebad90624d 100644
--- a/themes/finc/templates/search/controls/sort.phtml
+++ b/themes/finc/templates/search/controls/sort.phtml
@@ -7,7 +7,7 @@
<? /* Do not use form-control as it messes up the select box */ ?>
<select id="sort_options_1" name="sort" class="jumpMenu">
<? foreach ($list as $sortType => $sortData): ?>
- <option value="<?=$this->escapeHtmlAttr($sortType)?>"<?=$sortData['selected']?' selected="selected"':''?>><?=$this->transEsc($sortData['desc'])?></option>
+ <option value="<?=$this->escapeHtmlAttr($sortType)?>" <?=$sortData['selected']?' selected="selected"':''?>><?=$this->transEsc($sortData['desc'])?></option>
<? endforeach; ?>
</select>
<noscript><input type="submit" class="btn btn-primary" value="<?=$this->transEsc("Set")?>" /></noscript>