Ignore:
Timestamp:
10/07/21 20:37:55 (3 years ago)
Author:
NikolaCenevski <cenevskinikola@…>
Branches:
master
Children:
b8a8d06
Parents:
ee0e297
Message:

Added post grouping

Location:
src/main/resources/templates
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/main/resources/templates/album.html

    ree0e297 r7888b17  
    3535                    </select>
    3636                </div>
     37                <div class="col-md-2">
     38                    <label class="form-label" for="groupBy">Group by</label>
     39                    <select class="input-group-text" id="groupBy">
     40                        <option value="all">All</option>
     41                        <option value="completed">Completed</option>
     42                        <option value="expired">Expired</option>
     43                    </select>
     44                </div>
    3745            </div>
    3846            <br>
  • src/main/resources/templates/common/navbar.html

    ree0e297 r7888b17  
    2323                    </li>
    2424                    <li class="nav-item">
    25                         <a sec:authorize="isAnonymous() or hasAuthority('USER')" th:href="@{/album?page=1&sort=id}" class="nav-link px-2 text-white">Posts</a>
     25                        <a sec:authorize="isAnonymous() or hasAuthority('USER')" th:href="@{/album?page=1&sort=id&order=desc&groupBy=all}" class="nav-link px-2 text-white">Posts</a>
    2626                        <a sec:authorize="hasAuthority('MODERATOR')" th:href="@{/moderator/approval?page=1&sort=id}" class="nav-link px-2 text-white">Posts for approval</a>
    2727                    </li>
  • src/main/resources/templates/post.html

    ree0e297 r7888b17  
    6767                Donate
    6868            </button>
    69             <a sec:authorize="isAnonymous()" type="button" class="btn btn-primary" th:href="@{/login}">
     69            <button sec:authorize="isAnonymous()" type="button" class="btn btn-primary" disabled>
    7070                Donate
    71             </a>
    72             <button type="button" class="btn btn-danger" data-bs-toggle="modal"
     71            </button>
     72            <button sec:authorize="isAuthenticated()" type="button" class="btn btn-danger" data-bs-toggle="modal"
    7373                    data-bs-target="#staticBackdrop1">
    7474                Report
    7575            </button>
     76            <button sec:authorize="isAnonymous()" type="button" class="btn btn-danger" disabled>
     77                Report
     78            </button>
    7679
    7780            <!-- Modal -->
    78             <div class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
     81            <div sec:authorize="isAuthenticated()" class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
    7982                <div class="modal-dialog modal-dialog-centered">
    8083                    <div class="modal-content">
     
    136139                </div>
    137140            </div>
    138             <div class="modal fade" id="staticBackdrop1" data-bs-backdrop="static" data-bs-keyboard="false"
     141            <div sec:authorize="isAuthenticated()" class="modal fade" id="staticBackdrop1" data-bs-backdrop="static" data-bs-keyboard="false"
    139142                 tabindex="-1" aria-labelledby="staticBackdropLabel1" aria-hidden="true">
    140143                <div class="modal-dialog modal-dialog-centered">
Note: See TracChangeset for help on using the changeset viewer.