issues add link to version-name (or elsewhere) at book-settings to access version-page directly #147

This commit is contained in:
SvyatoslavArtymovych 2023-06-16 10:44:15 +03:00
parent 18e66a8f01
commit 13a77f288f
3 changed files with 23 additions and 11 deletions

View File

@ -1,13 +1,11 @@
<!-- Add contributor modal -->
<!-- prettier-ignore-->
<div id="edit-version-label-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-[150] hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div id="add-version-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-[150] hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div class="relative w-full max-w-2xl max-h-full">
<!-- Modal content -->
<form action="{{ url_for('book.edit_version', book_id=book.id) }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<form action="{{ url_for('book.create_version', book_id=book.id) }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
{{ form_hidden_tag() }}
<!-- Modal header -->
<input type="hidden" name="version_id" id="version_id" value="0" class="version-id-input"/>
<div class="p-6 space-y-6">
<div>
<label for="semver-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Name</label>
@ -17,7 +15,7 @@
<!-- Modal footer -->
<div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
<button name="submit" type="submit" class="prevent-unsaved-changes-event text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Save</button>
<button name="submit" type="submit" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Save</button>
</div>
</form>
</div>

View File

@ -1,11 +1,12 @@
<!-- Add contributor modal -->
<!-- prettier-ignore-->
<div id="add-version-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-[150] hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div id="edit-version-label-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-[150] hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div class="relative w-full max-w-2xl max-h-full">
<!-- Modal content -->
<form action="{{ url_for('book.create_version', book_id=book.id) }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<form action="{{ url_for('book.edit_version', book_id=book.id) }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
{{ form_hidden_tag() }}
<!-- Modal header -->
<input type="hidden" name="version_id" id="version_id" value="0" class="version-id-input"/>
<div class="p-6 space-y-6">
<div>
<label for="semver-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Name</label>
@ -15,7 +16,7 @@
<!-- Modal footer -->
<div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
<button name="submit" type="submit" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Save</button>
<button name="submit" type="submit" class="prevent-unsaved-changes-event text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Save</button>
</div>
</form>
</div>

View File

@ -12,7 +12,7 @@
{% include 'book/modals/delete_contributor_modal.html' %}
{% include 'book/modals/edit_version_label_modal.html' %}
{% include 'book/modals/delete_version_modal.html' %}
{% include 'book/modals/edit_version_label_modal.html' %}
{% include 'book/modals/add_version_modal.html' %}
<!-- Hide right_sidebar -->
<!-- prettier-ignore -->
@ -187,6 +187,9 @@
<th scope="col" class="px-6 py-3">
Created At
</th>
<th scope="col" class="px-6 py-3">
Link
</th>
<th scope="col" class="px-6 py-3"> </th>
<th scope="col" class="px-6 py-3"> </th>
</tr>
@ -195,8 +198,18 @@
{% for version in book.actual_versions if not version.is_active %}
<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700">
<td class="px-6 truncate max-w-[280]">{{ loop.index }}</td>
<td class="px-6 truncate max-w-[280]">{{ version.semver }}</td>
<td class="px-6 truncate max-w-[280]">
{{ version.semver }}
</td>
<td class="px-6"> {{ version.created_at.strftime('%B %d, %Y') }} </td>
<td class="px-6 truncate max-w-[280]">
<a
href="{{url_for('book.collection_view',book_id=book.id,version_index=loop.index)}}"
class="text-blue-500"
>
Read
</a>
</td>
<td class="px-4 py-4">
<button type="button" data-version-id="{{ version.id }}" data-version-semver="{{ version.semver }}" data-modal-target="edit-version-label-modal" data-modal-toggle="edit-version-label-modal" class="edit-version-label-btns text-gray-900 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 font-medium rounded-lg text-sm px-5 py-1 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700">
Edit