add a branch for ska-search
Remote on kro is:
origin https://mittinatten@gitlab.com/ubbdev/marcus-search-client.git (fetch) origin https://mittinatten@gitlab.com/ubbdev/marcus-search-client.git (push)
This should be this branch.
Currently at:
commit 61d1b9b9 Author: Simon Mitternacht simon.mitternacht@gmail.com Date: Tue Nov 20 09:41:16 2018 +0100
Remove sub-header border.
There are changes in the working directory:
index f6eb8f0..c80ccf3 100644
--- a/app/services/blackbox.js
+++ b/app/services/blackbox.js
@@ -4,7 +4,7 @@ app.factory('blackbox', ['$http', function($http) {
//Send ajax request to Blackbox
$http({
method: 'GET',
- url: 'http://kirishima.uib.no/blackbox/search?aggs=' + encodeURI(JSON.stringify(facets)),
+ url: 'https://jambo.uib.no/blackbox/search?aggs=' + encodeURI(JSON.stringify(facets)),
params: params,
cache: true,
}).then(function (response) {
diff --git a/js/lib/typeahead/js/main.js b/js/lib/typeahead/js/main.js
index 619e650..f46607b 100644
--- a/js/lib/typeahead/js/main.js
+++ b/js/lib/typeahead/js/main.js
@@ -21,7 +21,7 @@ $(document).ready(function () {
limit: 10,
remote: {
/*You must manually append indices here*/
- url: 'http://kirishima.uib.no/blackbox/suggest?q=%QUERY&index=ska2',
+ url: 'https://jambo.uib.no/blackbox/suggest?q=%QUERY&index=ska2',
wildcard: '%QUERY',
rateLimitWait: 20
}
@@ -151,4 +151,4 @@ $(document).ready(function () {
.on('typeahead:asynccancel typeahead:asyncreceive', function () {
$('.Typeahead-spinner').hide();
});**/
-});
\ No newline at end of file
+});
diff --git a/partials/header.html b/partials/header.html
index e4c39df..2845cd2 100644
--- a/partials/header.html
+++ b/partials/header.html
@@ -2,7 +2,7 @@
<div class="ska-header tablet or lower uihidden">
<header class="ui container">
<nav class="ui menu">
- <div class="item logo"><a href="http://skeivtarkiv.no/" title="Forsida"><img src="https://skeivtarkiv.no/sites/all/themes/skeivtarkiv/img/logo.svg" alt="Forsida" style="height: 75px; padding: 15px"></a></div>
+ <div class="item logo"><a href="http://skeivtarkiv.no/" title="Forsida"><img src="https://skeivtarkiv.no/sites/all/themes/custom/skeivtarkiv/img/logo.svg" alt="Forsida" style="height: 75px; padding: 15px"></a></div>
<div class="item active"><span class="header-item"><a href="http://katalog.skeivtarkiv.no">Digitalt arkiv</a></span></div>
<div class="item"><span class="header-item"><a href="http://skeivtarkiv.no/skeivopedia">Skeivopedia</a></span></div>
<div class="item"><span class="header-item"><a href="http://skeivtarkiv.no/bidra" title="Bidra til Skeivt Arkiv">Bidra</a></span></div>
@@ -21,7 +21,7 @@
<a class="tablet mobile only item"><i class="fa fa-filter fa-2x facet-nav-toggle" aria-hidden="true"></i></a>
</div>
<div class="ui twelve wide column center aligned logo">
- <a href="http://skeivtarkiv.no/" title="Forsida"><img src="https://skeivtarkiv.no/sites/all/themes/skeivtarkiv/img/logo.svg" alt="Forsida"></a>
+ <a href="http://skeivtarkiv.no/" title="Forsida"><img src="https://skeivtarkiv.no/sites/all/themes/custom/skeivtarkiv/img/logo.svg" alt="Forsida"></a>
</div>
<div class="ui two wide column right aligned">
<a class="tablet mobile only item"><i class="fa fa-bars fa-2x main-nav-toggle" aria-hidden="true"></i></a>
(END)