diff --git a/themes/finc/scss/default.scss b/themes/finc/scss/default.scss
index 47fa34efd3fd71db453d7c7f6b60bba530c61fa2..5c9906123e1dc0fbd200e35ff7be0848b1fb657c 100644
--- a/themes/finc/scss/default.scss
+++ b/themes/finc/scss/default.scss
@@ -68,7 +68,8 @@ header.fixed { left:auto;max-width: $row-width; }
margin-top: .5rem;
}
}
-// Internformat
+// Internformat - staff view
+table.citation th {min-width: 18%}
.pace-car th {min-width: 10%}
diff --git a/themes/finc/templates/Email/acquisition-html.phtml b/themes/finc/templates/Email/acquisition-html.phtml
index 0bb9d0484071ae4d67f578d3a3c0c2ef170ba3ef..567461b65dd5b0cd63c3e27bd762260bf54f797a 100644
--- a/themes/finc/templates/Email/acquisition-html.phtml
+++ b/themes/finc/templates/Email/acquisition-html.phtml
@@ -4,18 +4,18 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Erwerbungsvorschlag</title>
</head>
-<body style="font-family: Arial, Verdana, sans-serif;">
-<h2 style="padding:5px 0;">Erwerbungsvorschlag</h2>
-<table width="800" border="0">
+<body>
+<h2>Erwerbungsvorschlag</h2>
+<table>
<tr valign="top">
- <td width="390">
+ <td>
Name: <strong><?=$user->lastname ?>, <?=$user->firstname ?></strong><br />
Lesekarte-Nr.: <strong><?=$user->username ?></strong><br />
Email: <a href="mailto:<?=$user->email ?>"><?=$user->email ?></a><br />
<? /*if ($user->group): ?>Benutzergruppe: <?=$user->group ?><? endif;*/ ?>
</td>
- <td width="20"> </td>
- <td width="390">
+ <td> </td>
+ <td>
hat folgenden Titel zur Erwerbung empfohlen:<br />
<br />
<strong><?=$proposal ?></strong><br />
@@ -29,7 +29,7 @@
</td>
</tr>
<tr valign="top">
- <td width="800" colspan="3">
+ <td colspan="3">
Zeitpunkt der Bestellung: <?=$time ?>
</td>
</tr>
diff --git a/themes/finc/templates/RecordDriver/SolrAI/core.phtml b/themes/finc/templates/RecordDriver/SolrAI/core.phtml
index 2f83e1d7c8eb7ddb53b86a8e6b5e0fabe68ab3f7..6aac65fea9e6abee2843ae101cb75978859856de 100644
--- a/themes/finc/templates/RecordDriver/SolrAI/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrAI/core.phtml
@@ -17,8 +17,10 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? /* Display thumbnail if appropriate: */ ?>
<? if($cover): ?>
<?=$cover?>
+ <? /* BOF - finc-specific StyleBasedIcons */ ?>
<? elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
<?=$this->record($this->driver)->getFormatIcon()?>
+ <? /* EOF - finc-specific StyleBasedIcons */ ?>
<? endif; ?>
<? /* Display qrcode if appropriate: */ ?>
@@ -54,13 +56,14 @@ 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="dialogalert">
+ <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
<?/* Display Main Details */?>
- <table class="table" width="100%" summary="<?=$this->transEsc('Bibliographic Details')?>">
+ <table class="table">
+ <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
<? $journalTitle = $this->driver->getContainerTitle(); if (!empty($journalTitle)): ?>
<tr>
<th><?=$this->transEsc('Journal Title')?>:</th>
@@ -101,15 +104,19 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? $authors = $this->driver->getDeduplicatedAuthors(); ?>
<? if (isset($authors['main']) && !empty($authors['main'])): ?>
<tr>
- <th><?=$this->transEsc('Main Author')?>: </th>
- <td property="author"><a href="<?=$this->record($this->driver)->getLink('author', $authors['main'])?>"><?=$this->escapeHtml($authors['main'])?></a></td>
+ <th><?=$this->transEsc(count($authors['main']) > 1 ? 'Main Authors' : 'Main Author')?>: </th>
+ <td>
+ <? $i = 0; foreach ($authors['main'] as $author => $roles): ?><?=($i++ == 0)?'':', '?><span property="author"><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; ?></span><? endforeach; ?>
+ </td>
</tr>
<? endif; ?>
<? if (isset($authors['corporate']) && !empty($authors['corporate'])): ?>
<tr>
- <th><?=$this->transEsc('Corporate Author')?>: </th>
- <td property="creator"><a href="<?=$this->record($this->driver)->getLink('author', $authors['corporate'])?>"><?=$this->escapeHtml($authors['corporate'])?></a></td>
+ <th><?=$this->transEsc(count($authors['corporate']) > 1 ? 'Corporate Author' : 'Corporate Authors')?>: </th>
+ <td>
+ <? $i = 0; foreach ($authors['corporate'] as $corporate => $roles): ?><?=($i++ == 0)?'':', '?><span property="creator"><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; ?></span><? endforeach; ?>
+ </td>
</tr>
<? endif; ?>
@@ -117,7 +124,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<tr>
<th><?=$this->transEsc('Other Authors')?>: </th>
<td>
- <? $i = 0; foreach ($authors['secondary'] as $field): ?><?=($i++ == 0)?'':', '?><span property="contributor"><a href="<?=$this->record($this->driver)->getLink('author', $field)?>"><?=$this->escapeHtml($field)?></a></span><? endforeach; ?>
+ <? $i = 0; foreach ($authors['secondary'] as $author => $roles): ?><?=($i++ == 0)?'':', '?><span property="contributor"><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; ?></span><? endforeach; ?>
</td>
</tr>
<? endif; ?>
@@ -276,7 +283,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<th><?=$this->transEsc('Tags')?>: </th>
<td>
<span class="right hide-for-print">
- <a class="tagRecord right" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><i class="fa fa-plus"></i><?=$this->transEsc('Add Tag')?></a>
+ <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)) ?>
</td>
diff --git a/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml b/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
index 88dcb82db588d0f7c3c4dcf0baba167c585d70a0..30887a31c604b78ccfeec3210d1ad0d6986c678c 100644
--- a/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
@@ -176,7 +176,7 @@
<? /* Add to favorites */ ?>
<a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>" title="<?=$this->transEsc('Add to favorites')?>"><i class="fa fa-fw fa-star"></i> <?=$this->transEsc('Add to favorites')?></a><br/>
<? /* Saved lists */ ?>
- <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
+ <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml
index d656dda67628b54bf109c0e607f3023cac359e19..cefba8425701bae0fe358a92ed39299766b766cf 100644
--- a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml
@@ -56,13 +56,14 @@ 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="dialogalert">
+ <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
<?/* Display Main Details */?>
- <table class="table" width="100%" summary="<?=$this->transEsc('Bibliographic Details')?>">
+ <table class="table">
+ <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
<? $journalTitle = $this->driver->getContainerTitle(); if (!empty($journalTitle)): ?>
<tr>
<th><?=$this->transEsc('Published in')?>:</th>
@@ -270,7 +271,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<th><?=$this->transEsc('Tags')?>: </th>
<td>
<span class="right hide-for-print">
- <a class="tagRecord right" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><i class="fa fa-plus"></i><?=$this->transEsc('Add Tag')?></a>
+ <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)) ?>
</td>
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml b/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml
index e4f26172f29d8bf557f177a24bdb407dcc2c4179..9f5655f95092267a51c677525ddb3a10d97540a1 100644
--- a/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml
@@ -172,7 +172,7 @@
<? /* Add to favorites */ ?>
<a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId()) ?>" title="<?=$this->transEsc('Add to favorites')?>"><i class="fa fa-fw fa-star"></i> <?=$this->transEsc('Add to favorites')?></a><br/>
<? /* Saved lists */ ?>
- <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
+ <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="alertdialog">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml b/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml
index 30cb7971a41034303e6b874e31a7d372c5f5c2d2..ac6baf9f89a5301f3b404c3aebf2c137143f5b0e 100644
--- a/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml
+++ b/themes/finc/templates/RecordDriver/SolrDefault/toolbar.phtml
@@ -12,20 +12,19 @@ $cart = $this->cart();
$cartId = $this->driver->getSourceIdentifier() . '|' . $id;
?>
<dl class="sub-nav hide-for-print">
+ <dt class="sr-only"><?=$this->transEsc('Toolbar')?></dt>
<? if (count($this->driver->getCitationFormats()) > 0): ?>
- <dd><? /* potential modal solution with next FNDTN theme - FIXME - CK */ ?>
- <a class="cite-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" title="<?=$this->transEsc('Cite this')?>" rel="nofollow"><i class="fa fa-asterisk"></i> <?=$this->transEsc('Cite this')?></a>
+ <dd>
+ <a class="cite-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Cite')?>" rel="nofollow"><i class="fa fa-asterisk"></i> <?=$this->transEsc('Cite this')?></a>
</dd>
<? endif; ?>
- <?
- /*
+ <? /*
<dd>
- <a class="sms-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" title="<?=$this->transEsc('Text this')?>" rel="nofollow"><i class="fa fa-mobile"></i> <?=$this->transEsc('Text this')?></a>
+ <a class="sms-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'SMS')?>" rel="nofollow"><i class="fa fa-mobile"></i> <?=$this->transEsc('Text this')?></a>
</dd>
- */
- ?>
+ */ ?>
<dd>
- <a class="mail-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" title="<?=$this->transEsc('Email this')?>" rel="nofollow"><i class="fa fa-envelope"></i> <?=$this->transEsc('Email this')?></a>
+ <a class="mail-record <?=$controllerClass?>" data-lightbox href="<?=$this->recordLink()->getActionUrl($this->driver, 'Email')?>" rel="nofollow"><i class="fa fa-envelope"></i> <?=$this->transEsc('Email this')?></a>
</dd>
<? $exportFormats = $this->export()->getFormatsForRecord($this->driver); ?>
@@ -58,16 +57,6 @@ $cartId = $this->driver->getSourceIdentifier() . '|' . $id;
<input class="cartId" type="hidden" name="ids[]" value="<?= $this->escapeHtmlAttr($cartId) ?>" />
<a class="cart-add hide <? if (!$cart->contains($cartId)): ?>correct <? endif ?>" href="#"><i class="fa fa-plus"></i> <?= $this->transEsc('Add to Book Bag') ?></a>
<a class="cart-remove hide <? if ($cart->contains($cartId)): ?>correct <? endif ?>" href="#"><i class="fa fa-minus-circle"></i> <?= $this->transEsc('Remove from Book Bag') ?></a>
- <noscript>
- <form method="post" name="addForm" action="<?= $this->url('cart-processor') ?>">
- <input type="hidden" name="ids[]" value="<?= $this->escapeHtmlAttr($cartId) ?>"/>
- <? if ($cart->contains($cartId)): ?>
- <input class="button secondary small" type="submit" name="delete" role="button" value="<?= $this->transEsc('Remove from Book Bag') ?>"/>
- <? else: ?>
- <input class="button secondary small" type="submit" name="add" role="button" value="<?= $this->transEsc('Add to Book Bag') ?>"/>
- <? endif; ?>
- </form>
- </noscript>
</dd>
<? endif; ?>
</dl>
diff --git a/themes/finc/templates/RecordTab/holdingsils.phtml b/themes/finc/templates/RecordTab/holdingsils.phtml
index 1e071d2cccc6062af7f00810eaebd19641a66a92..92448700d053551ba62548b64b6cb9155686a7ce 100644
--- a/themes/finc/templates/RecordTab/holdingsils.phtml
+++ b/themes/finc/templates/RecordTab/holdingsils.phtml
@@ -16,7 +16,7 @@
<?=$this->context($this)->renderInContext('librarycards/selectcard.phtml', array('user' => $this->auth()->isLoggedIn())); ?>
<? if ($offlineMode == "ils-offline"): ?>
- <div data-alert class="alert-box warning" tabindex="0" aria-live="assertive" role="dialogalert">
+ <div data-alert class="alert-box warning" tabindex="0" aria-live="assertive" role="alertdialog">">
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_holdings_message')?></p>
@@ -27,11 +27,11 @@
<? if (($this->ils()->getHoldsMode() == 'driver' && !empty($holdings)) || $this->ils()->getTitleHoldsMode() == 'driver'): ?>
<? if ($account->loginEnabled() && $offlineMode != 'ils-offline'): ?>
<? if (!$user): ?>
- <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="dialogalert">
+ <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="alertdialog">">
<a href="<?=$this->recordLink()->getTabUrl($this->driver, 'Holdings')?>?login=true&catalogLogin=true" data-lightbox><?=$this->transEsc("Login")?></a> <?=$this->transEsc("hold_login")?>
</div>
<? elseif (!$user->cat_username): ?>
- <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="dialogalert">
+ <div data-alert class="alert-box info" tabindex="0" aria-live="assertive" role="alertdialog">">
<?=$this->translate("hold_profile_html", array('%%url%%' => $this->recordLink()->getTabUrl($this->driver, 'Holdings') . '?catalogLogin=true'))?>
</div>
<? endif; ?>
@@ -58,7 +58,8 @@
<?=$locationText?>
<? endif; ?>
</h3>
-<table class="table" summary="<?=$this->transEsc('Holdings details from')?> <?=$this->transEsc($holding['location'])?>">
+<table class="table">
+ <caption class="sr-only"><?=$this->transEsc('Holdings details from')?> <?=$this->transEsc($holding['location'])?></caption>
<? /* WE USE NO callNos here, next are th for availability and details - 04.16. CK */ ?>
<tr>
<th><?=$this->transEsc("Availability")?></th>
diff --git a/themes/finc/templates/RecordTab/staffviewarray.phtml b/themes/finc/templates/RecordTab/staffviewarray.phtml
index 217c46103050311e4aae2c6f966851d9df4cb0aa..48724739c569b6d6f61493d99f0949b7d5fb17a0 100644
--- a/themes/finc/templates/RecordTab/staffviewarray.phtml
+++ b/themes/finc/templates/RecordTab/staffviewarray.phtml
@@ -6,7 +6,7 @@
<table class="citation table table-striped">
<? foreach ($this->driver->getRawData() as $field => $values): ?>
<tr>
- <th width="30%"><?=$this->escapeHtml($field)?></th>
+ <th><?=$this->escapeHtml($field)?></th>
<td>
<? if (!is_array($values)) { $values = array($values); } ?>
<? foreach ($values as $value): ?>
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index 829f020a51690f0aae9140704d8d602bffbdef67..4401c57367ddae07f58b8f8dcfc6ea1893a76424 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -3,7 +3,7 @@
<nav class="top-bar" data-topbar data-options="sticky_on:all">
<ul class="title-area">
<li class="name">
- <h1><a role="logo" class="navbar-brand" href="<?=$this->url('home')?>"><span class="hide-for-medium-up"><?=$this->transEsc("LibraryName")?></span><img src="<?=$this->imageLink('headerlogo.png')?>" class="hide-for-small" alt="Logo <?=$this->transEsc("LibraryName")?>" title="<?=$this->transEsc("LibraryName")?>"></a></h1>
+ <h1><a class="navbar-brand" href="<?=$this->url('home')?>"><span class="hide-for-medium-up"><?=$this->transEsc("LibraryName")?></span><img src="<?=$this->imageLink('headerlogo.png')?>" class="hide-for-small" alt="Logo <?=$this->transEsc("LibraryName")?>" title="<?=$this->transEsc("LibraryName")?>"></a></h1>
</li>
<? /*Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone */ ?>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
@@ -11,15 +11,17 @@
<section class="top-bar-section">
<? if ($this->layout()->searchbox !== false): ?>
<ul class="left list-unstyled show-for-medium-up">
+ <li>
<?=$this->layout()->searchbox?>
+ </li>
</ul>
<? endif; ?>
<? if (!isset($this->layout()->renderingError)): ?>
<? /* Right-hand Nav Section */ ?>
- <ul role="navigation" class="right">
+ <ul class="right">
<? if ($this->feedback()->tabEnabled()): ?>
<li>
- <a id="feedbackLink" data-lightbox href="<?=$this->url('feedback-home')?>"><i class="fa fa-envelope"></i> <?=$this->transEsc("Feedback")?></a>
+ <a class="feedbackLink" data-lightbox href="<?=$this->url('feedback-home')?>"><i class="fa fa-envelope"></i> <?=$this->transEsc("Feedback")?></a>
</li>
<? endif; ?>
<? $cart = $this->cart();
diff --git a/themes/finc/templates/search/searchbox.phtml b/themes/finc/templates/search/searchbox.phtml
index e0205882b5730aaa85715a618b0560e2d3d5581f..a8fcfe33d5e473b4bd5c7cebae2649adbb92e76c 100644
--- a/themes/finc/templates/search/searchbox.phtml
+++ b/themes/finc/templates/search/searchbox.phtml
@@ -61,7 +61,7 @@ $advSearch = $options->getAdvancedSearchAction();
<input type="hidden" name="type" value="<?= $this->escapeHtmlAttr($handlers[0]['value']) ?>"/>
<? endif; ?>
<li class="has-form">
- <button type="submit" class="postfix" role="button"><i class="fa fa-search"></i> <?= $this->transEsc("Find") ?></button>
+ <button type="submit" class="postfix"><i class="fa fa-search"></i> <?= $this->transEsc("Find") ?></button>
</li>
<? if ($advSearch): ?>
<li class="has-form">