Skip to content

Commit ac9b494

Browse files
phasenraum2010phasenraum2010
committed
fixed #224 
1 parent 5a23aca commit ac9b494

File tree

3 files changed

+70
-31
lines changed

3 files changed

+70
-31
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public String getTestData(Model model) {
8787
model.addAttribute("taskTweets",null);
8888
model.addAttribute("taskUsers",null);
8989
}
90-
return PATH+"/start/taskStarted";
90+
return PATH+"/start/createTestData";
9191
}
9292

9393
@RequestMapping("/start/user/onlist/renew")

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,37 @@
1111
<div class="container">
1212
<div class="row">
1313
<div class="col-md-12">
14-
<div th:if="${param.error}">
15-
<div class="alert alert-success" role="alert">
16-
<span>Invalid username and password.</span>
17-
</div>
18-
</div>
19-
<div th:if="${param.logout}">
20-
<div class="alert alert-danger" role="alert">
21-
<span>You have been logged out.</span>
22-
</div>
23-
</div>
24-
<form th:action="@{/login}" method="post" class="form-horizontal">
25-
<div class="form-group">
26-
<label for="username-input" class="col-sm-2 control-label">User Name:</label>
27-
<div class="col-sm-10">
28-
<input type="text" name="username" id="username-input" class="form-control" placeholder="User Name"/>
14+
<div class="well">
15+
<div th:if="${param.error}">
16+
<div class="alert alert-success" role="alert">
17+
<span>Invalid username and password.</span>
2918
</div>
3019
</div>
31-
<div class="form-group">
32-
<label for="username-input" class="col-sm-2 control-label">Password:</label>
33-
<div class="col-sm-10">
34-
<input type="password" name="password" id="password-input" class="form-control" placeholder="Password"/>
20+
<div th:if="${param.logout}">
21+
<div class="alert alert-danger" role="alert">
22+
<span>You have been logged out.</span>
3523
</div>
3624
</div>
37-
<div class="form-group">
38-
<div class="col-sm-offset-2 col-sm-10">
39-
<button class="btn btn-primary form-control">Sign In</button>
25+
<form th:action="@{/login}" method="post" class="form-horizontal">
26+
<div class="form-group">
27+
<label for="username-input" class="col-sm-2 control-label">User Name:</label>
28+
<div class="col-sm-10">
29+
<input type="text" name="username" id="username-input" class="form-control" placeholder="User Name"/>
30+
</div>
4031
</div>
41-
</div>
42-
</form>
32+
<div class="form-group">
33+
<label for="username-input" class="col-sm-2 control-label">Password:</label>
34+
<div class="col-sm-10">
35+
<input type="password" name="password" id="password-input" class="form-control" placeholder="Password"/>
36+
</div>
37+
</div>
38+
<div class="form-group">
39+
<div class="col-sm-offset-2 col-sm-10">
40+
<button class="btn btn-primary form-control">Sign In</button>
41+
</div>
42+
</div>
43+
</form>
44+
</div>
4345
</div>
4446
</div>
4547
</div>

‎src/main/resources/templates/task/start/createTestData.html‎

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,57 @@
88
</header>
99
<main class="page-content">
1010
<div class="container">
11-
<div th:if="${latestTweets} != null">
12-
<div th:include="layoutTweetList :: tw-tweet-list" >
13-
</div>
14-
</div>
15-
<div th:if="${users} != null">
16-
<div th:include="layoutUserList :: tw-user-list" >
11+
<div class="row">
12+
<div class="col-md-12">
13+
<h3>Backend Task Started.</h3>
14+
<div class="well" th:if="${taskTweets}">
15+
<ul>
16+
<li>
17+
<a href="/task/0" th:href="@{|/task/${taskTweets.id}|}">
18+
<i class="fa fa-check-square" aria-hidden="true"></i>
19+
<span th:text="${taskTweets.id}">id</span>
20+
</a>
21+
</li>
22+
<li th:if="${taskTweets.timeStarted}">timeStarted: <span th:text="${#dates.format(taskTweets.timeStarted,'HH:mm:ss (dd.MM.yyyy)')}">timeStarted</span></li>
23+
<li th:if="${taskTweets.timeLastUpdate}">timeLastUpdate: <span th:text="${#dates.format(taskTweets.timeLastUpdate,'HH:mm:ss (dd.MM.yyyy)')}">timeLastUpdate</span></li>
24+
<li th:if="${taskTweets.timeFinished}">timeFinished: <span th:text="${#dates.format(taskTweets.timeFinished,'HH:mm:ss (dd.MM.yyyy)')}">timeFinished</span></li>
25+
<li th:if="${taskTweets.taskType}">taskType: <span th:text="${taskTweets.taskType}">taskType</span></li>
26+
<li th:if="${taskTweets.taskStatus}">taskStatus: <span th:text="${taskTweets.taskStatus}">taskStatus</span></li>
27+
<li th:if="${taskTweets.sendType}">sendType: <span th:text="${taskTweets.sendType}">sendType</span></li>
28+
</ul>
29+
</div>
30+
<div class="well" th:if="${taskUsers}">
31+
<ul>
32+
<li>
33+
<a href="/task/0" th:href="@{|/task/${taskUsers.id}|}">
34+
<i class="fa fa-check-square" aria-hidden="true"></i>
35+
<span th:text="${taskUsers.id}">id</span>
36+
</a>
37+
</li>
38+
<li th:if="${taskUsers.timeStarted}">timeStarted: <span th:text="${#dates.format(taskUsers.timeStarted,'HH:mm:ss (dd.MM.yyyy)')}">timeStarted</span></li>
39+
<li th:if="${taskUsers.timeLastUpdate}">timeLastUpdate: <span th:text="${#dates.format(taskUsers.timeLastUpdate,'HH:mm:ss (dd.MM.yyyy)')}">timeLastUpdate</span></li>
40+
<li th:if="${taskUsers.timeFinished}">timeFinished: <span th:text="${#dates.format(taskUsers.timeFinished,'HH:mm:ss (dd.MM.yyyy)')}">timeFinished</span></li>
41+
<li th:if="${taskUsers.taskType}">taskType: <span th:text="${taskUsers.taskType}">taskType</span></li>
42+
<li th:if="${taskUsers.taskStatus}">taskStatus: <span th:text="${taskUsers.taskStatus}">taskStatus</span></li>
43+
<li th:if="${taskUsers.sendType}">sendType: <span th:text="${taskUsers.sendType}">sendType</span></li>
44+
</ul>
45+
</div>
46+
<div class="well">
47+
<a href="/task/all" th:href="@{/task/all}">
48+
<i class="fa fa-check-square" aria-hidden="true"></i>
49+
<span>Tasks</span>
50+
</a>
51+
</div>
1752
</div>
1853
</div>
1954
</div>
2055
</main>
56+
2157
<section th:include="layoutMain :: tw-history-back-section" >
2258
</section>
2359

2460
<footer th:include="layoutMain :: footer" >
61+
2562
</footer>
2663
</body>
2764
</html>

0 commit comments

Comments
 (0)