diff --git a/template_list.go b/template_list.go index 4c5bd3ce..5311b224 100644 --- a/template_list.go +++ b/template_list.go @@ -90,7 +90,7 @@ var topic_19 []byte = []byte(` -
+
`) var topic_49 []byte = []byte(`👑`) var topic_50 []byte = []byte(`
-

+
`) var topic_51 []byte = []byte(` -
+
`) var topic_52 []byte = []byte(` `) @@ -176,6 +176,7 @@ var topic_80 []byte = []byte(`
`) var topic_81 []byte = []byte(`
+ `) var topic_82 []byte = []byte(`
@@ -205,6 +206,7 @@ var topic_alt_5 []byte = []byte(`" /> var topic_alt_6 []byte = []byte(`?page=`) var topic_alt_7 []byte = []byte(`">>
`) var topic_alt_8 []byte = []byte(` +
@@ -231,6 +233,7 @@ var topic_alt_19 []byte = []byte(`
+
@@ -279,53 +282,67 @@ var topic_alt_47 []byte = []byte(`
`) var topic_alt_48 []byte = []byte(` -
+
 
+var topic_alt_51 []byte = []byte(`), url(/static/white-dot.jpg);background-position: 0px -10px;"> 
`) -var topic_alt_51 []byte = []byte(` +var topic_alt_52 []byte = []byte(`" class="the_name">`) +var topic_alt_53 []byte = []byte(` `) -var topic_alt_52 []byte = []byte(`
`) -var topic_alt_54 []byte = []byte(`
-
+
+ `) +var topic_alt_61 []byte = []byte(` + `) +var topic_alt_62 []byte = []byte(` + `) +var topic_alt_63 []byte = []byte(` + `) +var topic_alt_64 []byte = []byte(`
`) -var topic_alt_57 []byte = []byte(`
+var topic_alt_65 []byte = []byte(`
`) -var topic_alt_58 []byte = []byte(`+1`) -var topic_alt_60 []byte = []byte(`Edit`) -var topic_alt_62 []byte = []byte(`Delete`) -var topic_alt_64 []byte = []byte(` +var topic_alt_66 []byte = []byte(`+1`) +var topic_alt_68 []byte = []byte(`Edit`) +var topic_alt_70 []byte = []byte(`Delete`) +var topic_alt_72 []byte = []byte(` Report +var topic_alt_73 []byte = []byte(`?session=`) +var topic_alt_74 []byte = []byte(`&type=reply" class="action_button report_item">Report `) -var topic_alt_67 []byte = []byte(``) -var topic_alt_68 []byte = []byte(``) -var topic_alt_69 []byte = []byte(``) -var topic_alt_70 []byte = []byte(` up`) -var topic_alt_71 []byte = []byte(` +var topic_alt_75 []byte = []byte(``) +var topic_alt_76 []byte = []byte(``) +var topic_alt_77 []byte = []byte(``) +var topic_alt_78 []byte = []byte(` up`) +var topic_alt_79 []byte = []byte(`
+ `) +var topic_alt_80 []byte = []byte(`
`) -var topic_alt_72 []byte = []byte(`
+var topic_alt_81 []byte = []byte(`
`) -var topic_alt_73 []byte = []byte(` +var topic_alt_82 []byte = []byte(`
+var topic_alt_83 []byte = []byte(`' type="hidden" />
diff --git a/template_topic_alt.go b/template_topic_alt.go index a29e226b..6b980247 100644 --- a/template_topic_alt.go +++ b/template_topic_alt.go @@ -150,62 +150,80 @@ w.Write(topic_alt_47) if len(tmpl_topic_alt_vars.ItemList) != 0 { for _, item := range tmpl_topic_alt_vars.ItemList { w.Write(topic_alt_48) -w.Write([]byte(item.Avatar)) +if item.ActionType != "" { w.Write(topic_alt_49) -w.Write([]byte(strconv.Itoa(item.CreatedBy))) -w.Write(topic_alt_50) -w.Write([]byte(item.CreatedByName)) -w.Write(topic_alt_51) -if item.Tag != "" { -w.Write(topic_alt_52) -w.Write([]byte(item.Tag)) -w.Write(topic_alt_53) -} else { -w.Write(topic_alt_54) -w.Write([]byte(strconv.Itoa(item.Level))) -w.Write(topic_alt_55) } +w.Write(topic_alt_50) +w.Write([]byte(item.Avatar)) +w.Write(topic_alt_51) +w.Write([]byte(strconv.Itoa(item.CreatedBy))) +w.Write(topic_alt_52) +w.Write([]byte(item.CreatedByName)) +w.Write(topic_alt_53) +if item.Tag != "" { +w.Write(topic_alt_54) +w.Write([]byte(item.Tag)) +w.Write(topic_alt_55) +} else { w.Write(topic_alt_56) -w.Write([]byte(item.ContentHtml)) +w.Write([]byte(strconv.Itoa(item.Level))) w.Write(topic_alt_57) -if tmpl_topic_alt_vars.CurrentUser.Perms.LikeItem { +} w.Write(topic_alt_58) -w.Write([]byte(strconv.Itoa(item.ID))) +if item.ActionType != "" { w.Write(topic_alt_59) } -if tmpl_topic_alt_vars.CurrentUser.Perms.EditReply { w.Write(topic_alt_60) -w.Write([]byte(strconv.Itoa(item.ID))) +if item.ActionType != "" { w.Write(topic_alt_61) +w.Write([]byte(item.ActionIcon)) +w.Write(topic_alt_62) +w.Write([]byte(item.ActionType)) +w.Write(topic_alt_63) +} else { +w.Write(topic_alt_64) +w.Write([]byte(item.ContentHtml)) +w.Write(topic_alt_65) +if tmpl_topic_alt_vars.CurrentUser.Perms.LikeItem { +w.Write(topic_alt_66) +w.Write([]byte(strconv.Itoa(item.ID))) +w.Write(topic_alt_67) +} +if tmpl_topic_alt_vars.CurrentUser.Perms.EditReply { +w.Write(topic_alt_68) +w.Write([]byte(strconv.Itoa(item.ID))) +w.Write(topic_alt_69) } if tmpl_topic_alt_vars.CurrentUser.Perms.DeleteReply { -w.Write(topic_alt_62) -w.Write([]byte(strconv.Itoa(item.ID))) -w.Write(topic_alt_63) -} -w.Write(topic_alt_64) -w.Write([]byte(strconv.Itoa(item.ID))) -w.Write(topic_alt_65) -w.Write([]byte(tmpl_topic_alt_vars.CurrentUser.Session)) -w.Write(topic_alt_66) -if tmpl_topic_alt_vars.CurrentUser.Perms.ViewIPs { -w.Write(topic_alt_67) -w.Write([]byte(item.IpAddress)) -w.Write(topic_alt_68) -} -if item.LikeCount > 0 { -w.Write(topic_alt_69) -w.Write([]byte(strconv.Itoa(item.LikeCount))) w.Write(topic_alt_70) -} +w.Write([]byte(strconv.Itoa(item.ID))) w.Write(topic_alt_71) } -} w.Write(topic_alt_72) -if tmpl_topic_alt_vars.CurrentUser.Perms.CreateReply { +w.Write([]byte(strconv.Itoa(item.ID))) w.Write(topic_alt_73) -w.Write([]byte(strconv.Itoa(tmpl_topic_alt_vars.Topic.ID))) +w.Write([]byte(tmpl_topic_alt_vars.CurrentUser.Session)) w.Write(topic_alt_74) +if tmpl_topic_alt_vars.CurrentUser.Perms.ViewIPs { +w.Write(topic_alt_75) +w.Write([]byte(item.IpAddress)) +w.Write(topic_alt_76) +} +if item.LikeCount > 0 { +w.Write(topic_alt_77) +w.Write([]byte(strconv.Itoa(item.LikeCount))) +w.Write(topic_alt_78) +} +w.Write(topic_alt_79) +} +w.Write(topic_alt_80) +} +} +w.Write(topic_alt_81) +if tmpl_topic_alt_vars.CurrentUser.Perms.CreateReply { +w.Write(topic_alt_82) +w.Write([]byte(strconv.Itoa(tmpl_topic_alt_vars.Topic.ID))) +w.Write(topic_alt_83) } w.Write(footer_0) } diff --git a/templates/topic.html b/templates/topic.html index c8f84fb1..ef432aac 100644 --- a/templates/topic.html +++ b/templates/topic.html @@ -33,7 +33,7 @@
{{range .ItemList}}{{if .ActionType}} -
+
{{.ActionIcon}} {{.ActionType}}
@@ -49,6 +49,7 @@ {{if .Tag}}{{.Tag}}{{else}}{{.Level}}👑{{end}}
{{end}}{{end}}
+ {{if .CurrentUser.Perms.CreateReply}}
diff --git a/templates/topic_alt.html b/templates/topic_alt.html index 3cef331c..0e38688c 100644 --- a/templates/topic_alt.html +++ b/templates/topic_alt.html @@ -2,6 +2,7 @@ {{if gt .Page 1}}
<
{{end}} {{if ne .LastPage .Page}}
>
{{end}} +
@@ -18,6 +19,7 @@
+
@@ -36,20 +38,24 @@ {{if .CurrentUser.Perms.PinTopic}} {{if .Topic.Sticky}}Unpin{{else}}Pin{{end}}{{end}} Report - {{/* Element Queries might help with having to use JS. Unfortunately, the W3C is taking a while with it */}} + {{/* Element Queries might help with having to use JS. Who knows when or *if* the W3C will standardise it */}} {{if .CurrentUser.Perms.ViewIPs}}{{.Topic.IpAddress}}{{end}} {{if .Topic.LikeCount}}{{.Topic.LikeCount}} up{{end}}
{{range .ItemList}} -
+
 
{{.CreatedByName}} {{if .Tag}}
{{else}}
{{end}}
-
+
+ {{if .ActionType}} + {{.ActionIcon}} + {{.ActionType}} + {{else}}
{{.ContentHtml}}
{{if $.CurrentUser.Perms.LikeItem}}+1{{end}} @@ -59,6 +65,7 @@ {{if $.CurrentUser.Perms.ViewIPs}}{{.IpAddress}}{{end}} {{if .LikeCount}}{{.LikeCount}} up{{end}}
+ {{end}}
diff --git a/themes/cosmo-conflux/public/main.css b/themes/cosmo-conflux/public/main.css index c6d66e66..6c6ca908 100644 --- a/themes/cosmo-conflux/public/main.css +++ b/themes/cosmo-conflux/public/main.css @@ -700,6 +700,15 @@ blockquote p box-shadow:0 1px 2px rgba(0,0,0,.1); } +.action_item .userinfo { + display: none; +} +.action_item .content_container { + min-height: auto; + padding: 15px; + text-align: center; +} + .prev_button, .next_button { position: fixed; top: 50%; diff --git a/themes/cosmo/public/main.css b/themes/cosmo/public/main.css index e9ac5148..79be211b 100644 --- a/themes/cosmo/public/main.css +++ b/themes/cosmo/public/main.css @@ -736,6 +736,15 @@ blockquote p border-radius: 4px; } +.action_item .userinfo { + display: none; +} +.action_item .content_container { + min-height: auto; + padding: 15px; + text-align: center; +} + .prev_button, .next_button { position: fixed; top: 50%; diff --git a/themes/tempra-conflux/public/main.css b/themes/tempra-conflux/public/main.css index e4f96f4b..c60ef478 100644 --- a/themes/tempra-conflux/public/main.css +++ b/themes/tempra-conflux/public/main.css @@ -543,6 +543,15 @@ button.username box-shadow:0 1px 2px rgba(0,0,0,.1); } +.action_item .userinfo { + display: none; +} +.action_item .content_container { + min-height: auto; + padding: 15px; + text-align: center; +} + .prev_button, .next_button { position: fixed; top: 50%; @@ -625,6 +634,7 @@ button.username } @media (max-width: 470px) { + ul { margin-bottom: 10px; } .menu_overview, .menu_profile, .hide_on_micro { display: none; } .post_container { overflow: visible !important; } diff --git a/themes/tempra-cursive/public/main.css b/themes/tempra-cursive/public/main.css index 6154f23e..5ed37002 100644 --- a/themes/tempra-cursive/public/main.css +++ b/themes/tempra-cursive/public/main.css @@ -417,6 +417,12 @@ button.username opacity: 0.9; } +.action_item { + padding: 14px; + text-align: center; + background-color: rgb(255,245,245); +} + .postQuote { border: 1px solid #ccc; background: white; diff --git a/themes/tempra-simple/public/main.css b/themes/tempra-simple/public/main.css index 8fbe01f2..ec37cd8b 100644 --- a/themes/tempra-simple/public/main.css +++ b/themes/tempra-simple/public/main.css @@ -395,6 +395,12 @@ button.username { position: relative; top: -0.25px; } opacity: 0.9; } +.action_item { + padding: 14px; + text-align: center; + background-color: rgb(255,245,245); +} + .postQuote { border: 1px solid #ccc; background: white; @@ -534,9 +540,9 @@ button.username { position: relative; top: -0.25px; } .menu_overview, .menu_profile { display: none; } .hide_on_micro { display: none !important; } .post_container { overflow: visible !important; } - .post_item { + .post_item:not(.action_item) { background-position: 0px 2px !important; - background-size: 64px 64px !important; + background-size: 64px auto !important; padding-left: 2px !important; min-height: 96px; position: relative !important; @@ -552,15 +558,22 @@ button.username { position: relative; top: -0.25px; } } .post_item > .mod_button > button { opacity: 1; } .post_item > .real_username { - position: absolute; + /*position: absolute; top: 70px; float: left; - margin-top: -2px; - padding-top: 3px !important; + margin-top: -2px;*/ + margin-top: 0px; + /*padding-top: 3px !important; margin-right: 2px; - width: 60px; + width: 60px;*/ + margin-left: 74px; + margin-right: 0px; font-size: 15px; - text-align: center; + /*text-align: center;*/ + color: black; + max-width: 61px; + /*overflow: hidden;*/ + text-overflow: ellipsis; } .container { width: 100% !important; } }