Skip to content

Commit 7a0c80f

Browse files
phasenraum2010phasenraum2010
committed
working on #157 
1 parent 5aaabff commit 7a0c80f

File tree

8 files changed

+21
-38
lines changed

8 files changed

+21
-38
lines changed

‎src/main/java/org/woehlke/twitterwall/conf/WebSecurityConfig.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ protected void configure(HttpSecurity http) throws Exception {
2525
"/hashtag/overview",
2626
"/imprint",
2727
"/user/*",
28+
"/user/id/*",
2829
"/hashtag/*",
2930
"/css/*","/css/**",
3031
"/favicon/*","/favicon/**",

‎src/main/java/org/woehlke/twitterwall/frontend/controller/UserController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ public String getUserForId(
5858
Sort.Direction.DESC,
5959
"createdAt"
6060
);
61-
Page<Tweet> tweetsForUser = tweetService.findTweetsForUser(user,pageRequest);
61+
Page<Tweet> latestTweets = tweetService.findTweetsForUser(user,pageRequest);
6262
String symbol = Symbols.PROFILE.toString();
6363
String title = "@" + user.getScreenName();
6464
String subtitle = user.getName();
6565
model = controllerHelper.setupPage(model, title, subtitle, symbol);
6666
model.addAttribute("user", user);
67-
model.addAttribute("latestTweets",tweetsForUser);
67+
model.addAttribute("latestTweets",latestTweets);
6868
return "user/id";
6969
}
7070

@@ -84,13 +84,13 @@ public String getUserForScreeName(
8484
Sort.Direction.DESC,
8585
"createdAt"
8686
);
87-
Page<Tweet> tweetsForUser = tweetService.findTweetsForUser(user,pageRequest);
87+
Page<Tweet> latestTweets = tweetService.findTweetsForUser(user,pageRequest);
8888
String symbol = Symbols.PROFILE.toString();
8989
String title = "@" + user.getScreenName();
9090
String subtitle = user.getName();
9191
model = controllerHelper.setupPage(model, title, subtitle, symbol);
9292
model.addAttribute("user", user);
93-
model.addAttribute("latestTweets",tweetsForUser);
93+
model.addAttribute("latestTweets",latestTweets);
9494
return "user/id";
9595
} else {
9696
throw new IllegalArgumentException("/user/"+ screenName);

‎src/main/resources/templates/layoutDataview.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="container">
1111
<div class="tw-data-view">
1212
<div class="row">
13-
<details class="col-md-12">
13+
<div class="col-md-12">
1414
<table class="table table-striped">
1515
<thead th:fragment="tw-data-view-thead">
1616
<tr>

‎src/main/resources/templates/layoutTweet.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml"
3-
xmlns:th="http://www.thymeleaf.org"
4-
xmlns:spring="http://www.springframework.org/hashTags">
3+
xmlns:th="http://www.thymeleaf.org">
54
<head th:include="layoutMain :: tw-head">
65
</head>
76
<body id="page-top" class="page-2" style="padding-top:50px; padding-bottom:200px;">
@@ -11,8 +10,8 @@
1110
<div class="container">
1211
<div th:fragment="tw-one-tweet">
1312
<div class="row">
14-
<div class="col-md-12 tw-col-4-wrapper">
15-
<div class="tw-col-4-box" th:each="tweet : ${latestTweets}">
13+
<div class="col-md-12 tw-col-3-wrapper">
14+
<div class="tw-col-3-box-center">
1615
<div class="thumbnail tw-tweet" th:fragment="tw-one-tweet-thumbnail">
1716
<div>
1817
<p>

‎src/main/resources/templates/mention/all.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<div class="row">
2323
<div class="col-md-12">
2424
<table class="table table-striped">
25-
<thead th:include="dataview :: tw-data-view-thead">
25+
<thead th:include="layoutDataview :: tw-data-view-thead">
2626
</thead>
2727
<tbody>
2828
<tr th:each="myPageItem : ${myPageContent}">
2929
<td>
30-
<span th:include="dataview :: tw-data-view-id" th:with="myPageItem=${myPageItem}"></span>
30+
<span th:include="layoutDataview :: tw-data-view-id" th:with="myPageItem=${myPageItem}"></span>
3131
</td>
3232
<td>
3333
<div class="row">
@@ -63,11 +63,11 @@
6363
</div>
6464
</td>
6565
<td>
66-
<span th:include="dataview :: tw-data-view-common-fields" th:with="myPageItem=${myPageItem}"></span>
66+
<span th:include="layoutDataview :: tw-data-view-common-fields" th:with="myPageItem=${myPageItem}"></span>
6767
</td>
6868
</tr>
6969
</tbody>
70-
<tfoot th:include="dataview :: tw-data-view-tfoot">
70+
<tfoot th:include="layoutDataview :: tw-data-view-tfoot">
7171
</tfoot>
7272
</table>
7373
</div>

‎src/main/resources/templates/task/all.html‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@
66
<body id="page-top" class="page-2" style="padding-top:50px; padding-bottom:200px;">
77
<header th:include="layoutMain :: tw-header" >
88
</header>
9+
10+
<section th:include="layoutMain :: tw-history-back-section" >
11+
</section>
12+
913
<main class="page-content">
1014
<div class="container">
11-
<div class="row">
12-
<div class="col-md-12">
13-
<p>
14-
<a href="javascript:history.back()">
15-
<i class="fa fa-arrow-circle-left" aria-hidden="true"></i>
16-
<span>zurück</span>
17-
</a>
18-
</p>
19-
</div>
20-
</div>
2115
<div class="row">
2216
<div class="col-md-12">
2317
<span class="tw-pager-arrow tw-pager-up" th:if="${tasks.hasPrevious()}">
@@ -65,17 +59,6 @@
6559
</span>
6660
</div>
6761
</div>
68-
<div class="row">
69-
<div class="col-md-12">
70-
<hr/>
71-
<p>
72-
<a href="javascript:history.back()">
73-
<i class="fa fa-arrow-circle-left" aria-hidden="true"></i>
74-
<span>zurück</span>
75-
</a>
76-
</p>
77-
</div>
78-
</div>
7962
</div>
8063
</main>
8164

‎src/main/resources/templates/url/all.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="row">
2424
<div class="col-md-12">
2525
<table class="table table-striped">
26-
<thead th:include="dataview :: tw-data-view-thead">
26+
<thead th:include="layoutDataview :: tw-data-view-thead">
2727
</thead>
2828
<tbody>
2929
<tr th:each="myPageItem : ${myPageContent.getContent()}">
@@ -51,11 +51,11 @@
5151
</div>
5252
</td>
5353
<td>
54-
<span th:include="dataview :: tw-data-view-common-fields" th:with="myPageItem=${myPageItem}"></span>
54+
<span th:include="layoutDataview :: tw-data-view-common-fields" th:with="myPageItem=${myPageItem}"></span>
5555
</td>
5656
</tr>
5757
</tbody>
58-
<tfoot th:include="dataview :: tw-data-view-tfoot">
58+
<tfoot th:include="layoutDataview :: tw-data-view-tfoot">
5959
</tfoot>
6060
</table>
6161
</div>

‎src/main/resources/templates/user/id.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
</div>
2323
</div>
24-
<div th:include="layouTweetList :: tw-tweet-list" ></div>
24+
<div th:include="layoutTweetList :: tw-tweet-list" ></div>
2525
<div class="tw-pager-below">
2626
<div class="row">
2727
<div class="col-md-12">

0 commit comments

Comments
 (0)