Skip to content

Commit 57bfcd5

Browse files
php-coderphp-coder
committed
Add checking of html templates by bootlint.
Fix #89
2 parents 8a0a66c + 94cad4f commit 57bfcd5

File tree

18 files changed

+394
-382
lines changed

18 files changed

+394
-382
lines changed

‎.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
language: java
2+
before_script:
3+
- npm install -g bootlint
24
script:
35
- mvn --batch-mode checkstyle:check -Dcheckstyle.violationSeverity=warning | egrep -v '^\[INFO\] Download(ing|ed):' | tee cs.log; fgrep -qs '[ERROR]' cs.log && false || true
46
- mvn --batch-mode pmd:check | egrep -v '^\[INFO\] Download(ing|ed):' | tee pmd.log; fgrep -qs '[ERROR]' pmd.log && false || true
57
- mvn --batch-mode license:check | egrep -v '^\[INFO\] Download(ing|ed):' | tee licence.log; fgrep -qs '[ERROR]' licence.log && false || true
8+
- find src -type f -name '*.html' | xargs bootlint
69
- mvn --batch-mode verify | egrep -v '^\[INFO\] Download(ing|ed):' | tee verify.log; fgrep -qs '[ERROR]' verify.log && false || true
710
- mvn --batch-mode jasmine:test | egrep -v '^\[INFO\] Download(ing|ed):' | tee jasmine.log; fgrep -qs '[ERROR]' jasmine.log && false || true
811
after_success:

‎src/main/config/nginx/503.en.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
67
<meta name="robots" content="noindex" />
78
<title>503: maintenance</title>
89
<link rel="shortcut icon" type="image/x-icon" href="#" />
@@ -60,7 +61,7 @@ <h4 id="error-msg">
6061
</div>
6162

6263
<div class="row">
63-
<footer class="text-right">
64+
<footer class="col-sm-12 text-right">
6465
<i class="glyphicon glyphicon-envelope"></i>
6566
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail">Slava Semushin</a>, 2009-2015
6667
</footer>

‎src/main/config/nginx/503.ru.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
67
<meta name="robots" content="noindex" />
78
<title>503: технические работы</title>
89
<link rel="shortcut icon" type="image/x-icon" href="#" />
@@ -60,7 +61,7 @@ <h4 id="error-msg">
6061
</div>
6162

6263
<div class="row">
63-
<footer class="text-right">
64+
<footer class="col-sm-12 text-right">
6465
<i class="glyphicon glyphicon-envelope"></i>
6566
<a href="mailto:slava.semushin@gmail.com" title="Написать письмо">Слава Семушин</a>, 2009-2015
6667
</footer>

‎src/main/webapp/WEB-INF/views/account/activate.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="|MyStamps: #{t_activation_title}|">MyStamps: account activation</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -146,7 +147,7 @@ <h3 th:text="#{t_activation_on_site}">
146147
</div>
147148
/*/-->
148149
<div class="row">
149-
<footer class="text-right">
150+
<footer class="col-sm-12 text-right">
150151
<i class="glyphicon glyphicon-envelope"></i>
151152
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
152153
</footer>

‎src/main/webapp/WEB-INF/views/account/auth.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="|MyStamps: #{t_auth_title}|">MyStamps: authentication</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -120,7 +121,7 @@ <h3 th:text="#{t_authentication_on_site}">
120121
</div>
121122
/*/-->
122123
<div class="row">
123-
<footer class="text-right">
124+
<footer class="col-sm-12 text-right">
124125
<i class="glyphicon glyphicon-envelope"></i>
125126
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
126127
</footer>

‎src/main/webapp/WEB-INF/views/account/register.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="|MyStamps: #{t_registration_title}|">MyStamps: registration</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -99,7 +100,7 @@ <h3 th:text="#{t_registration_on_site}">
99100
</div>
100101
/*/-->
101102
<div class="row">
102-
<footer class="text-right">
103+
<footer class="col-sm-12 text-right">
103104
<i class="glyphicon glyphicon-envelope"></i>
104105
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
105106
</footer>

‎src/main/webapp/WEB-INF/views/category/add.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="|MyStamps: #{t_create_category}|">MyStamps: add category</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -100,7 +101,7 @@ <h3 th:text="#{t_create_category_ucfirst}">
100101
</div>
101102
</div>
102103
<div class="row">
103-
<footer class="text-right">
104+
<footer class="col-sm-12 text-right">
104105
<i class="glyphicon glyphicon-envelope"></i>
105106
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
106107
</footer>

‎src/main/webapp/WEB-INF/views/category/info.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<title th:text="|MyStamps: #{t_category_info}|">MyStamps: Category info</title>
910
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1011
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
@@ -84,7 +85,7 @@ <h3 th:text="${category.getLocalizedName(#locale)}">
8485
</div>
8586
</div>
8687
<div class="row">
87-
<footer class="text-right">
88+
<footer class="col-sm-12 text-right">
8889
<i class="glyphicon glyphicon-envelope"></i>
8990
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
9091
</footer>

‎src/main/webapp/WEB-INF/views/collection/info.html

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<title th:text="|MyStamps: #{t_collection_of(${ownerName})}|">MyStamps: John Doe's collection</title>
910
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1011
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
@@ -117,23 +118,19 @@ <h3 class="text-center" th:text="#{t_collection_of(${ownerName})}">
117118
</ul>
118119
</div>
119120
<div class="col-sm-3">
120-
<div class="col-sm-12" togglz:active="SHOW_COLLECTION_CHARTS" th:if="${not #lists.isEmpty(seriesOfCollection)}">
121-
<div class="panel panel-default">
122-
<div class="panel-heading">
123-
<h4 class="panel-title" th:text="#{t_stamps_by_countries}">Stamps by countries</h4>
124-
</div>
125-
<div id="categories-chart" class="panel-body no-padding"></div>
126-
</div>
121+
<div class="panel panel-default" togglz:active="SHOW_COLLECTION_CHARTS" th:if="${not #lists.isEmpty(seriesOfCollection)}">
122+
<div class="panel-heading">
123+
<h4 class="panel-title" th:text="#{t_stamps_by_countries}">Stamps by countries</h4>
127124
</div>
125+
<div id="categories-chart" class="panel-body no-padding"></div>
126+
</div>
128127
</div>
129128
<div class="col-sm-3">
130-
<div class="col-sm-12" togglz:active="SHOW_COLLECTION_CHARTS" th:if="${not #lists.isEmpty(seriesOfCollection)}">
131-
<div class="panel panel-default">
132-
<div class="panel-heading">
133-
<h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories</h4>
134-
</div>
135-
<div id="countries-chart" class="panel-body no-padding"></div>
136-
</div>
129+
<div class="panel panel-default" togglz:active="SHOW_COLLECTION_CHARTS" th:if="${not #lists.isEmpty(seriesOfCollection)}">
130+
<div class="panel-heading">
131+
<h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories</h4>
132+
</div>
133+
<div id="countries-chart" class="panel-body no-padding"></div>
137134
</div>
138135
</div>
139136
<div class="col-sm-2">
@@ -159,7 +156,7 @@ <h4 class="panel-title" th:text="#{t_in_collection}">In this collection</h4>
159156
</div>
160157
</div>
161158
<div class="row">
162-
<footer class="text-right">
159+
<footer class="col-sm-12 text-right">
163160
<i class="glyphicon glyphicon-envelope"></i>
164161
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
165162
</footer>

‎src/main/webapp/WEB-INF/views/country/add.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="|MyStamps: #{t_add_country}|">MyStamps: add country</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -100,7 +101,7 @@ <h3 th:text="#{t_add_country_ucfirst}">
100101
</div>
101102
</div>
102103
<div class="row">
103-
<footer class="text-right">
104+
<footer class="col-sm-12 text-right">
104105
<i class="glyphicon glyphicon-envelope"></i>
105106
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
106107
</footer>

‎src/main/webapp/WEB-INF/views/country/info.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<title th:text="|MyStamps: #{t_country_info}|">MyStamps: Country info</title>
910
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1011
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
@@ -84,7 +85,7 @@ <h3 th:text="${country.getLocalizedName(#locale)}">
8485
</div>
8586
</div>
8687
<div class="row">
87-
<footer class="text-right">
88+
<footer class="col-sm-12 text-right">
8889
<i class="glyphicon glyphicon-envelope"></i>
8990
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
9091
</footer>

‎src/main/webapp/WEB-INF/views/error/401.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="#{t_401_title}">401: unauthorized</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -61,7 +62,7 @@ <h4 id="error-msg" th:utext="#{t_401_description('&lt;br /&gt;')}">
6162
</div>
6263

6364
<div class="row">
64-
<footer class="text-right">
65+
<footer class="col-sm-12 text-right">
6566
<i class="glyphicon glyphicon-envelope"></i>
6667
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
6768
</footer>

‎src/main/webapp/WEB-INF/views/error/403.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="#{t_403_title}">403: forbidden</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -61,7 +62,7 @@ <h4 id="error-msg" th:text="#{t_403_description}">
6162
</div>
6263

6364
<div class="row">
64-
<footer class="text-right">
65+
<footer class="col-sm-12 text-right">
6566
<i class="glyphicon glyphicon-envelope"></i>
6667
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
6768
</footer>

‎src/main/webapp/WEB-INF/views/error/404.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="#{t_404_title}">404: page not found</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -61,7 +62,7 @@ <h4 id="error-msg" th:utext="#{t_404_description('&lt;br /&gt;')}">
6162
</div>
6263

6364
<div class="row">
64-
<footer class="text-right">
65+
<footer class="col-sm-12 text-right">
6566
<i class="glyphicon glyphicon-envelope"></i>
6667
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
6768
</footer>

‎src/main/webapp/WEB-INF/views/error/500.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="#{t_500_title}">500: internal server error</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -61,7 +62,7 @@ <h4 id="error-msg" th:utext="#{t_500_description('&lt;br /&gt;')}">
6162
</div>
6263

6364
<div class="row">
64-
<footer class="text-right">
65+
<footer class="col-sm-12 text-right">
6566
<i class="glyphicon glyphicon-envelope"></i>
6667
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
6768
</footer>

‎src/main/webapp/WEB-INF/views/series/add.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
89
<meta name="robots" content="noindex" />
910
<title th:text="|MyStamps: #{t_add_series}|">MyStamps: add stamp series</title>
1011
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
@@ -398,7 +399,7 @@ <h3 th:text="#{t_add_series_ucfirst}">
398399
</div>
399400
</div>
400401
<div class="row">
401-
<footer class="text-right">
402+
<footer class="col-sm-12 text-right">
402403
<i class="glyphicon glyphicon-envelope"></i>
403404
<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
404405
</footer>

0 commit comments

Comments
 (0)