diff --git a/backend/00-router.go b/backend/00-router.go
index 31f805f..c402e60 100644
--- a/backend/00-router.go
+++ b/backend/00-router.go
@@ -403,7 +403,7 @@ func sourceMailboxMessagesHandler(w http.ResponseWriter, r *http.Request) {
return
}
renderSourceMailboxMessageList(w, account, folder, headers)
- fmt.Fprintf(w, `
%s
`, renderSourceMailboxRead(account, folder, firstHeaderUID(headers)))
+ fmt.Fprintf(w, `%s
`, renderInitialReadPane(`Nachricht waehlen.
`))
}
func sourceMailboxMessageHandler(w http.ResponseWriter, r *http.Request) {
@@ -449,7 +449,7 @@ func targetMailboxMessagesHandler(w http.ResponseWriter, r *http.Request) {
return
}
renderTargetMailboxMessageList(w, account, folder, headers)
- fmt.Fprintf(w, `%s
`, renderTargetMailboxRead(account, folder, firstHeaderUID(headers)))
+ fmt.Fprintf(w, `%s
`, renderInitialReadPane(`Nachricht waehlen.
`))
}
func targetMailboxMessageHandler(w http.ResponseWriter, r *http.Request) {
@@ -994,7 +994,7 @@ func transferMessagesHandler(w http.ResponseWriter, r *http.Request) {
folder := strings.TrimSpace(r.URL.Query().Get("folder"))
w.Header().Set("Content-Type", "text/html; charset=utf-8")
fmt.Fprint(w, renderTransferMessageList(side, kind, value, folder))
- fmt.Fprintf(w, `%s
`, renderTransferPreview(kind, value, folder, 0, 0))
+ fmt.Fprintf(w, `%s
`, renderEmptyPreviewPane("Nachricht links oder rechts waehlen."))
}
func transferMessageHandler(w http.ResponseWriter, r *http.Request) {
@@ -1173,16 +1173,6 @@ func renderInitialTransferList(side, kind string, accounts []Account, archives [
}
func renderInitialTransferPreview(leftKind, leftValue, rightKind, rightValue string) string {
- if leftValue != "" {
- if folder, err := firstTransferFolder(leftKind, leftValue); err == nil {
- return renderTransferPreview(leftKind, leftValue, folder, 0, 0)
- }
- }
- if rightValue != "" {
- if folder, err := firstTransferFolder(rightKind, rightValue); err == nil {
- return renderTransferPreview(rightKind, rightValue, folder, 0, 0)
- }
- }
return renderEmptyPreviewPane("Nachricht links oder rechts waehlen.")
}
@@ -1563,18 +1553,7 @@ func renderInitialSourceMailboxList(account Account) string {
}
func renderInitialSourceMailboxRead(account Account) string {
- if account.Name == "" {
- return `Nachricht waehlen.
`
- }
- folder, err := firstSourceFolder(account)
- if err != nil {
- return `Nachricht waehlen.
`
- }
- headers, err := fetchSourceFolderHeaders(account, folder)
- if err != nil {
- return `Nachricht waehlen.
`
- }
- return renderSourceMailboxRead(account, folder, firstHeaderUID(headers))
+ return `Nachricht waehlen.
`
}
func firstSourceFolder(account Account) (string, error) {
@@ -1765,18 +1744,7 @@ func renderInitialTargetMailboxList(account Account) string {
}
func renderInitialTargetMailboxRead(account Account) string {
- if account.Name == "" {
- return `Nachricht waehlen.
`
- }
- folder, err := firstTargetFolder(account)
- if err != nil {
- return `Nachricht waehlen.
`
- }
- headers, err := fetchTargetFolderHeaders(account, folder)
- if err != nil {
- return `Nachricht waehlen.
`
- }
- return renderTargetMailboxRead(account, folder, firstHeaderUID(headers))
+ return `Nachricht waehlen.
`
}
func firstTargetFolder(account Account) (string, error) {