Skip to content

Commit 1745e76

Browse files
niccokunzmannniccokunzmann
authored
Merge pull request #113 from undoingtech/master
removed whitespace
2 parents 1a1140e + 6d92a88 commit 1745e76

File tree

1 file changed

+81
-75
lines changed

1 file changed

+81
-75
lines changed

‎_layouts/tutorial.html‎

Lines changed: 81 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -18,120 +18,126 @@
1818
<link type="text/css" rel="stylesheet" href="../css/Ubuntu.css" media="screen"/>
1919
<link rel="shortcut icon" href="../favicon.ico?v=2" type="image/x-icon">
2020
<meta charset="utf-8">
21-
<title>{{ page.title | escape }} - {{ site.data.localization.title[page.lang] }}</title>
21+
<title>{{- page.title | escape -}} - {{- site.data.localization.title[page.lang] -}}</title>
2222
<script type="text/javascript">
23-
var current_page_id = "page-" + {{ page.path | jsonify }};
23+
var current_page_id = "page-" + {{- page.path | jsonify -}};
2424
</script>
2525
<style>
2626
.clicked .toggle-hint:before {
27-
content: "{{ site.data.localization.hint.shown[page.lang] }}";
27+
content: "{{- site.data.localization.hint.shown[page.lang] -}}";
2828
}
2929

3030
.secret .toggle-hint:before {
31-
content: "{{ site.data.localization.hint.hidden[page.lang] }}";
31+
content: "{{- site.data.localization.hint.hidden[page.lang] -}}";
3232
}
3333

3434
.playfield.verbose .match.ok:after {
35-
content: "{{ site.data.localization.match.matched[page.lang] }}";
35+
content: "{{- site.data.localization.match.matched[page.lang] -}}";
3636
}
3737

3838
.playfield.verbose .match.fail:after {
39-
content: "{{ site.data.localization.match.shouldNotMatch[page.lang] }}";
39+
content: "{{- site.data.localization.match.shouldNotMatch[page.lang] -}}";
4040
}
4141

4242
.playfield.verbose .nomatch.ok:after {
43-
content: "{{ site.data.localization.match.shouldMatch[page.lang] }}";
43+
content: "{{- site.data.localization.match.shouldMatch[page.lang] -}}";
4444
}
4545

4646
.playfield.verbose .nomatch.fail:after {
47-
content: "{{ site.data.localization.match.noMatch[page.lang] }}";
47+
content: "{{- site.data.localization.match.noMatch[page.lang] -}}";
4848
}
4949

5050
.quiz .expression:before {
51-
content: "{{ site.data.localization.quiz.before[page.lang] }}";
51+
content: "{{- site.data.localization.quiz.before[page.lang] -}}";
5252
}
5353

5454
.quiz .expression:after {
55-
content: "{{ site.data.localization.quiz.after[page.lang] }}";
55+
content: "{{- site.data.localization.quiz.after[page.lang] -}}";
5656
}
5757

5858
.quiz .button-ok:before {
59-
content: "{{ site.data.localization.quiz.yes[page.lang] }}";
59+
content: "{{- site.data.localization.quiz.yes[page.lang] -}}";
6060
}
6161

6262
.quiz .button-fail:before {
63-
content: "{{ site.data.localization.quiz.no[page.lang] }}";
63+
content: "{{- site.data.localization.quiz.no[page.lang] -}}";
6464
}
6565
</style>
6666
</head>
6767
<body>
6868
<header>
6969
<div class="progress">
70-
{% assign same_topic_started = false %}
71-
{% assign should_assign_next = false %}
72-
{% assign has_next_page = false %}
73-
{% assign step_index = 0 %}
74-
{% assign next_page = nil %}
75-
{% for p in site.pages %}
76-
{% assign file_name = page.path | split: "/" %}
77-
{% assign file_name = file_name[1] %}
78-
79-
{% assign p_file_name = p.path | split: "/" %}
80-
{% assign p_file_name = p_file_name[1] %}
81-
82-
{% assign topic = file_name | split: "-" | first %}
83-
{% assign p_topic = p_file_name | split: "-" | first %}
84-
85-
{% if p.lang == page.lang %}
86-
{% assign step_index = step_index | plus: 1 %}
87-
{% if p_topic == topic and same_topic_started == false %}
70+
{% comment %}{% endcomment %}
71+
{%- assign same_topic_started = false -%}
72+
{%- assign should_assign_next = false -%}
73+
{%- assign has_next_page = false -%}
74+
{%- assign step_index = 0 -%}
75+
{%- assign next_page = nil -%}
76+
{%- for p in site.pages -%}
77+
{%- assign file_name = page.path | split: "/" -%}
78+
{%- assign file_name = file_name[1] -%}
79+
80+
{%- assign p_file_name = p.path | split: "/" -%}
81+
{%- assign p_file_name = p_file_name[1] -%}
82+
83+
{%- assign topic = file_name | split: "-" | first -%}
84+
{%- assign p_topic = p_file_name | split: "-" | first -%}
85+
86+
{%- if p.lang == page.lang -%}
87+
{%- assign step_index = step_index | plus: 1 -%}
88+
{%- if p_topic == topic and same_topic_started == false -%}
8889
<div class="same-topic">
89-
{% assign same_topic_started = true %}
90-
{% endif %}
91-
{% if p_topic != topic and same_topic_started == true %}
90+
{% comment %}{% endcomment %}
91+
{%- assign same_topic_started = true -%}
92+
{%- endif -%}
93+
{%- if p_topic != topic and same_topic_started == true -%}
9294
</div>
93-
{% assign same_topic_started = false %}
94-
{% endif %}
95-
<a id="page-{{ p.path }}" class="step {% if page == p %}current{% endif %}" href="..{{ p.url }}">{% if page == p %}{{ step_index }}{% endif %}</a>
96-
{% if should_assign_next %}
97-
{% assign should_assign_next = false %}
98-
{% assign has_next_page = true %}
99-
{% assign next_page = p %}
100-
{% endif %}
101-
{% if page == p %}
102-
{% assign should_assign_next = true %}
103-
{% endif %}
104-
{% endif %}
105-
{% endfor %}
106-
{% if same_topic_started %}
95+
{% comment %}{% endcomment %}
96+
{%- assign same_topic_started = false -%}
97+
{%- endif -%}
98+
<a id="page-{{- p.path -}}" class="step {%- if page == p -%}current{%- endif -%}" href="..{{- p.url -}}">{%- if page == p -%}{{- step_index -}}{%- endif -%}</a>
99+
{% comment %}{% endcomment %}
100+
{%- if should_assign_next -%}
101+
{%- assign should_assign_next = false -%}
102+
{%- assign has_next_page = true -%}
103+
{%- assign next_page = p -%}
104+
{%- endif -%}
105+
{%- if page == p -%}
106+
{%- assign should_assign_next = true -%}
107+
{%- endif -%}
108+
{%- endif -%}
109+
{%- endfor -%}
110+
{%- if same_topic_started -%}
107111
</div>
108-
{% endif %}
112+
{% comment %}{% endcomment %}
113+
{%- endif -%}
109114
</div>
110-
<h2>{{ page.title | escape }}</h2>
115+
{% comment %}{% endcomment %}
116+
<h2>{{- page.title | escape -}}</h2>
111117
</header>
112118
<div class="main">
113-
{{ content }}
114-
{% if has_next_page %}
115-
<a href="..{{ next_page.url }}" class="next-page">{{ site.data.localization.footer.nextStep[page.lang] }}</a>
116-
{% endif %}
119+
{{- content -}}
120+
{%- if has_next_page -%}
121+
<a href="..{{- next_page.url -}}" class="next-page">{{- site.data.localization.footer.nextStep[page.lang] -}}</a>
122+
{%- endif -%}
117123
</div>
118124
<footer>
119125
<div class = "languageFooterMenu" >
120126
<select id="languageMenu" onchange="changeLanguage()">
121127

122-
{% assign languagesArray = 'English,Deutsch,Svenska' | split: ',' %}
123-
124-
{% for language in languagesArray %}
125-
{% assign lang = language | slice: 0, 2 | downcase %}
126-
{{ lang }}
127-
{{ page.lang }}
128-
{% if lang == page.lang %}
129-
<option id = page.lang selected href="..{{page.url}}" value="{{ page.url | remove: ".html"}}">{{language}}</option>
130-
{% endif %}
131-
{% if lang != page.lang %}
132-
<option id = "{{lang}}" href="..{{page.url | replace: page.lang, lang}}" value="{{ page.url | remove: ".html" | replace: page.lang, lang}}" >{{language}}</option>
133-
{% endif %}
134-
{% endfor %}
128+
{%- assign languagesArray = 'English,Deutsch,Svenska' | split: ',' -%}
129+
130+
{%- for language in languagesArray -%}
131+
{%- assign lang = language | slice: 0, 2 | downcase -%}
132+
{{- lang -}}
133+
{{- page.lang -}}
134+
{%- if lang == page.lang -%}
135+
<option id = page.lang selected href="..{{page.url}}" value="{{- page.url | remove: ".html"}}">{{language}}</option>
136+
{%- endif -%}
137+
{%- if lang != page.lang -%}
138+
<option id = "{{lang}}" href="..{{page.url | replace: page.lang, lang}}" value="{{- page.url | remove: ".html" | replace: page.lang, lang}}" >{{language}}</option>
139+
{%- endif -%}
140+
{%- endfor -%}
135141
</select>
136142

137143
<script>
@@ -152,20 +158,20 @@ <h2>{{ page.title | escape }}</h2>
152158
</script>
153159
</div>
154160
<div class="links">
155-
<a href="{{ site.data.localization.github.edit }}/{{ page.path }}">{{ site.data.localization.footer.edit[page.lang] }}</a>
156-
<a href="{{ site.data.localization.github.newIssue }}">{{ site.data.localization.footer.newIssue[page.lang] }}</a>
157-
<a href="javascript:deleteCookies()">{{ site.data.localization.footer.deleteCookies[page.lang] }}</a>
158-
<a href="{{ site.data.localization.github.view }}/{{ page.path }}">{{ site.data.localization.footer.view[page.lang] }}</a>
161+
<a href="{{- site.data.localization.github.edit -}}/{{- page.path -}}">{{- site.data.localization.footer.edit[page.lang] -}}</a>
162+
<a href="{{- site.data.localization.github.newIssue -}}">{{- site.data.localization.footer.newIssue[page.lang] -}}</a>
163+
<a href="javascript:deleteCookies()">{{- site.data.localization.footer.deleteCookies[page.lang] -}}</a>
164+
<a href="{{- site.data.localization.github.view -}}/{{- page.path -}}">{{- site.data.localization.footer.view[page.lang] -}}</a>
159165
</div>
160166
<div class="license">
161167
<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
162168
<img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="../img/cc-by-sa.png" />
163169
</a>
164-
{{ site.data.localization.license[page.lang] }}
165-
{% assign lowercase_content = content | downcase %}
166-
{% if lowercase_content contains "<img" %}
167-
{{ site.data.localization.licenseImage[page.lang] }}
168-
{% endif %}
170+
{{- site.data.localization.license[page.lang] -}}
171+
{%- assign lowercase_content = content | downcase -%}
172+
{%- if lowercase_content contains "<img" -%}
173+
{{- site.data.localization.licenseImage[page.lang] -}}
174+
{%- endif -%}
169175
</div>
170176
</footer>
171177
</body>

0 commit comments

Comments
 (0)