diff --git a/.idea/recipes.iml b/.idea/recipes.iml index a8c515d0c..7854b7178 100644 --- a/.idea/recipes.iml +++ b/.idea/recipes.iml @@ -27,8 +27,8 @@ diff --git a/cookbook/templates/rest_framework/api.html b/cookbook/templates/rest_framework/api.html new file mode 100644 index 000000000..a589e706d --- /dev/null +++ b/cookbook/templates/rest_framework/api.html @@ -0,0 +1,19 @@ +{% extends "rest_framework/base.html" %} +{% load i18n %} + +{% block branding %} + {% trans 'Recipe Home' %} +{% endblock %} + +{% block userlinks %} + + + {{ block.super }} + +{% endblock %} \ No newline at end of file diff --git a/cookbook/templatetags/theming_tags.py b/cookbook/templatetags/theming_tags.py index 0b6609d5c..6c354d61f 100644 --- a/cookbook/templatetags/theming_tags.py +++ b/cookbook/templatetags/theming_tags.py @@ -26,7 +26,7 @@ def theme_url(request): def nav_color(request): if not request.user.is_authenticated: return 'primary' - return request.user.userpreference.nav_color + return request.user.userpreference.nav_color.lower() @register.simple_tag diff --git a/recipes/settings.py b/recipes/settings.py index 1eef94c70..5e8c3da9b 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -102,7 +102,7 @@ ROOT_URLCONF = 'recipes.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'DIRS': [os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'cookbook', 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [