Changeset 4bfcc04


Ignore:
Timestamp:
02/09/23 14:37:33 (21 months ago)
Author:
milamihajlovska <mila.mihajlovska01@…>
Branches:
master
Children:
ff75720
Parents:
6a9006d (diff), a9ffccd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://github.com/DenicaKj/MovieZone

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

Legend:

Unmodified
Added
Removed

  • src/main/resources/templates/fragments/header.html

    r6a9006d r4bfcc04  
    5959<body>
    6060<div style="width: 100%">
    61 <nav class="menu">
     61<nav class="menu" xmlns:sec="http://www.w3.org/1999/xhtml">
    6262    <ul class="menu-left">
    6363        <li class="begin"><a href="/home">MovieZone</a></li>
    … …  
    7474    </ul>
    7575    <ul class="menu-right">
    76         <li class="reg"><a href="/login">Најава</a></li>
    77         <li class="reg"><a href="/register">Регистрација</a></li>
     76        <th:block th:if="${#request.getRemoteUser() != null}">
     77            <li class="reg">
     78                <a href="/">
     79                    <th:block th:text="${#request.getRemoteUser()}"></th:block>
     80                </a>
     81            </li>
     82        </th:block>
     83        <th:block th:if="${#request.getRemoteUser() == null}">
     84            <li class="reg"><a href="/register">Регистрација</a></li>
     85        </th:block>
     86        <th:block th:if="${#request.getRemoteUser() != null}">
     87            <li class="reg" sec:authorize="isAuthenticated()">
     88                <a  href="/logout">
     89                    Одјави се
     90                </a>
     91            </li>
     92        </th:block>
     93        <th:block th:if="${#request.getRemoteUser() == null}">
     94            <li class="reg"><a href="/login">Најава</a></li>
     95        </th:block>
    7896    </ul>
    7997</nav></div>

  • src/main/resources/templates/workers.html

    r6a9006d r4bfcc04  
    11<div xmlns:th="http://www.thymeleaf.org">
    22  <h1 style="color: white">Вработени</h1>
    3   <div class="container mb-4">
     3  <div style="color: white" class="container mb-4">
    44    <div class="row">
    55      <div class="col-12" >
    6         <div class="table-responsive">
    7           <table class="table table-striped">
     6        <div style="color: white" class="table-responsive">
     7          <table style="color: white" class="table table-striped">
    88            <thead>
    99            <tr>
Note: See TracChangeset for help on using the changeset viewer.