mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2025-12-24 02:39:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

nav color theming

Browse Source
This commit is contained in:
vabene1111
2020-02-17 00:11:15 +01:00
parent ad9944dd01
commit 41bfa95cb2
7 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cookbook/forms.py
View File

@@ -29,7 +29,11 @@ class DateWidget(forms.DateInput):
class UserPreferenceForm(forms.ModelForm): class UserPreferenceForm(forms.ModelForm):
class Meta: class Meta:
model = UserPreference model = UserPreference
fields = ('theme',) fields = ('theme', 'nav_color')
help_texts = {
'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!')
}
class ExternalRecipeForm(forms.ModelForm): class ExternalRecipeForm(forms.ModelForm):

18
cookbook/migrations/0025_userpreference_nav_color.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 3.0.2 on 2020-02-16 23:05
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0024_auto_20200216_2313'),
]
operations = [
migrations.AddField(
model_name='userpreference',
name='nav_color',
field=models.CharField(choices=[('PRIMARY', 'Primary'), ('SECONDARY', 'Secondary'), ('SUCCESS', 'Success'), ('INFO', 'Info'), ('WARNING', 'Warning'), ('DANGER', 'Danger'), ('LIGHT', 'Light'), ('DARK', 'Dark')], default='PRIMARY', max_length=128),
),
]

14
cookbook/models.py
View File

@@ -4,6 +4,7 @@ from django.db import models
class UserPreference(models.Model): class UserPreference(models.Model):
# Themes
BOOTSTRAP = 'BOOTSTRAP' BOOTSTRAP = 'BOOTSTRAP'
DARKLY = 'DARKLY' DARKLY = 'DARKLY'
FLATLY = 'FLATLY' FLATLY = 'FLATLY'
@@ -11,8 +12,21 @@ class UserPreference(models.Model):
THEMES = ((BOOTSTRAP, 'Bootstrap'), (DARKLY, 'Darkly'), (FLATLY, 'Flatly'), (SUPERHERO, 'Superhero')) THEMES = ((BOOTSTRAP, 'Bootstrap'), (DARKLY, 'Darkly'), (FLATLY, 'Flatly'), (SUPERHERO, 'Superhero'))
# Nav colors
PRIMARY = 'PRIMARY'
SECONDARY = 'SECONDARY'
SUCCESS = 'SUCCESS'
INFO = 'INFO'
WARNING = 'WARNING'
DANGER = 'DANGER'
LIGHT = 'LIGHT'
DARK = 'DARK'
COLORS = ((PRIMARY, 'Primary'), (SECONDARY, 'Secondary'), (SUCCESS, 'Success'), (INFO, 'Info'), (WARNING, 'Warning'), (DANGER, 'Danger'), (LIGHT, 'Light'), (DARK, 'Dark'))
user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True) user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY) theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY)
nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
class Storage(models.Model): class Storage(models.Model):

2
cookbook/templates/base.html
View File

@@ -66,7 +66,7 @@
</style> </style>
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-lg navbar-dark bg-primary" id="id_main_nav"> <nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %}" id="id_main_nav">
<!--<a class="navbar-brand" href="{% url 'index' %}">{% trans 'Cookbook' %}</a>--> <!--<a class="navbar-brand" href="{% url 'index' %}">{% trans 'Cookbook' %}</a>-->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation"> aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">

2
cookbook/templates/settings.html
View File

@@ -30,7 +30,7 @@
{% endfor %} {% endfor %}
</select> </select>
<br/> <br/>
<input type="submit" value="{% trans 'Save' %}" class="btn btn-success"> <button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button>
</form> </form>
</div> </div>

8
cookbook/templatetags/theming_tags.py
View File

@@ -23,6 +23,14 @@ def theme_url(request):
return static('themes/flatly.min.css') return static('themes/flatly.min.css')
@register.simple_tag
def nav_color(request):
try:
return request.user.userpreference.nav_color
except AttributeError:
return 'primary'
@register.simple_tag @register.simple_tag
def tabulator_theme_url(request): def tabulator_theme_url(request):
try: try:

1
cookbook/views/views.py
View File

@@ -156,6 +156,7 @@ def settings(request):
if not up: if not up:
up = UserPreference(user=request.user) up = UserPreference(user=request.user)
up.theme = form.cleaned_data['theme'] up.theme = form.cleaned_data['theme']
up.nav_color = form.cleaned_data['nav_color']
up.save() up.save()
if up: if up: