Made some containers fluid, tag counts are no longer part of the search link

This commit is contained in:
neviyn 2021-05-10 15:55:28 +01:00
parent 1a154f2db4
commit a78bea1167
3 changed files with 10 additions and 9 deletions

View File

@ -39,8 +39,8 @@
</nav> </nav>
</div> </div>
<div th:fragment="searchBarRow"> <div th:fragment="searchBarRow">
<form action="/gallery" class="text-center row row-cols-auto align-items-center mt-2"> <form action="/gallery" class="text-center row row-cols-auto justify-content-center align-items-center mt-2">
<div class="col-10"> <div class="col-10 col-lg-6">
<!--suppress HtmlFormInputWithoutLabel --> <!--suppress HtmlFormInputWithoutLabel -->
<input class="form-control" id="imageSearch" <input class="form-control" id="imageSearch"
name="tags" name="tags"
@ -49,7 +49,7 @@
th:value="${#request.getParameter('tags')}" th:value="${#request.getParameter('tags')}"
type="search"> type="search">
</div> </div>
<div class="col-2 d-grid"> <div class="col-2 col-lg-1 d-grid">
<button class="btn btn-primary" type="submit">Search</button> <button class="btn btn-primary" type="submit">Search</button>
</div> </div>
</form> </form>

View File

@ -6,19 +6,19 @@
</head> </head>
<body> <body>
<div th:replace="fragments :: navbar"></div> <div th:replace="fragments :: navbar"></div>
<div class="container"> <div class="container-fluid">
<div th:replace="fragments :: searchBarRow"></div> <div th:replace="fragments :: searchBarRow"></div>
<div class="row mt-3" th:if="${imagePage != null}"> <div class="row mt-3" th:if="${imagePage != null}">
<div class="col-2"> <div class="col-md-1 col-2">
<ul> <ul>
<li th:each="tag : ${commonTags}"> <li th:each="tag : ${commonTags}">
<a class="text-decoration-none" <a class="text-decoration-none"
th:href="${#mvc.url('IC#getGalleryPage').arg(0, 1).arg(1, tag.tag).build()}" th:href="${#mvc.url('IC#getGalleryPage').arg(0, 1).arg(1, tag.tag).build()}"
th:text="${tag.tag} + ' ' + ${tag.amount}">tag</a> th:text="${tag.tag} + ' ' ">tag</a><span th:text="${tag.amount}"></span>
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-10"> <div class="col-11">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-xl-2 col-lg-4 col-md-6 col-sm-12" th:each="image : ${imagePage.content}"> <div class="col-xl-2 col-lg-4 col-md-6 col-sm-12" th:each="image : ${imagePage.content}">

View File

@ -6,7 +6,7 @@
</head> </head>
<body> <body>
<div th:replace="fragments :: navbar"></div> <div th:replace="fragments :: navbar"></div>
<div class="container"> <div class="container-fluid">
<div th:replace="fragments :: searchBarRow"></div> <div th:replace="fragments :: searchBarRow"></div>
<div class="row mt-2"> <div class="row mt-2">
<div class="col-2"> <div class="col-2">
@ -14,8 +14,9 @@
<li th:each="tag : ${tags}"> <li th:each="tag : ${tags}">
<a class="text-decoration-none" <a class="text-decoration-none"
th:href="${#mvc.url('IC#getGalleryPage').arg(1, tag.tag).build()}" th:href="${#mvc.url('IC#getGalleryPage').arg(1, tag.tag).build()}"
th:text="${tag.tag} + ' ' + ${tag.amount}">tag</a></li> th:text="${tag.tag} + ' '">tag</a><span th:text="${tag.amount}"></span></li>
</ul> </ul>
<p>Uploaded by: <span th:text="${image.uploader.name}"></span></p>
<form th:action="'/upload/d/' + ${image.id}" <form th:action="'/upload/d/' + ${image.id}"
th:if="${isUploader}" th:if="${isUploader}"
th:method="delete"> th:method="delete">