Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

cleanup unused templates

Browse source
This commit is contained in:
Your Name 2023-06-09 02:45:27 -04:00 • committed by Henri Dickson
parent 94fe6f5030
commit 80fa8366ac
33 changed files with 341 additions and 955 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
catalog/search/views.py
View file

@ -39,17 +39,17 @@ def fetch_refresh(request, job_id):
item_url = "-"
if item_url:
if item_url == "-":
return render(request, "fetch_failed.html")
return render(request, "_fetch_failed.html")
else:
return HTTPResponseHXRedirect(item_url)
else:
retry = int(request.GET.get("retry", 0)) + 1
if retry > 10:
return render(request, "fetch_failed.html")
return render(request, "_fetch_failed.html")
else:
return render(
request,
"fetch_refresh.html",
"_fetch_refresh.html",
{"job_id": job_id, "retry": retry, "delay": retry * 2},
)

0
catalog/templates/fetch_failed.html → catalog/templates/_fetch_failed.html
View file

0
catalog/templates/fetch_refresh.html → catalog/templates/_fetch_refresh.html
View file

0
catalog/templates/item_comments.html → catalog/templates/_item_comments.html
View file

0
catalog/templates/item_reviews.html → catalog/templates/_item_reviews.html
View file

0
catalog/templates/sidebar_item.html → catalog/templates/_sidebar_item.html
View file

43
catalog/templates/_sidebar_search.html Normal file
View file

@ -0,0 +1,43 @@
{% load static %}
{% load i18n %}
{% load l10n %}
<style>
.add-entity-entries__button {
margin: 4px;
}
</style>
<article>
<div class="add-entity-entries__label">{% trans '没有想要的结果？' %}</div>
<p>
如果在
{% for site in sites %}
{{ site }}
{% if not forloop.last %}/{% endif %}
{% endfor %}
找到了条目，可以在搜索栏中输入完整链接提交。
</p>
<p>当然也可以手工创建条目：</p>
<ul>
<li>
<a href="{% url 'catalog:create' 'Edition' %}?title={{ request.GET.q | default:'' }}">{% trans '添加图书' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Movie' %}?title={{ request.GET.q | default:'' }}">{% trans '添加电影' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'TVShow' %}?title={{ request.GET.q | default:'' }}">{% trans '添加电视剧集' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Podcast' %}?title={{ request.GET.q | default:'' }}">{% trans '添加播客' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Album' %}?title={{ request.GET.q | default:'' }}">{% trans '添加音乐专辑' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Game' %}?title={{ request.GET.q | default:'' }}">{% trans '添加游戏' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Performance' %}?title={{ request.GET.q | default:'' }}">{% trans '添加表演或戏剧作品' %}</a>
</li>
</ul>
</article>

4
catalog/templates/fetch_pending.html
View file

@ -29,7 +29,9 @@
</div>
</article>
</div>
{% include "search_sidebar.html" %}
<aside class="grid__aside bottom">
{% include "_sidebar_search.html" %}
</aside>
</main>
{% include 'partial/_footer.html' %}
</body>

10
catalog/templates/item_base.html
View file

@ -58,7 +58,7 @@
{% if v %}
<button class="primary"
data-status="{{ k }}"
hx-get="{% url 'journal:mark' item.uuid %}?shelf_type={{ k }}&new=1"
hx-get="{% url 'journal:mark' item.uuid %}?shelf_type={{ k }}"
hx-target="body"
hx-swap="beforeend">{% trans v %}</button>
{% endif %}
@ -86,7 +86,7 @@
<div id="item-primary-mark" class="right mark">
<div class="item-action">
<button class="outline edit"
hx-get="{% url 'journal:mark' item.uuid %}?new=1"
hx-get="{% url 'journal:mark' item.uuid %}"
hx-target="body"
hx-swap="beforeend">
{{ mark.created_time | date }} {% trans mark.action_label %}
@ -111,7 +111,7 @@
我的标签
<small>
<a href="#"
hx-get="{% url 'journal:mark' item.uuid %}?new=1"
hx-get="{% url 'journal:mark' item.uuid %}"
class="item-mark-icon"
hx-target="body"
hx-swap="beforeend">
@ -136,7 +136,7 @@
我的短评
<small>
<a href="#"
hx-get="{% url 'journal:mark' item.uuid %}?new=1"
hx-get="{% url 'journal:mark' item.uuid %}"
class="item-mark-icon"
hx-target="body"
hx-swap="beforeend">
@ -208,7 +208,7 @@
我的收藏单
<small>
<a href="#"
hx-get="{% url 'journal:add_to_collection' item.uuid %}?new=1"
hx-get="{% url 'journal:add_to_collection' item.uuid %}"
class="edit"
hx-target="body"
hx-swap="beforeend">

2
catalog/templates/item_mark_list.html
View file

@ -85,7 +85,7 @@
</div>
</div>
<aside class="grid__aside top">
{% include "sidebar_item.html" %}
{% include "_sidebar_item.html" %}
</aside>
</main>
{% include "partial/_footer.html" %}

2
catalog/templates/item_review_list.html
View file

@ -79,7 +79,7 @@
</div>
</div>
<aside class="grid__aside top">
{% include "sidebar_item.html" %}
{% include "_sidebar_item.html" %}
</aside>
</main>
{% include "partial/_footer.html" %}

4
catalog/templates/search_results.html
View file

@ -126,7 +126,9 @@
</div>
</div>
</div>
{% include "search_sidebar.html" %}
<aside class="grid__aside bottom">
{% include "_sidebar_search.html" %}
</aside>
</main>
{% include 'partial/_footer.html' %}
</body>

45
catalog/templates/search_sidebar.html
View file

@ -1,45 +0,0 @@
{% load static %}
{% load i18n %}
{% load l10n %}
<style>
.add-entity-entries__button {
margin: 4px;
}
</style>
<aside class="grid__aside bottom">
<article>
<div class="add-entity-entries__label">{% trans '没有想要的结果？' %}</div>
<p>
如果在
{% for site in sites %}
{{ site }}
{% if not forloop.last %}/{% endif %}
{% endfor %}
找到了条目，可以在搜索栏中输入完整链接提交。
</p>
<p>当然也可以手工创建条目：</p>
<ul>
<li>
<a href="{% url 'catalog:create' 'Edition' %}?title={{ request.GET.q | default:'' }}">{% trans '添加图书' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Movie' %}?title={{ request.GET.q | default:'' }}">{% trans '添加电影' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'TVShow' %}?title={{ request.GET.q | default:'' }}">{% trans '添加电视剧集' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Podcast' %}?title={{ request.GET.q | default:'' }}">{% trans '添加播客' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Album' %}?title={{ request.GET.q | default:'' }}">{% trans '添加音乐专辑' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Game' %}?title={{ request.GET.q | default:'' }}">{% trans '添加游戏' %}</a>
</li>
<li>
<a href="{% url 'catalog:create' 'Performance' %}?title={{ request.GET.q | default:'' }}">{% trans '添加表演或戏剧作品' %}</a>
</li>
</ul>
</article>
</aside>

4
catalog/views.py
View file

@ -379,7 +379,7 @@ def comments(request, item_path, item_uuid):
queryset = queryset.filter(created_time__lte=before_time)
return render(
request,
"item_comments.html",
"_item_comments.html",
{
"item": item,
"comments": queryset[:11],
@ -400,7 +400,7 @@ def reviews(request, item_path, item_uuid):
queryset = queryset.filter(created_time__lte=before_time)
return render(
request,
"item_reviews.html",
"_item_reviews.html",
{
"item": item,
"reviews": queryset[:11],

4
journal/templates/_list_item.html
View file

@ -22,7 +22,7 @@
<span>
{% if not action.taken %}
<a title="添加标记"
hx-get="{% url 'journal:mark' item.uuid %}?shelf_type=wishlist&new=1"
hx-get="{% url 'journal:mark' item.uuid %}?shelf_type=wishlist"
hx-target="body"
hx-swap="beforeend">
<i class="fa-regular fa-bookmark"></i>
@ -30,7 +30,7 @@
{% else %}
<a class="activated"
title="修改标记"
hx-get="{% url 'journal:mark' item.uuid %}?new=1"
hx-get="{% url 'journal:mark' item.uuid %}"
hx-target="body"
hx-swap="beforeend">
<i class="fa-solid fa-bookmark"></i>

20
journal/templates/list_item_album.html
View file

@ -1,20 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.artist %}
{% trans '艺术家' %}:
{% for artist in item.artist %}
<span>{{ artist }}</span>
{% if not forloop.last %}{% endif %}
{% endfor %}
{% endif %}
{% if item.genre %}
/ {% trans '流派' %}:
{{ item.genre }}
{% endif %}
{% if item.release_date %}
/ {% trans '发行日期' %}:
{{ item.release_date }}
{% endif %}
{% endblock %}

53
journal/templates/list_item_edition.html
View file

@ -1,53 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.pub_year %}
/
{{ item.pub_year }}{% trans '年' %}
{% if item.pub_month %}
{{ item.pub_month }}{% trans '月' %}
{% endif %}
{% endif %}
{% if item.author %}
/
{% for author in item.author %}
{% if request.GET.q %}
{{ author | highlight:request.GET.q }}
{% else %}
{{ author }}
{% endif %}
{% if not forloop.last %},{% endif %}
{% endfor %}
{% endif %}
{% if item.translator %}
/
{% trans '翻译' %}:
{% for translator in item.translator %}
{% if request.GET.q %}
{{ translator | highlight:request.GET.q }}
{% else %}
{{ translator }}
{% endif %}
{% if not forloop.last %},{% endif %}
{% endfor %}
{% endif %}
{% if item.subtitle %}
/
{% trans '副标题' %}:
{% if request.GET.q %}
{{ item.subtitle | highlight:request.GET.q }}
{% else %}
{{ item.subtitle }}
{% endif %}
{% endif %}
{% if item.orig_title %}
/
{% trans '原名' %}:
{% if request.GET.q %}
{{ item.orig_title | highlight:request.GET.q }}
{% else %}
{{ item.orig_title }}
{% endif %}
{% endif %}
{% endblock %}

36
journal/templates/list_item_game.html
View file

@ -1,36 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.other_title %}
{% trans '别名' %}:
{% for other_title in item.other_title %}
{{ other_title }}
{% if not forloop.last %}{% endif %}
{% endfor %}
/
{% endif %}
{% if item.developer %}
{% trans '开发商' %}:
{% for developer in item.developer %}
{{ developer }}
{% if not forloop.last %}{% endif %}
{% endfor %}
/
{% endif %}
{% if item.genre %}
{% trans '类型' %}:
{% for genre in item.genre %}
{{ genre }}
{% if not forloop.last %}{% endif %}
{% endfor %}
/
{% endif %}
{% if item.platform %}
{% trans '平台' %}:
{% for platform in item.platform %}
{{ platform }}
{% if not forloop.last %}{% endif %}
{% endfor %}
{% endif %}
{% endblock %}

42
journal/templates/list_item_movie.html
View file

@ -1,42 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.director %}
{% trans '导演' %}:
{% for director in item.director %}
{% if request.GET.q %}
{{ director | highlight:request.GET.q }}
{% else %}
{{ director }}
{% endif %}
{% if not forloop.last %},{% endif %}
{% endfor %}
/
{% endif %}
{% if item.genre %}
{% trans '类型' %}:
{% for genre in item.genre %}
{{ genre }}
{% if not forloop.last %}{% endif %}
{% endfor %}
/
{% endif %}
{% endblock %}
{% block info_full %}
{% if item.actor %}
{% trans '主演' %}:
{% for actor in item.actor %}
<span {% if forloop.counter > 5 %}style="display: none;"{% endif %}>
{% if request.GET.q %}
{{ actor | highlight:request.GET.q }}
{% else %}
{{ actor }}
{% endif %}
</span>
{% if forloop.counter <= 5 %}
{% if not forloop.counter == 5 and not forloop.last %}{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% endblock %}

22
journal/templates/list_item_performance.html
View file

@ -1,22 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block brief %}
<div>{% include '_people.html' with people=item.genre _role='类型' max=5 %}</div>
<div></div>
<div>{% include '_people.html' with people=item.troupe _role='剧团' max=5 %}</div>
<div>{% include '_people.html' with people=item.location _role='剧院' max=5 %}</div>
<div>
{% if item.opening_date %}<span>{{ item.opening_date }}</span>{% endif %}
</div>
{% endblock %}
{% block full %}
<div>{% include '_people.html' with people=item.other_title role='又名' max=2 %}</div>
<div>{% include '_people.html' with people=item.director role='导演' max=2 %}</div>
<div>{% include '_people.html' with people=item.playwright role='编剧' max=2 %}</div>
<div>{% include '_people.html' with people=item.actor role='演员' max=5 %}</div>
<div>{% include '_people.html' with people=item.performer role='表演者' max=5 %}</div>
<div>{% include '_people.html' with people=item.composer role='作曲' max=2 %}</div>
<div>{% include '_people.html' with people=item.choreographer role='编舞' max=2 %}</div>
<div>{% include '_people.html' with people=item.crew role='演职人员' max=2 %}</div>
{% endblock %}

1
journal/templates/list_item_performanceproduction.html
View file

@ -1 +0,0 @@
{% extends "list_item_base.html" %}

13
journal/templates/list_item_podcast.html
View file

@ -1,13 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.genre %}
{% trans '类型' %}:
{{ item.genre|join:" / " }}
{% endif %}
{% if item.genre %}
{% trans '主播' %}:
{{ item.hosts|join:" / " }}
{% endif %}
{% endblock %}

43
journal/templates/list_item_tvseason.html
View file

@ -1,43 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.director %}
{% trans '导演' %}:
{% for director in item.director %}
{% if request.GET.q %}
{{ director | highlight:request.GET.q }}
{% else %}
{{ director }}
{% endif %}
{% if not forloop.last %},{% endif %}
{% endfor %}
/
{% endif %}
{% if item.genre %}
{% trans '类型' %}:
{% for genre in item.genre %}
{{ genre }}
{% if not forloop.last %}{% endif %}
{% endfor %}
/
{% endif %}
{% endblock %}
{% block info_full %}
{% if item.actor %}
{% trans '主演' %}:
{% for actor in item.actor %}
<span {% if forloop.counter > 5 %}style="display: none;"{% endif %}>
{% if request.GET.q %}
{{ actor | highlight:request.GET.q }}
{% else %}
{{ actor }}
{% endif %}
</span>
{% if forloop.counter <= 5 %}
{% if not forloop.counter == 5 and not forloop.last %}{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% if item.show %}<!-- {{ item.show }} -->{% endif %}
{% endblock %}

42
journal/templates/list_item_tvshow.html
View file

@ -1,42 +0,0 @@
{% extends "list_item_base.html" %}
{% load i18n %}
{% load highlight %}
{% block info %}
{% if item.director %}
{% trans '导演' %}:
{% for director in item.director %}
{% if request.GET.q %}
{{ director | highlight:request.GET.q }}
{% else %}
{{ director }}
{% endif %}
{% if not forloop.last %},{% endif %}
{% endfor %}
/
{% endif %}
{% if item.genre %}
{% trans '类型' %}:
{% for genre in item.genre %}
{{ genre }}
{% if not forloop.last %}{% endif %}
{% endfor %}
/
{% endif %}
{% endblock %}
{% block info_full %}
{% if item.actor %}
{% trans '主演' %}:
{% for actor in item.actor %}
<span {% if forloop.counter > 5 %}style="display: none;"{% endif %}>
{% if request.GET.q %}
{{ actor | highlight:request.GET.q }}
{% else %}
{{ actor }}
{% endif %}
</span>
{% if forloop.counter <= 5 %}
{% if not forloop.counter == 5 and not forloop.last %}{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% endblock %}

1
journal/templates/list_item_work.html
View file

@ -1 +0,0 @@
<!-- -->

566
journal/templates/mark.html
View file

@ -8,336 +8,308 @@
{% load truncate %}
{% load highlight %}
{% load thumb %}
<div id="modal"
_="on closeModal add .closing then wait for animationend then remove me">
<div class="modal-underlay" _="on click trigger closeModal"></div>
<div class="modal-content">
<div class="add-to-list-modal__head">
<span class="add-to-list-modal__title">{% trans '标记' %} {{ item.title }}</span>
<span class="add-to-list-modal__close-button modal-close"
_="on click trigger closeModal">
<i class="fa-solid fa-xmark"></i>
</span>
</div>
{% load duration %}
<dialog open
_="on close_dialog add .closing then wait for animationend then remove me">
<article>
<header>
<link to="#"
aria-label="Close"
class="close"
_="on click trigger close_dialog" />
<strong>标记 {{ item.title }}</strong>
</header>
<div class="add-to-list-modal__body">
<form action="{% url 'journal:mark' item.uuid %}" method="post">
<form method="post" action="{% url 'journal:mark' item.uuid %}">
{% csrf_token %}
<div id="statusSelection" class="mark-modal__status-radio float-right">
<ul id="id_status">
{% for k, v in shelf_types %}
{% if v %}
<li>
<label for="id_status_{{ k }}">
<input type="radio"
name="status"
value="{{ k }}"
required=""
id="id_status_{{ k }}"
{% if shelf_type == k %}checked=""{% endif %}>
{{ v }}
</label>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
<div class="mark-modal__rating-star rating-star-edit"></div>
<input type="hidden"
name="rating"
id="id_rating"
value="{{ mark.rating_grade }}">
<div class="mark-modal__clear"></div>
<textarea name="text"
cols="40"
rows="10"
placeholder="超过360字部分实例可能无法显示"
id="id_text">{% if mark.comment_text %}{{ mark.comment_text }}{% endif %}</textarea>
<div class="mark-modal__tag">
<label>标签</label>
<div class="tag-input">
<input name="tags" type="text" placeholder="回车增加标签" id="id_tags" value="">
<div class="grid mark-line">
<div>
<fieldset>
{% for k, v in shelf_types %}
{% if v %}
<input type="radio"
name="status"
value="{{ k }}"
required
id="id_status_{{ k }}"
{% if k == "wishlist" %} _="on click add .hidden to .rating-editor" {% else %} _="on click remove .hidden from .rating-editor" {% endif %}
{% if shelf_type == k %}checked=""{% endif %}>
<label for="id_status_{{ k }}">{{ v }}</label>
{% endif %}
{% endfor %}
</fieldset>
</div>
</div>
<div class="mark-modal__share-checkbox float-right">
<label for="id_share_to_mastodon">
<input type="checkbox"
name="share_to_mastodon"
id="id_share_to_mastodon"
value="1"
{% if not request.user.preference.default_no_share %}checked{% endif %}>
分享到联邦网络
</label>
</div>
<div class="mark-modal__option">
<div class="mark-modal__visibility-radio">
<span>可见性:
<ul id="id_visibility">
<li>
<label for="id_visibility_0">
<input type="radio"
name="visibility"
value="0"
required=""
id="id_visibility_0"
{% if mark.visibility == 0 %}checked{% endif %}>
公开
</label>
</li>
<li>
<label for="id_visibility_1">
<input type="radio"
name="visibility"
value="1"
required=""
id="id_visibility_1"
{% if mark.visibility == 1 %}checked{% endif %}>
仅关注者
</label>
</li>
<li>
<label for="id_visibility_2">
<input type="radio"
name="visibility"
value="2"
required=""
id="id_visibility_2"
{% if mark.visibility == 2 %}checked{% endif %}>
仅自己
</label>
</li>
</ul>
<div>
<span class="rating-editor {% if shelf_type == 'wishlist' %}hidden{% endif %}" _="on mousemove(currentTarget, offsetX) set current_value to Math.round((10 * offsetX) / currentTarget.offsetWidth) set star_div to the
<div/>
in me set star_div.style.width to (current_value * 10) + '%' set @data-tooltip to current_value or '未评分' add .yellow to star_div end on click(currentTarget, offsetX) set current_value to Math.round((10 * offsetX) / currentTarget.offsetWidth) set star_div to the
<div/>
in me set star_input to the
<input/>
in me set star_div.style.width to (current_value * 10) + '%' set @data-tooltip to current_value or '未评分' set star_input.value to current_value end on mouseleave(currentTarget) set star_div to the
<div/>
in me set star_input to the
<input/>
in me set current_value to star_input.value set star_div.style.width to (current_value * 10) + '%' set @data-tooltip to current_value or '未评分' end">
{{ mark.rating_grade|rating_star }}
<input type="hidden"
name="rating_grade"
id="id_rating"
value="{{ mark.rating_grade | default:0 }}">
</span>
</div>
</div>
<div class="mark-modal__confirm-button">
<input type="submit" class="button float-right" value="保存">
<div>
<fieldset>
<textarea name="text"
rows="5"
autofocus
placeholder="提示： 善用 &gt;!文字!&lt; 标记可隐藏剧透； 超过360字可能无法分享到联邦网络实例时间线。"
id="id_text">{{ mark.comment_text|default:"" }}</textarea>
</fieldset>
</div>
<div class="mark-modal__option">
<div class="mark-modal__visibility-radio">
<span>更改标记日期:
<label for="mark_anotherday">
<input type="checkbox" name="mark_anotherday" value="1" id="mark_anotherday">
<div class="mark-modal__tag">
<div class="tag-input">
<input name="tags" type="text" placeholder="回车增加标签" id="id_tags" value="">
<!-- {{ tags }} -->
</div>
</div>
<div class="grid">
<div>
<fieldset>
<input type="radio"
name="visibility"
value="0"
required
id="id_visibility_0"
{% if mark.visibility == 0 %}checked{% endif %}>
<label for="id_visibility_0">公开</label>
<input type="radio"
name="visibility"
value="1"
required
id="id_visibility_1"
{% if mark.visibility == 1 %}checked{% endif %}>
<label for="id_visibility_1">仅关注者</label>
<input type="radio"
name="visibility"
value="2"
required
id="id_visibility_2"
{% if mark.visibility == 2 %}checked{% endif %}>
<label for="id_visibility_2">仅自己</label>
</fieldset>
</div>
<div>
<fieldset>
<label for="id_share_to_mastodon">
<input role="switch"
type="checkbox"
name="share_to_mastodon"
id="id_share_to_mastodon"
value="1"
{% if not request.user.preference.default_no_share %}checked{% endif %}>
分享到联邦网络
</label>
<input type="date"
</fieldset>
</div>
</div>
<div class="grid">
<div>
<div>
<input role="switch"
_="on click toggle .invisible on #mark_date "
type="checkbox"
name="mark_anotherday"
value="1"
id="mark_anotherday">
<label for="mark_anotherday">更改日期:</label>
<input class="invisible"
type="date"
name="mark_date"
id="mark_date"
min="1900-01-01"
max="{{ date_today }}"
value="{{ date_today }}"
style="display: none">
</span>
value="{{ date_today }}">
</div>
</div>
<div>
<fieldset>
<input type="submit" value="保存">
</fieldset>
</div>
</div>
</form>
<div>
{% if mark.id %}
<form id="mark_delete"
action="{% url 'journal:mark' mark.item.uuid %}"
method="post">
{% csrf_token %}
<input type="hidden" name="delete" value="1">
<a>
<button class="secondary" onclick="return confirm('确认删除这条标记、短评和标签？')">删除标记</button>
</a>
</form>
{% endif %}
</div>
</div>
</div>
</div>
</article>
</dialog>
<script>
function inputTags(configs) {
function inputTags(configs) {
let tagsContainer = configs.container,
input = configs.container.querySelector('input')
let tagsContainer = configs.container,
input = configs.container.querySelector('input')
let _privateMethods = {
let _privateMethods = {
init: function (configs) {
init: function (configs) {
// this.inspectConfigProperties(configs);
// this.inspectConfigProperties(configs);
let self = this,
input_hidden = document.createElement('input');
let name = input.getAttribute('name'),
id = input.getAttribute('id');
input.removeAttribute('name');
// input.removeAttribute('id');
input_hidden.setAttribute('type', 'hidden');
// input_hidden.setAttribute('id', id);
input_hidden.setAttribute('name', name);
input.parentNode.insertBefore(input_hidden, input);
this.input_hidden = input_hidden
tagsContainer.addEventListener('click', function () {
input.focus();
});
if (configs.tags) {
for (let i = 0; i < configs.tags.length; i++) {
if (configs.tags[i]) {
this.create(configs.tags[i]);
}
}
}
input.addEventListener("focusout", function () {
let tag_txt = this.value.trim(),
tag_exists = false;
if (self.tags_array) {
tag_exists = Boolean(self.tags_array.indexOf(tag_txt) + 1);
}
if (tag_txt && tag_exists && !configs.allowDuplicateTags) {
self.showDuplicate(tag_txt);
}
else if (tag_txt && tag_exists && configs.allowDuplicateTags) {
self.create(tag_txt);
}
else if (tag_txt && !tag_exists) {
self.create(tag_txt);
}
this.value = "";
});
input.addEventListener('keydown', function (ev) {
if (ev.keyCode === 13 || ev.keyCode === 188 ||
(ev.keyCode === 32 && configs.allowDuplicateTags)) { // enter || comma || space
let event = new Event('focusout');
input.dispatchEvent(event);
ev.preventDefault();
}
else if (event.which === 8 && !input.value) { // backspace
let tag_nodes = document.querySelectorAll('.tag-input__tag');
if (tag_nodes.length > 0) {
input.addEventListener('keyup', function (event) {
if (event.which === 8) {
let node_to_del = tag_nodes[tag_nodes.length - 1];
node_to_del.remove();
self.update();
}
});
}
ev.preventDefault();
}
});
},
create: function (tag_txt) {
let tag_nodes = document.querySelectorAll('.tag-input__tag');
if (!configs.maxTags || tag_nodes.length < configs.maxTags) {
let self = this,
span_tag = document.createElement('span'),
input_hidden_field = self.input_hidden;
input_hidden = document.createElement('input');
let name = input.getAttribute('name'),
id = input.getAttribute('id');
input.removeAttribute('name');
// input.removeAttribute('id');
input_hidden.setAttribute('type', 'hidden');
// input_hidden.setAttribute('id', id);
input_hidden.setAttribute('name', name);
input.parentNode.insertBefore(input_hidden, input);
this.input_hidden = input_hidden
span_tag.setAttribute('class', 'tag-input__tag');
span_tag.innerText = tag_txt;
let span_tag_close = document.createElement('span');
span_tag_close.setAttribute('class', 'tag-input__close');
span_tag.appendChild(span_tag_close);
tagsContainer.insertBefore(span_tag, input_hidden_field);
span_tag.childNodes[1].addEventListener('click', function () {
self.remove(this);
tagsContainer.addEventListener('click', function () {
input.focus();
});
if (configs.tags) {
for (let i = 0; i < configs.tags.length; i++) {
if (configs.tags[i]) {
this.create(configs.tags[i]);
}
}
}
input.addEventListener("focusout", function () {
let tag_txt = this.value.trim(),
tag_exists = false;
if (self.tags_array) {
tag_exists = Boolean(self.tags_array.indexOf(tag_txt) + 1);
}
if (tag_txt && tag_exists && !configs.allowDuplicateTags) {
self.showDuplicate(tag_txt);
}
else if (tag_txt && tag_exists && configs.allowDuplicateTags) {
self.create(tag_txt);
}
else if (tag_txt && !tag_exists) {
self.create(tag_txt);
}
this.value = "";
});
input.addEventListener('keydown', function (ev) {
if (ev.keyCode === 13 || ev.keyCode === 188 ||
(ev.keyCode === 32 && configs.allowDuplicateTags)) { // enter || comma || space
let event = new Event('focusout');
input.dispatchEvent(event);
ev.preventDefault();
}
else if (event.which === 8 && !input.value) { // backspace
let tag_nodes = document.querySelectorAll('.tag-input__tag');
if (tag_nodes.length > 0) {
input.addEventListener('keyup', function (event) {
if (event.which === 8) {
let node_to_del = tag_nodes[tag_nodes.length - 1];
node_to_del.remove();
self.update();
}
});
}
ev.preventDefault();
}
});
},
create: function (tag_txt) {
let tag_nodes = document.querySelectorAll('.tag-input__tag');
if (!configs.maxTags || tag_nodes.length < configs.maxTags) {
let self = this,
span_tag = document.createElement('span'),
input_hidden_field = self.input_hidden;
span_tag.setAttribute('class', 'tag-input__tag');
span_tag.innerText = tag_txt;
let span_tag_close = document.createElement('span');
span_tag_close.setAttribute('class', 'tag-input__close');
span_tag.appendChild(span_tag_close);
tagsContainer.insertBefore(span_tag, input_hidden_field);
span_tag.childNodes[1].addEventListener('click', function () {
self.remove(this);
});
this.update();
}
},
update: function () {
let tags = document.getElementsByClassName('tag-input__tag'),
tags_arr = [];
for (let i = 0; i < tags.length; i++) {
tags_arr.push(tags[i].textContent.toLowerCase());
}
this.tags_array = tags_arr;
this.input_hidden.setAttribute('value', tags_arr.join());
},
remove: function (tag) {
configs.onTagRemove(tag.parentNode.textContent);
tag.parentNode.remove();
this.update();
},
}
},
showDuplicate: function (tag_value) {
let tags = document.getElementsByClassName('tag-input__tag');
update: function () {
let tags = document.getElementsByClassName('tag-input__tag'),
tags_arr = [];
for (let i = 0; i < tags.length; i++) {
tags_arr.push(tags[i].textContent.toLowerCase());
}
this.tags_array = tags_arr;
this.input_hidden.setAttribute('value', tags_arr.join());
},
remove: function (tag) {
configs.onTagRemove(tag.parentNode.textContent);
tag.parentNode.remove();
this.update();
},
showDuplicate: function (tag_value) {
let tags = document.getElementsByClassName('tag-input__tag');
for (let i = 0; i < tags.length; i++) {
if (tags[i].textContent === tag_value) {
tags[i].classList.add("tag-input__tag--highlight");
window.setTimeout(function () {
tags[i].classList.remove("tag-input__tag--highlight");
}, configs.duplicateTime);
for (let i = 0; i < tags.length; i++) {
if (tags[i].textContent === tag_value) {
tags[i].classList.add("tag-input__tag--highlight");
window.setTimeout(function () {
tags[i].classList.remove("tag-input__tag--highlight");
}, configs.duplicateTime);
}
}
}
}
}
_privateMethods.init(configs);
// return false;
}
(function(){
new inputTags({
container: document.getElementsByClassName("tag-input")[0],
tags : "{{ tags }}".split(","),
allowDuplicateTags : false,
duplicateTime: 300,
onTagRemove : function (tag) {},
});
// editable rating star in modal
ratingLabels = $("#modal .rating-star-edit");
$(ratingLabels).each( function(index, value) {
let ratingScore = $("input[type='hidden'][name='rating']").val() / 2;
let label = $(this);
label.starRating({
initialRating: ratingScore,
starSize: 20,
onHover: function(currentIndex, currentRating, $el){
$("input[type='hidden'][name='rating']").val(currentIndex);
},
onLeave: function(currentIndex, currentRating, $el){
$("input[type='hidden'][name='rating']").val(currentRating * 2);
}
_privateMethods.init(configs);
// return false;
}
(function () {
new inputTags({
container: document.getElementsByClassName("tag-input")[0],
tags: "{{ tags }}".split(","),
allowDuplicateTags: false,
duplicateTime: 300,
onTagRemove: function (tag) { },
});
});
//show date picker if mark yesterday
$("#modal #mark_anotherday").on('click', function(e) {
if ($("#modal #mark_anotherday:checked").val() == '1') {
$("#modal #mark_date").show()
} else {
$("#modal #mark_date").hide()
}
});
// hide rating star when select wish
const WISH_CODE = "wishlist";
if ($("#statusSelection input[type='radio']:checked").val() == WISH_CODE) {
$("#modal .rating-star-edit").hide();
}
$("#statusSelection input[type='radio']").on('click', function() {
if ($(this).val() == WISH_CODE) {
$("#modal .rating-star-edit").hide();
} else {
$("#modal .rating-star-edit").show();
}
});
// show confirm modal
$("#modal a.delete").on('click', function(e) {
e.preventDefault();
$(".confirm-modal").show();
$(".bg-mask").show();
});
// confirm modal
$(".confirm-modal input[type='submit']").on('click', function(e) {
e.preventDefault();
$("#modal form").submit();
});
})();
})();
</script>

315
journal/templates/mark2.html
View file

@ -1,315 +0,0 @@
{% load static %}
{% load i18n %}
{% load l10n %}
{% load humanize %}
{% load admin_url %}
{% load mastodon %}
{% load oauth_token %}
{% load truncate %}
{% load highlight %}
{% load thumb %}
{% load duration %}
<dialog open
_="on close_dialog add .closing then wait for animationend then remove me">
<article>
<header>
<link to="#"
aria-label="Close"
class="close"
_="on click trigger close_dialog" />
<strong>标记 {{ item.title }}</strong>
</header>
<div class="add-to-list-modal__body">
<form method="post" action="{% url 'journal:mark' item.uuid %}">
{% csrf_token %}
<div class="grid mark-line">
<div>
<fieldset>
{% for k, v in shelf_types %}
{% if v %}
<input type="radio"
name="status"
value="{{ k }}"
required
id="id_status_{{ k }}"
{% if k == "wishlist" %} _="on click add .hidden to .rating-editor" {% else %} _="on click remove .hidden from .rating-editor" {% endif %}
{% if shelf_type == k %}checked=""{% endif %}>
<label for="id_status_{{ k }}">{{ v }}</label>
{% endif %}
{% endfor %}
</fieldset>
</div>
<div>
<span class="rating-editor {% if shelf_type == 'wishlist' %}hidden{% endif %}" _="on mousemove(currentTarget, offsetX) set current_value to Math.round((10 * offsetX) / currentTarget.offsetWidth) set star_div to the
<div/>
in me set star_div.style.width to (current_value * 10) + '%' set @data-tooltip to current_value or '未评分' add .yellow to star_div end on click(currentTarget, offsetX) set current_value to Math.round((10 * offsetX) / currentTarget.offsetWidth) set star_div to the
<div/>
in me set star_input to the
<input/>
in me set star_div.style.width to (current_value * 10) + '%' set @data-tooltip to current_value or '未评分' set star_input.value to current_value end on mouseleave(currentTarget) set star_div to the
<div/>
in me set star_input to the
<input/>
in me set current_value to star_input.value set star_div.style.width to (current_value * 10) + '%' set @data-tooltip to current_value or '未评分' end">
{{ mark.rating_grade|rating_star }}
<input type="hidden"
name="rating_grade"
id="id_rating"
value="{{ mark.rating_grade | default:0 }}">
</span>
</div>
</div>
<div>
<fieldset>
<textarea name="text"
rows="5"
autofocus
placeholder="提示： 善用 &gt;!文字!&lt; 标记可隐藏剧透； 超过360字可能无法分享到联邦网络实例时间线。"
id="id_text">{{ mark.comment_text|default:"" }}</textarea>
</fieldset>
</div>
<div class="mark-modal__tag">
<div class="tag-input">
<input name="tags" type="text" placeholder="回车增加标签" id="id_tags" value="">
<!-- {{ tags }} -->
</div>
</div>
<div class="grid">
<div>
<fieldset>
<input type="radio"
name="visibility"
value="0"
required
id="id_visibility_0"
{% if mark.visibility == 0 %}checked{% endif %}>
<label for="id_visibility_0">公开</label>
<input type="radio"
name="visibility"
value="1"
required
id="id_visibility_1"
{% if mark.visibility == 1 %}checked{% endif %}>
<label for="id_visibility_1">仅关注者</label>
<input type="radio"
name="visibility"
value="2"
required
id="id_visibility_2"
{% if mark.visibility == 2 %}checked{% endif %}>
<label for="id_visibility_2">仅自己</label>
</fieldset>
</div>
<div>
<fieldset>
<label for="id_share_to_mastodon">
<input role="switch"
type="checkbox"
name="share_to_mastodon"
id="id_share_to_mastodon"
value="1"
{% if not request.user.preference.default_no_share %}checked{% endif %}>
分享到联邦网络
</label>
</fieldset>
</div>
</div>
<div class="grid">
<div>
<div>
<input role="switch"
_="on click toggle .invisible on #mark_date "
type="checkbox"
name="mark_anotherday"
value="1"
id="mark_anotherday">
<label for="mark_anotherday">更改日期:</label>
<input class="invisible"
type="date"
name="mark_date"
id="mark_date"
min="1900-01-01"
max="{{ date_today }}"
value="{{ date_today }}">
</div>
</div>
<div>
<fieldset>
<input type="submit" value="保存">
</fieldset>
</div>
</div>
</form>
<div>
{% if mark.id %}
<form id="mark_delete"
action="{% url 'journal:mark' mark.item.uuid %}"
method="post">
{% csrf_token %}
<input type="hidden" name="delete" value="1">
<a>
<button class="secondary" onclick="return confirm('确认删除这条标记、短评和标签？')">删除标记</button>
</a>
</form>
{% endif %}
</div>
</div>
</article>
</dialog>
<script>
function inputTags(configs) {
let tagsContainer = configs.container,
input = configs.container.querySelector('input')
let _privateMethods = {
init: function (configs) {
// this.inspectConfigProperties(configs);
let self = this,
input_hidden = document.createElement('input');
let name = input.getAttribute('name'),
id = input.getAttribute('id');
input.removeAttribute('name');
// input.removeAttribute('id');
input_hidden.setAttribute('type', 'hidden');
// input_hidden.setAttribute('id', id);
input_hidden.setAttribute('name', name);
input.parentNode.insertBefore(input_hidden, input);
this.input_hidden = input_hidden
tagsContainer.addEventListener('click', function () {
input.focus();
});
if (configs.tags) {
for (let i = 0; i < configs.tags.length; i++) {
if (configs.tags[i]) {
this.create(configs.tags[i]);
}
}
}
input.addEventListener("focusout", function () {
let tag_txt = this.value.trim(),
tag_exists = false;
if (self.tags_array) {
tag_exists = Boolean(self.tags_array.indexOf(tag_txt) + 1);
}
if (tag_txt && tag_exists && !configs.allowDuplicateTags) {
self.showDuplicate(tag_txt);
}
else if (tag_txt && tag_exists && configs.allowDuplicateTags) {
self.create(tag_txt);
}
else if (tag_txt && !tag_exists) {
self.create(tag_txt);
}
this.value = "";
});
input.addEventListener('keydown', function (ev) {
if (ev.keyCode === 13 || ev.keyCode === 188 ||
(ev.keyCode === 32 && configs.allowDuplicateTags)) { // enter || comma || space
let event = new Event('focusout');
input.dispatchEvent(event);
ev.preventDefault();
}
else if (event.which === 8 && !input.value) { // backspace
let tag_nodes = document.querySelectorAll('.tag-input__tag');
if (tag_nodes.length > 0) {
input.addEventListener('keyup', function (event) {
if (event.which === 8) {
let node_to_del = tag_nodes[tag_nodes.length - 1];
node_to_del.remove();
self.update();
}
});
}
ev.preventDefault();
}
});
},
create: function (tag_txt) {
let tag_nodes = document.querySelectorAll('.tag-input__tag');
if (!configs.maxTags || tag_nodes.length < configs.maxTags) {
let self = this,
span_tag = document.createElement('span'),
input_hidden_field = self.input_hidden;
span_tag.setAttribute('class', 'tag-input__tag');
span_tag.innerText = tag_txt;
let span_tag_close = document.createElement('span');
span_tag_close.setAttribute('class', 'tag-input__close');
span_tag.appendChild(span_tag_close);
tagsContainer.insertBefore(span_tag, input_hidden_field);
span_tag.childNodes[1].addEventListener('click', function () {
self.remove(this);
});
this.update();
}
},
update: function () {
let tags = document.getElementsByClassName('tag-input__tag'),
tags_arr = [];
for (let i = 0; i < tags.length; i++) {
tags_arr.push(tags[i].textContent.toLowerCase());
}
this.tags_array = tags_arr;
this.input_hidden.setAttribute('value', tags_arr.join());
},
remove: function (tag) {
configs.onTagRemove(tag.parentNode.textContent);
tag.parentNode.remove();
this.update();
},
showDuplicate: function (tag_value) {
let tags = document.getElementsByClassName('tag-input__tag');
for (let i = 0; i < tags.length; i++) {
if (tags[i].textContent === tag_value) {
tags[i].classList.add("tag-input__tag--highlight");
window.setTimeout(function () {
tags[i].classList.remove("tag-input__tag--highlight");
}, configs.duplicateTime);
}
}
}
}
_privateMethods.init(configs);
// return false;
}
(function () {
new inputTags({
container: document.getElementsByClassName("tag-input")[0],
tags: "{{ tags }}".split(","),
allowDuplicateTags: false,
duplicateTime: 300,
onTagRemove: function (tag) { },
});
})();
</script>

2
journal/templates/review.html
View file

@ -80,7 +80,7 @@
</article>
</div>
<aside>
{% include "sidebar_item.html" with item=review.item %}
{% include "_sidebar_item.html" with item=review.item %}
</aside>
</main>
<script>

2
journal/templates/review_edit.html
View file

@ -117,7 +117,7 @@ Content Cell | Content Cell
</article>
</div>
<aside>
{% include "sidebar_item.html" with item=item %}
{% include "_sidebar_item.html" with item=item %}
</aside>
</main>
<script>

2
journal/views.py
View file

@ -147,7 +147,7 @@ def mark(request, item_uuid):
shelf_type = request.GET.get("shelf_type", mark.shelf_type)
return render(
request,
"mark2.html" if request.GET.get("new", 0) else "mark.html",
"mark.html",
{
"item": item,
"mark": mark,

4
social/templates/activity/comment_focus_item.html
View file

@ -40,14 +40,14 @@
<span>
{% if not action.taken %}
<a title="添加标记"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?shelf_type=wishlist&new=1"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?shelf_type=wishlist"
hx-target="body"
hx-swap="beforeend">
<i class="fa-regular fa-bookmark"></i>
</a>
{% else %}
<a title="修改标记"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?new=1"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}"
hx-target="body"
hx-swap="beforeend">
<i class="fa-solid fa-bookmark"></i>

4
social/templates/activity/mark_item.html
View file

@ -33,14 +33,14 @@
<span>
{% if not action.taken %}
<a title="添加标记"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?shelf_type=wishlist&new=1"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?shelf_type=wishlist"
hx-target="body"
hx-swap="beforeend">
<i class="fa-regular fa-bookmark"></i>
</a>
{% else %}
<a title="修改标记"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?new=1"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}"
hx-target="body"
hx-swap="beforeend">
<i class="fa-solid fa-bookmark"></i>

4
social/templates/activity/review_item.html
View file

@ -36,14 +36,14 @@
<span>
{% if not action.taken %}
<a title="添加标记"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?shelf_type=wishlist&new=1"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?shelf_type=wishlist"
hx-target="body"
hx-swap="beforeend">
<i class="fa-regular fa-bookmark"></i>
</a>
{% else %}
<a title="修改标记"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}?new=1"
hx-get="{% url 'journal:mark' activity.action_object.item.uuid %}"
hx-target="body"
hx-swap="beforeend">
<i class="fa-solid fa-bookmark"></i>