Compare commits

..

No commits in common. "befb013e58c618a5c8f47b196c33a7a94fa7fe8a" and "7237364ba57ebc12a3359ba5d3f8e5a5c4362e4d" have entirely different histories.

5 changed files with 10 additions and 18 deletions

View file

@ -1,6 +1,6 @@
from django.contrib import admin from django.contrib import admin
from reversion.admin import VersionAdmin from reversion.admin import VersionAdmin
from korektury.models import KorekturovanePDF, Oprava from korektury.models import KorekturovanePDF
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
from django.urls import reverse from django.urls import reverse
@ -62,4 +62,3 @@ Korekturovátko
).send() ).send()
admin.site.register(KorekturovanePDF, KorekturovanePDFAdmin) admin.site.register(KorekturovanePDF, KorekturovanePDFAdmin)
admin.site.register(Oprava)

View file

@ -27,25 +27,25 @@ img{background:white;}
--rgb: 255, 0, 0; --rgb: 255, 0, 0;
[value="k_oprave"] { display: none } [value="k_oprave"] { display: none }
.komentovat_disabled { display: none } [value="notcomment"] { display: none }
} }
[data-opravastatus="opraveno"] { [data-opravastatus="opraveno"] {
--rgb: 0, 0, 255; --rgb: 0, 0, 255;
[value="opraveno"] { display: none } [value="opraveno"] { display: none }
.komentovat { display: none } [value="comment"] { display: none }
} }
[data-opravastatus="neni_chyba"] { [data-opravastatus="neni_chyba"] {
--rgb: 128, 128, 128; --rgb: 128, 128, 128;
[value="neni_chyba"] { display: none } [value="neni_chyba"] { display: none }
.komentovat { display: none } [value="comment"] { display: none }
} }
[data-opravastatus="k_zaneseni"] { [data-opravastatus="k_zaneseni"] {
--rgb: 0, 255, 0; --rgb: 0, 255, 0;
[value="k_zaneseni"] { display: none } [value="k_zaneseni"] { display: none }
.komentovat { display: none } [value="notcomment"] { display: none }
} }
/* Skrývání korektur */ /* Skrývání korektur */

View file

@ -1,7 +1,7 @@
<div id="commform-div" style="display: none"> <div id="commform-div" style="display: none">
<input size="24" name="au" value="{{user.first_name}} {{user.last_name}}" readonly/> <input size="24" name="au" value="{{user.first_name}} {{user.last_name}}" readonly/>
<button type="button" id="commform-submit">Oprav!</button> <button id="commform-submit">Oprav!</button>
<button type="button" id="commform-close">Zavřít</button> <button id="commform-close">Zavřít</button>
<br/> <br/>
<textarea id="commform-text" cols=40 rows=10 name="txt"></textarea> <textarea id="commform-text" cols=40 rows=10 name="txt"></textarea>
<br/> <br/>

View file

@ -34,13 +34,10 @@
<img src='{% static "korektury/imgs/tex.png" %}' alt='TeX'/> <img src='{% static "korektury/imgs/tex.png" %}' alt='TeX'/>
</button> </button>
<a href='{% url "admin:korektury_oprava_change" -1 %}' class='edit' title='Uprav korekturu jako takovou.' style="text-decoration: none;"> {# FIXME Udělat z toho tlačítko? #} <button type='button' class='notcomment' title='Korekturu nelze komentovat, protože už je uzavřená' disabled=''>
<img src='{% static "korektury/imgs/edit.png"%}' alt='✏️' style="opacity: 0.5;"/> {# FIXME Odlišit jinak než pomocí opacity? #}
</a>
<button type='button' class='komentovat_disabled' title='Korekturu nelze komentovat, protože už je uzavřená' disabled=''>
<img src='{% static "korektury/imgs/comment-gr.png" %}' alt='💭'/> <img src='{% static "korektury/imgs/comment-gr.png" %}' alt='💭'/>
</button> </button>
<button type='button' class='komentovat' title='Komentovat'> <button type='button' class='comment' title='Komentovat'>
<img src='{% static "korektury/imgs/comment.png" %}' alt='💭'/> <img src='{% static "korektury/imgs/comment.png" %}' alt='💭'/>
</button> </button>
</span> </span>
@ -87,11 +84,8 @@
this.htmlElement.getElementsByClassName('toggle-vis')[0].addEventListener('click', _ => this.#toggle_visibility()); this.htmlElement.getElementsByClassName('toggle-vis')[0].addEventListener('click', _ => this.#toggle_visibility());
for (const button of this.htmlElement.getElementsByClassName('action')) for (const button of this.htmlElement.getElementsByClassName('action'))
button.addEventListener('click', async event => this.#zmenStavKorektury(event)); button.addEventListener('click', async event => this.#zmenStavKorektury(event));
this.htmlElement.getElementsByClassName('komentovat')[0].addEventListener('click', _ => this.#comment()) this.htmlElement.getElementsByClassName('comment')[0].addEventListener('click', _ => this.#comment())
this.htmlElement.getElementsByClassName('del')[0].addEventListener('click', _ => this.#delete()); this.htmlElement.getElementsByClassName('del')[0].addEventListener('click', _ => this.#delete());
const odkaz_editace = this.htmlElement.getElementsByClassName('edit')[0];
odkaz_editace.href = odkaz_editace.href.replace("-1", this.id);
odkaz_editace.onclick = ev => { if (!confirm("Editace korektury je velmi pokročilá featura umožňující přesouvat korekturu nebo přidávat informované orgy, opravdu chceš pokračovat do adminu?")) ev.preventDefault(); };
this.htmlElement.addEventListener('mouseover', _ => this.pointer.dataset.highlight = 'true'); this.htmlElement.addEventListener('mouseover', _ => this.pointer.dataset.highlight = 'true');
this.htmlElement.addEventListener('mouseout', _ => this.pointer.dataset.highlight = 'false'); this.htmlElement.addEventListener('mouseout', _ => this.pointer.dataset.highlight = 'false');

View file

@ -45,7 +45,6 @@
} }
const img_id = image.id.substring(4); const img_id = image.id.substring(4);
commform.show(img_id, dx, dy, ''); commform.show(img_id, dx, dy, '');
console.log("Pro přesun korektur: strana = " + img_id + ", x = " + dx + ", y = " + dy);
}); });
} }
</script> </script>