Merge branch...

Merge branch '121-overview-replace-the-course-link-with-a-button-on-the-overview' into 'development'

Resolve "Overview: Replace the course link with a button on the overview"

Closes #121

See merge request !324

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Users can no longer visit enqueue page while already enqueued. [@tnulle](https://gitlab.ewi.tudelft.nl/tnulle)
 - Average waiting time is now calculated over the requests handled in the last hour [@tnulle](https://gitlab.ewi.tudelft.nl/tnulle)
 - Sort labs based on opening time instead of creation time [@tnulle](https://gitlab.ewi.tudelft.nl/tnulle)
+- Change view course from link to button [@tnulle](https://gitlab.ewi.tudelft.nl/tnulle)
 
 ### Fixed
 - Fix the "assigned to" filter not filtering newly incoming requests through push notifications by [@lemaire](https://gitlab.ewi.tudelft.nl/lemaire)

src/main/resources/templates/course/index.html

@@ -53,18 +53,18 @@
             <tbody>
                 <tr th:each="course : ${courses}">
                     <td>
-                    	<th:block th:if="${@permissionService.canViewCourse(#authentication.principal, course.id)}">
-                        	<a href="#" th:href="@{/course/{id}(id=${course.id})}" th:text="${course}">Algorithms &amp; Datastructures (TI1316)</a>
-                        </th:block>
-                        <th:block th:unless="${@permissionService.canViewCourse(#authentication.principal, course.id)}" th:text="${course}">
+                        <th:block th:text="${course}">
                         	Algorithms &amp; Datastructures (TI1316)
                         </th:block>
                     </td>
                     <td th:text="${#strings.listJoin(course.teachers, ', ')}">Prof. dr. A. Einstein</td>
                     <td>
-                        <th:block th:unless="${#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course) || #authenticated.participates(course) || course.getIsArchived() }">
+                        <th:block th:unless="${@permissionService.canViewCourse(#authentication.principal, course.id) || course.getIsArchived() }">
                             <a href="#" class="btn btn-success" th:href="@{/course/{id}/enroll(id=${course.id})}">enrol</a>
                         </th:block>
+                        <th:block th:if="${@permissionService.canViewCourse(#authentication.principal, course.id)}">
+                            <a href="#" class="btn btn-primary" th:href="@{/course/{id}(id=${course.id})}">view</a>
+                        </th:block>
                     </td>
                 </tr>
             </tbody>
@@ -74,7 +74,7 @@
         <!-- Shown on extra small devices (phone) -->
         <div class="d-block d-sm-none">
             <div th:each="course : ${courses}" class="card "
-                 th:classappend="${#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course) || #authenticated.participates(course)} ? 'bg-primary text-white' : 'bg-light'"
+                 th:classappend="${@permissionService.canViewCourse(#authentication.principal, course.id)} ? 'bg-primary text-white' : 'bg-light'"
                  style="margin-bottom:20px;">
                     <h4 class="card-header" th:text="${course}">Algorithms &amp; Datastructures (TI1316)</h4>
 
@@ -87,11 +87,11 @@
                 </div>
                 <div class="card-footer">
                 <div class="btn-group btn-group-justified">
-                    <th:block th:if="${#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course) || #authenticated.participates(course)}">
+                    <th:block th:if="${@permissionService.canViewCourse(#authentication.principal, course.id)}">
                         <a href="#" th:href="@{/course/{id}(id=${course.id})}" class="btn btn-primary btn-sm">View</a>
                     </th:block>
 
-                    <th:block th:unless="${#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course) || #authenticated.participates(course)}">
+                    <th:block th:unless="${@permissionService.canViewCourse(#authentication.principal, course.id)}">
                         <a href="#" th:href="@{/course/{id}/enroll(id=${course.id})}" class="btn btn-success btn-sm">Enrol</a>
                     </th:block>
                 </div>