{% if book.isbn %}{% trans 'ISBN：' %}{{ book.isbn }}{% endif %}
{% if book.author %}{% trans '作者：' %}
{% for author in book.author %}
- {{ author }}
+ {{ author }}{% if not forloop.last %} / {% endif %}
{% endfor %}
{% endif %}
{% if book.pub_house %}{% trans '出版社：' %}{{ book.pub_house }}{% endif %}
{% if book.subtitle %}{% trans '副标题：' %}{{ book.subtitle }}{% endif %}
{% if book.translator %}{% trans '译者：' %}
{% for translator in book.translator %}
- {{ translator }}
+ {{ translator }}{% if not forloop.last %} / {% endif %}
{% endfor %}
{% endif %}
{% if book.orig_title %}{% trans '原作名：' %}{{ book.orig_title }}{% endif %}
diff --git a/books/templates/books/list.html b/books/templates/books/list.html
index 44b11b1c..63d62165 100644
--- a/books/templates/books/list.html
+++ b/books/templates/books/list.html
@@ -11,7 +11,7 @@
-
{% trans '剽取！' %}
@@ -97,7 +98,10 @@ ISBN: 9787020104345
diff --git a/books/views.py b/books/views.py
index af69aa95..66765291 100644
--- a/books/views.py
+++ b/books/views.py
@@ -132,7 +132,7 @@ def retrieve(request, id):
except ObjectDoesNotExist:
mark = None
if mark:
- mark_tags = mark.mark_tags.all()
+ mark_tags = mark.bookmark_tags.all()
mark.get_status_display = BookMarkStatusTranslator(mark.status)
mark_form = BookMarkForm(instance=mark, initial={
'tags': mark_tags
@@ -239,7 +239,7 @@ def create_update_mark(request):
if pk:
mark = get_object_or_404(BookMark, pk=pk)
old_rating = mark.rating
- old_tags = mark.mark_tags.all()
+ old_tags = mark.bookmark_tags.all()
# update
form = BookMarkForm(request.POST, instance=mark)
else:
diff --git a/common/forms.py b/common/forms.py
index 890bb37c..25301801 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -1,5 +1,6 @@
from django import forms
-from django.contrib.postgres.forms import JSONField
+import django.contrib.postgres.forms as postgres
+from django.utils import formats
from django.core.exceptions import ValidationError
from django.utils.translation import gettext_lazy as _
import json
@@ -26,6 +27,21 @@ class KeyValueInput(forms.Widget):
context['widget']['keyvalue_pairs'] = key_value_pairs
return context
+ class Media:
+ js = ('js/key_value_input.js',)
+
+
+class JSONField(postgres.JSONField):
+ widget = KeyValueInput
+ def to_python(self, value):
+ if not value:
+ return None
+ json = {}
+ pairs = eval(value)
+ for pair in pairs:
+ json = {**json, **pair}
+ return super().to_python(json)
+
class RadioBooleanField(forms.ChoiceField):
widget = forms.RadioSelect
@@ -110,3 +126,35 @@ class TagField(forms.CharField):
if not value:
return
return [t.strip() for t in value.split(',')]
+
+
+class MultiSelect(forms.SelectMultiple):
+ template_name = 'widgets/multi_select.html'
+
+
+class HstoreInput(forms.Widget):
+ template_name = 'widgets/hstore.html'
+
+ def format_value(self, value):
+ """
+ Return a value as it should appear when rendered in a template.
+ """
+ if value == '' or value is None:
+ return None
+ if self.is_localized:
+ return formats.localize_input(value)
+ return value
+
+ class Media:
+ js = ('js/key_value_input.js',)
+
+
+class HstoreField(forms.CharField):
+ widget = HstoreInput
+ def to_python(self, value):
+ if not value:
+ return None
+ pairs = eval(value)
+ if len(pairs) == 1:
+ pairs = (pairs,)
+ return pairs
diff --git a/common/scraper.py b/common/scraper.py
index 894f8585..c3a2a784 100644
--- a/common/scraper.py
+++ b/common/scraper.py
@@ -300,7 +300,7 @@ def scrape_douban_movie(url):
if duration_elem:
duration = duration_elem[0].strip()
if other_duration_elem:
- duration += other_duration_elem[0]
+ duration += other_duration_elem[0].rstrip()
else:
duration = None
@@ -324,7 +324,7 @@ def scrape_douban_movie(url):
is_series = True if episodes else False
brief_elem = content.xpath("//span[@property='v:summary']/text()")
- brief = brief[0].strip() if brief_elem else None
+ brief = brief_elem[0].strip() if brief_elem else None
img_url_elem = content.xpath("//img[@rel='v:image']/@src")
img_url = img_url_elem[0].strip() if img_url_elem else None
diff --git a/common/static/css/boofilsic.css b/common/static/css/boofilsic.css
index ed22f322..b7863979 100644
--- a/common/static/css/boofilsic.css
+++ b/common/static/css/boofilsic.css
@@ -1193,10 +1193,15 @@ select::placeholder {
font-weight: bold;
}
+.entity-detail .entity-detail__title--secondary {
+ color: #bbb;
+}
+
.entity-detail .entity-detail__fields {
display: inline-block;
vertical-align: top;
- width: 48%;
+ width: 46%;
+ margin-left: 2%;
}
.entity-detail .entity-detail__fields div, .entity-detail .entity-detail__fields span {
@@ -2083,3 +2088,44 @@ select::placeholder {
.rating-star .jq-star {
cursor: unset !important;
}
+
+.ms-parent > .ms-choice {
+ margin-bottom: 1.5rem;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ background-color: transparent;
+ border: 0.1rem solid #ccc;
+ border-radius: .4rem;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ -webkit-box-sizing: inherit;
+ box-sizing: inherit;
+ padding: .6rem 1.0rem;
+ width: 100%;
+ height: 30.126px;
+}
+
+.ms-parent > .ms-choice:focus {
+ border-color: #00a1cc;
+}
+
+.ms-parent > .ms-choice > .icon-caret {
+ top: 15.5px;
+}
+
+.ms-parent > .ms-choice > span {
+ color: black;
+ font-weight: initial;
+ font-size: 13.3333px;
+ top: 2.5px;
+ left: 2px;
+}
+
+.ms-parent > .ms-choice > span:hover, .ms-parent > .ms-choice > span:focus {
+ color: black;
+}
+
+.ms-parent > .ms-drop > ul > li > label > span {
+ margin-left: 10px;
+}
diff --git a/common/static/js/key_value_input.js b/common/static/js/key_value_input.js
new file mode 100644
index 00000000..aa7abd55
--- /dev/null
+++ b/common/static/js/key_value_input.js
@@ -0,0 +1,63 @@
+function keyValueInput(valueKeyWidget, hiddenInput) {
+ let placeholderKey = valueKeyWidget.attr('placeholder-key');
+ let placeholderValue = valueKeyWidget.attr('placeholder-value');
+ if (placeholderKey == null) {
+ placeholderKey = '';
+ }
+
+ if (placeholderValue == null) {
+ placeholderValue = '';
+ }
+
+ let newInputPair = $('');
+ valueKeyWidget.append(newInputPair.clone());
+ // add new input pair
+ valueKeyWidget.on('input', ':nth-last-child(1)', function () {
+ if ($(this).val() && $(this).prev().val()) {
+ valueKeyWidget.append($(newInputPair).clone());
+ }
+ });
+ valueKeyWidget.on('input', ':nth-last-child(2)', function () {
+ if ($(this).val() && $(this).next().val()) {
+ valueKeyWidget.append($(newInputPair).clone());
+ }
+ });
+ valueKeyWidget.on('input', ':nth-last-child(4)', function () {
+ if (!$(this).val() && !$(this).next().val() && valueKeyWidget.children("input").length > 2) {
+ $(this).next().remove();
+ $(this).remove();
+ }
+ });
+
+ valueKeyWidget.on('input', ':nth-last-child(3)', function () {
+ if (!$(this).val() && !$(this).prev().val() && valueKeyWidget.children("input").length > 2) {
+ $(this).prev().remove();
+ $(this).remove();
+ }
+ });
+
+ valueKeyWidget.on('input', function () {
+ let keys = $(this).children(":nth-child(odd)").map(function () {
+ if ($(this).val()) {
+ return $(this).val();
+ }
+ }).get();
+ let values = $(this).children(":nth-child(even)").map(function () {
+ if ($(this).val()) {
+ return $(this).val();
+ }
+ }).get();
+ if (keys.length == values.length) {
+ let finalValue = [];
+ keys.forEach(function (key, i) {
+ let json = new Object;
+ json[key] = values[i];
+ finalValue.push(JSON.stringify(json))
+ });
+ hiddenInput.val(finalValue.toString());
+ } else {
+
+ }
+ });
+}
+
diff --git a/common/static/sass/_Color.sass b/common/static/sass/_Color.sass
index 74cfb583..edf8093f 100644
--- a/common/static/sass/_Color.sass
+++ b/common/static/sass/_Color.sass
@@ -5,7 +5,7 @@
$color-initial: #fff !default
$color-primary: #00a1cc !default
$color-secondary: #606c76 !default
-$color-tertiary: #fff !default
+$color-tertiary: #bbb !default
$color-quaternary: #d5d5d5 !default
$color-quinary: #e5e5e5 !default
diff --git a/common/static/sass/_Divider.sass b/common/static/sass/_Divider.sass
index 1583766f..4398327c 100644
--- a/common/static/sass/_Divider.sass
+++ b/common/static/sass/_Divider.sass
@@ -4,5 +4,5 @@
hr
border: 0
- border-top: .1rem solid $color-tertiary
+ border-top: .1rem solid $color-initial
margin: 3.0rem 0
diff --git a/common/static/sass/_MainSection.sass b/common/static/sass/_MainSection.sass
index 4a347275..8f073a5d 100644
--- a/common/static/sass/_MainSection.sass
+++ b/common/static/sass/_MainSection.sass
@@ -106,11 +106,15 @@ $sub-section-title-margin: 8px
& &__title
font-weight: bold
+
+ & &__title--secondary
+ color: $color-tertiary
& &__fields
display: inline-block
vertical-align: top
- width: 48%
+ width: 46%
+ margin-left: 2%
// margin-bottom: 5px
& div, & span
margin: 1px 0
diff --git a/common/static/sass/_Vendor.sass b/common/static/sass/_Vendor.sass
index 3021b378..bc0af71a 100644
--- a/common/static/sass/_Vendor.sass
+++ b/common/static/sass/_Vendor.sass
@@ -2,4 +2,35 @@
min-height: 100px
.rating-star .jq-star
- cursor: unset !important
\ No newline at end of file
+ cursor: unset !important
+
+.ms-parent > .ms-choice
+ margin-bottom: 1.5rem
+ appearance: none
+ background-color: transparent
+ border: 0.1rem solid #ccc
+ border-radius: .4rem
+ box-shadow: none
+ box-sizing: inherit
+ padding: .6rem 1.0rem
+ width: 100%
+ height: 30.126px
+
+ &:focus
+ border-color: $color-primary
+
+ & > .icon-caret
+ top: 15.5px
+
+ & > span
+ color: black
+ font-weight: initial
+ // font-size: 1.3rem
+ font-size: 13.3333px
+ top: 2.5px
+ left: 2px
+ &:hover, &:focus
+ color: black
+
+.ms-parent > .ms-drop > ul > li > label > span
+ margin-left: 10px
\ No newline at end of file
diff --git a/common/templates/common/home.html b/common/templates/common/home.html
index 1722307c..8b10acb8 100644
--- a/common/templates/common/home.html
+++ b/common/templates/common/home.html
@@ -10,7 +10,13 @@
-