Reorganize assets folder

assets/diary/calendar.html

@@ -26,4 +26,4 @@
     </tbody>
   </table>
 </div>
-<script src="/_/diary/diary-calendar.js"></script>
+<script src="/_/diary/calendar.js"></script>

assets/editor/main.html

@@ -35,5 +35,5 @@
 <script src="/_/editor/tables.js"></script>
 <script src="/_/editor/dates.js"></script>
 <script src="/_/editor/movie.js"></script>
-<script src="/_/editor.js"></script>
+<script src="/_/editor/main.js"></script>
 {{end}}

assets/page/main.html

@@ -1,4 +1,4 @@
-{{define "headScripts"}}<script src="/_/page-actions.js"></script>{{end}}
+{{define "headScripts"}}<script src="/_/page/actions.js"></script>{{end}}
 
 {{define "content"}}
 {{if .Content}}
@@ -24,13 +24,13 @@
 {{end}}
 {{end}}
 {{if or .Content .SpecialContent}}
-<script src="/_/content.js"></script>
-<script src="/_/anchors.js"></script>
-<script src="/_/toc.js"></script>
-<script src="/_/tasks.js"></script>
+<script src="/_/page/content.js"></script>
+<script src="/_/page/anchors.js"></script>
+<script src="/_/page/toc.js"></script>
+<script src="/_/page/tasks.js"></script>
 {{end}}
 {{if .Content}}
-<script src="/_/sections.js"></script>
+<script src="/_/page/sections.js"></script>
 {{end}}
 {{end}}
 

assets/search/main.html

@@ -1,4 +1,4 @@
-{{define "headScripts"}}<script src="/_/search-actions.js"></script>{{end}}
+{{define "headScripts"}}<script src="/_/search/actions.js"></script>{{end}}
 
 {{define "searchQuery"}}{{.Query}}{{end}}
 

diary.go

@@ -102,7 +102,7 @@ type calendarData struct {
 	AllMonths    []calMonth
 }
 
-var diaryCalTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-calendar.html"))
+var diaryCalTmpl = template.Must(template.ParseFS(assets, "assets/diary/calendar.html"))
 
 func computeCalendarWidget(diaryRootFS, diaryRootURL, fsPath string, depth int) template.HTML {
 	today := time.Now()
@@ -312,9 +312,9 @@ type diaryYearData struct {
 type diaryMonthData struct{ Days []diaryDaySection }
 type diaryDayData struct{ Photos []diaryPhoto }
 
-var diaryYearTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-year.html"))
-var diaryMonthTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-month.html"))
-var diaryDayTmpl = template.Must(template.ParseFS(assets, "assets/diary/diary-day.html"))
+var diaryYearTmpl = template.Must(template.ParseFS(assets, "assets/diary/year.html"))
+var diaryMonthTmpl = template.Must(template.ParseFS(assets, "assets/diary/month.html"))
+var diaryDayTmpl = template.Must(template.ParseFS(assets, "assets/diary/day.html"))
 
 var germanWeekdays = map[time.Weekday]string{
 	time.Sunday:    "Sonntag",

main.go

@@ -20,9 +20,9 @@ import (
 var assets embed.FS
 
 var (
-	pageTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/page.html"))
-	editTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/edit.html"))
-	searchTmpl = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/search.html"))
+	pageTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/page/main.html"))
+	editTmpl   = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/editor/main.html"))
+	searchTmpl = template.Must(template.ParseFS(assets, "assets/layout.html", "assets/search/main.html"))
 )
 
 // specialPage is the result returned by a pageTypeHandler.