From 390469e6cceb4a78c3bd26a095e76fdd17aab1f7 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sat, 28 Mar 2020 19:44:28 +0100 Subject: [PATCH] Bootstrap 4 and Font Awesome upgrade - creds: @slinkymanbyday Co-authored-by: Sean Meyer --- Makefile | 4 +- src/wiki/forms.py | 4 +- .../wiki/plugins/attachments/index.html | 40 +- .../plugins/globalhistory/globalhistory.html | 2 +- .../plugins/globalhistory/menubaritem.html | 8 +- .../templates/wiki/plugins/images/purge.html | 2 +- .../templates/wiki/plugins/images/render.html | 2 +- .../wiki/plugins/images/revision_add.html | 2 +- .../wiki/plugins/images/sidebar.html | 24 +- src/wiki/plugins/images/wiki_plugin.py | 2 +- .../templates/wiki/plugins/links/sidebar.html | 50 +- .../plugins/notifications/menubaritem.html | 16 +- src/wiki/static/wiki/bootstrap/LICENSE | 198 +- .../wiki/bootstrap/css/wiki-bootstrap.css | 22300 +++++++++++----- .../wiki/bootstrap/css/wiki-bootstrap.css.map | 1 + .../wiki/bootstrap/css/wiki-bootstrap.min.css | 21 +- .../bootstrap/css/wiki-bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../wiki/bootstrap/js/bootstrap.bundle.min.js | 7 + .../static/wiki/bootstrap/js/bootstrap.js | 2377 -- .../static/wiki/bootstrap/js/bootstrap.min.js | 12 +- .../static/wiki/bootstrap/less/alerts.less | 73 - .../static/wiki/bootstrap/less/badges.less | 66 - .../static/wiki/bootstrap/less/bootstrap.less | 56 - .../wiki/bootstrap/less/breadcrumbs.less | 26 - .../wiki/bootstrap/less/button-groups.less | 244 - .../static/wiki/bootstrap/less/buttons.less | 166 - .../static/wiki/bootstrap/less/carousel.less | 270 - .../static/wiki/bootstrap/less/close.less | 34 - src/wiki/static/wiki/bootstrap/less/code.less | 69 - .../bootstrap/less/component-animations.less | 33 - .../static/wiki/bootstrap/less/dropdowns.less | 216 - .../static/wiki/bootstrap/less/forms.less | 613 - .../wiki/bootstrap/less/glyphicons.less | 305 - src/wiki/static/wiki/bootstrap/less/grid.less | 84 - .../wiki/bootstrap/less/input-groups.less | 171 - .../static/wiki/bootstrap/less/jumbotron.less | 54 - .../static/wiki/bootstrap/less/labels.less | 64 - .../wiki/bootstrap/less/list-group.less | 130 - .../static/wiki/bootstrap/less/media.less | 66 - .../static/wiki/bootstrap/less/mixins.less | 40 - .../wiki/bootstrap/less/mixins/alerts.less | 14 - .../less/mixins/background-variant.less | 9 - .../bootstrap/less/mixins/border-radius.less | 18 - .../wiki/bootstrap/less/mixins/buttons.less | 65 - .../bootstrap/less/mixins/center-block.less | 7 - .../wiki/bootstrap/less/mixins/clearfix.less | 22 - .../wiki/bootstrap/less/mixins/forms.less | 85 - .../wiki/bootstrap/less/mixins/gradients.less | 59 - .../bootstrap/less/mixins/grid-framework.less | 91 - .../wiki/bootstrap/less/mixins/grid.less | 122 - .../wiki/bootstrap/less/mixins/hide-text.less | 21 - .../wiki/bootstrap/less/mixins/image.less | 33 - .../wiki/bootstrap/less/mixins/labels.less | 12 - .../bootstrap/less/mixins/list-group.less | 30 - .../bootstrap/less/mixins/nav-divider.less | 10 - .../less/mixins/nav-vertical-align.less | 9 - .../wiki/bootstrap/less/mixins/opacity.less | 8 - .../bootstrap/less/mixins/pagination.less | 24 - .../wiki/bootstrap/less/mixins/panels.less | 24 - .../bootstrap/less/mixins/progress-bar.less | 10 - .../bootstrap/less/mixins/reset-filter.less | 8 - .../less/mixins/responsive-visibility.less | 15 - .../wiki/bootstrap/less/mixins/size.less | 10 - .../wiki/bootstrap/less/mixins/tab-focus.less | 9 - .../wiki/bootstrap/less/mixins/table-row.less | 28 - .../bootstrap/less/mixins/text-emphasis.less | 9 - .../less/mixins/vendor-prefixes.less | 227 - .../static/wiki/bootstrap/less/modals.less | 150 - .../static/wiki/bootstrap/less/navbar.less | 660 - src/wiki/static/wiki/bootstrap/less/navs.less | 242 - .../static/wiki/bootstrap/less/normalize.less | 424 - .../static/wiki/bootstrap/less/pager.less | 54 - .../wiki/bootstrap/less/pagination.less | 89 - .../static/wiki/bootstrap/less/panels.less | 271 - .../static/wiki/bootstrap/less/popovers.less | 131 - .../static/wiki/bootstrap/less/print.less | 101 - .../wiki/bootstrap/less/progress-bars.less | 87 - .../wiki/bootstrap/less/responsive-embed.less | 35 - .../bootstrap/less/responsive-utilities.less | 194 - .../wiki/bootstrap/less/scaffolding.less | 161 - .../static/wiki/bootstrap/less/tables.less | 234 - .../static/wiki/bootstrap/less/theme.less | 291 - .../wiki/bootstrap/less/thumbnails.less | 36 - .../static/wiki/bootstrap/less/tooltip.less | 101 - src/wiki/static/wiki/bootstrap/less/type.less | 302 - .../static/wiki/bootstrap/less/utilities.less | 55 - .../static/wiki/bootstrap/less/variables.less | 869 - .../static/wiki/bootstrap/less/wells.less | 29 - .../static/wiki/bootstrap/scss/_alert.scss | 51 + .../static/wiki/bootstrap/scss/_badge.scss | 54 + .../wiki/bootstrap/scss/_breadcrumb.scss | 42 + .../wiki/bootstrap/scss/_button-group.scss | 163 + .../static/wiki/bootstrap/scss/_buttons.scss | 139 + .../static/wiki/bootstrap/scss/_card.scss | 278 + .../static/wiki/bootstrap/scss/_carousel.scss | 197 + .../static/wiki/bootstrap/scss/_close.scss | 41 + .../static/wiki/bootstrap/scss/_code.scss | 48 + .../wiki/bootstrap/scss/_custom-forms.scss | 521 + .../static/wiki/bootstrap/scss/_dropdown.scss | 191 + .../static/wiki/bootstrap/scss/_forms.scss | 338 + .../wiki/bootstrap/scss/_functions.scss | 134 + .../static/wiki/bootstrap/scss/_grid.scss | 69 + .../static/wiki/bootstrap/scss/_images.scss | 42 + .../wiki/bootstrap/scss/_input-group.scss | 191 + .../wiki/bootstrap/scss/_jumbotron.scss | 17 + .../wiki/bootstrap/scss/_list-group.scss | 158 + .../static/wiki/bootstrap/scss/_media.scss | 8 + .../static/wiki/bootstrap/scss/_mixins.scss | 47 + .../static/wiki/bootstrap/scss/_modal.scss | 239 + src/wiki/static/wiki/bootstrap/scss/_nav.scss | 120 + .../static/wiki/bootstrap/scss/_navbar.scss | 324 + .../wiki/bootstrap/scss/_pagination.scss | 73 + .../static/wiki/bootstrap/scss/_popover.scss | 170 + .../static/wiki/bootstrap/scss/_print.scss | 141 + .../static/wiki/bootstrap/scss/_progress.scss | 46 + .../static/wiki/bootstrap/scss/_reboot.scss | 482 + .../static/wiki/bootstrap/scss/_root.scss | 20 + .../static/wiki/bootstrap/scss/_spinners.scss | 55 + .../static/wiki/bootstrap/scss/_tables.scss | 185 + .../static/wiki/bootstrap/scss/_toasts.scss | 44 + .../static/wiki/bootstrap/scss/_tooltip.scss | 115 + .../wiki/bootstrap/scss/_transitions.scss | 20 + .../static/wiki/bootstrap/scss/_type.scss | 125 + .../wiki/bootstrap/scss/_utilities.scss | 17 + .../wiki/bootstrap/scss/_variables.scss | 1143 + .../wiki/bootstrap/scss/bootstrap-grid.scss | 29 + .../wiki/bootstrap/scss/bootstrap-reboot.scss | 12 + .../static/wiki/bootstrap/scss/bootstrap.scss | 44 + .../wiki/bootstrap/scss/mixins/_alert.scss | 13 + .../scss/mixins/_background-variant.scss | 22 + .../wiki/bootstrap/scss/mixins/_badge.scss | 17 + .../bootstrap/scss/mixins/_border-radius.scss | 63 + .../bootstrap/scss/mixins/_box-shadow.scss | 20 + .../bootstrap/scss/mixins/_breakpoints.scss | 123 + .../wiki/bootstrap/scss/mixins/_buttons.scss | 110 + .../wiki/bootstrap/scss/mixins/_caret.scss | 62 + .../wiki/bootstrap/scss/mixins/_clearfix.scss | 7 + .../bootstrap/scss/mixins/_deprecate.scss | 10 + .../wiki/bootstrap/scss/mixins/_float.scss | 14 + .../wiki/bootstrap/scss/mixins/_forms.scss | 177 + .../bootstrap/scss/mixins/_gradients.scss | 45 + .../scss/mixins/_grid-framework.scss | 71 + .../wiki/bootstrap/scss/mixins/_grid.scss | 69 + .../wiki/bootstrap/scss/mixins/_hover.scss | 37 + .../wiki/bootstrap/scss/mixins/_image.scss | 36 + .../bootstrap/scss/mixins/_list-group.scss | 21 + .../wiki/bootstrap/scss/mixins/_lists.scss | 7 + .../bootstrap/scss/mixins/_nav-divider.scss | 11 + .../bootstrap/scss/mixins/_pagination.scss | 22 + .../mixins/_reset-text.scss} | 17 +- .../resize.less => scss/mixins/_resize.scss} | 4 +- .../bootstrap/scss/mixins/_screen-reader.scss | 34 + .../wiki/bootstrap/scss/mixins/_size.scss | 7 + .../bootstrap/scss/mixins/_table-row.scss | 39 + .../bootstrap/scss/mixins/_text-emphasis.scss | 17 + .../bootstrap/scss/mixins/_text-hide.scss | 11 + .../mixins/_text-truncate.scss} | 4 +- .../bootstrap/scss/mixins/_transition.scss | 16 + .../bootstrap/scss/mixins/_visibility.scss | 8 + .../wiki/bootstrap/scss/utilities/_align.scss | 8 + .../bootstrap/scss/utilities/_background.scss | 19 + .../bootstrap/scss/utilities/_borders.scss | 75 + .../bootstrap/scss/utilities/_clearfix.scss | 3 + .../bootstrap/scss/utilities/_display.scss | 26 + .../wiki/bootstrap/scss/utilities/_embed.scss | 39 + .../wiki/bootstrap/scss/utilities/_flex.scss | 51 + .../wiki/bootstrap/scss/utilities/_float.scss | 11 + .../bootstrap/scss/utilities/_overflow.scss | 5 + .../bootstrap/scss/utilities/_position.scss | 32 + .../scss/utilities/_screenreaders.scss | 11 + .../bootstrap/scss/utilities/_shadows.scss | 6 + .../bootstrap/scss/utilities/_sizing.scss | 20 + .../bootstrap/scss/utilities/_spacing.scss | 73 + .../scss/utilities/_stretched-link.scss | 19 + .../wiki/bootstrap/scss/utilities/_text.scss | 72 + .../bootstrap/scss/utilities/_visibility.scss | 13 + .../wiki/bootstrap/scss/vendor/_rfs.scss | 204 + .../wiki/_codehilite.scss} | 0 .../wiki/_typeahead.scss} | 0 .../wiki/wiki-bootstrap.scss} | 4 +- .../wiki/wiki.less => scss/wiki/wiki.scss} | 98 +- src/wiki/static/wiki/font-awesome/LICENSE.txt | 34 + .../wiki/font-awesome/font/FontAwesome.otf | Bin 85908 -> 0 bytes .../font-awesome/font/fontawesome-webfont.eot | Bin 56006 -> 0 bytes .../font-awesome/font/fontawesome-webfont.svg | 520 - .../font-awesome/font/fontawesome-webfont.ttf | Bin 112160 -> 0 bytes .../font/fontawesome-webfont.woff | Bin 65452 -> 0 bytes .../font-awesome/less/bordered-pulled.less | 16 - .../static/wiki/font-awesome/less/core.less | 11 - .../wiki/font-awesome/less/font-awesome.less | 17 - .../static/wiki/font-awesome/less/icons.less | 552 - .../static/wiki/font-awesome/less/larger.less | 13 - .../static/wiki/font-awesome/less/list.less | 19 - .../static/wiki/font-awesome/less/mixins.less | 25 - .../static/wiki/font-awesome/less/path.less | 14 - .../font-awesome/less/rotated-flipped.less | 20 - .../wiki/font-awesome/less/spinning.less | 29 - .../wiki/font-awesome/less/stacked.less | 20 - .../wiki/font-awesome/less/variables.less | 560 - .../wiki/font-awesome/scss/_animated.scss | 20 + .../font-awesome/scss/_bordered-pulled.scss | 20 + .../static/wiki/font-awesome/scss/_core.scss | 21 + .../_fixed-width.scss} | 4 +- .../static/wiki/font-awesome/scss/_icons.scss | 1410 + .../wiki/font-awesome/scss/_larger.scss | 23 + .../static/wiki/font-awesome/scss/_list.scss | 18 + .../wiki/font-awesome/scss/_mixins.scss | 56 + .../font-awesome/scss/_rotated-flipped.scss | 24 + .../font-awesome/scss/_screen-reader.scss | 5 + .../static/wiki/font-awesome/scss/_shims.scss | 2065 ++ .../wiki/font-awesome/scss/_stacked.scss | 31 + .../wiki/font-awesome/scss/_variables.scss | 1427 + .../static/wiki/font-awesome/scss/brands.scss | 23 + .../wiki/font-awesome/scss/fontawesome.scss | 16 + .../wiki/font-awesome/scss/regular.scss | 23 + .../static/wiki/font-awesome/scss/solid.scss | 24 + .../wiki/font-awesome/scss/v4-shims.scss | 6 + .../font-awesome/webfonts/fa-brands-400.eot | Bin 0 -> 133034 bytes .../font-awesome/webfonts/fa-brands-400.svg | 3570 +++ .../font-awesome/webfonts/fa-brands-400.ttf | Bin 0 -> 132728 bytes .../font-awesome/webfonts/fa-brands-400.woff | Bin 0 -> 89824 bytes .../font-awesome/webfonts/fa-brands-400.woff2 | Bin 0 -> 76548 bytes .../font-awesome/webfonts/fa-regular-400.eot | Bin 0 -> 34390 bytes .../font-awesome/webfonts/fa-regular-400.svg | 803 + .../font-awesome/webfonts/fa-regular-400.ttf | Bin 0 -> 34092 bytes .../font-awesome/webfonts/fa-regular-400.woff | Bin 0 -> 16800 bytes .../webfonts/fa-regular-400.woff2 | Bin 0 -> 13600 bytes .../font-awesome/webfonts/fa-solid-900.eot | Bin 0 -> 194078 bytes .../font-awesome/webfonts/fa-solid-900.svg | 4700 ++++ .../font-awesome/webfonts/fa-solid-900.ttf | Bin 0 -> 193792 bytes .../font-awesome/webfonts/fa-solid-900.woff | Bin 0 -> 99004 bytes .../font-awesome/webfonts/fa-solid-900.woff2 | Bin 0 -> 76120 bytes src/wiki/static/wiki/js/article.js | 3 +- src/wiki/static/wiki/js/diff.js | 4 +- src/wiki/static/wiki/js/jquery-3.3.1.min.js | 2 - src/wiki/static/wiki/js/jquery-3.4.1.min.js | 2 + .../js/jquery-ui-1.12.1.custom/LICENSE.txt | 43 - .../jquery-ui-1.12.1.custom/jquery-ui.min.css | 6 - .../jquery-ui-1.12.1.custom/jquery-ui.min.js | 7 - src/wiki/static/wiki/js/popper.js | 6 + src/wiki/static/wiki/js/typeahead.min.js | 7 - .../static/wiki/select2/css/select2.min.css | 1 + .../static/wiki/select2/js/select2.min.js | 2 + src/wiki/templates/wiki/article.html | 10 +- src/wiki/templates/wiki/base_site.html | 147 +- src/wiki/templates/wiki/dir.html | 53 +- src/wiki/templates/wiki/edit.html | 2 +- src/wiki/templates/wiki/forms/text.html | 2 +- src/wiki/templates/wiki/history.html | 16 +- .../templates/wiki/includes/article_menu.html | 60 +- .../templates/wiki/includes/breadcrumbs.html | 57 +- .../wiki/includes/editor_sidebar.html | 15 +- .../templates/wiki/includes/formfield.html | 4 +- src/wiki/templates/wiki/includes/modals.html | 31 +- src/wiki/templates/wiki/search.html | 2 +- src/wiki/templates/wiki/source.html | 3 +- testproject/testproject/db/prepopulated.db | Bin 377856 -> 413696 bytes tests/plugins/images/test_views.py | 2 +- 263 files changed, 37626 insertions(+), 20672 deletions(-) create mode 100644 src/wiki/static/wiki/bootstrap/css/wiki-bootstrap.css.map create mode 100644 src/wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css.map delete mode 100644 src/wiki/static/wiki/bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 100644 src/wiki/static/wiki/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 src/wiki/static/wiki/bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 100644 src/wiki/static/wiki/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 src/wiki/static/wiki/bootstrap/fonts/glyphicons-halflings-regular.woff2 create mode 100644 src/wiki/static/wiki/bootstrap/js/bootstrap.bundle.min.js delete mode 100644 src/wiki/static/wiki/bootstrap/js/bootstrap.js delete mode 100644 src/wiki/static/wiki/bootstrap/less/alerts.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/badges.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/bootstrap.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/breadcrumbs.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/button-groups.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/buttons.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/carousel.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/close.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/code.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/component-animations.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/dropdowns.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/forms.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/glyphicons.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/grid.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/input-groups.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/jumbotron.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/labels.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/list-group.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/media.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/alerts.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/background-variant.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/border-radius.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/buttons.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/center-block.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/clearfix.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/forms.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/gradients.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/grid-framework.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/grid.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/hide-text.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/image.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/labels.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/list-group.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/nav-divider.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/nav-vertical-align.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/opacity.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/pagination.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/panels.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/progress-bar.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/reset-filter.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/responsive-visibility.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/size.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/tab-focus.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/table-row.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/text-emphasis.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/mixins/vendor-prefixes.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/modals.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/navbar.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/navs.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/normalize.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/pager.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/pagination.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/panels.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/popovers.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/print.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/progress-bars.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/responsive-embed.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/responsive-utilities.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/scaffolding.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/tables.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/theme.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/thumbnails.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/tooltip.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/type.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/utilities.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/variables.less delete mode 100644 src/wiki/static/wiki/bootstrap/less/wells.less create mode 100644 src/wiki/static/wiki/bootstrap/scss/_alert.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_badge.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_breadcrumb.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_button-group.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_buttons.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_card.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_carousel.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_close.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_code.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_custom-forms.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_dropdown.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_forms.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_functions.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_grid.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_images.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_input-group.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_jumbotron.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_list-group.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_media.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_mixins.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_modal.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_nav.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_navbar.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_pagination.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_popover.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_print.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_progress.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_reboot.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_root.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_spinners.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_tables.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_toasts.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_tooltip.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_transitions.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_type.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_utilities.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/_variables.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/bootstrap-grid.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/bootstrap-reboot.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/bootstrap.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_alert.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_background-variant.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_badge.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_border-radius.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_box-shadow.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_breakpoints.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_buttons.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_caret.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_clearfix.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_deprecate.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_float.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_forms.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_gradients.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_grid-framework.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_grid.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_hover.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_image.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_list-group.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_lists.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_nav-divider.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_pagination.scss rename src/wiki/static/wiki/bootstrap/{less/mixins/reset-text.less => scss/mixins/_reset-text.scss} (61%) rename src/wiki/static/wiki/bootstrap/{less/mixins/resize.less => scss/mixins/_resize.scss} (54%) create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_screen-reader.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_size.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_table-row.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_text-emphasis.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_text-hide.scss rename src/wiki/static/wiki/bootstrap/{less/mixins/text-overflow.less => scss/mixins/_text-truncate.scss} (75%) create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_transition.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/mixins/_visibility.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_align.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_background.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_borders.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_clearfix.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_display.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_embed.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_flex.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_float.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_overflow.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_position.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_screenreaders.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_shadows.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_sizing.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_spacing.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_stretched-link.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_text.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/utilities/_visibility.scss create mode 100644 src/wiki/static/wiki/bootstrap/scss/vendor/_rfs.scss rename src/wiki/static/wiki/bootstrap/{less/wiki/codehilite.less => scss/wiki/_codehilite.scss} (100%) rename src/wiki/static/wiki/bootstrap/{less/wiki/typeahead.less => scss/wiki/_typeahead.scss} (100%) rename src/wiki/static/wiki/bootstrap/{less/wiki/wiki-bootstrap.less => scss/wiki/wiki-bootstrap.scss} (80%) rename src/wiki/static/wiki/bootstrap/{less/wiki/wiki.less => scss/wiki/wiki.scss} (81%) create mode 100644 src/wiki/static/wiki/font-awesome/LICENSE.txt delete mode 100644 src/wiki/static/wiki/font-awesome/font/FontAwesome.otf delete mode 100644 src/wiki/static/wiki/font-awesome/font/fontawesome-webfont.eot delete mode 100644 src/wiki/static/wiki/font-awesome/font/fontawesome-webfont.svg delete mode 100644 src/wiki/static/wiki/font-awesome/font/fontawesome-webfont.ttf delete mode 100644 src/wiki/static/wiki/font-awesome/font/fontawesome-webfont.woff delete mode 100644 src/wiki/static/wiki/font-awesome/less/bordered-pulled.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/core.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/font-awesome.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/icons.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/larger.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/list.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/mixins.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/path.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/rotated-flipped.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/spinning.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/stacked.less delete mode 100644 src/wiki/static/wiki/font-awesome/less/variables.less create mode 100644 src/wiki/static/wiki/font-awesome/scss/_animated.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_bordered-pulled.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_core.scss rename src/wiki/static/wiki/font-awesome/{less/fixed-width.less => scss/_fixed-width.scss} (61%) create mode 100644 src/wiki/static/wiki/font-awesome/scss/_icons.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_larger.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_list.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_mixins.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_rotated-flipped.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_screen-reader.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_shims.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_stacked.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/_variables.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/brands.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/fontawesome.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/regular.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/solid.scss create mode 100644 src/wiki/static/wiki/font-awesome/scss/v4-shims.scss create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-brands-400.eot create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-brands-400.svg create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-brands-400.ttf create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-brands-400.woff create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-brands-400.woff2 create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-regular-400.eot create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-regular-400.svg create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-regular-400.ttf create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-regular-400.woff create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-regular-400.woff2 create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-solid-900.eot create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-solid-900.svg create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-solid-900.ttf create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-solid-900.woff create mode 100644 src/wiki/static/wiki/font-awesome/webfonts/fa-solid-900.woff2 delete mode 100644 src/wiki/static/wiki/js/jquery-3.3.1.min.js create mode 100644 src/wiki/static/wiki/js/jquery-3.4.1.min.js delete mode 100644 src/wiki/static/wiki/js/jquery-ui-1.12.1.custom/LICENSE.txt delete mode 100644 src/wiki/static/wiki/js/jquery-ui-1.12.1.custom/jquery-ui.min.css delete mode 100644 src/wiki/static/wiki/js/jquery-ui-1.12.1.custom/jquery-ui.min.js create mode 100644 src/wiki/static/wiki/js/popper.js delete mode 100644 src/wiki/static/wiki/js/typeahead.min.js create mode 100644 src/wiki/static/wiki/select2/css/select2.min.css create mode 100644 src/wiki/static/wiki/select2/js/select2.min.js diff --git a/Makefile b/Makefile index 408f5558..3b13b136 100644 --- a/Makefile +++ b/Makefile @@ -96,8 +96,8 @@ release: dist ## Generate and upload release to PyPi twine upload -s dist/* assets: ## Build CSS files - lessc src/wiki/static/wiki/bootstrap/less/wiki/wiki-bootstrap.less src/wiki/static/wiki/bootstrap/css/wiki-bootstrap.css - lessc -x src/wiki/static/wiki/bootstrap/less/wiki/wiki-bootstrap.less src/wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css + sass src/wiki/static/wiki/bootstrap/scss/wiki/wiki-bootstrap.scss src/wiki/static/wiki/bootstrap/css/wiki-bootstrap.css + sass --style compressed src/wiki/static/wiki/bootstrap/scss/wiki/wiki-bootstrap.scss src/wiki/static/wiki/bootstrap/css/wiki-bootstrap.min.css dist: clean assets ## Generate wheels distribution python setup.py bdist_wheel diff --git a/src/wiki/forms.py b/src/wiki/forms.py index 738362d8..330a33bf 100644 --- a/src/wiki/forms.py +++ b/src/wiki/forms.py @@ -331,7 +331,7 @@ class SelectWidgetBootstrap(forms.Select): option_template_name = "wiki/forms/select_option.html" def __init__(self, attrs={}, choices=(), disabled=False): - attrs["class"] = "btn-group pull-left btn-group-form" + attrs["class"] = "btn-group float-left btn-group-form" self.disabled = disabled self.noscript_widget = forms.Select(attrs={}, choices=choices) super().__init__(attrs, choices) @@ -607,7 +607,7 @@ class DirFilterForm(forms.Form): query = forms.CharField( widget=forms.TextInput( - attrs={"placeholder": _("Filter..."), "class": "search-query form-control"} + attrs={"placeholder": _("Filter..."), "class": "search-query"} ), required=False, ) diff --git a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html index c45341b7..fa273a45 100644 --- a/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html +++ b/src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html @@ -47,7 +47,7 @@ {% endif %}

- + {% trans "File history" %} ({{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %})

@@ -69,16 +69,15 @@
{% if article|can_write:user and not article|is_locked %} -
-
-
- -

{% trans "Upload new file" %}

+
+ -
-
+
+
{% if anonymous_disallowed %} {% include "wiki/includes/anonymous_blocked.html" %} {% else %} @@ -93,15 +92,15 @@
-
-
- -

{% trans "Search and add file" %}

+
+ -
-
+
+

{% trans "You can reuse files from other articles. These files are subject to updates on other articles which may or may not be a good thing." %}

@@ -118,14 +117,14 @@
{% if article|can_write:user %} -
-
- -

{% trans "Restore attachments" %}

+
+ -
-
+
+
{% for attachment in deleted_attachments %}

@@ -151,7 +150,6 @@ {% endif %} -

{% else %} {% if article|is_locked %} diff --git a/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html b/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html index 7015034b..a654f8d6 100644 --- a/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html +++ b/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html @@ -18,7 +18,7 @@ {% endblocktrans %} {% endwith %}
-
+
diff --git a/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/menubaritem.html b/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/menubaritem.html index 676cd8d4..7aef4690 100644 --- a/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/menubaritem.html +++ b/src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/menubaritem.html @@ -1,9 +1,7 @@ {% load i18n sekizai_tags %} -
  • -
  • - - + + + {% trans "Global history" %} -
  • diff --git a/src/wiki/plugins/images/templates/wiki/plugins/images/purge.html b/src/wiki/plugins/images/templates/wiki/plugins/images/purge.html index 28b8b476..9b56c324 100644 --- a/src/wiki/plugins/images/templates/wiki/plugins/images/purge.html +++ b/src/wiki/plugins/images/templates/wiki/plugins/images/purge.html @@ -6,7 +6,7 @@ {% block wiki_contents_tab %} {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %} -

    +

    {{ revision.get_filename }}

    {% endthumbnail %} diff --git a/src/wiki/plugins/images/templates/wiki/plugins/images/render.html b/src/wiki/plugins/images/templates/wiki/plugins/images/render.html index d4470d98..ecc0d657 100644 --- a/src/wiki/plugins/images/templates/wiki/plugins/images/render.html +++ b/src/wiki/plugins/images/templates/wiki/plugins/images/render.html @@ -3,7 +3,7 @@ NB! Watch out for line breaks, markdown might add
    s and

    s. {% endcomment %}{% with image.current_revision.imagerevision as revision %}{% spaceless %} -

    +
    {% if size %} {% thumbnail revision.image size upscale=False as thumb %} diff --git a/src/wiki/plugins/images/templates/wiki/plugins/images/revision_add.html b/src/wiki/plugins/images/templates/wiki/plugins/images/revision_add.html index 87ca7a08..1e0b1c55 100644 --- a/src/wiki/plugins/images/templates/wiki/plugins/images/revision_add.html +++ b/src/wiki/plugins/images/templates/wiki/plugins/images/revision_add.html @@ -6,7 +6,7 @@ {% block wiki_contents_tab %} {% thumbnail image.current_revision.imagerevision.image "250x250" as thumb %} -

    +

    {{ revision.get_filename }}

    {% endthumbnail %} diff --git a/src/wiki/plugins/images/templates/wiki/plugins/images/sidebar.html b/src/wiki/plugins/images/templates/wiki/plugins/images/sidebar.html index cd711f22..69b87c83 100644 --- a/src/wiki/plugins/images/templates/wiki/plugins/images/sidebar.html +++ b/src/wiki/plugins/images/templates/wiki/plugins/images/sidebar.html @@ -41,26 +41,24 @@ function add_image(form) { #image-list tr:first-child td {border:0;}
    - +
    {% for image in images %} {% with image.current_revision.imagerevision as revision %} {% thumbnail revision.image "50x50" crop="center" as thumb %} -
    - - - + + {% endthumbnail %} {% endwith %} {% empty %} @@ -68,7 +66,7 @@ function add_image(form) { {% endfor %} -
    -

    {% trans "Image id" %}: {{ image.id }}

    -

    +

    {% trans "Image id" %}: {{ image.id }}

    +
    +
    +
    + {{ revision.get_filename }} +
    +

    {% trans "Insert" %}
    {% if image|can_write:user %} {% trans "Replace" %} {% endif %}

    -
    -
    - {{ revision.get_filename }} -
    -
    {% trans "No images found for this article" %}
    +

    diff --git a/src/wiki/plugins/images/wiki_plugin.py b/src/wiki/plugins/images/wiki_plugin.py index d8d50d25..cdd57a8f 100644 --- a/src/wiki/plugins/images/wiki_plugin.py +++ b/src/wiki/plugins/images/wiki_plugin.py @@ -13,7 +13,7 @@ class ImagePlugin(BasePlugin): slug = settings.SLUG sidebar = { "headline": _("Images"), - "icon_class": "fa-picture-o", + "icon_class": "fa-image", "template": "wiki/plugins/images/sidebar.html", "form_class": forms.SidebarForm, "get_form_kwargs": (lambda a: {"instance": models.Image(article=a)}), diff --git a/src/wiki/plugins/links/templates/wiki/plugins/links/sidebar.html b/src/wiki/plugins/links/templates/wiki/plugins/links/sidebar.html index 45096edd..e3438105 100644 --- a/src/wiki/plugins/links/templates/wiki/plugins/links/sidebar.html +++ b/src/wiki/plugins/links/templates/wiki/plugins/links/sidebar.html @@ -7,14 +7,12 @@

    [Title of link](wiki:ArticleSlug)
    -
    - - - - + + +
    + +

    @@ -26,19 +24,35 @@

    [Clickable text](http://example.com)
    -{% addtoblock "js" %}{% endaddtoblock %} +{% addtoblock "js" %}{% endaddtoblock %} {% addtoblock "js" %} - {% endaddtoblock %} +{% addtoblock "css" %} + +{% endaddtoblock %} diff --git a/src/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html b/src/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html index 6f1b6000..fe82745a 100644 --- a/src/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html +++ b/src/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html @@ -1,20 +1,16 @@ {% load i18n sekizai_tags static %} -
  • -
  • {% trans "No notifications" %}
  • -
  • -
  • - - + + {% trans "No notifications" %} + + + {% trans "Clear notifications list" %} -
  • -
  • - + {% trans "Notification settings" %} -
  • {% addtoblock "js" %} + - - + + + {% render_block "js" %} diff --git a/src/wiki/templates/wiki/dir.html b/src/wiki/templates/wiki/dir.html index 86b04c85..d777b6fe 100644 --- a/src/wiki/templates/wiki/dir.html +++ b/src/wiki/templates/wiki/dir.html @@ -8,40 +8,43 @@ {% url 'wiki:dir' urlpath.path as self_url %} - -
    -
    - {% if urlpath.parent %} - - - {% trans "Up one level" %} - +
    +
    + +
    + {% if urlpath.parent %} + + + {% trans "Up one level" %} + + {% endif %} + + + {% trans "Add article" %} + +
    +
    + {{ filter_form.query }} +
    + + {% if filter_query %} + {% endif %} - - - {% trans "Add article" %} - -
    -
    - {{ filter_form.query }} -
    - {% if filter_query %} - - {% endif %} -
    +
    + +
    - -

    +

    {% with paginator.object_list.count as cnt %} {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb trimmed %} Browsing /{{ path }}. There {{ articles_plur_verb }} {{ cnt }} {{ articles_plur }} in this level. {% endblocktrans %} {% endwith %} -

    +
    diff --git a/src/wiki/templates/wiki/edit.html b/src/wiki/templates/wiki/edit.html index 545a1970..7ad69cb4 100644 --- a/src/wiki/templates/wiki/edit.html +++ b/src/wiki/templates/wiki/edit.html @@ -36,7 +36,7 @@ {% trans "Save changes" %} -
    +
    {% if user.is_authenticated and urlpath.path %} diff --git a/src/wiki/templates/wiki/forms/text.html b/src/wiki/templates/wiki/forms/text.html index 23246aa8..ccb023fb 100644 --- a/src/wiki/templates/wiki/forms/text.html +++ b/src/wiki/templates/wiki/forms/text.html @@ -1 +1 @@ -
    {{ prepend }}{% include "django/forms/widgets/input.html" %}
    +
    {{ prepend }}
    {% include "django/forms/widgets/input.html" %}
    diff --git a/src/wiki/templates/wiki/history.html b/src/wiki/templates/wiki/history.html index f1c34e31..d558e476 100644 --- a/src/wiki/templates/wiki/history.html +++ b/src/wiki/templates/wiki/history.html @@ -52,10 +52,10 @@
    {% for revision in revisions %} -
    -
    -
    - +
    +
    +
    + {% if revision == article.current_revision %} {% else %} @@ -77,7 +77,7 @@ - -
    -
    +
    +
    {% trans "Auto log:" %}
    {{ revision.automatic_log|default:"-"|linebreaksbr }}
    @@ -123,7 +123,7 @@ {% if revisions.count > 1 and article|can_write:user and not article.current_revision.locked %}
    -
    +
    +
    -
    - {% endif %} diff --git a/src/wiki/templates/wiki/includes/editor_sidebar.html b/src/wiki/templates/wiki/includes/editor_sidebar.html index 480dc239..36c06784 100644 --- a/src/wiki/templates/wiki/includes/editor_sidebar.html +++ b/src/wiki/templates/wiki/includes/editor_sidebar.html @@ -12,20 +12,18 @@ {% endaddtoblock %} -
    - {% for plugin, plugin_form in sidebar %} -
    +
    -
    - -

    {{ plugin.sidebar.headline }}

    +
    -
    -
    +
    +
    {% if plugin.sidebar.template %} {% with plugin_form as form and plugin as plugin %} @@ -39,4 +37,3 @@
    {% endfor %} -
    diff --git a/src/wiki/templates/wiki/includes/formfield.html b/src/wiki/templates/wiki/includes/formfield.html index db6725a9..d5fe6959 100644 --- a/src/wiki/templates/wiki/includes/formfield.html +++ b/src/wiki/templates/wiki/includes/formfield.html @@ -2,7 +2,7 @@ {{ field }} {% else %} -
    +
    {% if field.label %}
    - {{ field }} {% if field.field.required %}*{% endif %} +
    {{ field }} {% if field.field.required %}*{% endif %}
    {% if field.errors %} {% for error in field.errors %}
    {{ error }}
    diff --git a/src/wiki/templates/wiki/includes/modals.html b/src/wiki/templates/wiki/includes/modals.html index b86d4f65..f53d3ae9 100644 --- a/src/wiki/templates/wiki/includes/modals.html +++ b/src/wiki/templates/wiki/includes/modals.html @@ -1,31 +1,14 @@ {% load sekizai_tags static %} {% addtoblock "js" %} - {% endaddtoblock %} -{% addtoblock "css" %} - -{% endaddtoblock %} diff --git a/src/wiki/templates/wiki/search.html b/src/wiki/templates/wiki/search.html index 080cf40d..03c7af60 100644 --- a/src/wiki/templates/wiki/search.html +++ b/src/wiki/templates/wiki/search.html @@ -10,7 +10,7 @@

    -

    +
    {% if urlpath %} {% trans "Searching in" %} {{ urlpath.article }} {% else %} diff --git a/src/wiki/templates/wiki/source.html b/src/wiki/templates/wiki/source.html index 0c610208..bf4f0ab1 100644 --- a/src/wiki/templates/wiki/source.html +++ b/src/wiki/templates/wiki/source.html @@ -10,8 +10,9 @@

    {% trans "This article is currently locked for editing." %}

    {% endif %} -
    +
    
       {{ article.current_revision.content }}
    +
     
    {% endblock %} diff --git a/testproject/testproject/db/prepopulated.db b/testproject/testproject/db/prepopulated.db index 6d3e7fd9a98da6fae243fe36fd8fbffdfa521358..78fde0fa77da017acfc1b1ee27ad7977062d0bff 100644 GIT binary patch delta 23805 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 RfCX25(Jfyf;Rapm{|6%2^S=N9 delta 1173 zcmaJ2vv_-a2*9}K- zieY@(l9@p%=Bj8y#1Q>pL`wFEF*BkBFvJ)V#t`SfOeMPb2h27mFz*|DkT2eo_q+H0 z&bhyH^3Lfy@?hV<;sbe^PK7b(W{kZhKS-=7<&yCk_79^+s_hx{iN(f~>Fe`SPRC(N ze!6i@8qj6Qvcq&)au*2R5bh52o~TvcU7CR*M&tAm3F@Ib^3g)PhG+0?+>1>ZlHrRn z6`DP(=440#f}4zr@F}=ShP26~)6od$B%XyU5>N9eDf`qdBEi9BJ{0CZfhWy+MpcXk z=yR%~J<>-0Yr>@vSaHiXlx)`0J zE}1S$W>+;F(qvD@t)9G2~B zh$%LWL&2Ed9w?KEij+dy1j)WF9`V6)u8L~Tz2Z9?&ljod>cir>>#A40dP7~F9IEk% zHqM_1h2mhc%t$MJKo4f~SRsrjuJBsGqQBn_?N+BF4TPA1w zvJgeQoL8E+$`yNhwv8qj-J%&eUw_I8zD5&L=u0vuHY%Gtwgxr13b)6)p5ET88@&zf z-G#fKShKb9g~oO3w?%vEHv}WQx;O7Mf-iOkjcB}XcSF3PZRaNcll75U=i{qOv=XgY u)8$xu^g!6}4+jE1tt=EQE$JT|R?NX+wHNHjW*By|8Tm^l&6!iGec``4Gff`= diff --git a/tests/plugins/images/test_views.py b/tests/plugins/images/test_views.py index 25441a32..81b33700 100644 --- a/tests/plugins/images/test_views.py +++ b/tests/plugins/images/test_views.py @@ -117,7 +117,7 @@ class ImageTests(RequireRootArticleMixin, ArticleWebTestUtils, DjangoClientTestB output = self.get_article("[image:1 align:right size:large]", True) image_rev = models.Image.objects.get().current_revision.imagerevision expected = ( - '
    ' + '
    ' '' 'test\.gif' '
    ' -- 2.45.2