diff --git a/yadc/assets/css/base-types.scss b/yadc/assets/css/base-types.scss index fce26f1..12222f0 100644 --- a/yadc/assets/css/base-types.scss +++ b/yadc/assets/css/base-types.scss @@ -92,6 +92,21 @@ h4 { .edit { display: none !important; } + + // START COMMENT NOJS EDITING + &:hover { + .jsoff-show.edit { + display: initial !important; + } + .jsoff-show.notedit { + display: none !important; + } + } + .jsoff-hide.edit, .jsoff-hide.notedit { + display: none !important; + } + // END COMMENT NOJS EDITING + } &.time-to-edit { .notedit { @@ -308,18 +323,17 @@ label { .comment-container { - padding: 0 10px; + // padding: 0 10px; max-width: 500px; article.comment { overflow: hidden; // margin-bottom: 1em; - margin: .4em 0; + margin: .4em .4em; + padding: .4em .4em; p, textarea { - // margin-top: .5em; - margin-top: 0; - // margin-bottom: 1em; + margin: 0; &.deleted { color: red; @@ -329,11 +343,32 @@ label { .comment-head { display: flex; justify-content: space-between; + align-items: baseline; + + h4 { + margin: 0; + padding: .4em; + } a, label { cursor: pointer; } - .controls > * { display: inline-block; } + .controls { display: flex; } + + .controls label > input { + display: none; + } + } + .comment-editform { + // THIS IS FUCKED UP + p { + padding: .5em; + } + textarea { + font-size: inherit; + font-family: inherit; + border: none; + } } } } diff --git a/yadc/assets/js/formswitchers.js b/yadc/assets/js/formswitchers.js index ad87570..6f53e8b 100644 --- a/yadc/assets/js/formswitchers.js +++ b/yadc/assets/js/formswitchers.js @@ -56,5 +56,7 @@ function doubleclickSwitcher(rootSelector, triggerSelector, dblSelector) { }) } -toggleSwitcher('section.comments article.comment', '.comment-head .control-edit', '.comment-content') -doubleclickSwitcher('section.management-table tbody > tr', 'label.to-edit, label.to-close', '.notedit') \ No newline at end of file +toggleSwitcher('article.comment', '.comment-head .control-edit', '.comment-content') +doubleclickSwitcher('section.management-table tbody > tr', 'label.to-edit, label.to-close', '.notedit') + +document.querySelectorAll('.jsoff-show, .jsoff-hide').forEach(el => el.classList.remove('jsoff-show', 'jsoff-hide')) \ No newline at end of file diff --git a/yadc/bp/main.py b/yadc/bp/main.py index 0b1408e..9f8d9ac 100644 --- a/yadc/bp/main.py +++ b/yadc/bp/main.py @@ -41,6 +41,15 @@ def uploaded_big_thumb(*args, **kwargs): def uploaded_smol_thumb(*args, **kwargs): return uploaded_img(*args, **kwargs, store=IMAGE_STORE.thumb_smol, exten='jpg') +@bp.route('/test') +def test(): + from yadc.models import Comment + from yadc.forms import CommentForm + comment = Comment.query.get(2) + comment2 = Comment.query.get(5) + comment.editform = CommentForm(id=comment.id, content=comment.content) + comment2.editform = CommentForm(id=comment2.id, content=comment2.content) + return render_template('test.html', comment=comment, comment2=comment2) # @bp.route('/threads') # def threads(): diff --git a/yadc/static/all.css b/yadc/static/all.css index 19e88c3..c866084 100644 --- a/yadc/static/all.css +++ b/yadc/static/all.css @@ -1 +1 @@ -.flash_msgs{display:flex;flex-flow:column-reverse nowrap;position:fixed;z-index:20;bottom:0;right:0;margin:0;padding:10px;font-size:.9em;pointer-events:none}.flash_msgs>li{width:250px;padding:10px;list-style-type:none;background-color:#000c;overflow:hidden;opacity:0;animation:fade 7s normal}.flash_msgs>li:not(:first-child){margin-bottom:10px}@keyframes fade{0%,100%{opacity:0}20%,80%{opacity:1}}.flash_msgs>li.error{background-color:#500c}h2{margin:0;margin-bottom:.5em}h3{margin:0;margin-bottom:.5em;font-size:1.3em}h4{margin:0;margin-bottom:.8em;margin-top:.4em}.oneline-space{height:1em}.comment-form{margin-left:10px;max-width:500px}.comment-form input:required{box-shadow:none}.editingable:not(.time-to-edit) .edit{display:none!important}.editingable.time-to-edit .notedit{display:none!important}input[type=text],input[type=password],textarea{background:#444a;border:1px solid #444;color:inherit;display:block;padding:.5em}input[type=text],input[type=password]{width:100%}textarea{resize:vertical;width:100%}input[type=submit]{background:#444a;border:2px solid #666a;border-radius:4px;color:inherit;padding:.4em 1.8em}input[type=submit]:active{background:#000a;border:2px solid #444a}label{padding:.4em}.baseform input[type=text],.baseform input[type=password],.baseform textarea,.pageform input[type=text],.pageform input[type=password],.pageform textarea{width:100%}.baseform input[type=checkbox],.pageform input[type=checkbox]{margin:.5em}.baseform input[type=submit],.pageform input[type=submit]{margin:.2em}.baseform>input,.baseform>textarea,.baseform>div,.baseform form>input,.baseform form>textarea,.baseform form>div,.pageform>input,.pageform>textarea,.pageform>div,.pageform form>input,.pageform form>textarea,.pageform form>div{margin:.8em 0}.baseform div.row,.pageform div.row{display:flex;align-items:center}.baseform div.row.stretch,.pageform div.row.stretch{justify-content:space-between}.baseform div.row label,.pageform div.row label{padding:0;margin-left:.2em;margin-right:.6em}.baseform ul,.pageform ul{padding:0;margin:0}.baseform ul li,.pageform ul li{list-style-type:none}.pageform{padding:1em;width:300px;margin:0 auto}.tag-input .tag-suggester{width:100%;position:relative}.tag-input .tag-suggester input[type=text]{margin:.3em 0}.tag-input .tag-suggester>.suggest-dropdown{display:flex;align-items:start;width:100%;top:100%;position:absolute;z-index:10;overflow:auto;background-color:#2d2d2de0}.tag-input .tag-suggester>.suggest-dropdown:not(:empty){padding:.2em}.tag-input .tag-suggester>.suggest-dropdown>a.sug-sel{background-color:#242424}.tag-container{display:flex;flex-flow:row wrap}.tag-container:empty{display:none}.tag-container>a{display:flex;justify-content:space-between;overflow:hidden;align-items:baseline;margin:.2em;padding:.35em .6em;border-radius:4px;background-color:#121212ff;cursor:pointer}.tag-container>a .content{margin:0 .4em;flex-grow:1;flex-basis:100%;word-break:break-word;overflow-wrap:anywhere}.tag-container>a .tag-icon,.tag-container>a .tag-right{align-self:center}.tag-container>a .count{font-size:.8em;margin-right:.4em}.tag-container>a>*{pointer-events:none}.tag-container>a:not(:hover) span.close{opacity:0}.tag-container>a:not(:hover) span.plus{opacity:0}.tag-container>a.tagselected{background-color:#400808ff}.tag-container>a.tag_hide{display:none}.comment-container{padding:0 10px;max-width:500px}.comment-container article.comment{overflow:hidden;margin:.4em 0}.comment-container article.comment p,.comment-container article.comment textarea{margin-top:0}.comment-container article.comment p.deleted,.comment-container article.comment textarea.deleted{color:red}.comment-container article.comment .comment-head{display:flex;justify-content:space-between}.comment-container article.comment .comment-head a,.comment-container article.comment .comment-head label{cursor:pointer}.comment-container article.comment .comment-head .controls>*{display:inline-block}header{display:flex;align-items:baseline;padding:0 10px;background-color:#222}header>a.logo{font-size:2em;margin:6px}@media(max-width:559px){header{position:relative}}header>nav{flex-grow:1;display:flex}header>nav>._overlay{display:none}@media(max-width:559px){header>nav{display:none}header>nav._drop{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;left:0;right:0;z-index:10;background-color:#111d}header>nav>a,header>nav a#user-menu,header>nav .user_dropdown>a{padding:12px;padding-left:24px}header>nav>a:hover,header>nav>a:active,header>nav a#user-menu:hover,header>nav a#user-menu:active,header>nav .user_dropdown>a:hover,header>nav .user_dropdown>a:active{background-color:#333}header>nav .user::before{content:"";display:block;border-top:1px solid grey;margin:2px 12px}header>nav .user #user-menu{display:block}header>nav .user .user_dropdown{display:flex;flex-flow:column nowrap}header>nav>._overlay{display:block;position:fixed;width:100%;height:100%;z-index:-1;background-color:#0006}html.oh{overflow:hidden}}@media(min-width:560px){header>nav{margin:0 5px;align-items:center}header>nav>*{margin:0 5px;padding:6px 0}header>nav>.user{padding:0;margin-left:auto;margin-right:0;position:relative}header>nav>.user #user-menu{display:block;padding:6px 10px}header>nav>.user .user_dropdown{display:none}header>nav>.user .user_dropdown a{padding:10px}header>nav>.user .user_dropdown a:hover{background-color:#333}header>nav>.user:hover>.user_dropdown{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;right:0;z-index:10;background-color:#111d}}header>#nav-menu{display:none}@media(max-width:559px){header>#nav-menu{display:block;margin:5px;margin-left:auto;padding:0 2px;align-self:center;font-size:2em;cursor:pointer}}.main-wrap{margin:0 auto;max-width:1300px;padding:8px;padding-top:0;padding-bottom:0;display:flex}@media(min-width:900px){.main-wrap{flex-flow:row nowrap}}@media(max-width:899px){.main-wrap{flex-flow:column nowrap}}@media(max-width:899px){.main-wrap{overflow:visible}}.main-wrap .important-subwrap{display:flex;flex-flow:column nowrap;flex-grow:1;overflow:visible}@media(max-width:899px){.main-wrap .important-subwrap{display:contents}}.main-wrap>section.sidepanel{flex-shrink:0;padding:10px}@media(min-width:900px){.main-wrap>section.sidepanel{width:18rem}}.main-wrap>section.sidepanel article:not(:last-child){margin-bottom:10px}@media(max-width:899px){.main-wrap>section.sidepanel article.tags .tag-container,.main-wrap>section.sidepanel article.post-edit .tag-container{flex-flow:row wrap}}@media(min-width:900px){.main-wrap>section.sidepanel article.tags .tag-container,.main-wrap>section.sidepanel article.post-edit .tag-container{flex-flow:column nowrap;align-items:start}.main-wrap>section.sidepanel article.tags .suggest-dropdown,.main-wrap>section.sidepanel article.post-edit .suggest-dropdown{flex-flow:row wrap}.main-wrap>section.sidepanel article.tags .suggest-dropdown a,.main-wrap>section.sidepanel article.post-edit .suggest-dropdown a{width:100%}}.main-wrap>section.sidepanel article.rating ul{padding:0}.main-wrap>section.sidepanel article.rating ul li{list-style-type:none}.main-wrap>section.sidepanel article.post-desc{display:flex;flex-flow:column nowrap;font-size:.9em}.main-wrap>section.sidepanel article.post-desc .source>a{word-break:break-all}.main-wrap>section.sidepanel article.post-desc>img{display:block;max-width:128px}.main-wrap>section.sidepanel article.sidenav>a{display:block;padding:.3em 1em}@media(min-width:900px){.main-wrap section:not(.sidepanel){width:100%}}.main-wrap section.post-list{overflow:hidden}@media(max-width:559px){.main-wrap section.post-list{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts{display:flex;flex-flow:row wrap}@media(max-width:899px){.main-wrap section.post-list .posts{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts::after{content:"";flex:10000 0 350px}.main-wrap section.post-list .posts>figure{position:relative;margin:8px}.main-wrap section.post-list .posts>figure img{display:block;width:100%;height:100%;transition:.2s ease}.main-wrap section.post-list .posts>figure:hover img{opacity:.7}@media(min-width:900px){.main-wrap section.post-single{padding:8px}}@media(max-width:899px){.main-wrap section.post-single{order:-1;margin-bottom:8px}}@media(max-width:559px){.main-wrap section.post-single{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-single img{display:block;max-width:100%}.main-wrap section.comments{padding:10px}.main-wrap section.management-table{overflow-x:auto}.main-wrap section.management-table table{margin:0 auto}.main-wrap section.management-table tr{background-color:#303030}.main-wrap section.management-table tr th,.main-wrap section.management-table tr td{padding:6px 10px}.main-wrap section.management-table tr th{background-color:#606060}.main-wrap section.management-table tr label>input{display:none}.main-wrap section.management-table tr .fa{padding:4px 4px;align-self:center;font-size:1.5em;cursor:pointer}.main-wrap section.manage-profile>.baseform{margin:0 10px;margin-bottom:15px;max-width:500px}.main-wrap .pagin{margin:10px 0;display:flex;flex-flow:row nowrap;justify-content:center}.main-wrap .pagin>a{display:block;background-color:#0005;padding:8px 12px;margin:0 2px}footer{padding:10px;text-align:center}*{box-sizing:border-box}body{margin:0;font-family:Verdana,Geneva,Tahoma,sans-serif;background-color:#222;color:#fff}a{color:#bbb;text-decoration:none}a:hover{color:#909090;text-decoration:none} \ No newline at end of file +.flash_msgs{display:flex;flex-flow:column-reverse nowrap;position:fixed;z-index:20;bottom:0;right:0;margin:0;padding:10px;font-size:.9em;pointer-events:none}.flash_msgs>li{width:250px;padding:10px;list-style-type:none;background-color:#000c;overflow:hidden;opacity:0;animation:fade 7s normal}.flash_msgs>li:not(:first-child){margin-bottom:10px}@keyframes fade{0%,100%{opacity:0}20%,80%{opacity:1}}.flash_msgs>li.error{background-color:#500c}h2{margin:0;margin-bottom:.5em}h3{margin:0;margin-bottom:.5em;font-size:1.3em}h4{margin:0;margin-bottom:.8em;margin-top:.4em}.oneline-space{height:1em}.comment-form{margin-left:10px;max-width:500px}.comment-form input:required{box-shadow:none}.editingable:not(.time-to-edit) .edit{display:none!important}.editingable:not(.time-to-edit):hover .jsoff-show.edit{display:initial!important}.editingable:not(.time-to-edit):hover .jsoff-show.notedit{display:none!important}.editingable:not(.time-to-edit) .jsoff-hide.edit,.editingable:not(.time-to-edit) .jsoff-hide.notedit{display:none!important}.editingable.time-to-edit .notedit{display:none!important}input[type=text],input[type=password],textarea{background:#444a;border:1px solid #444;color:inherit;display:block;padding:.5em}input[type=text],input[type=password]{width:100%}textarea{resize:vertical;width:100%}input[type=submit]{background:#444a;border:2px solid #666a;border-radius:4px;color:inherit;padding:.4em 1.8em}input[type=submit]:active{background:#000a;border:2px solid #444a}label{padding:.4em}.baseform input[type=text],.baseform input[type=password],.baseform textarea,.pageform input[type=text],.pageform input[type=password],.pageform textarea{width:100%}.baseform input[type=checkbox],.pageform input[type=checkbox]{margin:.5em}.baseform input[type=submit],.pageform input[type=submit]{margin:.2em}.baseform>input,.baseform>textarea,.baseform>div,.baseform form>input,.baseform form>textarea,.baseform form>div,.pageform>input,.pageform>textarea,.pageform>div,.pageform form>input,.pageform form>textarea,.pageform form>div{margin:.8em 0}.baseform div.row,.pageform div.row{display:flex;align-items:center}.baseform div.row.stretch,.pageform div.row.stretch{justify-content:space-between}.baseform div.row label,.pageform div.row label{padding:0;margin-left:.2em;margin-right:.6em}.baseform ul,.pageform ul{padding:0;margin:0}.baseform ul li,.pageform ul li{list-style-type:none}.pageform{padding:1em;width:300px;margin:0 auto}.tag-input .tag-suggester{width:100%;position:relative}.tag-input .tag-suggester input[type=text]{margin:.3em 0}.tag-input .tag-suggester>.suggest-dropdown{display:flex;align-items:start;width:100%;top:100%;position:absolute;z-index:10;overflow:auto;background-color:#2d2d2de0}.tag-input .tag-suggester>.suggest-dropdown:not(:empty){padding:.2em}.tag-input .tag-suggester>.suggest-dropdown>a.sug-sel{background-color:#242424}.tag-container{display:flex;flex-flow:row wrap}.tag-container:empty{display:none}.tag-container>a{display:flex;justify-content:space-between;overflow:hidden;align-items:baseline;margin:.2em;padding:.35em .6em;border-radius:4px;background-color:#121212ff;cursor:pointer}.tag-container>a .content{margin:0 .4em;flex-grow:1;flex-basis:100%;word-break:break-word;overflow-wrap:anywhere}.tag-container>a .tag-icon,.tag-container>a .tag-right{align-self:center}.tag-container>a .count{font-size:.8em;margin-right:.4em}.tag-container>a>*{pointer-events:none}.tag-container>a:not(:hover) span.close{opacity:0}.tag-container>a:not(:hover) span.plus{opacity:0}.tag-container>a.tagselected{background-color:#400808ff}.tag-container>a.tag_hide{display:none}.comment-container{max-width:500px}.comment-container article.comment{overflow:hidden;margin:.4em .4em;padding:.4em .4em}.comment-container article.comment p,.comment-container article.comment textarea{margin:0}.comment-container article.comment p.deleted,.comment-container article.comment textarea.deleted{color:red}.comment-container article.comment .comment-head{display:flex;justify-content:space-between;align-items:baseline}.comment-container article.comment .comment-head h4{margin:0;padding:.4em}.comment-container article.comment .comment-head a,.comment-container article.comment .comment-head label{cursor:pointer}.comment-container article.comment .comment-head .controls{display:flex}.comment-container article.comment .comment-head .controls label>input{display:none}.comment-container article.comment .comment-editform p{padding:.5em}.comment-container article.comment .comment-editform textarea{font-size:inherit;font-family:inherit;border:none}header{display:flex;align-items:baseline;padding:0 10px;background-color:#222}header>a.logo{font-size:2em;margin:6px}@media(max-width:559px){header{position:relative}}header>nav{flex-grow:1;display:flex}header>nav>._overlay{display:none}@media(max-width:559px){header>nav{display:none}header>nav._drop{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;left:0;right:0;z-index:10;background-color:#111d}header>nav>a,header>nav a#user-menu,header>nav .user_dropdown>a{padding:12px;padding-left:24px}header>nav>a:hover,header>nav>a:active,header>nav a#user-menu:hover,header>nav a#user-menu:active,header>nav .user_dropdown>a:hover,header>nav .user_dropdown>a:active{background-color:#333}header>nav .user::before{content:"";display:block;border-top:1px solid grey;margin:2px 12px}header>nav .user #user-menu{display:block}header>nav .user .user_dropdown{display:flex;flex-flow:column nowrap}header>nav>._overlay{display:block;position:fixed;width:100%;height:100%;z-index:-1;background-color:#0006}html.oh{overflow:hidden}}@media(min-width:560px){header>nav{margin:0 5px;align-items:center}header>nav>*{margin:0 5px;padding:6px 0}header>nav>.user{padding:0;margin-left:auto;margin-right:0;position:relative}header>nav>.user #user-menu{display:block;padding:6px 10px}header>nav>.user .user_dropdown{display:none}header>nav>.user .user_dropdown a{padding:10px}header>nav>.user .user_dropdown a:hover{background-color:#333}header>nav>.user:hover>.user_dropdown{display:flex;flex-flow:column nowrap;position:absolute;margin:0;top:100%;right:0;z-index:10;background-color:#111d}}header>#nav-menu{display:none}@media(max-width:559px){header>#nav-menu{display:block;margin:5px;margin-left:auto;padding:0 2px;align-self:center;font-size:2em;cursor:pointer}}.main-wrap{margin:0 auto;max-width:1300px;padding:8px;padding-top:0;padding-bottom:0;display:flex}@media(min-width:900px){.main-wrap{flex-flow:row nowrap}}@media(max-width:899px){.main-wrap{flex-flow:column nowrap}}@media(max-width:899px){.main-wrap{overflow:visible}}.main-wrap .important-subwrap{display:flex;flex-flow:column nowrap;flex-grow:1;overflow:visible}@media(max-width:899px){.main-wrap .important-subwrap{display:contents}}.main-wrap>section.sidepanel{flex-shrink:0;padding:10px}@media(min-width:900px){.main-wrap>section.sidepanel{width:18rem}}.main-wrap>section.sidepanel article:not(:last-child){margin-bottom:10px}@media(max-width:899px){.main-wrap>section.sidepanel article.tags .tag-container,.main-wrap>section.sidepanel article.post-edit .tag-container{flex-flow:row wrap}}@media(min-width:900px){.main-wrap>section.sidepanel article.tags .tag-container,.main-wrap>section.sidepanel article.post-edit .tag-container{flex-flow:column nowrap;align-items:start}.main-wrap>section.sidepanel article.tags .suggest-dropdown,.main-wrap>section.sidepanel article.post-edit .suggest-dropdown{flex-flow:row wrap}.main-wrap>section.sidepanel article.tags .suggest-dropdown a,.main-wrap>section.sidepanel article.post-edit .suggest-dropdown a{width:100%}}.main-wrap>section.sidepanel article.rating ul{padding:0}.main-wrap>section.sidepanel article.rating ul li{list-style-type:none}.main-wrap>section.sidepanel article.post-desc{display:flex;flex-flow:column nowrap;font-size:.9em}.main-wrap>section.sidepanel article.post-desc .source>a{word-break:break-all}.main-wrap>section.sidepanel article.post-desc>img{display:block;max-width:128px}.main-wrap>section.sidepanel article.sidenav>a{display:block;padding:.3em 1em}@media(min-width:900px){.main-wrap section:not(.sidepanel){width:100%}}.main-wrap section.post-list{overflow:hidden}@media(max-width:559px){.main-wrap section.post-list{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts{display:flex;flex-flow:row wrap}@media(max-width:899px){.main-wrap section.post-list .posts{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-list .posts::after{content:"";flex:10000 0 350px}.main-wrap section.post-list .posts>figure{position:relative;margin:8px}.main-wrap section.post-list .posts>figure img{display:block;width:100%;height:100%;transition:.2s ease}.main-wrap section.post-list .posts>figure:hover img{opacity:.7}@media(min-width:900px){.main-wrap section.post-single{padding:8px}}@media(max-width:899px){.main-wrap section.post-single{order:-1;margin-bottom:8px}}@media(max-width:559px){.main-wrap section.post-single{margin-left:-8px;margin-right:-8px}}.main-wrap section.post-single img{display:block;max-width:100%}.main-wrap section.comments{padding:10px}.main-wrap section.management-table{overflow-x:auto}.main-wrap section.management-table table{margin:0 auto}.main-wrap section.management-table tr{background-color:#303030}.main-wrap section.management-table tr th,.main-wrap section.management-table tr td{padding:6px 10px}.main-wrap section.management-table tr th{background-color:#606060}.main-wrap section.management-table tr label>input{display:none}.main-wrap section.management-table tr .fa{padding:4px 4px;align-self:center;font-size:1.5em;cursor:pointer}.main-wrap section.manage-profile>.baseform{margin:0 10px;margin-bottom:15px;max-width:500px}.main-wrap .pagin{margin:10px 0;display:flex;flex-flow:row nowrap;justify-content:center}.main-wrap .pagin>a{display:block;background-color:#0005;padding:8px 12px;margin:0 2px}footer{padding:10px;text-align:center}*{box-sizing:border-box}body{margin:0;font-family:Verdana,Geneva,Tahoma,sans-serif;background-color:#222;color:#fff}a{color:#bbb;text-decoration:none}a:hover{color:#909090;text-decoration:none} \ No newline at end of file diff --git a/yadc/static/all.js b/yadc/static/all.js index f13c020..7ff472d 100644 --- a/yadc/static/all.js +++ b/yadc/static/all.js @@ -56,8 +56,10 @@ function doubleclickSwitcher(rootSelector, triggerSelector, dblSelector) { }) } -toggleSwitcher('section.comments article.comment', '.comment-head .control-edit', '.comment-content') +toggleSwitcher('article.comment', '.comment-head .control-edit', '.comment-content') doubleclickSwitcher('section.management-table tbody > tr', 'label.to-edit, label.to-close', '.notedit') + +document.querySelectorAll('.jsoff-show, .jsoff-hide').forEach(el => el.classList.remove('jsoff-show', 'jsoff-hide')) let nav_menu = document.querySelectorAll("#nav-menu, nav#main-nav > ._overlay") function nav_menu_event(event) { let drop = document.getElementById("main-nav") diff --git a/yadc/templates/_includes.html b/yadc/templates/_includes.html index 1bee272..d7e71f4 100644 --- a/yadc/templates/_includes.html +++ b/yadc/templates/_includes.html @@ -45,6 +45,46 @@ {% endmacro %} +{% macro render_comment(comment, editform) %} +
+
+ {{ editform.csrf_token }} + {{ editform.id() }} +
+

{{ comment.user.username or "Deleted account" }}

+ + {% if current_user.is_moderator %} + {% if not comment.deleted %} + + {% else %} + + {% endif %} + {% endif %} + {% if comment.is_author %} + + + + + {% endif %} + +
+ +
+ {% if not comment.deleted or comment.is_author or current_user.is_moderator %} +

{{ comment.content }}

+ {% endif %} + {% if comment.is_author %} + {{ editform.content(class="jsoff-show edit") }} + {% endif %} + + {% if comment.deleted %} +

[Comment banned]

+ {% endif %} +
+
+
+{% endmacro %} + {% macro render_tag_input(input_field, param_dict={}) %}
diff --git a/yadc/templates/post/post.html b/yadc/templates/post/post.html index 7ebeac6..b56743b 100644 --- a/yadc/templates/post/post.html +++ b/yadc/templates/post/post.html @@ -1,5 +1,5 @@ {% extends 'layout/base_sidebar_tags.html' %} -{% from '_includes.html' import render_tag_input %} +{% from '_includes.html' import render_tag_input, render_comment with context %} {% block sidebar %}
@@ -75,8 +75,7 @@

Comments

- {% for comment in comments %} -
+ {#
{{ comment.editform.csrf_token }} {{ comment.editform.id() }} @@ -91,6 +90,7 @@ {% endif %} {% endif %} {% if comment.is_author %} + {% endif %} @@ -106,13 +106,17 @@ {% endif %} {% if comment.is_author %} + {{ comment.editform.content(class="edit") }} {{ comment.editform.edit(class="edit") }} {{ comment.editform.delete(class="edit") }} {% endif %}
-
+ #} + + {% for comment in comments %} + {{ render_comment(comment, comment.editform) }} {% endfor %} {% if not comments %} diff --git a/yadc/templates/test.html b/yadc/templates/test.html new file mode 100644 index 0000000..32d04a5 --- /dev/null +++ b/yadc/templates/test.html @@ -0,0 +1,97 @@ +{% extends 'layout/base.html' %} +{% from '_includes.html' import render_comment with context %} + +{% block content %} +
+
+ + + + + + bruuuuuuuuuuuh + {##} + + 12 + + + + + + + + + + + + bruuuuuuuuuuuh + {##} + + 12 + + + + + + + + + + + + bruuuuuuuuuuuh + {##} + + + + + + + +
+
+ +
+
+
+ {{ comment.editform.csrf_token }} + {{ comment.editform.id() }} +
+

{{ comment.user.username or "Deleted account" }}

+ + {% if current_user.is_moderator %} + {% if not comment.deleted %} + + {% else %} + + {% endif %} + {% endif %} + {% if comment.is_author %} + + + + + + {% endif %} + +
+ +
+ {% if not comment.deleted or comment.is_author or current_user.is_moderator %} +

{{ comment.content }}

+ {% endif %} + {% if comment.deleted %} +

[Comment banned]

+ {% endif %} + + {% if comment.is_author %} + {{ comment.editform.content(class="jsoff-show edit") }} + {% endif %} +
+
+
+ + {{ render_comment(comment2, comment2.editform) }} +
+ +{% endblock %} \ No newline at end of file