Skip to content

Commit 7a3dc66

Browse files
working on #157
1 parent c8a8a64 commit 7a3dc66

File tree

35 files changed

+1004
-710
lines changed

35 files changed

+1004
-710
lines changed

src/main/resources/public/css/my.css

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,19 @@
134134
}
135135

136136
.tw-left-space {
137-
margin-left: 12px ;
137+
margin-left: 12px;
138+
}
139+
140+
.tw-right-space {
141+
margin-right: 12px;
142+
}
143+
144+
.tw-vector-hashtag-overview {
145+
margin-right: 1em;
146+
}
147+
148+
i.fa, span.map-icon, span.glyphicon {
149+
margin-right: 0.5em;
138150
}
139151
}
140152

src/main/resources/templates/application/countedEntities.html

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<body id="page-top" class="page-2" style="padding-top:50px; padding-bottom:200px;">
88
<header th:include="layout :: tw-header" >
99
</header>
10-
<section>
10+
<main class="page-content">
1111
<div class="container">
1212
<div th:fragment="tw-data-view-above">
1313
<div class="row">
1414
<div class="col-md-12">
1515
<div th:if="${page.historyBack}">
16-
<a href="javascript:history.back()"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i>&nbsp;&nbsp;zurück</a>
16+
<a href="javascript:history.back()"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i>zurück</a>
1717
</div>
1818
</div>
1919
</div>
@@ -29,42 +29,44 @@
2929
</div>
3030
</div>
3131
</div>
32-
<div class="row">
33-
<div class="col-md-12">
34-
<table class="table table-striped">
35-
<thead th:fragment="tw-data-view-thead">
36-
<tr>
37-
<th><span th:text="${nameObject}">nameObject</span> ID</th>
38-
<th><span th:text="${nameEntity}">nameEntity</span> ID</th>
39-
</tr>
40-
</thead>
41-
<tbody>
42-
<tr th:each="object2Entity : ${listObject2EntityContent}">
43-
<td>
44-
<span class="tw-vector">
45-
<i class="fa fa-database" aria-hidden="true"></i>
46-
<a href="/tweet/id" th:href="@{|/${nameObject}/id/${object2Entity.objectId}|}">
47-
<span th:text="${object2Entity.objectId}">objectId</span>
48-
<span th:text="${object2Entity.objectInfo}" class="tw-left-space">objectInfo</span>
49-
</a>
50-
</span>
51-
</td>
52-
<td>
53-
<span class="tw-vector">
54-
<i class="fa fa-database" aria-hidden="true"></i>
55-
<span th:text="${object2Entity.entityId}">entityId</span>
56-
<span th:text="${object2Entity.entityInfo}" class="tw-left-space">entityInfo</span>
57-
</span>
58-
</td>
59-
</tr>
60-
</tbody>
61-
<tfoot th:fragment="tw-data-view-tfoot">
62-
<tr>
63-
<th><span th:text="${nameObject}">nameObject</span> ID</th>
64-
<th><span th:text="${nameEntity}">nameEntity</span> ID</th>
65-
</tr>
66-
</tfoot>
67-
</table>
32+
<div class="tw-count-entities-data-view">
33+
<div class="row">
34+
<div class="col-md-12">
35+
<table class="table table-striped">
36+
<thead th:fragment="tw-data-view-thead">
37+
<tr>
38+
<th><span th:text="${nameObject}">nameObject</span> ID</th>
39+
<th><span th:text="${nameEntity}">nameEntity</span> ID</th>
40+
</tr>
41+
</thead>
42+
<tbody>
43+
<tr th:each="object2Entity : ${listObject2EntityContent}">
44+
<td>
45+
<span class="tw-vector">
46+
<i class="fa fa-database" aria-hidden="true"></i>
47+
<a href="/tweet/id" th:href="@{|/${nameObject}/id/${object2Entity.objectId}|}">
48+
<span th:text="${object2Entity.objectId}">objectId</span>
49+
<span th:text="${object2Entity.objectInfo}" class="tw-left-space">objectInfo</span>
50+
</a>
51+
</span>
52+
</td>
53+
<td>
54+
<span class="tw-vector">
55+
<i class="fa fa-database" aria-hidden="true"></i>
56+
<span th:text="${object2Entity.entityId}">entityId</span>
57+
<span th:text="${object2Entity.entityInfo}" class="tw-left-space">entityInfo</span>
58+
</span>
59+
</td>
60+
</tr>
61+
</tbody>
62+
<tfoot th:fragment="tw-data-view-tfoot">
63+
<tr>
64+
<th><span th:text="${nameObject}">nameObject</span> ID</th>
65+
<th><span th:text="${nameEntity}">nameEntity</span> ID</th>
66+
</tr>
67+
</tfoot>
68+
</table>
69+
</div>
6870
</div>
6971
</div>
7072
<div th:fragment="tw-data-view-below">
@@ -82,13 +84,13 @@
8284
<div class="row">
8385
<div class="col-md-12">
8486
<div th:if="${page.historyBack}">
85-
<a href="javascript:history.back()"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i>&nbsp;&nbsp;zurück</a>
87+
<a href="javascript:history.back()"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i>zurück</a>
8688
</div>
8789
</div>
8890
</div>
8991
</div>
9092
</div>
91-
</section>
93+
</main>
9294
<footer th:include="layout :: footer" >
9395

9496
</footer>

0 commit comments

Comments
 (0)