betterplace-content 0.4.10 → 0.4.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d2b108ec17f612b301ad6006845b313d26bade9b
4
- data.tar.gz: 76f72b811bf41e492bbc398f87525a2867e6196f
3
+ metadata.gz: 2208636bf6e2735c3025f0a0efb25ef4e9c176ef
4
+ data.tar.gz: 1c0d581b471bc845e860013cdfe2cf8824a861d0
5
5
  SHA512:
6
- metadata.gz: 8147756bcc5cc743a2310b3eba274eee5fcd7d3961824ba04d76046cbd3317b5d533f59705757be59b94f7e7e4a0d12edc725d9bf314672918a5b5ab7fb1c96d
7
- data.tar.gz: 9726ce07ec037b79d7aa80de87bd7ff78f935a3db2cdb32b87db4c5300b079b6420cc9d41eb3bc85c8e052bd8b925a37965dd629090f9f00e9a51b7866ee302c
6
+ metadata.gz: a5918ecbb2861d40d101a982d49f034d442611bdfb5eb1055669fde19b35719e480445af0aaf88fae4c717d9d9d980473580359ddd58dedd03742d931fff5d9e
7
+ data.tar.gz: 3bbf14cb6ef576a9bc50b0be05f7c4f6fcb725df5568b12637307eb8904e4f59b28bcc14e37d1fdfeb9a45d3aef01aeed095163fe29249c3c5111e89299112c0
@@ -1,12 +1,12 @@
1
1
  <ul class="generic-subnavi">
2
- <li class="is-left"><a href="/de/projects/7046" class="btn btn-primary">Unterstütze betterplace.org</a></li>
3
- <li><a href="/c/ueber-uns">Über uns</a></li>
4
- <li><a href="/c/neues">Blog &amp; News</a></li>
5
- <li><a href="/c/hilfe">Hilfe</a></li>
6
- <li><a href="/c/kontakt">Kontakt</a></li>
7
- <li><a href="/c/stellen">Jobs</a></li>
8
- <li><a href="/c/unser-team">Team</a></li>
9
- <li><a href="/c/botschafter">Botschafter</a></li>
10
- <li><a href="/c/neues/termine">Termine</a></li>
11
- <li><a href="/c/medien">Presse</a></li>
2
+ <li class="is-left"><a href="{{ include.hostname }}/de/projects/7046" class="btn btn-primary">Unterstütze betterplace.org</a></li>
3
+ <li><a href="{{ include.hostname }}/c/ueber-uns">Über uns</a></li>
4
+ <li><a href="{{ include.hostname }}/c/neues">Blog &amp; News</a></li>
5
+ <li><a href="{{ include.hostname }}/c/hilfe">Hilfe</a></li>
6
+ <li><a href="{{ include.hostname }}/c/kontakt">Kontakt</a></li>
7
+ <li><a href="{{ include.hostname }}/c/stellen">Jobs</a></li>
8
+ <li><a href="{{ include.hostname }}/c/unser-team">Team</a></li>
9
+ <li><a href="{{ include.hostname }}/c/botschafter">Botschafter</a></li>
10
+ <li><a href="{{ include.hostname }}/c/neues/termine">Termine</a></li>
11
+ <li><a href="{{ include.hostname }}/c/medien">Presse</a></li>
12
12
  </ul>
@@ -1,12 +1,12 @@
1
1
  <ul class="generic-subnavi">
2
- <li class="is-left"><a href="/en/projects/7046" class="btn btn-primary">Support betterplace.org</a></li>
3
- <li><a href="/c/about-us">About us</a></li>
4
- <li><a href="/c/news">Blog &amp; News</a></li>
5
- <li><a href="/c/help">Help</a></li>
6
- <li><a href="/c/contact">Contact</a></li>
7
- <li><a href="/c/jobs">Jobs</a></li>
8
- <li><a href="/c/our-team">Team</a></li>
9
- <!--<li><a href="/c/botschafter">Ambassadors</a></li>-->
2
+ <li class="is-left"><a href="{{ include.hostname }}/en/projects/7046" class="btn btn-primary">Support betterplace.org</a></li>
3
+ <li><a href="{{ include.hostname }}/c/about-us">About us</a></li>
4
+ <li><a href="{{ include.hostname }}/c/news">Blog &amp; News</a></li>
5
+ <li><a href="{{ include.hostname }}/c/help">Help</a></li>
6
+ <li><a href="{{ include.hostname }}/c/contact">Contact</a></li>
7
+ <li><a href="{{ include.hostname }}/c/jobs">Jobs</a></li>
8
+ <li><a href="{{ include.hostname }}/c/our-team">Team</a></li>
9
+ <!--<li><a href="{{ include.hostname }}/c/botschafter">Ambassadors</a></li>-->
10
10
  <!--<li><a href="#">Termine</a></li>-->
11
- <li><a href="/c/media">Press</a></li>
11
+ <li><a href="{{ include.hostname }}/c/media">Press</a></li>
12
12
  </ul>
@@ -9,10 +9,13 @@
9
9
  Layout {{ page.layout }}
10
10
  -->
11
11
  {% comment %}Use via `JEKYLL_ENV=production bundle exec jekyll serve`{% endcomment %}
12
+ {% comment %}TODO: Since GCE, this does not do anything for staging. We dont have a staging ATM. We left the code to make it easier to add a staging later.{% endcomment %}
12
13
  {% if jekyll.environment == 'production' %}
14
+ {% assign hostname = 'https://www.betterplace.org' %}
13
15
  {% assign style_host = 'https://www.betterplace.org' %}
14
16
  {% assign assets_host = 'https://betterplace-assets.betterplace.org' %}
15
17
  {% elsif jekyll.environment == 'staging' %}
18
+ {% assign hostname = 'https://www.bp42.com' %}
16
19
  {% assign style_host = 'https://www.bp42.com' %}
17
20
  {% assign assets_host = 'https://staging-assets.bp42.com' %}
18
21
  {% endif %}
@@ -21,7 +24,7 @@
21
24
 
22
25
  {% if page.translation_url %}
23
26
  <link rel="alternate" hreflang="{{ site.translation_lang | replace:'_','-' }}"
24
- href="{{ page.translation_url | replace:'https://www.betterplace.org',style_host }}">
27
+ href="{{ page.translation_url | replace:'https://www.betterplace.org',hostname }}">
25
28
  {% endif %}
26
29
 
27
30
  <script src="{{ style_host }}/de/layouts/current_javascript/application"></script>
@@ -41,7 +44,7 @@
41
44
 
42
45
  {% include google_analytics.html %}
43
46
 
44
- {% include sharing.html sharing_host=style_host %}
47
+ {% include sharing.html sharing_host=hostname %}
45
48
 
46
49
  {% if site.feed_meta_in_head %}{% feed_meta %}{% endif %}
47
50
  </head>
@@ -50,11 +53,11 @@
50
53
  <div id="fb-root"></div>
51
54
 
52
55
  {% if site.lang == 'de' %}
53
- {% include header-de.html %}
54
- {% include subnavi-de.html %}
56
+ {% include header-de.html hostname=hostname %}
57
+ {% include subnavi-de.html hostname=hostname %}
55
58
  {% else %}
56
- {% include header-en.html %}
57
- {% include subnavi-en.html %}
59
+ {% include header-en.html hostname=hostname %}
60
+ {% include subnavi-en.html hostname=hostname %}
58
61
  {% endif %}
59
62
 
60
63
  {{ content }}
@@ -65,14 +68,14 @@
65
68
 
66
69
  {% capture language_switch_content %}
67
70
  {% if page.translation_url %}
68
- <a onclick="ga(&#39;send&#39;, &#39;event&#39;, &#39;navigation header&#39;, &#39;{{ page.translation_url | replace:'https://www.betterplace.org','' }}&#39;);" class="language-switcher" href="{{ page.translation_url | replace:'https://www.betterplace.org',style_host }}">{{ other_lang }}</a>
71
+ <a onclick="ga(&#39;send&#39;, &#39;event&#39;, &#39;navigation header&#39;, &#39;{{ page.translation_url | replace:'https://www.betterplace.org','' }}&#39;);" class="language-switcher" href="{{ page.translation_url | replace:'https://www.betterplace.org',hostname }}">{{ other_lang }}</a>
69
72
  {% else %}
70
73
  <span style="text-decoration: line-through; color: #cccccc;" class="language-switcher">{{ other_lang }}</span>
71
74
  {% endif %}
72
75
  {% endcapture %}
73
76
 
74
77
  {% capture footer %}
75
- {% include footer-{{ site.lang }}.html %}
78
+ {% include footer-{{ site.lang }}.html hostname=hostname %}
76
79
  {% endcapture %}
77
80
 
78
81
  {{ footer | replace_first:'<!--language-switch-content-->',language_switch_content }}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: betterplace-content
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.10
4
+ version: 0.4.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - betterplace.org Developers