Revert "Keep the globe on the same line #230"

This reverts commit ae78e5e459.

hypview/readers.qtpl.go

@@ -32,7 +32,7 @@ import "github.com/bouncepaw/mycorrhiza/l18n"
 import "github.com/bouncepaw/mycorrhiza/internal/mimetype"
 
 //line hypview/readers.qtpl:11
-import "github.com/bouncepaw/mycorrhiza/internal/tree"
+import "github.com/bouncepaw/mycorrhiza/tree"
 
 //line hypview/readers.qtpl:12
 import "github.com/bouncepaw/mycorrhiza/internal/user"

interwiki/web.go

@@ -2,12 +2,11 @@ package interwiki
 
 import (
 	"embed"
+	viewutil2 "github.com/bouncepaw/mycorrhiza/web/viewutil"
+	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"strings"
-
-	"github.com/bouncepaw/mycorrhiza/web/viewutil"
-	"github.com/gorilla/mux"
 )
 
 var (
@@ -30,13 +29,13 @@ var (
 {{define "edit separately."}}Изменяйте записи по отдельности.{{end}}
 {{define "add interwiki entry"}}Добавить запись в интеркарту{{end}}
 `
-	chainInterwiki viewutil.Chain
+	chainInterwiki viewutil2.Chain
-	chainNameTaken viewutil.Chain
+	chainNameTaken viewutil2.Chain
 )
 
 func InitHandlers(rtr *mux.Router) {
-	chainInterwiki = viewutil.CopyEnRuWith(fs, "view_interwiki.html", ruTranslation)
+	chainInterwiki = viewutil2.CopyEnRuWith(fs, "view_interwiki.html", ruTranslation)
-	chainNameTaken = viewutil.CopyEnRuWith(fs, "view_name_taken.html", ruTranslation)
+	chainNameTaken = viewutil2.CopyEnRuWith(fs, "view_name_taken.html", ruTranslation)
 	rtr.HandleFunc("/interwiki", handlerInterwiki)
 	rtr.HandleFunc("/interwiki/add-entry", handlerAddEntry).Methods(http.MethodPost)
 	rtr.HandleFunc("/interwiki/modify-entry/{target}", handlerModifyEntry).Methods(http.MethodPost)
@@ -65,13 +64,13 @@ func handlerModifyEntry(w http.ResponseWriter, rq *http.Request) {
 
 	if oldData, ok = entriesByName[name]; !ok {
 		log.Printf("Could not modify interwiki entry ‘%s’ because it does not exist", name)
-		viewutil.HandlerNotFound(w, rq)
+		viewutil2.HandlerNotFound(w, rq)
 		return
 	}
 
 	if err := replaceEntry(oldData, &newData); err != nil {
 		log.Printf("Could not modify interwiki entry ‘%s’ because one of the proposed aliases/name is taken\n", name)
-		viewNameTaken(viewutil.MetaFrom(w, rq), oldData, err.Error(), "modify-entry/"+name)
+		viewNameTaken(viewutil2.MetaFrom(w, rq), oldData, err.Error(), "modify-entry/"+name)
 		return
 	}
 
@@ -83,7 +82,7 @@ func handlerModifyEntry(w http.ResponseWriter, rq *http.Request) {
 func handlerAddEntry(w http.ResponseWriter, rq *http.Request) {
 	wiki := readInterwikiEntryFromRequest(rq)
 	if err := addEntry(&wiki); err != nil {
-		viewNameTaken(viewutil.MetaFrom(w, rq), &wiki, err.Error(), "add-entry")
+		viewNameTaken(viewutil2.MetaFrom(w, rq), &wiki, err.Error(), "add-entry")
 		return
 	}
 	saveInterwikiJson()
@@ -91,15 +90,15 @@ func handlerAddEntry(w http.ResponseWriter, rq *http.Request) {
 }
 
 type nameTakenData struct {
-	*viewutil.BaseData
+	*viewutil2.BaseData
 	*Wiki
 	TakenName string
 	Action    string
 }
 
-func viewNameTaken(meta viewutil.Meta, wiki *Wiki, takenName, action string) {
+func viewNameTaken(meta viewutil2.Meta, wiki *Wiki, takenName, action string) {
-	viewutil.ExecutePage(meta, chainNameTaken, nameTakenData{
+	viewutil2.ExecutePage(meta, chainNameTaken, nameTakenData{
-		BaseData:  &viewutil.BaseData{},
+		BaseData:  &viewutil2.BaseData{},
 		Wiki:      wiki,
 		TakenName: takenName,
 		Action:    action,
@@ -107,19 +106,19 @@ func viewNameTaken(meta viewutil.Meta, wiki *Wiki, takenName, action string) {
 }
 
 func handlerInterwiki(w http.ResponseWriter, rq *http.Request) {
-	viewInterwiki(viewutil.MetaFrom(w, rq))
+	viewInterwiki(viewutil2.MetaFrom(w, rq))
 }
 
 type interwikiData struct {
-	*viewutil.BaseData
+	*viewutil2.BaseData
 	Entries []*Wiki
 	CanEdit bool
 	Error   string
 }
 
-func viewInterwiki(meta viewutil.Meta) {
+func viewInterwiki(meta viewutil2.Meta) {
-	viewutil.ExecutePage(meta, chainInterwiki, interwikiData{
+	viewutil2.ExecutePage(meta, chainInterwiki, interwikiData{
-		BaseData: &viewutil.BaseData{},
+		BaseData: &viewutil2.BaseData{},
 		Entries:  listOfEntries,
 		CanEdit:  meta.U.Group == "admin",
 		Error:    "",

interwiki/wiki.go

@@ -2,9 +2,8 @@ package interwiki
 
 import (
 	"fmt"
-	"log"
-
 	"github.com/bouncepaw/mycorrhiza/util"
+	"log"
 )
 
 // WikiEngine is an enumeration of supported interwiki targets.

web/static/default.css

@@ -106,14 +106,13 @@ textarea {font-size:16px; font-family: inherit; line-height: 150%; }
 
 main h1:not(.navi-title) {font-size:1.7rem;}
 blockquote { margin: 0; padding-left: .75rem; }
-.wikilink { display: inline-block; }
+.wikilink_external::before { display: inline-block; width: 18px; height: 16px; vertical-align: sub; }
-.wikilink_external::before { width: 18px; height: 16px; vertical-align: text-top; margin-right: 2px; }
 /* .wikilink_external { padding-left: 16px; } */
-.wikilink_gopher::before { content: url("/static/icon/gopher-proto.svg"); }
+.wikilink_gopher::before { content: url("/staticatic/icon/gopher-proto.svg"); }
-.wikilink_http::before, .wikilink_https::before { content: url("/static/icon/http-proto.svg"); }
+.wikilink_http::before, .wikilink_https::before { content: url("/staticatic/icon/http-proto.svg"); }
 /* .wikilink_https { background: transparent url("/static/icon/http-proto.svg") center left no-repeat; } */
-.wikilink_gemini::before { content: url("/static/icon/gemini-proto.svg"); }
+.wikilink_gemini::before { content: url("/staticatic/icon/gemini-proto.svg"); }
-.wikilink_mailto::before { content: url("/static/icon/mailto-proto.svg"); }
+.wikilink_mailto::before { content: url("/staticatic/icon/mailto-proto.svg"); }
 
 article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; }
 main h1 { margin: .5rem 0 0 0; }