Merge branch 'development'

local/config/vufind/searchspecs.yaml

@@ -26,6 +26,7 @@ AllFields:
     - ctrlnum^1000
     - publishDate
     - isbn
+    - variant_isbn_isn_mv
     - issn
     - localcode                            # local codes (field 909)
     - idscode_txt_mv                       # IDS codes (field 908, IDS MARC 906/907)
@@ -108,6 +109,7 @@ Author:
 ISN:
   DismaxFields:
     - isbn
+    - variant_isbn_isn_mv
     - issn
     - ismn_isn_mv
     - doi_isn_mv
@@ -119,6 +121,9 @@ ISN:
     isbn:
       - [and, 100]
       - [or, ~]
+    variant_isbn_isn_mv:
+      - [and, 100]
+      - [or, ~]
     ismn_isn_mv:
       - [and, 100]
       - [or, ~]

local/languages/de.ini

@@ -2813,3 +2813,4 @@ F 88.4 = "Beziehungen der EU mit anderen lateinamerikanischen Binnenmärkten"
 F 88.5 = "Beziehungen mit afrikanischen Binnenmärkten"
 F 88.6 = "Beziehungen mit Binnenmärkten von Asien"
 F 89 = "Verteidigung. Internationale militärische Politik"
+test.beta.responsive = "Testen Sie unsere Betaversion im Responsive Design"

local/languages/en.ini

@@ -2812,3 +2812,4 @@ F 88.4 = "Relations with other common markets of Latin America"
 F 88.5 = "Relations with African common markets"
 F 88.6 = "Relations with Asian common markets"
 F 89 = "Defence. International military policy "
+test.beta.responsive = "Try our beta version in Responsive Design"

local/languages/fr.ini

@@ -2812,3 +2812,4 @@ F 88.4 = "Relations avec d'autres marchés communs de l'Amérique latine"
 F 88.5 = "Relations avec les marchés communs de l'Afrique"
 F 88.6 = "Relations avec les marchés communs de l'Asie"
 F 89 = "Défense. Politique militaire internationale"
+test.beta.responsive = "todo: translate"

local/languages/it.ini

@@ -2812,3 +2812,4 @@ F 88.4 = "Relazioni con altri mercati comuni d'America latina"
 F 88.5 = "Relazioni con i mercati comuni africani"
 F 88.6 = "Relazioni con i mercati comuni asiatici"
 F 89 = "Difesa. Politica militare internazionale"
+test.beta.responsive = "todo: translate"

module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php

@@ -1221,7 +1221,7 @@ public function getCopyNotes()
      */
     public function getGroup()
     {
-        return isset($this->fields['groupid_isn_mv']) ? $this->fields['groupid_isn_mv'][0] : '';
+        return isset($this->fields['groupid_isn_mv']) ? $this->fields['groupid_isn_mv'] : '';
     }
 
 

module/Swissbib/src/Swissbib/View/Helper/DomainURL.php

@@ -1,6 +1,7 @@
 <?php
 namespace Swissbib\View\Helper;
 
+use Zend\Mvc\Router\RouteStackInterface;
 use Zend\View\Helper\AbstractHelper;
 use Zend\Http\Request;
 
@@ -14,10 +15,13 @@ class DomainURL extends AbstractHelper
 
 
     protected $request;
+    protected $router;
 
-    public function __construct(Request $request)
+    public function __construct(Request $request, RouteStackInterface $router)
     {
         $this->request = $request;
+        //$test = $router->match($request);
+        $this->router = $router;
     }
 
 
@@ -39,6 +43,21 @@ public function getRefererURL() {
 
     }
 
+
+    public function getMatchedRouteName ()
+    {
+        $routeMatch = $this->router->match($this->request);
+
+        if ($this->router && $routeMatch)
+        {
+            return $routeMatch->getMatchedRouteName();
+        } else {
+            return null;
+        }
+
+
+    }
+
 }
 
 

module/Swissbib/src/Swissbib/View/Helper/Factory.php

@@ -125,7 +125,7 @@ public static function isFavoriteInstitutionHelper(ServiceManager $sm)
     public static function getDomainURLHelper(ServiceManager $sm)
     {
         $locator = $sm->getServiceLocator();
-        return new DomainURL($locator->get('Request'));
+        return new DomainURL($locator->get('Request'), $locator->get('router'));
 
     }
 

themes/swissbib/css/screen/basemod.css

@@ -148,15 +148,15 @@ div#main {
 	background-position:15px 15px;
 	background-repeat:no-repeat;
 }*/
-#logo a {
+#logo  h1 > a {
 	display:block;
 	/* beta logo */
 	height:60px;
 	width:140px;
 	padding:15px 835px 8px 15px;
 	background-color:#32CD0F;
 	background-color:transparent;
-	background-image:url(../../images/logo_swissbib_beta.gif);
+	background-image:url(../../images/logo_swissbib.gif);
 	background-position:15px 15px;
 	background-repeat:no-repeat;
 }
@@ -247,13 +247,13 @@ div#main {
 	background-image:url(../../images/logo_swissbib-home.gif);
 	background-position:30px 75px;
 } */
-.template_home #logo a {
+.template_home #logo > h1 a {
 	display:block;
 	/* beta logo */
 	height:135px;
 	width:300px;
 	padding:75px 660px 13px 30px;
-	background-image:url(../../images/logo_swissbib_beta-home.gif);
+	background-image:url(../../images/logo_swissbib-home.gif);
 	background-position:30px 75px;
 }
 .template_home #main {

themes/swissbib/css/swissbib.css

@@ -1,26 +1,64 @@
 /** ------------ Logo HOME and OTHER - PNG-versions ------------  */
 
-/* home logo
+/*home logo */
+/*
 .template_home #logo a {
 	display:block;
 	height:100px;
 	width:300px;
 	padding:75px 660px 48px 30px;
-	background-image:url(../../images/logo_swissbib-home.png);
+	background-image:url(../images/logo_swissbib-home.png);
 	background-position:30px 75px;
-} */
-
-/* logo
+}
+*/
+/* logo */
+/*
 #logo a {
 	display:block;
 	height:50px;
 	width:140px;
 	padding:15px 835px 18px 15px;
 	background-color:#32CD0F;
-	background-image:url(../../images/logo_swissbib.png);
+	background-image:url(../images/logo_swissbib.png);
 	background-position:15px 15px;
 	background-repeat:no-repeat;
-}*/
+}
+*/
+
+
+#logo h1 {
+    display: inline-block;
+    width: 50%;
+    text-indent: 0;
+}
+
+
+#logo div#betaURLHome, #logo div#betaURL {
+    display: inline-block;
+    margin-right: 0;
+    position: absolute;
+    height: 2px;
+    right: 60px;
+    top: 100px;
+    width: 500px;
+    font-size: 1.8em;
+    color: #ffffff;
+
+}
+
+#logo div#betaURL {
+    top: 20px;
+    right: 180px;
+}
+
+
+#logo div#betaURLHome.right a, #logo div#betaURL.right a {
+    color: #ffffff;
+}
+
+
+
+
 
 /** ------------ Basic table design ------------  */
 
@@ -160,21 +198,21 @@
 }
 
 /** ------------ adv. search: classification tree ------------  */
-.classification-tree {
+#classification-tree {
     float: left;
     width: 540px;
     font-size: 1.2em;
     font-family: Arial, Helvetica, sans-serif;
 }
 
-.classification-tree.jstree-default .jstree-clicked {
+#classification-tree.jstree-default .jstree-clicked {
     background: none;
     border: 1px solid #FFF;
     padding: 0 2px 0 1px;
 }
 
-.classification-tree.jstree-default li.selected > a,
-.classification-tree.jstree-default li a:hover {
+#classification-tree.jstree-default li.selected > a,
+#classification-tree.jstree-default li a:hover {
     background: #188100;
     color: #FFF;
     border: 1px solid #188100;
@@ -424,19 +462,6 @@ form[name="bulkActionForm"] .mail {
     display: inline-block;
 }
 
-#sidebar .subnavigation .filters li a.filter_remove {
-    display: block;
-    font-size: 11px;
-    line-height: 13px;
-    color: #FFFFFF;
-    text-decoration: none;
-    padding: 1px 20px 1px 2px;
-    margin-right: 5px;
-    background-image: url('../images/icon_remove.gif');
-    background-position: right 1px;
-    background-repeat: no-repeat;
-}
-
 #popupDetails .info {
     height: auto;
     margin-top: 40px;
@@ -660,9 +685,9 @@ tr.infoMessagesRow td {
 }
 
 .keywordList li {
-    font-size: 1.3em;
+    font-size: 1.2em;
     list-style: square inside;
-    line-height: 1.1538em;
+    line-height: 1.2em;
 }
 
 #modalDialog .info {
@@ -679,13 +704,13 @@ Bibliotheksinfo-Link mit Fragezeichen - TVI: 20130920
 .bibinfo {
     position: relative;
     display: block;
-    width: 45px;
-    height: 12px;
+    width: 16px;
+    height: 16px;
     font-size: 0;
     line-height: 0;
     text-indent: -10000px;
-    margin: 2px 1px 0 1px;
-    background-image: url(../images/icon_link-external.gif);
+    margin: 0 1px 0 1px;
+    background-image: url(../images/icon_info.gif);
     background-position: 0 0;
     background-repeat: no-repeat;
     text-decoration: none;

themes/swissbib/templates/global/logo.phtml

@@ -1,4 +1,17 @@
+
 <div id="logo">
+
 	<h1><a href="<?=$this->url('search-home')?>" title="<?= $this->transEsc('start.service.title') ?>"><?= $this->transEsc('start.service.title') ?></a></h1>
-	<h2 class="hidden"><?= $this->transEsc('start.service.title') ?>: <?= $this->transEsc('start.service.info') ?></h2>
+
+    <?
+        $zendUriHTTP = $this->domainURL()->normalize();
+        $server = 'https://test.swissbib.ch';
+        $path = $zendUriHTTP->getPath();
+        $query = $zendUriHTTP->getQuery();
+        $betaUri = $server . $zendUriHTTP->getPath()  .   (strlen($query) > 0 ?    '?' . $zendUriHTTP->getQuery() : '');
+        $routeMatch = $this->domainURL()->getMatchedRouteName();
+        $className = $routeMatch === 'search-home' || $routeMatch === 'home' ? 'betaURLHome' : 'betaURL'
+    ?>
+    <div id="<?= $className ?>" class="rdBetaTest right"><a  target="_blank"  href="<?= $betaUri ?>"  ><?= $this->transEsc('test.beta.responsive') ?></a></div>
+
 </div>

themes/swissbibsingle/theme.config.php

@@ -8,4 +8,12 @@
         // I'm pretty sure we can throw away at least 99% of the code
         // but: a little bit later.....
     //),
+
+    /*
+    'css'     => array(
+        'team.css'
+    ),
+    */
+
+
 );