betterplace-content 0.2.5 → 0.3.0

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: 68a9db72325f671c168dfae7a1b026b2e8896427
4
- data.tar.gz: c2ee1c0cd1139072e4176dd55298f66029d10741
3
+ metadata.gz: '0919d77cc0750cc5f98d8b4c88466b831a08be12'
4
+ data.tar.gz: d6d4dea334c14d9b5a64da07bba39a31411899e9
5
5
  SHA512:
6
- metadata.gz: 05fc28c78ad3b85876ac6cff02e7360ddf6704b9a99d37334d2c4e271124067ab5829a64fe7d655a0659eaef9bcbcc92a0bb3c7e2c5b7cc8d28dbec801fe1c05
7
- data.tar.gz: e180c85232275a2edf191268fa21938d87a3eaadf0dddcb86fa12d3f89bf3a7db50d3ebc33cba939db2eb69c92b8c6b65c03d9a1411c4f7b4fdc8a4d2ca18e89
6
+ metadata.gz: ad560414c4bd3c3e7bcb3750fcb860b7830509aaa6c2defcbceacf20f73d1a5ad7ce0a9e8815906f69d2de2e1cf411fbb3182c8d837dcde57454fa37a8f09d9b
7
+ data.tar.gz: 19eb12a01c83969aae008bd5822fa9139ca41b9295b715c7da1fc600b6683508d9a7aa2347967dfe50423757e0d4ece54619950537be1dfe86a82e09c5a5275f
@@ -0,0 +1,21 @@
1
+ <div class="help-search-and-categories m-t">
2
+ <hr/>
3
+
4
+ <ul class="list-unstyled m-t m-b">
5
+ {% for category in site.categories %}
6
+ <li>
7
+ <a href="{{ site.baseurl}}/{{ category | first | slugify }}">{{ category | first }}</a>
8
+ </li>
9
+ {% endfor %}
10
+ </ul>
11
+
12
+ <div class="row">
13
+ <div class="col-md-10 col-md-offset-7">
14
+ {% if site.lang == 'de' %}
15
+ {% include help_searchbar-de.html %}
16
+ {% else %}
17
+ {% include help_searchbar-en.html %}
18
+ {% endif %}
19
+ </div>
20
+ </div>
21
+ </div>
@@ -0,0 +1,9 @@
1
+ <form action="{{ site.baseurl }}/suche" method="get">
2
+ <div class="input-group">
3
+ <input type="text" id="search-box" name="s" placeholder="Hilfebereich durchsuchen" class="form-control" value="">
4
+ <input name="ga_category" value="content-pages--help" type="hidden">
5
+ <span class="input-group-btn">
6
+ <button type="submit" class="btn"><i class="fa fa-search fa-fw"></i></button>
7
+ </span>
8
+ </div>
9
+ </form>
@@ -0,0 +1,9 @@
1
+ <form action="{{ site.baseurl }}/search" method="get">
2
+ <div class="input-group">
3
+ <input type="text" id="search-box" name="s" placeholder="Search help area" class="form-control" value="">
4
+ <input name="ga_category" value="content-pages--help" type="hidden">
5
+ <span class="input-group-btn">
6
+ <button type="submit" class="btn"><i class="fa fa-search fa-fw"></i></button>
7
+ </span>
8
+ </div>
9
+ </form>
@@ -0,0 +1,15 @@
1
+ {% comment %}
2
+
3
+ # Um den `header_image_path` zu setzen:
4
+ # Option 1: Auf _config Ebene für alle Seiten.
5
+ # Option 2: Pro Page/Post.
6
+ # Option 3: Über die _config-Defaults für bestimmte Page/Post (siehe bspw. content-stellen).
7
+
8
+ {% endcomment %}
9
+
10
+ {% assign captured_header_image_path = page.header_image_path | default: site.header_image_path %}
11
+
12
+ {% if captured_header_image_path %}
13
+ <div class="generic-hero-image" style="background-image: url('{{ site.baseurl }}{{ captured_header_image_path }}');">
14
+ </div>
15
+ {% endif %}
@@ -22,9 +22,9 @@
22
22
 
23
23
  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/default.css" />
24
24
 
25
- <link rel="stylesheet" href="https://www.betterplace.org/de/layouts/current_stylesheet/generics_bootstrap" />
26
- <link rel="stylesheet" href="https://www.betterplace.org/de/layouts/current_stylesheet/generics" />
27
- <link rel="stylesheet" href="https://www.betterplace.org/de/layouts/current_stylesheet/application" />
25
+ <link rel="stylesheet" href="/de/layouts/current_stylesheet/generics_bootstrap" />
26
+ <link rel="stylesheet" href="/de/layouts/current_stylesheet/generics" />
27
+ <link rel="stylesheet" href="/de/layouts/current_stylesheet/application" />
28
28
 
29
29
  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
30
30
 
@@ -33,7 +33,8 @@
33
33
 
34
34
  {% include google_analytics.html %}
35
35
  </head>
36
- <body class="{% if page.url contains '404' %} error404 {% else %} {{ site.css_root }} {% endif %}{% if page.transparent_header %} has-transparent-header {% endif %}">
36
+ {% assign transparent_header = page.transparent_header | default: site.transparent_header %}
37
+ <body class="{% if page.url contains '404' %} error404 {% else %} {{ site.css_root }} {% endif %}{% if transparent_header %} has-transparent-header {% endif %}">
37
38
  <div id="fb-root"></div>
38
39
 
39
40
  {% if site.lang == 'de' %}
data/_layouts/help.html CHANGED
@@ -1,55 +1,38 @@
1
1
  ---
2
2
  layout: default
3
3
  ---
4
+ {% include hero_image.html %}
4
5
 
5
- <div class="generic-content-header">
6
- <div class="container">
6
+ <div class="content-wrapper layout-help">
7
+ <div class="container centered">
7
8
  <div class="row">
8
- <div class="col-md-18">
9
- <h1>
10
- <a href="{{ site.baseurl }}">Hilfe</a>
11
- <b><img src="//www.betterplace.org/c/wp-content/themes/betterplace.org//images/breadcrumb-arrow.png" alt=">" heigth="13" width="8"></b>
12
- {{ page.title }}
13
- </h1>
9
+ <div class="col-md-20 col-md-offset-2">
10
+ <h1 class="text-center m-b">{{ page.title }}</h1>
11
+
12
+ <article class="help-article">
14
13
 
15
- <div class="generic-search-form">
16
- <form action="{{ site.baseurl }}" method="get">
17
- <div class="input-group">
18
- <input type="text" id="search-box" name="s" class="form-control" value="">
19
- <input name="ga_category" value="content-pages--help" type="hidden">
20
- <span class="input-group-btn hidden-xs">
21
- <input value="Hilfe durchsuchen" class="btn btn-default" type="submit">
22
- </span>
14
+ {% if page.author %}
15
+ <div class="help-meta-information m-b">
16
+ <div class="help-author">
17
+ <i class="fa fa-user-circle-o fa-fw"></i>
18
+ {{ page.author.display_name }}
23
19
  </div>
24
- </form>
25
- </div>
26
- </div>
27
- </div>
28
- </div>
29
- </div>
30
20
 
31
- <div class="content-wrapper">
32
- <div class="container centered">
33
- <div class="row">
34
- <div class="col-md-18">
35
- <article>
21
+ <div class="help-modified">
22
+ <i class="fa fa-clock-o fa-fw"></i>
23
+ {{ page.modified | date:"%d.%m.%Y" }}
24
+ </div>
25
+ </div>
26
+ {% endif %}
27
+
36
28
  {{ content }}
37
29
  </article>
30
+ </div>
31
+ </div>
38
32
 
39
- <hr/>
40
-
41
- {% if page.categories.size > 0 %}
42
- <div class="themenline">
43
- <strong>Themen:</strong>
44
- {% for category in page.categories %}
45
- <a href="{{ site.baseurl }}/{{ category | slugify }}" rel="category tag">{{ category }}</a>{% unless forloop.last %},{% endunless %}
46
- {% endfor %}
47
- </div>
48
- {% endif %}
49
-
50
- <div class="descText">
51
- Geschrieben von {{ page.author.display_name }} am {{ page.date | date:"%d.%m.%Y" }}. Zuletzt aktualisiert am {{ page.modified | date:"%d.%m.%Y" }}.
52
- </div>
33
+ <div class="row">
34
+ <div class="col-md-24">
35
+ {% include help_search_and_categories.html %}
53
36
  </div>
54
37
  </div>
55
38
  </div>
data/_layouts/post.html CHANGED
@@ -1,34 +1,15 @@
1
1
  ---
2
2
  layout: default
3
3
  ---
4
- {% comment %}
5
-
6
- # Um den `header_image_path` zu setzen:
7
- # Option 1: Auf _config Ebene für alle Seiten.
8
- # Option 2: Pro Page/Post.
9
- # Option 3: Über die _config-Defaults für bestimmte Page/Post (siehe bspw. content-stellen).
10
-
11
- {% endcomment %}
12
- {% assign header_image_path = page.header_image_path | default: site.header_image_path %}
13
- {% if page.header_image_path %}
14
- {% capture content_header_css %}no-background-on-mobile has-background-image{% endcapture %}
15
- {% capture content_header_style %}background-image: url('{{ site.baseurl }}{{ page.header_image_path }}');{% endcapture %}
16
- {% endif %}
17
- <div class="generic-content-header {{ content_header_css }}" style="{{ content_header_style }}">
18
- <div class="container">
19
- <div class="row">
20
- <div class="col-md-18">
21
- <h1>{{ page.page_headline }}</h1>
22
- </div>
23
- </div>
24
- </div>
25
- </div>
4
+ {% include hero_image.html %}
26
5
 
27
6
  <div class="content-wrapper">
28
7
  <div class="container centered">
29
8
  <div class="row">
30
9
  <div class="col-md-18">
31
10
  <article class="post">
11
+ <h1 class="text-center">{{ page.page_headline }}</h1>
12
+
32
13
  {{ content }}
33
14
  </article>
34
15
  </div>
data/_sass/colors.sass CHANGED
@@ -1,23 +1,24 @@
1
- $light-green: #cccc20
2
- $medium-green: #bad304
3
- $dark-green: #6a9000
4
- $very-dark-green: #2c5100
1
+ $very-light-green: #d8e89e
2
+ $light-green: #cccc20
3
+ $medium-green: #bad304
4
+ $dark-green: #6a9000
5
+ $very-dark-green: #2c5100
5
6
 
6
- $almost-white: #f8f8f8
7
- $very-light-grey: #eeeeee
8
- $light-grey: #cccccc
9
- $medium-grey: #949494
10
- $dark-grey: #636b70
11
- $very-dark-grey: #3f3f3f
7
+ $almost-white: #f8f8f8
8
+ $very-light-grey: #eeeeee
9
+ $light-grey: #cccccc
10
+ $medium-grey: #949494
11
+ $dark-grey: #636b70
12
+ $very-dark-grey: #3f3f3f
12
13
 
13
- $error-red: #ad3922
14
- $dangerous-red: #cd0920
14
+ $error-red: #ad3922
15
+ $dangerous-red: #cd0920
15
16
 
16
- $very-light-blue: #d9e5ec
17
- $medium-blue: #00a0c8
18
- $dark-blue: #28638c
17
+ $very-light-blue: #d9e5ec
18
+ $medium-blue: #00a0c8
19
+ $dark-blue: #28638c
19
20
 
20
- $pink: #ff00ff
21
+ $pink: #ff00ff
21
22
 
22
23
  $brand-color-facebook: #4e69a2
23
24
  $brand-color-twitter: #1da1f2
@@ -0,0 +1,12 @@
1
+ .generic-hero-image
2
+ background-position: top center
3
+ background-repeat: no-repeat
4
+ background-size: cover
5
+ position: relative
6
+ z-index: 20
7
+ position: relative
8
+ +desktop
9
+ min-height: 275px
10
+ min-width: 960px
11
+ +phone
12
+ display: none
data/_sass/help.sass ADDED
@@ -0,0 +1,43 @@
1
+ .layout-help
2
+ .help-article,
3
+ .help-category-teaser
4
+ font-size: 15px
5
+
6
+ .help-category-teaser li
7
+ margin-bottom: 5px
8
+
9
+ .help-meta-information
10
+ display: flex
11
+ justify-content: center
12
+
13
+ .help-author,
14
+ .help-modified
15
+ padding: 10px
16
+ color: $medium-grey
17
+
18
+ .help-search-and-categories
19
+ ul
20
+ display: flex
21
+ justify-content: center
22
+
23
+ li > a
24
+ padding-right: 10px
25
+ padding-left: 10px
26
+ border-right: 1px solid $light-grey
27
+
28
+ li:last-child a
29
+ border-right: 0
30
+
31
+ .help-hero-search
32
+ background: $very-light-green
33
+ height: 160px
34
+ display: flex
35
+ justify-content: center
36
+ align-items: center
37
+
38
+ form
39
+ +desktop
40
+ width: 530px
41
+
42
+ +phone
43
+ width: 100%
@@ -19,6 +19,7 @@ $site_baseurl: "{{ site.baseurl }}"
19
19
  @import "generics/sidebar-menu"
20
20
  @import "generics/team_list"
21
21
  @import "generics/topicblock"
22
+ @import "generics/hero_image"
22
23
 
23
24
  @import "error404"
24
25
 
@@ -34,3 +35,4 @@ $site_baseurl: "{{ site.baseurl }}"
34
35
  @import "news"
35
36
  @import "team"
36
37
  @import "freundeskreis"
38
+ @import "help"
@@ -13,7 +13,7 @@
13
13
 
14
14
  searchResults.innerHTML = appendString;
15
15
  } else {
16
- searchResults.innerHTML = '<li>No results found</li>';
16
+ searchResults.innerHTML = '<li><h3>Es wurde leider kein Ergebnis gefunden.</h3></li>';
17
17
  }
18
18
  }
19
19
 
@@ -54,13 +54,10 @@
54
54
  'tags': window.store[key].tags,
55
55
  'content': window.store[key].content
56
56
  });
57
-
58
57
  }
59
-
60
58
  });
61
59
 
62
60
  var results = idx.search(searchTerm); // Get lunr to perform a search
63
61
  displaySearchResults(results, window.store); // We'll write this in the next section
64
-
65
62
  }
66
63
  })();
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: betterplace-content
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - betterplace.org Developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-20 00:00:00.000000000 Z
11
+ date: 2018-01-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -66,6 +66,10 @@ files:
66
66
  - _includes/google_analytics.html
67
67
  - _includes/header-de.html
68
68
  - _includes/header-en.html
69
+ - _includes/help_search_and_categories.html
70
+ - _includes/help_searchbar-de.html
71
+ - _includes/help_searchbar-en.html
72
+ - _includes/hero_image.html
69
73
  - _includes/sharing.html
70
74
  - _includes/subnavi-de.html
71
75
  - _includes/subnavi-en.html
@@ -95,12 +99,14 @@ files:
95
99
  - _sass/generics/comments.sass
96
100
  - _sass/generics/content-header.sass
97
101
  - _sass/generics/desktop-navigation.scss
102
+ - _sass/generics/hero_image.sass
98
103
  - _sass/generics/mobile-navigation.sass
99
104
  - _sass/generics/pagination.scss
100
105
  - _sass/generics/search-form.scss
101
106
  - _sass/generics/sidebar-menu.scss
102
107
  - _sass/generics/team_list.scss
103
108
  - _sass/generics/topicblock.sass
109
+ - _sass/help.sass
104
110
  - _sass/jobs.sass
105
111
  - _sass/media_queries.sass
106
112
  - _sass/news.sass