Skip to content

Commit 4786453

Browse files
murrantmurrant
committed
Store switcher and persistent header
reorganize and clean up a few things (no wechat icon for discord)
1 parent e053018 commit 4786453

17 files changed

Lines changed: 2851 additions & 735 deletions

‎_config.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,20 @@ color:
1414
social:
1515
- title: twitter
1616
url: https://twitter.com/LibreNMS
17+
- title: comment
18+
url: https://discord.com/invite/librenms
19+
- title: reddit
20+
url: https://www.reddit.com/r/LibreNMS/
1721
- title: facebook-official
1822
url: https://www.facebook.com/LibreNMS
19-
- title: google-plus
20-
url: https://plus.google.com/u/1/communities/111170344284862070465
23+
# - title: google-plus
24+
# url: https://plus.google.com/u/1/communities/111170344284862070465
2125
- title: github
2226
url: https://github.com/librenms/librenms
23-
- title: apple
24-
url: https://t.libren.ms/iphone
25-
- title: android
26-
url: https://t.libren.ms/android
27+
# - title: apple
28+
# url: https://t.libren.ms/iphone
29+
# - title: android
30+
# url: https://t.libren.ms/android
2731

2832
# Build settings
2933
permalink: pretty

‎_includes/brand.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!-- Brand and toggle get grouped for better mobile display -->
2+
<div class="navbar-header page-scroll">
3+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
4+
<span class="sr-only">Toggle navigation</span>
5+
<span class="icon-bar"></span>
6+
<span class="icon-bar"></span>
7+
<span class="icon-bar"></span>
8+
</button>
9+
<div class="navbar-brand hidden-sm">
10+
<a class="page-scroll" href="#page-top"><img src="/images/LibreNMS-Logo-Black.png" srcset="/images/LibreNMS-Logo.svg" alt="LibreNMS" width="207" height="38"></a>
11+
<div class="header-social-links">
12+
{% for network in site.social %}
13+
<a href="{{ network.url }}"><i class="fa fa-{{ network.title }}"></i></a>
14+
{% endfor %}
15+
</div>
16+
</div>
17+
</div>

‎_includes/footer.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
</div>
1616
</div>
1717
</footer>
18-
<a class="hidden-xs hidden-sm hidden-md" href="https://github.com/librenms/librenms"><img style="position: absolute; top: 0; right: 0; border: 0; z-index: 1200;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>

‎_includes/head.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,6 @@
5353
ga('send', 'pageview', location.pathname+location.search+location.hash);
5454
</script>
5555
<script src="https://cdn.jsdelivr.net/npm/arrive@2.4.1/src/arrive.min.js"></script>
56+
<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
57+
<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
5658
</head>

‎_includes/menu.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<li class="hidden">
2+
<a href="#page-top"></a>
3+
</li>
4+
<li>
5+
<a class="page-scroll" href="/#features">Features</a>
6+
</li>
7+
<li>
8+
<a class="page-scroll" href="/#try">Try</a>
9+
</li>
10+
<li>
11+
<a class="page-scroll" href="/#downloads">Downloads</a>
12+
</li>
13+
<li>
14+
<a class="page-scroll" href="/#screenshots">Screenshots</a>
15+
</li>
16+
<li>
17+
<a class="page-scroll" href="/#support">Support</a>
18+
</li>
19+
<li>
20+
<a class="page-scroll" href="/#thanks">Thanks</a>
21+
</li>
22+
<li>
23+
<a href="/shop">Shop</a>
24+
</li>
25+
<li>
26+
<a href="http://docs.librenms.org">Docs</a>
27+
</li>

‎_includes/nav.html‎

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,12 @@
11
<!-- Navigation -->
22
<nav class="navbar navbar-default navbar-fixed-top navbar-inverse navbar-black">
3-
<div class="container">
4-
<!-- Brand and toggle get grouped for better mobile display -->
5-
<div class="navbar-header page-scroll">
6-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
7-
<span class="sr-only">Toggle navigation</span>
8-
<span class="icon-bar"></span>
9-
<span class="icon-bar"></span>
10-
<span class="icon-bar"></span>
11-
</button>
12-
<a class="navbar-brand page-scroll hidden-md" href="#page-top"><img src="/images/LibreNMS-Logo-Black.png" srcset="/images/LibreNMS-Logo.svg" alt="LibreNMS" width="207" height="38"></a>
13-
</div>
3+
<div class="navbar-container container-fluid">
4+
{% include brand.html %}
145

156
<!-- Collect the nav links, forms, and other content for toggling -->
167
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
178
<ul class="nav navbar-nav navbar-right">
18-
<li class="hidden">
19-
<a href="#page-top"></a>
20-
</li>
21-
<li>
22-
<a class="page-scroll" href="/#features">Features</a>
23-
</li>
24-
<li>
25-
<a class="page-scroll" href="/#try">Try</a>
26-
</li>
27-
<li>
28-
<a class="page-scroll" href="/#downloads">Downloads</a>
29-
</li>
30-
<li>
31-
<a class="page-scroll" href="/#screenshots">Screenshots</a>
32-
</li>
33-
<li>
34-
<a class="page-scroll" href="/#support">Support</a>
35-
</li>
36-
<li>
37-
<a class="page-scroll" href="/#thanks">Thanks</a>
38-
</li>
39-
<li>
40-
<a href="/shop">Shop</a>
41-
</li>
42-
<li>
43-
<a href="http://docs.librenms.org">Docs</a>
44-
</li>
9+
{% include menu.html %}
4510
</ul>
4611
</div>
4712
<!-- /.navbar-collapse -->

‎_includes/support.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h3 class="section-subheading text-muted">We have a few ways to get in touch, th
1212
<div class="col-md-4">
1313
<span class="fa-stack fa-4x">
1414
<i class="fa fa-circle fa-stack-2x text-primary"></i>
15-
<i class="fa fa-wechat fa-stack-1x fa-inverse"></i>
15+
<i class="fa fa-comment fa-stack-1x fa-inverse"></i>
1616
</span>
1717
<h4 class="service-heading">Discord<br /><small>No registration required</small></h4>
1818
</div>

‎_layouts/shopping.html‎

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,93 @@
55

66
<body>
77

8+
<!-- Navigation -->
9+
<nav class="navbar navbar-default navbar-static-top navbar-inverse navbar-black">
10+
<div class="navbar-container container-fluid">
11+
{% include brand.html %}
12+
13+
<!-- Collect the nav links, forms, and other content for toggling -->
14+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
15+
<ul class="nav navbar-nav navbar-right">
16+
{% 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="#" onclick="changeStore('EU')">EU</a></li>
22+
<li><a href="#" onclick="changeStore('NA')">NA</a></li>
23+
</ul>
24+
</li>
25+
<li><a href="#"></a></li>
26+
</ul>
27+
</div>
28+
<!-- /.navbar-collapse -->
29+
</div>
30+
<!-- /.container-fluid -->
31+
</nav>
32+
33+
834
<div id="librenms-shop">
935
</div>
1036

1137
<script>
38+
const eu_store = 'https://librenms.myspreadshop.net';
39+
const na_store = 'https://librenms.myspreadshop.com';
40+
1241
var spread_shop_config = {
1342
shopName: 'librenms',
14-
prefix: 'https://librenms.myspreadshop.net',
43+
locale: 'en_EU',
44+
prefix: localStorage.getItem('store_url'),
1545
baseId: 'librenms-shop'
1646
};
17-
</script>
1847

19-
<script type="text/javascript" src="https://librenms.myspreadshop.net/shopfiles/shopclient/shopclient.nocache.js"></script>
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+
console.log(spread_shop_config.locale);
64+
65+
if (! spread_shop_config.prefix) {
66+
setStore(country);
67+
}
68+
document.getElementById('locale-display').innerText = spread_shop_config.prefix === na_store ? 'NA' : 'EU';
69+
70+
$.getScript(spread_shop_config.prefix + '/shopfiles/shopclient/shopclient.nocache.js');
71+
}
72+
73+
function changeStore(country) {
74+
document.getElementById('locale-display').innerText = country;
75+
setStore(country)
76+
77+
location.reload();
78+
}
79+
80+
function setStore(country) {
81+
spread_shop_config.prefix = country in store_map ? store_map[country] : eu_store;
82+
console.log(spread_shop_config.prefix, store_map[country], country);
83+
localStorage.setItem('store_url', spread_shop_config.prefix);
84+
}
85+
86+
function getLocale() {
87+
if (navigator.languages !== undefined)
88+
return navigator.languages[0].split(/[-_]/, 2);
89+
return navigator.language.split(/[-_]/, 2);
90+
}
91+
92+
// set locale
93+
intializeStore();
2094

21-
<script>
2295
document.arrive(".sprd-header__image", function () {
2396
document.unbindArrive(".sprd-header__image"); // don't infinite loop
2497
const new_element = this.cloneNode(true);

‎css/agency.css‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,17 @@ h6 {
8989
color: #fff;
9090
background-color: #{{ site.color.secondary }};
9191
}
92+
.navbar-inverse .navbar-nav>.open>a, .navbar-inverse .navbar-nav>.open>a:hover, .navbar-inverse .navbar-nav>.open>a:focus {
93+
background-color: #{{ site.color.primary }};
94+
color: #fff;
95+
}
96+
.navbar-default .nav .dropdown-menu li a {
97+
color: #000;
98+
}
99+
.navbar-default .nav .dropdown-menu li a:hover {
100+
color: #000;
101+
background-color: #ff6262;
102+
}
92103

93104
.btn-primary:active,
94105
.btn-primary.active,
@@ -275,7 +286,7 @@ header.librenms-header {
275286
background-attachment: scroll;
276287
background-image: url(/images/header-bg.jpg);
277288
background-position: center center;
278-
background-repeat: none;
289+
background-repeat: unset;
279290
-webkit-background-size: cover;
280291
-moz-background-size: cover;
281292
background-size: cover;

‎css/font-awesome.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)