Skip to content

Commit f24bbbf

Browse files
committed
series/info: move block with series in collection info to the top.
No functional changes.
1 parent 69b733d commit f24bbbf

File tree

1 file changed

+36
-35
lines changed
  • src/main/webapp/WEB-INF/views/series

1 file changed

+36
-35
lines changed

src/main/webapp/WEB-INF/views/series/info.html

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,42 @@
272272
</div>
273273

274274
<div class="col-sm-4">
275+
276+
<div class="row" togglz:active="ADD_SERIES_TO_COLLECTION">
277+
<div class="col-sm-12" th:if="${not isSeriesInCollection}" sec:authorize="hasAuthority('UPDATE_COLLECTION')">
278+
<form method="post" action="../collection/info.html" th:action="@{${INFO_SERIES_PAGE}(id=${series.id})}">
279+
<p th:text="#{t_series_not_in_collection}">
280+
Series isn't part of your collection
281+
</p>
282+
<p>
283+
<input type="hidden" name="action" value="ADD" />
284+
<input type="submit" class="btn btn-success" value="Add to collection" th:value="#{t_add_to_collection}" />
285+
</p>
286+
</form>
287+
</div>
288+
289+
<!--/*/
290+
<div class="col-sm-12" th:if="${isSeriesInCollection}" sec:authorize="hasAuthority('UPDATE_COLLECTION')">
291+
<form method="post" action="../collection/info.html" th:action="@{${INFO_SERIES_PAGE}(id=${series.id})}">
292+
<p th:text="#{t_series_in_collection}">
293+
Series is part of your collection
294+
</p>
295+
<p>
296+
<input type="hidden" name="action" value="REMOVE" />
297+
<input type="submit" class="btn btn-danger" value="Remove from collection" th:value="#{t_remove_from_collection}" />
298+
</p>
299+
</form>
300+
</div>
301+
302+
<div class="col-sm-12" sec:authorize="isAnonymous()">
303+
<p th:utext="#{t_need_authentication_to_add_series_to_collection(@{${REGISTRATION_PAGE}}, @{${AUTHENTICATION_PAGE}})}">
304+
In order to add this series to your collection you should <a href="../account/register.html">register</a>
305+
or <a href="../account/auth.html">pass authentication</a>.
306+
</p>
307+
</div>
308+
/*/-->
309+
</div>
310+
275311
<div class="row" th:if="${not #lists.isEmpty(purchasesAndSales)}" togglz:active="SHOW_PURCHASES_AND_SALES" sec:authorize="hasAuthority('VIEW_SERIES_SALES')">
276312
<div class="col-sm-12">
277313
<h5 th:text="|#{t_who_selling_series}:|">Who was selling/buying this series:</h5>
@@ -315,41 +351,6 @@ <h5 th:text="|#{t_who_selling_series}:|">Who was selling/buying this series:</h5
315351
</div>
316352
</div>
317353

318-
<div class="row" togglz:active="ADD_SERIES_TO_COLLECTION">
319-
<div class="col-sm-12" th:if="${not isSeriesInCollection}" sec:authorize="hasAuthority('UPDATE_COLLECTION')">
320-
<form method="post" action="../collection/info.html" th:action="@{${INFO_SERIES_PAGE}(id=${series.id})}">
321-
<p th:text="#{t_series_not_in_collection}">
322-
Series isn't part of your collection
323-
</p>
324-
<p>
325-
<input type="hidden" name="action" value="ADD" />
326-
<input type="submit" class="btn btn-success" value="Add to collection" th:value="#{t_add_to_collection}" />
327-
</p>
328-
</form>
329-
</div>
330-
331-
<!--/*/
332-
<div class="col-sm-12" th:if="${isSeriesInCollection}" sec:authorize="hasAuthority('UPDATE_COLLECTION')">
333-
<form method="post" action="../collection/info.html" th:action="@{${INFO_SERIES_PAGE}(id=${series.id})}">
334-
<p th:text="#{t_series_in_collection}">
335-
Series is part of your collection
336-
</p>
337-
<p>
338-
<input type="hidden" name="action" value="REMOVE" />
339-
<input type="submit" class="btn btn-danger" value="Remove from collection" th:value="#{t_remove_from_collection}" />
340-
</p>
341-
</form>
342-
</div>
343-
344-
<div class="col-sm-12" sec:authorize="isAnonymous()">
345-
<p th:utext="#{t_need_authentication_to_add_series_to_collection(@{${REGISTRATION_PAGE}}, @{${AUTHENTICATION_PAGE}})}">
346-
In order to add this series to your collection you should <a href="../account/register.html">register</a>
347-
or <a href="../account/auth.html">pass authentication</a>.
348-
</p>
349-
</div>
350-
/*/-->
351-
</div>
352-
353354
</div>
354355

355356
</div>

0 commit comments

Comments
 (0)