Skip to content

Commit a1d1650

Browse files
committed
switch to 2020 plus some formatting
1 parent 13fa09f commit a1d1650

5 files changed

Lines changed: 703 additions & 334 deletions

File tree

src/components/main/country/country.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h3>{{ county.name }}</h3>
4343
>
4444
<div flex="75" flex-xs="100">
4545
<p class="big">
46-
&copy; 2017-2019 <a href="//github.com/yarl">Paweł Marynowski</a> and
46+
&copy; 2017-2020 <a href="//github.com/yarl">Paweł Marynowski</a> and
4747
<a href="//github.com/slaporte">Stephen LaPorte</a> //
4848
<a href="//hatnote.com/">hatnote.com</a>
4949
</p>

src/components/main/dashboard/dashboard.html

Lines changed: 92 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
<div class="hero"
2-
layout="column" layout-align="center center">
3-
<img src="assets/images/wlm-logo.png" alt="Wiki Loves Monuments logo">
1+
<div class="hero" layout="column" layout-align="center center">
2+
<img src="assets/images/wlm-logo.png" alt="Wiki Loves Monuments logo" />
43
<div class="hero__search">
54
<md-autocomplete
6-
md-selected-item="$ctrl.selectedItem"
7-
md-search-text="$ctrl.searchText"
8-
md-items="item in $ctrl.getMatches($ctrl.searchText)"
9-
md-item-text="item.name"
10-
md-selected-item-change="$ctrl.goToMap()"
11-
placeholder="Search for city, address or monument">
5+
md-selected-item="$ctrl.selectedItem"
6+
md-search-text="$ctrl.searchText"
7+
md-items="item in $ctrl.getMatches($ctrl.searchText)"
8+
md-item-text="item.name"
9+
md-selected-item-change="$ctrl.goToMap()"
10+
placeholder="Search for city, address or monument"
11+
>
1212
<md-item-template>
1313
{{item.name}}
1414
<small class="muted">{{item.details}}</small>
1515
</md-item-template>
16-
<md-not-found>
17-
No matches found.
18-
</md-not-found>
16+
<md-not-found> No matches found. </md-not-found>
1917
</md-autocomplete>
2018
</div>
2119
<div class="hero__countries">
2220
<h4><a ui-sref="main.map({c:'49.4967:12.4805:4'})">or go to the map</a></h4>
2321
<div class="hero__or">jump to country</div>
24-
<div layout="row" layout-align="center center"
25-
layout-xs="column" layout-align-xs="start center">
22+
<div
23+
layout="row"
24+
layout-align="center center"
25+
layout-xs="column"
26+
layout-align-xs="start center"
27+
>
2628
<h4><a ui-sref="main.country({country: 'france'})">France</a></h4>
2729
<span hide-xs>&nbsp;·&nbsp;</span>
2830
<h4><a ui-sref="main.country({country: 'ireland'})">Ireland</a></h4>
@@ -37,64 +39,110 @@ <h4><a ui-sref="main.country({country: 'us'})">USA</a></h4>
3739
</div>
3840
</div>
3941
</div>
40-
<div class="container" layout="column" layout-align="space-between stretch" flex>
42+
<div
43+
class="container"
44+
layout="column"
45+
layout-align="space-between stretch"
46+
flex
47+
>
4148
<md-content layout="column" layout-align="start center" flex>
4249
<div class="dashboard" layout="column" layout-align="start stretch">
4350
<div layout="column" layout-align="start stretch">
44-
4551
<div class="dashboard__box">
46-
<h2 class="big">
47-
Join the contest!
48-
</h2>
49-
<p>Welcome to the Wiki Loves Monuments map, where you can explore and learn about built heritage.</p>
50-
<p>Wiki Loves Monuments is the world’s largest photo competition, where everyone is invited to share their photographs of monuments
51-
on Wikipedia. Enter the name of a city (like “Berlin”) to explore a map of over 1.2 million monuments around
52-
the world.</p>
52+
<h2 class="big">Join the contest!</h2>
53+
<p>
54+
Welcome to the Wiki Loves Monuments map, where you can explore and
55+
learn about built heritage.
56+
</p>
5357
<p>
54-
In order to participate in Wiki Loves Monuments 2019 please follow these steps:
58+
Wiki Loves Monuments is the world’s largest photo competition, where
59+
everyone is invited to share their photographs of monuments on
60+
Wikipedia. Enter the name of a city (like “Berlin”) to explore a map
61+
of over 1.2 million monuments around the world.
62+
</p>
63+
<p>
64+
In order to participate in Wiki Loves Monuments 2020 please follow
65+
these steps:
5566
</p>
5667
<ol>
57-
<li>Create account on <a href="//commons.wikimedia.org/wiki/Special:CreateAccount">Wikimedia Commons</a>.</li>
68+
<li>
69+
Create account on
70+
<a href="//commons.wikimedia.org/wiki/Special:CreateAccount"
71+
>Wikimedia Commons</a
72+
>.
73+
</li>
5874
<li>Log in using button in the top-right corner.</li>
5975
<li>Use search box to find places with monuments.</li>
6076
<li>Drag and drop files on monument page.</li>
6177
</ol>
6278

63-
<p>We believe that photography is an important part of preserving and sharing our heritage. Over the last eight years, 46 thousand
64-
volunteers have participated in Wiki Loves Monuments, to share data and photos of monuments around the world. You
65-
can use this page to explore a map of monuments, learn more about it from Wikipedia and Wikidata, and donate your
66-
photos to Wikimedia Commons.</p>
79+
<p>
80+
We believe that photography is an important part of preserving and
81+
sharing our heritage. Over the last eight years, 46 thousand
82+
volunteers have participated in Wiki Loves Monuments, to share data
83+
and photos of monuments around the world. You can use this page to
84+
explore a map of monuments, learn more about it from Wikipedia and
85+
Wikidata, and donate your photos to Wikimedia Commons.
86+
</p>
6787
</div>
6888

6989
<div class="dashboard__box dashboard__box--credits">
70-
<strong>Cookies Policy</strong><br/>
71-
We use cookies and Piwik tracking software to collect usage statistics and enhance your experience. You can find tracked
72-
information on <a href="https://piwik.org/faq/general/faq_18254/">Piwik documentation</a> website. Feel free to block it
73-
using Adblock software.
90+
<strong>Cookies Policy</strong><br />
91+
We use cookies and Piwik tracking software to collect usage statistics
92+
and enhance your experience. You can find tracked information on
93+
<a href="https://piwik.org/faq/general/faq_18254/"
94+
>Piwik documentation</a
95+
>
96+
website. Feel free to block it using Adblock software.
7497
</div>
7598

7699
<div class="dashboard__box dashboard__box--credits">
77-
<strong>Credits</strong><br/>
78-
<a href="//commons.wikimedia.org/wiki/File:Kostol_sv._Vavrinca,_Zliechov.jpg">Picture in the background</a> by Volodka22, licensed under the CC BY-SA 4.0 license.
79-
<a href="//commons.wikimedia.org/wiki/File:WLM_2012_horiz_white.svg">Wiki Loves Monuments logo</a> by Lusitana and Heatherawalls, licensed under the CC BY-SA 3.0 license.
100+
<strong>Credits</strong><br />
101+
<a
102+
href="//commons.wikimedia.org/wiki/File:Kostol_sv._Vavrinca,_Zliechov.jpg"
103+
>Picture in the background</a
104+
>
105+
by Volodka22, licensed under the CC BY-SA 4.0 license.
106+
<a href="//commons.wikimedia.org/wiki/File:WLM_2012_horiz_white.svg"
107+
>Wiki Loves Monuments logo</a
108+
>
109+
by Lusitana and Heatherawalls, licensed under the CC BY-SA 3.0
110+
license.
80111
</div>
81112
</div>
82113
</div>
83114
</md-content>
84115
</div>
85116
<footer layout="column" layout-align="center center" flex>
86-
<md-content class="container small" flex
87-
layout="row" layout-align="center stretch"
88-
layout-xs="column" layout-align-xs="start stretch">
117+
<md-content
118+
class="container small"
119+
flex
120+
layout="row"
121+
layout-align="center stretch"
122+
layout-xs="column"
123+
layout-align-xs="start stretch"
124+
>
89125
<div flex="75" flex-xs="100">
90-
<p class="big">&copy; 2019 <a href="//github.com/yarl">Paweł Marynowski</a> and <a href="//github.com/slaporte">Stephen LaPorte</a> // <a href="//hatnote.com/">hatnote.com</a></p>
91-
<p>Monumental is a free software available under <a href="//github.com/hatnote/monumental-wlm/blob/master/LICENSE">BSD 3-Clause License</a>. </p>
92-
<p><a href="//github.com/hatnote/monumental-wlm">source code</a> &bull; <a href="//github.com/hatnote/monumental-wlm/issues">report issue</a></p>
126+
<p class="big">
127+
&copy; 2020 <a href="//github.com/yarl">Paweł Marynowski</a> and
128+
<a href="//github.com/slaporte">Stephen LaPorte</a> //
129+
<a href="//hatnote.com/">hatnote.com</a>
130+
</p>
131+
<p>
132+
Monumental is a free software available under
133+
<a href="//github.com/hatnote/monumental-wlm/blob/master/LICENSE"
134+
>BSD 3-Clause License</a
135+
>.
136+
</p>
137+
<p>
138+
<a href="//github.com/hatnote/monumental-wlm">source code</a> &bull;
139+
<a href="//github.com/hatnote/monumental-wlm/issues">report issue</a>
140+
</p>
93141
</div>
94142
<div class="text-right" flex>
95143
<p>
96-
version <strong>{{ ::$ctrl.config.package.version }}</strong> &bull;
97-
env <strong>{{ ::$ctrl.config.env.name }}</strong>
144+
version <strong>{{ ::$ctrl.config.package.version }}</strong> &bull; env
145+
<strong>{{ ::$ctrl.config.env.name }}</strong>
98146
</p>
99147
</div>
100148
</md-content>

0 commit comments

Comments
 (0)