diff --git a/books/views.py b/books/views.py index 743f66ec..ec3b752b 100644 --- a/books/views.py +++ b/books/views.py @@ -104,14 +104,15 @@ def update(request, id): @mastodon_request_included -@login_required +# @login_required def retrieve(request, id): if request.method == 'GET': book = get_object_or_404(Book, pk=id) mark = None review = None try: - mark = BookMark.objects.get(owner=request.user, book=book) + if request.user.is_authenticated: + mark = BookMark.objects.get(owner=request.user, book=book) except ObjectDoesNotExist: mark = None if mark: @@ -123,18 +124,27 @@ def retrieve(request, id): }) try: - review = BookReview.objects.get(owner=request.user, book=book) + if request.user.is_authenticated: + review = BookReview.objects.get(owner=request.user, book=book) except ObjectDoesNotExist: review = None + - mark_list = BookMark.get_available(book, request.user, request.session['oauth_token']) - mark_list_more = True if len(mark_list) > MARK_NUMBER else False - mark_list = mark_list[:MARK_NUMBER] - for m in mark_list: - m.get_status_display = BookMarkStatusTranslator(m.status) - review_list = BookReview.get_available(book, request.user, request.session['oauth_token']) - review_list_more = True if len(review_list) > REVIEW_NUMBER else False - review_list = review_list[:REVIEW_NUMBER] + if request.user.is_anonymous: + mark_list = None + review_list = None + mark_list_more = None + review_list_more = None + else: + mark_list = BookMark.get_available(book, request.user, request.session['oauth_token']) + review_list = BookReview.get_available(book, request.user, request.session['oauth_token']) + mark_list_more = True if len(mark_list) > MARK_NUMBER else False + mark_list = mark_list[:MARK_NUMBER] + for m in mark_list: + m.get_status_display = BookMarkStatusTranslator(m.status) + review_list_more = True if len(review_list) > REVIEW_NUMBER else False + review_list = review_list[:REVIEW_NUMBER] + # def strip_html_tags(text): # import re diff --git a/common/static/css/boofilsic.css b/common/static/css/boofilsic.css index d19c48c8..f52d4955 100644 --- a/common/static/css/boofilsic.css +++ b/common/static/css/boofilsic.css @@ -144,10 +144,6 @@ textarea { width: 100%; } -input, select { - width: 100%; -} - label, legend { display: block; @@ -1073,6 +1069,11 @@ select::placeholder { .main-section-wrapper { padding: 32px 48px 32px 36px; background-color: #f7f7f7; + overflow: auto; +} + +.main-section-wrapper input, .main-section-wrapper select { + width: 100%; } .entity-list .entity-list__title { @@ -1525,6 +1526,7 @@ select::placeholder { padding: 28px 25px 12px 25px; background-color: #f7f7f7; margin-bottom: 30px; + overflow: auto; } .aside-section-wrapper--transparent { @@ -1896,6 +1898,10 @@ select::placeholder { overflow: auto; } +.single-section-wrapper input, .single-section-wrapper select { + width: 100%; +} + .entity-form, .review-form { overflow: auto; } diff --git a/common/static/sass/_AsideSection.sass b/common/static/sass/_AsideSection.sass index f381718b..06a4ea42 100644 --- a/common/static/sass/_AsideSection.sass +++ b/common/static/sass/_AsideSection.sass @@ -10,6 +10,7 @@ $aside-section-padding-mobile: 24px 25px 10px 25px padding: $aside-section-padding background-color: $color-bright margin-bottom: 30px + overflow: auto &--transparent background-color: unset diff --git a/common/static/sass/_Form.sass b/common/static/sass/_Form.sass index d7f56916..36e21308 100644 --- a/common/static/sass/_Form.sass +++ b/common/static/sass/_Form.sass @@ -15,8 +15,8 @@ textarea min-height: 6.5rem width: 100% -input, select - width: 100% +// input, select +// width: 100% label, legend diff --git a/common/static/sass/_MainSection.sass b/common/static/sass/_MainSection.sass index bca2b5ff..87fd5dbe 100644 --- a/common/static/sass/_MainSection.sass +++ b/common/static/sass/_MainSection.sass @@ -9,6 +9,10 @@ $sub-section-title-margin: 8px .main-section-wrapper padding: $main-section-padding background-color: $color-bright + overflow: auto + + & input, & select + width: 100% // for search result etc .entity-list diff --git a/common/static/sass/_SingleSection.sass b/common/static/sass/_SingleSection.sass index 7880893a..176e4d77 100644 --- a/common/static/sass/_SingleSection.sass +++ b/common/static/sass/_SingleSection.sass @@ -5,6 +5,9 @@ $single-section-padding-mobile: 32px 28px padding: $single-section-padding background-color: $color-bright overflow: auto + + & input, & select + width: 100% .entity-form, .review-form overflow: auto diff --git a/docs/ui_layout/ui (1).jpg b/docs/ui_layout/ui (1).jpg deleted file mode 100644 index 24a126a0..00000000 Binary files a/docs/ui_layout/ui (1).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (10).jpg b/docs/ui_layout/ui (10).jpg deleted file mode 100644 index 4262d521..00000000 Binary files a/docs/ui_layout/ui (10).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (11).jpg b/docs/ui_layout/ui (11).jpg deleted file mode 100644 index ff28ea1d..00000000 Binary files a/docs/ui_layout/ui (11).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (12).jpg b/docs/ui_layout/ui (12).jpg deleted file mode 100644 index cd528847..00000000 Binary files a/docs/ui_layout/ui (12).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (2).jpg b/docs/ui_layout/ui (2).jpg deleted file mode 100644 index 5340e155..00000000 Binary files a/docs/ui_layout/ui (2).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (3).jpg b/docs/ui_layout/ui (3).jpg deleted file mode 100644 index 6d9021ec..00000000 Binary files a/docs/ui_layout/ui (3).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (4).jpg b/docs/ui_layout/ui (4).jpg deleted file mode 100644 index 91f718c8..00000000 Binary files a/docs/ui_layout/ui (4).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (5).jpg b/docs/ui_layout/ui (5).jpg deleted file mode 100644 index 421175e3..00000000 Binary files a/docs/ui_layout/ui (5).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (6).jpg b/docs/ui_layout/ui (6).jpg deleted file mode 100644 index 6ab6f00f..00000000 Binary files a/docs/ui_layout/ui (6).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (7).jpg b/docs/ui_layout/ui (7).jpg deleted file mode 100644 index e7d8370f..00000000 Binary files a/docs/ui_layout/ui (7).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (8).jpg b/docs/ui_layout/ui (8).jpg deleted file mode 100644 index cd7ca76f..00000000 Binary files a/docs/ui_layout/ui (8).jpg and /dev/null differ diff --git a/docs/ui_layout/ui (9).jpg b/docs/ui_layout/ui (9).jpg deleted file mode 100644 index 7b0eecc4..00000000 Binary files a/docs/ui_layout/ui (9).jpg and /dev/null differ diff --git a/users/templates/users/login.html b/users/templates/users/login.html index 3891917d..55133fc0 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -6,6 +6,10 @@
+ + + +