diff options
| author | lxf <sng@luxagraf.net> | 2019-05-02 15:38:28 +0000 |
|---|---|---|
| committer | lxf <sng@luxagraf.net> | 2019-05-02 15:38:28 +0000 |
| commit | 5e545245ec2900aa33328629d18d4847860660bb (patch) | |
| tree | 57dc1728e27eab9f82b5a3a49b00089ddd10cff8 | |
| parent | 29520016f9039c669f725d693de22cdda8445e23 (diff) | |
| parent | 92db07b730c81b6ae503e5a3bc38f103af8e84fa (diff) | |
Merge branch 'master' of ssh://luxgit/luxagraf/fieldnotes
| -rw-r--r-- | config/base_urls.py | 2 | ||||
| -rw-r--r-- | design/templates/base.html | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config/base_urls.py b/config/base_urls.py index 19d6499..022fbe4 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -4,6 +4,7 @@ from django.views.generic.base import RedirectView from django.conf.urls import include, url from django.conf.urls.static import static from django.conf import settings +from django.views.generic import RedirectView from django_registration.backends.activation.views import RegistrationView from rest_framework import routers @@ -32,6 +33,7 @@ urlpatterns += [ path('magux/', admin.site.urls), path(r'accounts/', include('django_registration.backends.activation.urls')), path(r'accounts/', include('django.contrib.auth.urls')), + path(r'register/', RedirectView.as_view(url='/waitlist', permanent=False)), path(r'register/', RegistrationView.as_view(form_class=UserForm), name='django_registration_register',), path(r'settings/', include('accounts.urls')), path(r'', include('django_registration.backends.activation.urls')), diff --git a/design/templates/base.html b/design/templates/base.html index 7049d5e..c222906 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -4,10 +4,10 @@ <!--[if IE 9]> <html class="ie9"> <![endif]--> <!--[if !IE]><!--> <html lang="en"><!--<![endif]--> <head> - <title>{% block pagetitle %}{% endblock %}TKNotes</title> + <title>{% block pagetitle %}{% endblock %} - LuxNotes</title> <meta name="viewport" content="width=device-width"> - <meta name="description" content="TKNote taking for writers"> - <meta property="og:description" content="TkNote taking for writers"> + <meta name="description" content="Luxnotes: note taking for writers"> + <meta property="og:description" content="Luxnotes: note taking for writers"> <meta property="og:site_name" content="TKNotes"> <meta property="og:image" content=""> <link rel="stylesheet" href="/media/screenv1.css?{%now "u"%}" type="text/css"> @@ -48,7 +48,7 @@ <div class="logo"></div> <nav class="right {% if request.user.is_anonymous %}nologin{% endif %}"> <ul> - <li><a href="{% url 'forum:topic-list' %}" title="View the TKNote Forum">Community</a></li> + <li><a href="{% url 'forum:topic-list' %}" title="View the Luxnotes Forum">Community</a></li> <li><a href="{% url 'pages' slug='tour' %}" title="">Tour</a></li> <li><a href="{% url 'pages' slug='howto' %}" title="">How to</a></li>{% if not request.user.is_anonymous %} <li><a id="account-menu" href="{% url 'accounts:settings' %}" title="">Account</a> |