aboutsummaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authorFChannel <>2021-07-22 13:50:11 -0700
committerFChannel <>2021-07-22 13:50:11 -0700
commit3b2c8a4c78ade9e819b61aa055039ae00e517a3e (patch)
tree1d52c2c44cf89d6aa53b7ff2fd1e034553e2157a /static
parent5592a8c898b45e1e97d91b2c0bb0ed21750a9959 (diff)
fixed quote bug and moved comment parsing server side without javascript
Diffstat (limited to 'static')
-rw-r--r--static/main.html9
-rw-r--r--static/ncatalog.html5
-rw-r--r--static/posts.html35
3 files changed, 8 insertions, 41 deletions
diff --git a/static/main.html b/static/main.html
index 3cb8555..9209ed9 100644
--- a/static/main.html
+++ b/static/main.html
@@ -53,14 +53,6 @@
color: #789922;
}
- .reply {
- {{ if .Board.Restricted }}
- color:#af0a0f;
- {{ else }}
- color:#000080;
- {{ end }}
- }
-
.post {
{{ if .Board.Restricted }}
background-color: #d5daf0;
@@ -85,6 +77,7 @@
<body>
<ul style="display: inline; padding:0;">
{{ $l := len .Boards }}
+ <li style="display: inline;">[<a href="/">Home</a>]</li>
{{range $i, $e := .Boards}}
{{ if eq (sub $l 1) 0 }}
<li style="display: inline;">[ <a href="{{.Location}}">{{$e.Name}} </a>]</li>
diff --git a/static/ncatalog.html b/static/ncatalog.html
index 68bb01a..d007d62 100644
--- a/static/ncatalog.html
+++ b/static/ncatalog.html
@@ -105,7 +105,7 @@
document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}")
</script>
{{ end }}
- <a id="{{ .Id }}-link" href="/{{ $board.Name }}/">
+ <a id="{{ .Id }}-link" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox .Id }}">
<div>
{{ $replies := .Replies }}
{{ if $replies }}
@@ -121,9 +121,6 @@
</div>
</a>
</div>
- <script>
- document.getElementById("{{ .Id }}-link").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}")
- </script>
{{ end }}
</div>
<hr>
diff --git a/static/posts.html b/static/posts.html
index d16f780..7552188 100644
--- a/static/posts.html
+++ b/static/posts.html
@@ -7,7 +7,7 @@
<hr>
{{ end }}
<div style="overflow: auto;">
- <div id="{{ .Id }}" style="overflow: visible; margin-bottom: 12px;">
+ <div id="{{ short $board.Actor.Outbox .Id }}" style="overflow: visible; margin-bottom: 12px;">
{{ if eq $board.ModCred $board.Domain $board.Actor.Id }}
<a href="/delete?id={{ .Id }}&board={{ $board.Actor.Name }}">[Delete Post]</a>
{{ end }}
@@ -22,7 +22,6 @@
<div id="media-{{ .Id }}"></div>
<script>
media = document.getElementById("media-{{ .Id }}")
-
if(({{ .Sensitive }} && {{ $board.Actor.Restricted }}) || (isOnion("{{ .Id }}") && !isOnion("{{ $board.Domain }}"))){
sensitive = document.getElementById("sensitive-{{ .Id }}")
hide = document.getElementById("hide-{{ .Id }}")
@@ -84,8 +83,8 @@
}
</script>
{{ end }}
- <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/">No.</a> <a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
- <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.Content}}</p>
+ <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox $opId }}#{{ short $board.Actor.Outbox .Id }}">No.</a> <a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ short $board.Actor.Outbox .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
+ <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.ContentHTML}}</p>
{{ if .Replies }}
{{ $replies := .Replies }}
{{ if gt $replies.TotalItems 5 }}
@@ -94,7 +93,7 @@
{{ end }}
{{ end }}
{{ range $replies.OrderedItems }}
- <div id="{{ .Id }}">
+ <div id="{{ short $board.Actor.Outbox .Id }}">
<div style="display: inline-block; overflow: auto;">
<div style="float: left; display: block; margin-right: 5px;">>></div>
<div class="post" style="overflow: auto; padding: 5px; margin-bottom: 2px;">
@@ -176,7 +175,7 @@
}
</script>
{{ end }}
- <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/post/{{ $opId }}#{{ .Id }}">No. </a><a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
+ <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox $opId }}#{{ short $board.Actor.Outbox .Id }}">No. </a><a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ short $board.Actor.Outbox .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
{{ $parentId := .Id }}
{{ if .Replies.OrderedItems }}
{{ range .Replies.OrderedItems }}
@@ -187,7 +186,7 @@
</script>
{{ end }}
{{ end }}
- <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.Content}}</p>
+ <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.ContentHTML}}</p>
</div>
</div>
</div>
@@ -196,17 +195,6 @@
document.getElementById("{{ .Id }}-size").innerText = " (" + convertSize({{ (index .Attachment 0).Size }}) + ")";
document.getElementById("{{ .Id }}-img").innerText = shortImg("{{ (index .Attachment 0).Name }}");
{{ end }}
-
- document.getElementById("{{ .Id }}-link").innerText = shortURL("{{ $board.Actor.Id }}", "{{ .Id }}");
-
- document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ $opId }}") +
- "#" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}");
- document.getElementById("{{ .Id }}").setAttribute("id", shortURL("{{$board.Actor.Id}}", "{{ .Id }}"));
-
- var content = document.getElementById("{{ .Id }}-content");
-
- content.innerHTML = convertContent('{{$board.Actor.Id}}', content.innerText, '{{ $opId }}')
-
</script>
{{ end }}
{{ end }}
@@ -217,17 +205,6 @@
document.getElementById("{{ .Id }}-size").innerText = " (" + convertSize({{ (index .Attachment 0).Size }}) + ")";
document.getElementById("{{ .Id }}-img").innerText = shortImg("{{ (index .Attachment 0).Name }}");
{{ end }}
-
- document.getElementById("{{ .Id }}-link").innerText = shortURL("{{ $board.Actor.Id }}", "{{ .Id }}");
-
- document.getElementById("{{ .Id }}").setAttribute("id", shortURL("{{ $board.Actor.Id }}", "{{ .Id }}"));
-
- document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ $opId }}") +
- "#" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}");
-
- var content = document.getElementById("{{ .Id }}-content");
-
- content.innerHTML = convertContent('{{$board.Actor.Id}}', content.innerText, '{{ $opId }}')
</script>
{{ end }}
{{ end }}