Skip to content

Commit 49a2292

Browse files
robinboehmrobinboehm
committed
Pick commit from forked repo
robinboehm/talks-website@5162cb9
1 parent 8a51b77 commit 49a2292

File tree

5 files changed

+41
-35
lines changed

5 files changed

+41
-35
lines changed

‎css/tasks.css‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
body{
2-
margin: 0 auto;
3-
width: 500px;
4-
}
5-
61
li.result{
72
width: 300px;
83
}
94

105
.green{
11-
background-color: green;
6+
background-color: #dff0d8;
127
}
138

149
.red{
15-
background-color: red;
10+
background-color: #f2dede;
1611
}

‎index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html ng-app="typeCoercion">
33
<head>
4-
<title>AngularJS Intensiv Workshop - Type Coercion</title>
4+
<title>Type Coercion by AngularJS.DE</title>
55
</head>
66

77
<link href="bower_components/bootstrap/docs/assets/css/bootstrap.css" media="all" rel="stylesheet" type="text/css">
@@ -10,9 +10,11 @@
1010
<link href="css/tasks.css" media="all" rel="stylesheet" type="text/css">
1111
<body>
1212

13+
<div class="container">
14+
<h1 class="page-header">Tasks: Type Coercion</h1>
15+
<main ng-view></main>
1316

14-
<h1>Aufgaben zu Type Coercion</h1>
15-
<main ng-view></main>
17+
</div>
1618

1719
<script src="bower_components/google-code-prettify/src/prettify.js"></script>
1820

‎views/main.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h2>
2-
Aufgabenbeschreibung
2+
Description
33
</h2>
44

5-
<a href="#/1">Los gehts</a>
5+
<a href="#/1" class="btn btn-info">Start</a>

‎views/summary.html‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
<h2>
2-
Summary
3-
</h2>
4-
<ul>
5-
<li class="result" ng-class="{'red': (task | eval) != results[$index], 'green':(task | eval) == results[$index] }" ng-repeat="task in tasks">
6-
<span ng-bind="task"></span>
7-
Antwort: <span ng-bind="results[$index]"></span>
8-
<span>Korrekt : {{ task | eval }}</span>
9-
</li>
10-
</ul>
1+
<h2>Result</h2>
112

3+
4+
<table class="table">
5+
<tr>
6+
<th>Task</th>
7+
<th>Your Answer</th>
8+
<th>Correct Answer</th>
9+
</tr>
10+
<tr class="result" ng-class="{'red': (task | eval) != results[$index], 'success':(task | eval) == results[$index] }" ng-repeat="task in tasks">
11+
12+
<td ng-bind="task"></td>
13+
<td ng-bind="results[$index]"></td>
14+
<td ng-bind="task | eval"></td>
15+
</tr>
16+
17+
</table>

‎views/task.html‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
<section>
1+
<p>
2+
Task
3+
<span class="taskId" ng-bind="taskId"></span>
4+
of
5+
<span class="sumTasks" ng-bind="sumTasks"></span>
6+
</p>
7+
8+
<progress percent="(taskId / sumTasks)*100" class="progress-success active"></progress>
9+
10+
<hr>
211

3-
<button class="btn btn-success" value="true" ng-click="saveResult('true')">True</button>
4-
<button class="btn btn-danger" value="false" ng-click="saveResult('false')">False</button>
5-
<pre class="prettyprint linenums lang-js" ng-bind="task"></pre>
6-
7-
</section>
8-
<footer>
9-
Aufgabe
10-
<span class="taskId" ng-bind="taskId"></span>
11-
von
12-
<span class="sumTasks" ng-bind="sumTasks"></span>
13-
<progress percent="(taskId / sumTasks)*100" class="progress-success active"></progress>
14-
</footer>
12+
<pre class="prettyprint linenums lang-js" ng-bind="task"></pre>
13+
14+
<section>
15+
<button class="btn btn-success" value="true" ng-click="saveResult('true')">True</button>
16+
<button class="btn btn-danger" value="false" ng-click="saveResult('false')">False</button>
17+
</section>

0 commit comments

Comments
 (0)