Commit Graph

1242 Commits

Author SHA1 Message Date
Mouse Reeve 806638888e Stay on page when logging in from top bar
Was this bugging other people? It bugged me to no end.
2021-08-02 16:24:36 -07:00
Mouse Reeve 2370f60436
Update bookwyrm/templates/snippets/book_cover.html
Co-authored-by: Joachim <joachim.robert@protonmail.com>
2021-08-02 14:46:56 -06:00
Mouse Reeve 9b97fbc0ae
Fixes error in merge 2021-08-02 12:56:11 -07:00
Mouse Reeve af34dc6520
Merge branch 'main' into images-django-imagekit 2021-08-02 13:43:59 -06:00
Joachim 1a53f5c18a Update renamed layout.html 2021-08-01 11:38:44 +02:00
Joachim 78aa31afd5 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-08-01 11:38:32 +02:00
Kylie a6b8d44627 Summary display updates 2021-07-31 20:30:21 -04:00
Kylie 3f01cf8788
Update user_card.html 2021-07-31 19:58:12 -04:00
Kylie d75f33cfb2 Apply preserve-whitespace to profile summaries 2021-07-31 13:16:47 -04:00
Kylie 7af7a7b575 Recognize profile summary linebreaks + whitespace 2021-07-30 23:50:21 -04:00
Mouse Reeve 7f44693e0c Renames feed layout file to be more consistent with other templates 2021-07-28 13:21:42 -07:00
Mouse Reeve c9602e28ce Use consistant header size 2021-07-28 13:19:56 -07:00
Mouse Reeve 436afb0ebd Fixes heirarchy and classes in feed layout 2021-07-28 13:17:56 -07:00
Mouse Reeve b84ffeda08
Merge pull request #1221 from cincodenada/shelved-date
Add shelved date, populate from Goodreads import
2021-07-19 17:11:22 -06:00
Joel Bradshaw eadf5cf410 Use shelved date for display
I'm not sure if there's a better way to access this field, accessing via
book.shelfbook__shelved_date in the template didn't seem to work
2021-07-13 21:26:38 -07:00
Mouse Reeve 3f15e4410e Fixes link to edit book 2021-07-12 16:17:20 -07:00
Mouse Reeve fede777e9b Hide deleted status counts from book page 2021-07-07 09:37:21 -07:00
Joachim 3ea1bcb256
Merge branch 'main' into storage-s3 2021-07-05 13:06:19 +02:00
root ad3dc16005 Removrd Bio from Your books 2021-06-22 13:18:23 +00:00
Joachim 7818a4347f Specify width (250px) on Instance Description image 2021-06-20 15:57:08 +02:00
Joachim e251b687dc Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-19 19:32:56 +02:00
Joachim dee63d8825 Rename MEDIA_PATH to MEDIA_FULL_URL and handle protocol 2021-06-19 17:09:53 +02:00
Joachim c9c7a673d7 Fix template dependency 2021-06-19 12:02:48 +02:00
Joachim 6607c8b185 Better handling of absolute URLs with domain + scheme 2021-06-19 11:54:19 +02:00
Joachim d862be0564 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-06-19 11:53:05 +02:00
Mouse Reeve 98ae586889 Newline in following template 2021-06-18 16:52:12 -07:00
Mouse Reeve 5b6048e4c6 Merge branch 'main' into suggestions-redis 2021-06-18 16:48:04 -07:00
Mouse Reeve ea556bd83b
Merge pull request #1142 from joachimesque/opengraph-image-generation
Generate OpenGraph images for books, users, and site.
2021-06-18 14:47:54 -07:00
Mouse Reeve 7775d943d4 Fixes list link to user profile 2021-06-18 12:11:07 -07:00
Joachim 7e26a38403 Fix summary image format 2021-06-18 19:15:36 +02:00
Joachim 5d41781e6a Fix scheme 2021-06-18 19:15:24 +02:00
Mouse Reeve 22636041ba Use null instead of zero for unrated review 2021-06-17 17:47:46 -07:00
Mouse Reeve 973b23856c
Merge branch 'main' into opengraph-image-generation 2021-06-17 15:17:54 -07:00
Fabien Basmaison cc03460e00 Avoid space within parenthesises for series when no number is provided. 2021-06-17 17:18:55 +02:00
Fabien Basmaison 7f01dcf3b9 Merge branch 'main' into frontend/subtitle 2021-06-17 17:12:23 +02:00
Mouse Reeve 27a3d0ae96
Merge branch 'main' into 253-user-post-privacy-v2 2021-06-14 16:47:57 -07:00
Mouse Reeve c4f7f34ad4 Fixes edit readthrough toggle display 2021-06-14 16:04:58 -07:00
Mouse Reeve 3600f6ca3c Handle overflow text in notifications 2021-06-14 16:00:17 -07:00
Mouse Reeve a82bf99bd6 Icon-only link display on mobile for text links 2021-06-14 15:55:26 -07:00
Mouse Reeve fe2309f0bc Fixes orientation of edition want to read menu 2021-06-14 15:45:39 -07:00
Mouse Reeve 5a236e333f Fixes directory profile link 2021-06-14 15:33:03 -07:00
Mouse Reeve 2a606eec3e scroll horizontally on user page shelf preview 2021-06-14 15:27:37 -07:00
Mouse Reeve f4a6e18759
Merge pull request #1173 from bookwyrm-social/series-space
Fixes trailing space in series text
2021-06-14 12:49:41 -07:00
Mouse Reeve 6e6354bcce Fixes trailing space in series text
Fixes #1145
2021-06-14 12:34:11 -07:00
Mouse Reeve d4e2a06092
Merge pull request #1171 from bookwyrm-social/import-text
Clarifies wording on pending imports
2021-06-14 12:31:38 -07:00
Mouse Reeve 9a67c61487 Clarifies wording on pending imports
Fixes #1118
2021-06-14 11:59:44 -07:00
Mouse Reeve e98138e84f Show users as deleted in admin view 2021-06-14 11:38:54 -07:00
Mouse Reeve 8cd6712db3 Let users delete their accounts 2021-06-14 10:44:25 -07:00
Mouse Reeve 7ae64c2a68 Splits user view out and adds template 2021-06-14 10:01:21 -07:00
Fabien Basmaison 17635b47db Fix case where there is no subtitle.
Consequentially change back author to being a subtitle.
2021-06-11 09:41:55 +02:00
Fabien Basmaison cf751a8efa Merge branch 'main' into frontend/subtitle 2021-06-11 08:49:46 +02:00
Mouse Reeve ce4a57e5c9 Reading status view name 2021-06-09 11:16:52 -07:00
Mouse Reeve 3c7c8a1797 Fixes urls in fallback mode 2021-06-09 11:05:05 -07:00
Mouse Reeve 113ced2900 Merge reading status views into one view 2021-06-09 10:53:52 -07:00
Fabien Basmaison f58c1d1138 Tweak styles for subtitle:
- Make it bold as the title while preserving consistency with other subtitles.
- Pull the author closer to the subtitle to preserve a descending visual and typographic scales.
2021-06-09 12:20:34 +02:00
Fabien Basmaison 5047b8bf94 Do not break document structure with ratings. 2021-06-09 11:12:38 +02:00
Fabien Basmaison b9562e44e3 Merge branch 'main' into frontend/subtitle 2021-06-09 10:14:34 +02:00
Mouse Reeve eb12506985 No script fallback mode 2021-06-08 12:40:01 -07:00
Mouse Reeve 3356c652ee Adds standalone modal views for reading steps 2021-06-08 11:55:18 -07:00
Mouse Reeve 1231d40e80 Want to read view 2021-06-08 11:23:53 -07:00
Joachim d105ae9c78 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-07 19:53:11 +02:00
Joachim 2731ea9aa9 Add env var to enable/disable thumbnail generation 2021-06-07 19:52:25 +02:00
Joachim b448d40514 Use the right snippets on Templates 2021-06-07 18:13:24 +02:00
Mouse Reeve 5b40069d99
Merge pull request #1153 from bookwyrm-social/instance-language
Use "instance" consistently
2021-06-06 14:07:49 -07:00
Joachim 1f2c296cfd This should now work 2021-06-06 21:12:21 +02:00
Mouse Reeve c8d2df1203
Merge pull request #1155 from joachimesque/front-modal-title-fit
Front: Modal title fit
2021-06-05 12:43:35 -07:00
Mouse Reeve d1e33e14e2
Merge pull request #1154 from joachimesque/front-better-forms
Front-end: Better forms
2021-06-05 12:38:20 -07:00
Mouse Reeve bbbae9fc9d
Merge branch 'main' into images-django-imagekit 2021-06-05 11:46:57 -07:00
Mouse Reeve 61e55628fa
Merge pull request #1131 from joachimesque/author-page-microformats
Author page microformats
2021-06-05 11:27:16 -07:00
Joachim 6f105fcdcc Front: Modal title fit 2021-06-02 18:56:24 +02:00
Joachim 49c057625a Smol fixes 2021-06-02 18:30:36 +02:00
Joachim 7d1e4aebbc Better forms 2021-06-02 18:17:53 +02:00
Mouse Reeve 2816d7cc88 Use "instance" consistently 2021-06-01 14:50:14 -07:00
Mouse Reeve ff45238667
Merge pull request #1123 from eatsleepdeploy/add-max-upload-size-config
Add max upload size config
2021-06-01 14:09:50 -07:00
Joachim f206f61e9a Use global switch to enable/disable preview images 2021-05-28 17:00:07 +02:00
Joachim f848dcd756 Fix issue with protocol 2021-05-26 18:20:22 +02:00
Joachim e362c82495 Expose static & media paths 2021-05-26 17:54:59 +02:00
Joachim 7ea3153026 Fix site_path tag 2021-05-26 16:57:28 +02:00
Joachim 22c13f639c Update layout.html 2021-05-26 15:18:35 +02:00
Joachim e5e549d125 Add opengraph image depending on context 2021-05-26 14:44:15 +02:00
Fabien Basmaison c894f5ef35 Update subtitle behaviour:
- on Book
	- Remove problematic punctuation (locale and multiple punctuation if the title ends with `?`, `!` or similar).
	- Update view.
	- Use proper semantic to split combined title into `name`, `alternativeHeadline` and series-related microdata.
	- The author is not a subtitle, just data.
- Use parenthesis in the `get_title` filter instead of punctuation.
2021-05-26 13:21:06 +02:00
Joachim b72580daf6 Update author.html 2021-05-24 17:17:12 +02:00
Mouse Reeve ea0f7ff925
Merge pull request #1137 from bookwyrm-social/title-header
Uses correct filter for book title
2021-05-24 07:21:12 -07:00
Joachim 36f447210a Specify sizes on all templates 2021-05-24 16:18:05 +02:00
Joachim dc49432322 Change img_path to external_path 2021-05-24 16:17:39 +02:00
Joachim c1456ce853 Update .cover-caption name and styles 2021-05-24 16:16:33 +02:00
Joachim 4c55f07f2a Update book_cover.html 2021-05-24 16:16:09 +02:00
Mouse Reeve f058aa8f1d Uses correct filter for book title 2021-05-24 06:54:43 -07:00
Joachim 25858ed3aa Added LibraryThing and Goodreads links 2021-05-24 12:51:41 +02:00
Joachim 594f7b3708 Style fixes 2021-05-24 12:51:18 +02:00
Joachim 58c07d1677 Apply review suggestions 2021-05-24 12:36:48 +02:00
Joachim 55a3a28d49 Add microformats to author page 2021-05-23 21:17:14 +02:00
Joachim 6e9c9e839c Fix date of death display 2021-05-23 20:25:42 +02:00
Mouse Reeve 4e9c7a7748
Merge pull request #1070 from bookwyrm-social/top-bar
Top bar
2021-05-23 08:42:14 -07:00
Joachim 354b511089 Fix flex styles 2021-05-23 17:18:16 +02:00
Joachim 1aa319d6ee Move description text below header 2021-05-23 17:17:46 +02:00
Joachim cf7cbfdf8f Fix title styles 2021-05-23 17:17:30 +02:00
Joachim 9eb719106f Fix display bug 2021-05-23 17:17:02 +02:00
Joachim 251c8bbd08 Merge remote-tracking branch 'upstream/main' into list-style-fixes 2021-05-23 15:14:50 +02:00
Jason Kelly 6e655cb0e0 Added new widget to alert if a file is set at larger than 10 MB.
- Updated default widget to use template that adds a notification box.
- Added JS to add onchange & load events to look at the value in the input and trigger the notification & disable the form submits.
2021-05-23 14:12:00 +08:00
Mouse Reeve bdf267dea5 Refactors block button for query efficiency 2021-05-22 20:36:30 -07:00
Mouse Reeve 9285f483c2 Query tweaks for book page 2021-05-22 20:14:57 -07:00
Mouse Reeve 7a4c4248df Improves status template performance
Reduces queries about about 65
2021-05-22 19:01:40 -07:00
Mouse Reeve 3d3ab6433e Improves query efficiency for shelve buttons
About 50 fewer queries (yikes)
2021-05-22 17:58:08 -07:00
Mouse Reeve 368d2cd716 Reduces feed page queries for goals
9 fewer queries
2021-05-22 17:34:16 -07:00
Mouse Reeve 644e5926db Remove suggested users on block 2021-05-22 14:05:59 -07:00
Mouse Reeve 0044dc6587 Show suggested users when the feed is empty 2021-05-22 11:29:41 -07:00
Mouse Reeve d33b55e025 Hide delete button text on mobile 2021-05-21 09:52:40 -07:00
Mouse Reeve 00eba98e9f Fixes display of announcement show/hide button on mobile 2021-05-21 09:50:23 -07:00
Mouse Reeve a70c713c29 Fixes default values in edit announcement form 2021-05-20 20:21:04 -07:00
Mouse Reeve d39374f13c Fixes editions page 2021-05-20 18:41:36 -07:00
Mouse Reeve c52b26f404 Moves rss templates to base level directory 2021-05-20 16:12:24 -07:00
Mouse Reeve 9c13bf34a8 Only show banner to authenticated users 2021-05-20 15:11:47 -07:00
Mouse Reeve cefc5994a6 Makes extra content optional 2021-05-20 12:40:03 -07:00
Mouse Reeve 2e193aa3c6 Delete announcements 2021-05-20 12:08:12 -07:00
Mouse Reeve a415991e96 Fixes clashing filter names in templates 2021-05-20 11:56:26 -07:00
Mouse Reeve b8e9b9f57e Cleans up show/hide behavior 2021-05-20 11:46:24 -07:00
Mouse Reeve 49916a7498 Sorting for announcement headers and pagination 2021-05-20 09:43:29 -07:00
Mouse Reeve 3d70a36d86 Editable announcement 2021-05-20 09:28:39 -07:00
Mouse Reeve d64e0c4aa8 Adds admin view for individual announcement 2021-05-20 08:09:35 -07:00
Mouse Reeve c73c063949 Show announcements on all pages 2021-05-19 15:35:14 -07:00
Mouse Reeve 346d718265 Don't need both name and preview 2021-05-19 15:18:43 -07:00
Mouse Reeve 515d5bb237 Create announcements admin view 2021-05-19 14:57:28 -07:00
Mouse Reeve 8fc0da8dc2 Adds inventaire ID field to edit book form 2021-05-18 16:10:43 -07:00
Mouse Reeve 6fff45d36c Adds language field to edit book form 2021-05-18 15:56:11 -07:00
Mouse Reeve 0bddad259b
Merge pull request #1095 from bookwyrm-social/display-fixes
Display fixes
2021-05-18 11:46:28 -07:00
Mouse Reeve 9f789cd5d4
Merge branch 'main' into top-bar 2021-05-18 11:39:36 -07:00
Mouse Reeve 04c165113f Cleans up login page 2021-05-18 11:22:45 -07:00
Mouse Reeve 58a059c85f Fixes display of user ratings 2021-05-18 11:17:59 -07:00
Mouse Reeve 07d59c8c09 Don't show ratings below user statuses 2021-05-18 11:09:19 -07:00
Mouse Reeve ab69abb8f0 Gap between book search results 2021-05-18 10:57:54 -07:00
Mouse Reeve 8b14f8585e Small fixes for list display 2021-05-18 10:55:05 -07:00
Mouse Reeve 5cd5a6107f Show text with buttons in most places 2021-05-18 10:45:51 -07:00
Mouse Reeve 7dccce6b1f Adds keyboard focus to add readthrough form 2021-05-18 09:59:40 -07:00
Mouse Reeve 2b4ac71d7a Updates footer language around github link 2021-05-14 15:21:26 -07:00
Mouse Reeve 3b9fed1b31 Filter for concise status timestamps 2021-05-11 18:59:31 -07:00
Mouse Reeve 865faf6714 Fixes tests 2021-05-11 15:52:41 -07:00
Mouse Reeve 65f78b45da Merge branch 'main' into templatetags 2021-05-11 15:41:07 -07:00
Mouse Reeve 87bf863ac6
Revert "Preserve width when cover images fail to load" 2021-05-11 15:29:18 -07:00
Mouse Reeve ac2b63d0cd More templatetag files 2021-05-11 15:14:42 -07:00
Mouse Reeve 58da17d694 Use smaller templatetag modules 2021-05-11 14:41:28 -07:00
Mouse Reeve f5eb5f982a Removes filter for checking for follow requests 2021-05-11 14:05:46 -07:00
Mouse Reeve 63172ecf00 Fixes ratings on shelf pages 2021-05-11 13:54:38 -07:00
Mouse Reeve 1fbd6537b7 Remove unnecessary tags from import page 2021-05-11 13:28:52 -07:00
Mouse Reeve 680f300e7c Preserve width when cover images fail to load 2021-05-11 08:15:02 -07:00
Mouse Reeve 4c99fd7f12 Adds metadata to author view 2021-05-10 17:24:10 -07:00
Mouse Reeve 443109bac3 Adds aliases and inventaire id to edit author form
Plus consolidates some wording
2021-05-10 17:06:22 -07:00
Mouse Reeve 9bfe4f4e91 Uses a different snippet for previewing books on author page 2021-05-10 16:43:40 -07:00
Mouse Reeve 867a33de57 Creates author template dir 2021-05-10 16:34:37 -07:00
Mouse Reeve 27fe09a32b
Merge pull request #1062 from alisww/storygraph-import
add storygraph import
2021-05-10 16:23:00 -07:00