migrate to Bootstrap v4 #773
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,33 @@ | ||
| /* overriding icon-button text color with theme color */ | ||
| form.icon button { | ||
| color: inherit; | ||
| } | ||
|
|
||
| /* fixing table layout */ | ||
| .list-buttons-column {width: 0} | ||
| .list-buttons-column .icon:last-child {margin-right: 10px} | ||
|
|
||
| .filters .filter-op {width: var(--filter-op) !important} | ||
| .filters .filter-val {width: calc(var(--filters) - var(--filter-op) - var(--filter-buttons) - var(--filter-type)) !important} | ||
| #filter_form[action^='/tag/'] {--filter-type: var(--filter-type-tags)} | ||
|
|
||
| :root {--filters: 510px; --filter-op: 9rem; --filter-buttons: 12.5rem; --filter-type: 6rem; --filter-type-tags: 9.5rem} | ||
| /* due to how flask-admin filters are set up, each language requires manual adjustments for full-width sizes */ | ||
| html[lang=de] {--filter-buttons: 18rem} | ||
| html[lang=fr] {--filter-buttons: 16rem} | ||
| html[lang=ru] {--filter-buttons: 16.5rem; --filter-type: 8.5rem; --filter-type-tags: 11.5rem} | ||
|
|
||
| @media (max-width: 767px) { | ||
| .filters .filter-val {width: calc(var(--filters) - var(--filter-op) - var(--filter-type)) !important} | ||
| #filter_form .pull-right:first-child {margin: .5ex 0} | ||
| } | ||
| @media (min-width: 768px) { | ||
| :root {--filters: 690px; --filter-op: 11.5rem} | ||
| } | ||
| @media (min-width: 992px) { | ||
| :root {--filters: 930px; --filter-op: 20rem} | ||
| } | ||
| @media (min-width: 1200px) { | ||
| :root {--filters: 1110px; --filter-op: 20rem} | ||
| html[lang=ru] #filter_form[action^='/bookmark/'] {--filter-op: 25rem} /* the last 'buku' filter has a rather long name */ | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| javascript:void%20function(){var%20e=location.href,t=document.title.trim()||%22%22,o=document.getSelection().toString().trim()||(document.querySelector(%22meta[name$=description%20i],%20meta[property$=description%20i]%22)||{}).content||%22%22;o.length%3E4e3%26%26(o=o.substr(0,4e3)+%22...%22,alert(%22The%20selected%20text%20is%20too%20long,%20it%20will%20be%20truncated.%22)),e=%22{{url}}%3Furl=%22+encodeURIComponent(e)+%22%26title=%22+encodeURIComponent(t)+%22%26description=%22+encodeURIComponent(o),window.open(e,%22_blank%22,%22menubar=no,%20height=700,%20width=800,%20toolbar=no,%20scrollbars=yes,%20status=no,%20dialog=1%22)}(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,9 @@ | |
| {% macro limit_navigation_if_popup() %} | ||
| <style> | ||
| .popup .navbar-brand {pointer-events: none} | ||
| .popup #admin-navbar-collapse {display: block} | ||
| .popup :is(.navbar-nav, .navbar-toggler) {display: none} | ||
| .popup .nav-tabs :is(:first-child, :nth-child(2)) > .nav-link:not(.active) {display: none} | ||
|
There was a problem hiding this comment.
|
||
| </style> | ||
| <script>opener && (opener !== window) && document.body.classList.add('popup')</script> | ||
| {% endmacro %} | ||
|
|
@@ -31,17 +32,37 @@ | |
| {% endif %} | ||
| {% endmacro %} | ||
|
|
||
| {% macro fetch_checkbox(checked=True, modal=False) %} | ||
|
There was a problem hiding this comment.
|
||
| <script> | ||
| $('.admin-form [name=fetch]').remove(); | ||
| $('.admin-form fieldset{% if modal %} .modal-footer{% endif %}').{% if modal %}prepend{% else %}append{% endif %}( | ||
| $(`<div class="form-group {{ 'mb-0' if modal else '' }}"{% if modal %} style="flex-grow: 1"{% endif %}>` | ||
| +`<label class="control-label {{ 'mb-0' if modal else '' }}">{{ _('Fetch') }} </label>` | ||
| +`<input type="checkbox" name="fetch"{% if checked %} checked{% endif %}></div>`)); | ||
|
There was a problem hiding this comment. Rearranging it similarly to how checkbox inputs are generated by |
||
| </script> | ||
| {% endmacro %} | ||
|
|
||
| {% macro horizontal_form(excluding_popups=False) %} | ||
| <script> | ||
| $('.admin-form .form-group').each(function () { | ||
| if ($('.submit-row', this).length > 0{% if excluding_popups %} || document.body.matches('.popup'){% endif %}) { | ||
| $('.submit-row', this).addClass(document.body.matches('.popup') ? 'col-md-12' : 'offset-md-2'); | ||
|
There was a problem hiding this comment. Within popups, the buttons row is made full-width instead ( |
||
| } else if ($('input[type=checkbox], input[type=radio]', this).length > 0) { | ||
| $('label', this).addClass('form-row').css({cursor: 'pointer'}).html(`<span>${ $('label', this).html() }</span>`); | ||
| $('label span', this).addClass('col-md-2 col-form-label text-right d-inline-block'); | ||
| $('input', this).appendTo($('label', this)); | ||
|
There was a problem hiding this comment. Checkboxes/radiobuttons need custom rearrangement |
||
| } else { | ||
| $(this).addClass('form-row'); | ||
| $('input, textarea, select', this).addClass('col-md-10'); | ||
| $('label', this).addClass('col-md-2 col-form-label text-right'); | ||
| } | ||
| }); | ||
| </script> | ||
| {% endmacro %} | ||
|
|
||
| {% macro details_formatting(prefix='') %} | ||
| <script> | ||
| $(`.modal-header h3`).wrapInner('<h5 class="modal-title">').children(0).unwrap(); // flask-admin #2505 | ||
|
There was a problem hiding this comment. This can be removed once the related bug is fixed in upstream (…and ends up in the released version, of course) |
||
| $(`body.popup {{prefix}} a`).attr('target', '_blank'); | ||
| </script> | ||
| {% endmacro %} | ||
|
|
@@ -94,20 +115,18 @@ | |
| $(document).ready(function() { | ||
| const SIZES = [20, 50, 100]; // hardcoded list; see page_size_form() in admin/model/layout.html | ||
| let pageSize = url => new URL(url || location.host).searchParams.get('page_size'); | ||
| $(`.nav.nav-tabs .dropdown-menu`).each(function () { | ||
| let _sizes = $(`a.dropdown-item`, this).map(function () {return pageSize(this.href)}).get(); | ||
| if (SIZES.every((x, i) => x == _sizes[i])) | ||
| $('a', this).last().clone().text({{ _('custom')|tojson }}).attr('href', `#`).on('click', () => { | ||
| let page = prompt({{ _('Set custom page size (empty for default)')|tojson }}, pageSize(location) || ''); | ||
| if (Number(page) || (page == "")) { | ||
| let search = new URL(location).searchParams; | ||
| (page ? search.set('page_size', page) : search.delete('page_size')); | ||
| location.search = search; | ||
| } else if (page != null) | ||
| alert({{ _('Invalid page size')|tojson }} + `: "${page}"`); | ||
| return false; | ||
| }).appendTo(this); | ||
| }) | ||
| }); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fixes the Delete button in bookmarks/tags lists not matching theme color