Config option DEFAULT_PAGE_SERVICES to allow 'services' to be the default page

uffd/__init__.py

@@ -68,7 +68,11 @@ def create_app(test_config=None): # pylint: disable=too-many-locals,too-many-sta
 	register_template_helper(app)
 
 	# Sort the navbar positions by their blueprint names (from the left)
-	positions = ["selfservice", "service", "rolemod", "invite", "user", "group", "role", "mail"]
+	if app.config['DEFAULT_PAGE_SERVICES']:
+		positions = ["service", "selfservice"]
+	else:
+		positions = ["selfservice", "service"]
+	positions += ["rolemod", "invite", "user", "group", "role", "mail"]
 	setup_navbar(app, positions)
 
 	# We never want to fail here, but at a file access that doesn't work.
@@ -100,6 +104,8 @@ def create_app(test_config=None): # pylint: disable=too-many-locals,too-many-sta
 
 	@app.route("/")
 	def index(): #pylint: disable=unused-variable
+		if app.config['DEFAULT_PAGE_SERVICES']:
+			return redirect(url_for('service.overview'))
 		return redirect(url_for('selfservice.index'))
 
 	@app.route('/lang', methods=['POST'])

uffd/default_config.cfg

@@ -51,6 +51,10 @@ SQLALCHEMY_TRACK_MODIFICATIONS=False
 
 FOOTER_LINKS=[{"url": "https://example.com", "title": "example"}]
 
+# The default page after login or clicking the top left home button is the self-service
+# page. If you would like it to be the services list instead, set this to True.
+DEFAULT_PAGE_SERVICES=False
+
 # Service overview page (disabled if empty)
 SERVICES=[
 #	# Title is mandatory, all other fields are optional.

uffd/service/templates/service/overview.html

@@ -5,7 +5,18 @@
 {% set iconstyle = 'style="width: 1.8em;"'|safe %}
 
 {% if not request.user %}
-<div class="alert alert-warning" role="alert">{{_("Some services may not be publicly listed! Log in to see all services you have access to.")}}</div>
+<div class="alert alert-warning" role="alert">
+    <div class="row">
+        <div class="col-12 col-md-9 col-lg-10 col-xl-10">
+            {{ _("Some services may not be publicly listed! Log in to see all services you have access to.") }}
+        </div>
+        <div class="col-12 col-md-3 col-lg-2 col-xl-2 text-center text-md-right text-lg-right text-xl-right">
+            <a class="btn btn-primary" href="{{ url_for("session.login", ref=request.full_path) }}">
+                <i class="fa fa-sign-in-alt" aria-hidden="true"></i> {{ _("Login") }}
+            </a>
+        </div>
+    </div>
+</div>
 {% endif %}
 
 {% if banner %}

uffd/signup/views.py

@@ -20,7 +20,7 @@ def signup_enabled(func):
 	@functools.wraps(func)
 	def decorator(*args, **kwargs):
 		if not current_app.config['SELF_SIGNUP']:
-			flash(_('Singup not enabled'))
+			flash(_('Signup not enabled'))
 			return redirect(url_for('index'))
 		return func(*args, **kwargs)
 	return decorator
@@ -104,4 +104,4 @@ def signup_confirm_submit(signup_id, token):
 	db.session.commit()
 	set_session(user, skip_mfa=True)
 	flash(_('Your account was successfully created'))
-	return redirect(url_for('selfservice.index'))
+	return redirect(url_for('index'))

uffd/templates/base.html

@@ -36,7 +36,7 @@
 
 		<nav class="navbar navbar-expand-md navbar-dark bg-dark static-top" >
 			<a class="navbar-brand" href="{{ url_for('index') }}">{{ config['SITE_TITLE'] }}</a>
-			{% if getnavbar() or request.user or config['LANGUAGES']|length > 1 %}
+			{% if getnavbar() or request.user or request.endpoint != 'session.login' or config['LANGUAGES']|length > 1 %}
 			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#baseNavbar" aria-controls="baseNavbar" aria-expanded="false" aria-label="Toggle navigation">
 				<span class="navbar-toggler-icon"></span>
 			</button>
@@ -69,7 +69,7 @@
 				</ul>
 				{% endif %}
 
-				{% if request.user or config['LANGUAGES']|length > 1 %}
+				{% if request.user or request.endpoint != 'session.login' or config['LANGUAGES']|length > 1 %}
 				<ul class="navbar-nav ml-auto">
 					{% if config['LANGUAGES']|length > 1 %}
 					<li class="nav-item">
@@ -99,6 +99,13 @@
 							{{_("Logout")}}
 						</a>
 					</li>
+					{% elif request.endpoint != 'session.login' %}
+					<li class="nav-item">
+						<a class="nav-link" href="{{ url_for("session.login", ref=request.full_path) }}">
+							<span aria-hidden="true" class="fa fa-sign-in-alt"></span>
+							{{ _("Login") }}
+						</a>
+					</li>
 					{% endif %}
 				</ul>
 				{% endif %}

uffd/translations/de/LC_MESSAGES/messages.po

@@ -1420,7 +1420,7 @@ msgid "Forgot Password?"
 msgstr "Passwort vergessen?"
 
 #: uffd/signup/views.py:23
-msgid "Singup not enabled"
+msgid "Signup not enabled"
 msgstr "Account-Registrierung ist deaktiviert"
 
 #: uffd/signup/views.py:81 uffd/signup/views.py:89