add some styling to news pull request

5 files changed, 47 insertions, 32 deletions

diff --git a/static/anews.html b/static/anews.html
index 127760a..08bfdfa 100644
--- a/static/anews.html
+++ b/static/anews.html
@@ -22,16 +22,16 @@
   <h1>{{ .Title }}</h1>
 
   <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
+  <table style="text-align: left;">
     
     {{ range $i, $e := .NewsItems }}
     <tr>
       <td>
+        <div class="box" style="width:800px; padding: 25px; margin-bottom: 25px;">
           {{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}}
-      <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
-      {{ if eq $i 0 }}
-      <br><p>{{$e.Content}}</p>
-      {{ end }}
+          <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
+          <br><p style="margin-left: 25px;">{{$e.Content}}</p>
+        </div>
       </td>
     </tr>
     {{ end }}
diff --git a/static/index.html b/static/index.html
index 61aeab8..520829e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -20,45 +20,42 @@
 {{ define "content" }}
 <div style="text-align: center; max-width: 800px; margin: 0 auto;">
   <h1>{{ .Title }}</h1>
-  <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code <a href="https://github.com/FChannel0">here</a>.</p>
+  <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code at <a href="https://github.com/FChannel0">https://github.com/FChannel0</a>.</p>
   
   <div style="margin-top:50px;">
-
     <div style="display: grid;border-right: 2px solid #820404">
       <div style="display: inline-grid;grid-column: 1 / 4;border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
     {{ range .Boards }}
-      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}">{{.Name}} - {{.PrefName}}</a></div>
+      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}"><b>{{.Name}}</b> - {{.PrefName}} {{ if not .Restricted }} [NSFW] {{ end }}</a></div>
     {{ end }}
     {{ range .BoardRemainer }}
       <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"></div>
     {{ end }}
     </div>
-
   </div>
   
-  <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
+  {{ if .NewsItems }}  
+  <div class="popup-box" style="margin-top:50px;">
+    <table style="text-align: left; margin: 25px;">
     <th>
-      <tr><a href="/news">{{ .PreferredUsername }} news</a></tr>
+      <tr><h4><a href="/news">{{ .PreferredUsername }} News</a></h4></tr>
     </th>
-
     {{ range $i, $e := .NewsItems }}
     <tr>
       <td>{{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}} 
       <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
-      {{ if eq $i 0 }}
-      <br><p>{{$e.Content}}</p>
-      {{ end }}
+      <br><p style="margin-left: 25px;">{{$e.Content}}</p>
       </td>
     </tr>
     {{ end }}
   </table>
   </div>
+  {{ end }}  
   
-  <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
+  <div class="popup-box" style="margin-top:50px;">
+  <table style="text-align: left; margin: 25px;">
     <th>
-      <tr>Current known instances</tr>
+      <tr><h4>Current known instances</h4></tr>
     </th>
 
     {{ range .InstanceIndex }}
diff --git a/static/main.html b/static/main.html
index 70e3c23..00b395f 100644
--- a/static/main.html
+++ b/static/main.html
@@ -40,6 +40,14 @@
           background-color: #f9f9e0;
           {{ end }}
       }
+
+      .box {
+          {{ if .Board.Restricted }}
+          background-color: #eff5ff;
+          {{ else }}
+          background-color: #f9f9e0;
+          {{ end }}
+      }      
       
       .quote {
           color: #789922;
@@ -76,8 +84,15 @@
   </head>
   <body>
     <ul style="display: inline; padding:0;">
-      {{range .Boards}}
-      <li style="display: inline;"><a href="{{.Location}}">{{.Name}}</a></li>
+      {{ $l := len .Boards }}
+      {{range $i, $e := .Boards}}
+      {{ if eq $i 0 }}
+      <li style="display: inline;">[<a href="{{.Location}}">{{$e.Name}} </a>/</li>
+      {{ else if eq $i (sub $l 1) }}
+      <li style="display: inline;"><a href="{{.Location}}">{{$e.Name}}</a>]</li>
+      {{ else }}
+      <li style="display: inline;"><a href="{{.Location}}">{{$e.Name}} </a>/</li>      
+      {{ end }}
       {{end}}
     </ul>
     {{ if .Board.ModCred }}
diff --git a/static/nadmin.html b/static/nadmin.html
index 877e1e5..88b92c9 100644
--- a/static/nadmin.html
+++ b/static/nadmin.html
@@ -17,21 +17,24 @@
       <option value="False">False</option>          
     </select>
   </form>
-  
+  <ul style="display: inline-block; padding: 0;">
+    <li style="display: inline-block;"><a href="#following">Subscribed</a></li>
+    <!-- <li style="display: inline-block;"><a href="javascript:show('followers')">Followers</a></li> -->
+    <li style="display: inline-block;"><a href="#reported">Reported</a></li>            
+  </ul>
+</div>
+
+<div class="popup-box" style="margin-bottom: 25px; padding: 12px;">
   <h3>Post News</h3>
   <form id="news" action="/{{ .Key }}/postnews" method="post" enctype="application/x-www-form-urlencoded">
     <label>Title:</label><br>
-    <input type="text" name="title" placeholder="{{.Actor}} was created!" required><input type="submit" value="Post"><br>
+    <input type="text" name="title" placeholder="New Board" required><input type="submit" value="Post"><br>
     <label>Content:</label><br>
     <textarea name="summary" rows="8" cols="50"></textarea><br>
   </form>
+</div>
+
 
-  <ul style="display: inline-block; padding: 0;">
-    <li style="display: inline-block;"><a href="#following">Subscribed</a></li>
-    <!-- <li style="display: inline-block;"><a href="javascript:show('followers')">Followers</a></li> -->
-    <li style="display: inline-block;"><a href="#reported">Reported</a></li>            
-  </ul>
-</div>    
 
 <div id="following" class="popup-box" style="margin-bottom: 25px; padding: 12px;">
   <h4 style="margin: 0; margin-bottom: 5px;">Subscribed</h4>
diff --git a/static/news.html b/static/news.html
index 757c420..4bd43e1 100644
--- a/static/news.html
+++ b/static/news.html
@@ -20,9 +20,9 @@
 {{ define "content" }}
 <div style="text-align: left; max-width: 800px; margin: 0 auto;">
 
-    {{ range .NewsItems }}
-      <p><h1>{{unixtoreadable .Time}} - {{.Title}}</h1><br>{{.Content}}</p>
-    {{ end }}
+  {{ range .NewsItems }}
+  <p><h1>{{unixtoreadable .Time}} - {{.Title}}</h1><br>{{.Content}}</p>
+  {{ end }}
   
 </div>
 {{ end }}