Skip to content

Commit d4871ab

Browse files
committed
better temporary solution for the european store
1 parent 74816b9 commit d4871ab

File tree

3 files changed

+34
-60
lines changed

3 files changed

+34
-60
lines changed

_includes/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<link href="http://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css">
3636
<link rel="stylesheet" href="/css/prettyPhoto.css">
3737

38-
<link rel="stylesheet" href="/css/site.css?ver=10262021">
38+
<link rel="stylesheet" href="/css/site.css?ver=10272021">
3939

4040
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
4141
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

_layouts/shopping.html

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -14,88 +14,45 @@
1414
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
1515
<ul class="nav navbar-nav navbar-right">
1616
{% include menu.html %}
17-
<li class="dropdown">
18-
<a id="locale-selector" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="true"><span id="locale-display">EU</span><span class="caret"></span></a>
19-
<ul class="dropdown-menu">
20-
<li class="dropdown-header">Change Store</li>
21-
<li><a href="https://librenms.myspreadshop.net/">EU</a></li>
22-
<li><a href="#" onclick="changeStore('NA')">NA</a></li>
23-
</ul>
24-
</li>
25-
<li><a href="#"></a></li>
2617
</ul>
2718
</div>
2819
<!-- /.navbar-collapse -->
2920
</div>
3021
<!-- /.container-fluid -->
3122
</nav>
3223

24+
<div id="visit-eu" style="display: none;">
25+
<a href="https://librenms.myspreadshop.net"><i class="fa fa-exclamation-circle"></i> Want to deliver to Europe? Checkout out our European shop</a>
26+
<span class="close-button" title="Don't show this again" onclick="hideEu()">
27+
<i class="fa fa-times fa-lg"></i>
28+
</span>
29+
</div>
3330

3431
<div id="librenms-shop">
3532
</div>
3633

3734
<script>
38-
const eu_store = 'https://librenms.myspreadshop.net';
39-
const na_store = 'https://librenms.myspreadshop.com';
40-
4135
var spread_shop_config = {
4236
shopName: 'librenms',
43-
// locale: 'en_EU',
44-
prefix: na_store, // disable localStorage.getItem('store_url'),
37+
locale: getLocale(),
38+
prefix: 'https://librenms.myspreadshop.com',
4539
baseId: 'librenms-shop'
4640
};
4741

48-
const store_map = {
49-
'NA': na_store,
50-
'US': na_store,
51-
'EU': eu_store,
52-
'GB': eu_store,
53-
'AU': na_store,
54-
'CA': na_store,
55-
'SE': eu_store,
56-
'CH': eu_store
57-
};
58-
59-
function intializeStore() {
60-
var parts = getLocale();
61-
var country = parts[1];
62-
// spread_shop_config.locale = parts[0] + '_' + country;
63-
64-
// if (! spread_shop_config.prefix) {
65-
// setStore(country);
66-
// }
67-
68-
if (spread_shop_config.prefix === na_store) {
69-
document.getElementById('locale-display').innerText = 'NA';
70-
} else {
71-
// redirect to external store for now
72-
document.getElementById('locale-display').innerText = 'EU';
73-
location.href = eu_store;
74-
}
75-
76-
$.getScript(spread_shop_config.prefix + '/shopfiles/shopclient/shopclient.nocache.js');
77-
}
78-
79-
function changeStore(country) {
80-
document.getElementById('locale-display').innerText = country;
81-
setStore(country)
82-
83-
location.reload();
84-
}
85-
86-
function setStore(country) {
87-
spread_shop_config.prefix = country in store_map ? store_map[country] : eu_store;
88-
localStorage.setItem('store_url', spread_shop_config.prefix);
42+
if (localStorage.getItem('hide_eu') !== 'hide') {
43+
document.getElementById('visit-eu').style = 'display: block;'
8944
}
9045

9146
function getLocale() {
9247
if (navigator.languages !== undefined)
93-
return navigator.languages[0].split(/[-_]/, 2);
94-
return navigator.language.split(/[-_]/, 2);
48+
return navigator.languages[0];
49+
return navigator.language;
9550
}
9651

97-
// set locale
98-
intializeStore();
52+
function hideEu() {
53+
localStorage.setItem('hide_eu', 'hide');
54+
document.getElementById('visit-eu').style = 'display: none;'
55+
}
9956

10057
document.arrive(".sprd-header__image", function () {
10158
document.unbindArrive(".sprd-header__image"); // don't infinite loop
@@ -105,5 +62,8 @@
10562
this.parentNode.replaceChild(new_element, this);
10663
});
10764
</script>
65+
66+
<script type="text/javascript" src="https://librenms.myspreadshop.com/shopfiles/shopclient/shopclient.nocache.js"></script>
67+
10868
</body>
10969
</html>

css/site.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,17 @@
3838
margin-bottom: 0;
3939
z-index: auto;
4040
}
41+
42+
#visit-eu {
43+
padding: 10px 20px;
44+
background-color: #da223a;
45+
color: #fff;
46+
}
47+
48+
#visit-eu a {
49+
color: #fff;
50+
}
51+
52+
#visit-eu span {
53+
float: right;
54+
}

0 commit comments

Comments
 (0)