diff --git a/common/pages.go b/common/pages.go index 7126bea2..8c85af1e 100644 --- a/common/pages.go +++ b/common/pages.go @@ -166,6 +166,7 @@ type CustomPagePage struct { } type TopicCEditPost struct { + ID int Source string Ref string } diff --git a/common/template_init.go b/common/template_init.go index 229752c8..d6836d50 100644 --- a/common/template_init.go +++ b/common/template_init.go @@ -477,7 +477,7 @@ func compileJSTemplates(wg *sync.WaitGroup, c *tmpl.CTemplateSet, themeName stri pageList := Paginate(20, itemsPerPage, 5) tmpls.AddStd("paginator", "common.Paginator", Paginator{pageList, page, lastPage}) - tmpls.AddStd("topic_c_edit_post", "common.TopicCEditPost", TopicCEditPost{Source: "", Ref: ""}) + tmpls.AddStd("topic_c_edit_post", "common.TopicCEditPost", TopicCEditPost{ID: 0, Source: "", Ref: ""}) tmpls.AddStd("topic_c_attach_item", "common.TopicCAttachItem", TopicCAttachItem{ID: 1, ImgSrc: "", Path: "", FullPath: ""}) diff --git a/public/global.js b/public/global.js index b7e96763..aa7f0339 100644 --- a/public/global.js +++ b/public/global.js @@ -653,16 +653,21 @@ function mainInit(){ $(".edit_item").click(function(event){ event.preventDefault(); + let blockParent = this.closest('.editable_parent'); $(blockParent).find('.hide_on_edit').addClass("edit_opened"); $(blockParent).find('.show_on_edit').addClass("edit_opened"); + $(blockParent).find('.hide_on_block_edit').addClass("edit_opened"); + $(blockParent).find('.show_on_block_edit').addClass("edit_opened"); let srcNode = blockParent.querySelector(".edit_source"); let block = blockParent.querySelector('.editable_block'); block.classList.add("in_edit"); + let source = ""; if(srcNode!=null) source = srcNode.innerText; else source = block.innerHTML; block.innerHTML = Template_topic_c_edit_post({ + ID: blockParent.getAttribute("id").slice("post-".length), Source: source, Ref: this.closest('a').getAttribute("href") }) @@ -672,6 +677,8 @@ function mainInit(){ event.preventDefault(); $(blockParent).find('.hide_on_edit').removeClass("edit_opened"); $(blockParent).find('.show_on_edit').removeClass("edit_opened"); + $(blockParent).find('.hide_on_block_edit').removeClass("edit_opened"); + $(blockParent).find('.show_on_block_edit').removeClass("edit_opened"); block.classList.remove("in_edit"); let newContent = block.querySelector('textarea').value; block.innerHTML = quickParse(newContent); @@ -716,8 +723,7 @@ function mainInit(){ }); }); - $(".edit_fields").click(function(event) - { + $(".edit_fields").click(function(event) { event.preventDefault(); if($(this).find("input").length !== 0) return; //console.log("clicked .edit_fields"); diff --git a/templates/topic_alt.html b/templates/topic_alt.html index 0bc0d9c6..d6ee7373 100644 --- a/templates/topic_alt.html +++ b/templates/topic_alt.html @@ -79,9 +79,9 @@ {{end}}
{{if .CurrentUser.Perms.UploadFiles}} - + {{end}} - +
diff --git a/templates/topic_alt_posts.html b/templates/topic_alt_posts.html index 9bb1c99f..2af23f15 100644 --- a/templates/topic_alt_posts.html +++ b/templates/topic_alt_posts.html @@ -10,7 +10,7 @@
{{.Content}}
{{if $.CurrentUser.Perms.EditReply}} -
+
{{range .Attachments}}
{{if .Image}}{{end}} @@ -23,7 +23,7 @@ {{if $.CurrentUser.Perms.UploadFiles}} {{end}} - +
{{end}}{{end}} diff --git a/templates/topic_c_edit_post.html b/templates/topic_c_edit_post.html index d6232d7b..936a7247 100644 --- a/templates/topic_c_edit_post.html +++ b/templates/topic_c_edit_post.html @@ -1,2 +1,5 @@
- \ No newline at end of file +
+ + +
\ No newline at end of file diff --git a/themes/cosora/public/main.css b/themes/cosora/public/main.css index 209e3d2e..2ff35bf2 100644 --- a/themes/cosora/public/main.css +++ b/themes/cosora/public/main.css @@ -595,9 +595,9 @@ input[type=checkbox]:checked + label.poll_option_label .sel { } .formbutton { - margin-top: 12px; margin-left: auto; margin-right: auto; + margin-top: 12px; } .quick_button_row .formitem { display: flex; @@ -1087,6 +1087,13 @@ blockquote:first-child { red { color: red; } +.update_buttons { + margin-top: -8px; + margin-bottom: 8px; +} +.update_buttons .add_file_button { + margin-left: 8px; +} .button_container { margin-top: auto; display: flex; @@ -1170,8 +1177,55 @@ red { } .attach_edit_bay { + margin-top: -4px; +} +.top_post .attach_edit_bay { + margin-top: 8px; +} +.attach_item { + display: flex; + margin-top: 4px; + margin-bottom: 8px; + text-overflow: ellipsis; + overflow: hidden; + padding: 8px; + padding-left: 0px; + width: 100%; +} +.attach_item img { + margin-right: 8px; + border-radius: 4px; +} +.attach_item_item { + background-color: #EEEEEE; + padding-left: 8px; +} +.attach_item_item span { + margin-bottom: 4px; + margin-right: auto; + padding-top: 4px; + overflow: hidden; + text-overflow: ellipsis; + width: 350px; +} +.attach_image_holder span { + width: 300px; +} +.attach_item_buttons label, .attach_item_select, .attach_item_delete { + margin-left: 0px; + margin-right: 8px; + margin-top: 0px; +} +.post_item:not(.has_attachs) .attach_item_buttons, +.has_attachs .update_buttons .add_file_button { display: none; } +.update_buttons a button { + margin-top: 0px; +} +.top_post .attach_item_buttons { + margin-top: -4px; +} .zone_view_topic .pageset { margin-bottom: 14px; } diff --git a/themes/nox/public/main.css b/themes/nox/public/main.css index c0f38f49..39c50a16 100644 --- a/themes/nox/public/main.css +++ b/themes/nox/public/main.css @@ -875,13 +875,16 @@ blockquote:first-child { red { color: red; } -.user_content.in_edit a { +.update_buttons { display: flex; background-color: #444444; border-radius: 4px; margin-top: 4px; /*8 without
*/ padding: 6px; } +.user_content.in_edit a { + margin-right: 8px; +} .post_item .button_container { display: flex; margin-top: 8px; @@ -974,10 +977,6 @@ input[type=checkbox]:checked + label .sel { content: "{{lang "topic.like_count_suffix" . }}"; } -/*.attach_edit_bay { - display: flex; - flex-direction: row; -}*/ .attach_item { display: flex; background-color: #444444; @@ -994,9 +993,6 @@ input[type=checkbox]:checked + label .sel { margin-right: 8px; border-radius: 4px; } -.attach_item_item span { - margin-bottom: 4px; -} .attach_edit_bay button { margin-top: 8px; margin-left: 8px; @@ -1004,10 +1000,11 @@ input[type=checkbox]:checked + label .sel { /* New */ .attach_item { - padding: 8px; - width: 100%; + padding: 8px; + width: 100%; } .attach_item_item span { + margin-bottom: 4px; margin-right: auto; overflow: hidden; text-overflow: ellipsis; @@ -1019,7 +1016,8 @@ input[type=checkbox]:checked + label .sel { .attach_item button { margin-top: -1px; } -.post_item:not(.has_attachs) .attach_item_delete { +.post_item:not(.has_attachs) .attach_item_buttons, +.has_attachs .update_buttons .add_file_button { display: none; } diff --git a/themes/shadow/public/main.css b/themes/shadow/public/main.css index cbd921b8..1363b409 100644 --- a/themes/shadow/public/main.css +++ b/themes/shadow/public/main.css @@ -283,6 +283,9 @@ h1, h2, h3, h4, h5 { red { color: red; } +.update_buttons .add_file_button { + display: none; +} .controls { width: 100%; diff --git a/themes/tempra_simple/public/main.css b/themes/tempra_simple/public/main.css index 6d1b236c..cf3ca513 100644 --- a/themes/tempra_simple/public/main.css +++ b/themes/tempra_simple/public/main.css @@ -705,6 +705,9 @@ red { .staff_post { background-color: #ffeaff; } +.update_buttons .add_file_button { + display: none; +} .mod_button { margin-right: 4px;