Clearer new post logic

merge-requests/8/head
Bob Mottram 2020-08-24 10:05:46 +01:00
parent a691110ded
commit df29c0e024
16 changed files with 65 additions and 42 deletions

View File

@ -278,5 +278,6 @@
"Event banner image description": "وصف صورة شعار الحدث", "Event banner image description": "وصف صورة شعار الحدث",
"Banner image": "صورة بانر", "Banner image": "صورة بانر",
"Maximum attendees": "الحد الأقصى للحضور", "Maximum attendees": "الحد الأقصى للحضور",
"Ticket URL": "عنوان URL للتذكرة" "Ticket URL": "عنوان URL للتذكرة",
"Create a new event": "أنشئ حدثًا جديدًا"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Descripció de la imatge del banner de lesdeveniment", "Event banner image description": "Descripció de la imatge del banner de lesdeveniment",
"Banner image": "Imatge de pancarta", "Banner image": "Imatge de pancarta",
"Maximum attendees": "Màxim dassistents", "Maximum attendees": "Màxim dassistents",
"Ticket URL": "URL de l'entrada" "Ticket URL": "URL de l'entrada",
"Create a new event": "Creeu un esdeveniment nou"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Disgrifiad delwedd baner y digwyddiad", "Event banner image description": "Disgrifiad delwedd baner y digwyddiad",
"Banner image": "Delwedd baner", "Banner image": "Delwedd baner",
"Maximum attendees": "Uchafswm mynychwyr", "Maximum attendees": "Uchafswm mynychwyr",
"Ticket URL": "URL y tocyn" "Ticket URL": "URL y tocyn",
"Create a new event": "Creu digwyddiad newydd"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Beschreibung des Ereignisbannerbildes", "Event banner image description": "Beschreibung des Ereignisbannerbildes",
"Banner image": "Bannerbild", "Banner image": "Bannerbild",
"Maximum attendees": "Maximale Teilnehmerzahl", "Maximum attendees": "Maximale Teilnehmerzahl",
"Ticket URL": "Ticket URL" "Ticket URL": "Ticket URL",
"Create a new event": "Erstellen Sie ein neues Ereignis"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Event banner image description", "Event banner image description": "Event banner image description",
"Banner image": "Banner image", "Banner image": "Banner image",
"Maximum attendees": "Maximum attendees", "Maximum attendees": "Maximum attendees",
"Ticket URL": "Ticket URL" "Ticket URL": "Ticket URL",
"Create a new event": "Create a new event"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Descripción de la imagen del banner del evento", "Event banner image description": "Descripción de la imagen del banner del evento",
"Banner image": "Imagen de banner", "Banner image": "Imagen de banner",
"Maximum attendees": "Asistentes máximos", "Maximum attendees": "Asistentes máximos",
"Ticket URL": "URL del ticket" "Ticket URL": "URL del ticket",
"Create a new event": "Crea un nuevo evento"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Description de l'image de la bannière de l'événement", "Event banner image description": "Description de l'image de la bannière de l'événement",
"Banner image": "Image de bannière", "Banner image": "Image de bannière",
"Maximum attendees": "Nombre maximum de participants", "Maximum attendees": "Nombre maximum de participants",
"Ticket URL": "URL du ticket" "Ticket URL": "URL du ticket",
"Create a new event": "Créer un nouvel événement"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Tuairisc íomhá meirge na hócáide", "Event banner image description": "Tuairisc íomhá meirge na hócáide",
"Banner image": "Íomhá meirge", "Banner image": "Íomhá meirge",
"Maximum attendees": "Uasmhéid freastail", "Maximum attendees": "Uasmhéid freastail",
"Ticket URL": "URL na dticéad" "Ticket URL": "URL na dticéad",
"Create a new event": "Cruthaigh imeacht nua"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "घटना बैनर छवि विवरण", "Event banner image description": "घटना बैनर छवि विवरण",
"Banner image": "बैनर की छवि", "Banner image": "बैनर की छवि",
"Maximum attendees": "अधिकतम उपस्थित", "Maximum attendees": "अधिकतम उपस्थित",
"Ticket URL": "टिकट URL" "Ticket URL": "टिकट URL",
"Create a new event": "एक नई घटना बनाएँ"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Descrizione dell'immagine del banner dell'evento", "Event banner image description": "Descrizione dell'immagine del banner dell'evento",
"Banner image": "Immagine banner", "Banner image": "Immagine banner",
"Maximum attendees": "Numero massimo di partecipanti", "Maximum attendees": "Numero massimo di partecipanti",
"Ticket URL": "URL del biglietto" "Ticket URL": "URL del biglietto",
"Create a new event": "Crea un nuovo evento"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "イベントバナー画像の説明", "Event banner image description": "イベントバナー画像の説明",
"Banner image": "バナー画像", "Banner image": "バナー画像",
"Maximum attendees": "最大参加者", "Maximum attendees": "最大参加者",
"Ticket URL": "チケットURL" "Ticket URL": "チケットURL",
"Create a new event": "新しいイベントを作成する"
} }

View File

@ -274,5 +274,6 @@
"Event banner image description": "Event banner image description", "Event banner image description": "Event banner image description",
"Banner image": "Banner image", "Banner image": "Banner image",
"Maximum attendees": "Maximum attendees", "Maximum attendees": "Maximum attendees",
"Ticket URL": "Ticket URL" "Ticket URL": "Ticket URL",
"Create a new event": "Create a new event"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Descrição da imagem do banner do evento", "Event banner image description": "Descrição da imagem do banner do evento",
"Banner image": "Imagem de banner", "Banner image": "Imagem de banner",
"Maximum attendees": "Máximo de participantes", "Maximum attendees": "Máximo de participantes",
"Ticket URL": "URL do bilhete" "Ticket URL": "URL do bilhete",
"Create a new event": "Crie um novo evento"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "Описание изображения баннера мероприятия", "Event banner image description": "Описание изображения баннера мероприятия",
"Banner image": "Изображение баннера", "Banner image": "Изображение баннера",
"Maximum attendees": "Максимальное количество участников", "Maximum attendees": "Максимальное количество участников",
"Ticket URL": "URL билета" "Ticket URL": "URL билета",
"Create a new event": "Создать новое мероприятие"
} }

View File

@ -278,5 +278,6 @@
"Event banner image description": "活动横幅图片说明", "Event banner image description": "活动横幅图片说明",
"Banner image": "横幅图片", "Banner image": "横幅图片",
"Maximum attendees": "参加人数上限", "Maximum attendees": "参加人数上限",
"Ticket URL": "工单URL" "Ticket URL": "工单URL",
"Create a new event": "建立新活动"
} }

View File

@ -4729,33 +4729,8 @@ def htmlTimeline(defaultTimeline: str,
tlStr = htmlHeader(cssFilename, profileStyle) tlStr = htmlHeader(cssFilename, profileStyle)
if boxName != 'dm': # what screen to go to when a new post is created
if boxName != 'tlblogs': if boxName == 'dm':
if not manuallyApproveFollowers:
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newpost"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new post'] + '" alt="| ' + \
translate['Create a new post'] + \
'" class="timelineicon"/></a>\n'
else:
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newfollowers"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new post'] + \
'" alt="| ' + translate['Create a new post'] + \
'" class="timelineicon"/></a>\n'
else:
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newblog"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new post'] + '" alt="| ' + \
translate['Create a new post'] + \
'" class="timelineicon"/></a>\n'
else:
newPostButtonStr = \ newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \ '<a class="imageAnchor" href="' + usersPath + \
'/newdm"><img loading="lazy" src="/' + \ '/newdm"><img loading="lazy" src="/' + \
@ -4763,6 +4738,39 @@ def htmlTimeline(defaultTimeline: str,
translate['Create a new DM'] + \ translate['Create a new DM'] + \
'" alt="| ' + translate['Create a new DM'] + \ '" alt="| ' + translate['Create a new DM'] + \
'" class="timelineicon"/></a>\n' '" class="timelineicon"/></a>\n'
elif boxName == 'tlblogs':
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newblog"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new post'] + '" alt="| ' + \
translate['Create a new post'] + \
'" class="timelineicon"/></a>\n'
elif boxName == 'tlevents':
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newevent"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new event'] + '" alt="| ' + \
translate['Create a new event'] + \
'" class="timelineicon"/></a>\n'
else:
if not manuallyApproveFollowers:
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newpost"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new post'] + '" alt="| ' + \
translate['Create a new post'] + \
'" class="timelineicon"/></a>\n'
else:
newPostButtonStr = \
'<a class="imageAnchor" href="' + usersPath + \
'/newfollowers"><img loading="lazy" src="/' + \
iconsDir + '/newpost.png" title="' + \
translate['Create a new post'] + \
'" alt="| ' + translate['Create a new post'] + \
'" class="timelineicon"/></a>\n'
# This creates a link to the profile page when viewed # This creates a link to the profile page when viewed
# in lynx, but should be invisible in a graphical web browser # in lynx, but should be invisible in a graphical web browser