diff --git a/cookbook/forms.py b/cookbook/forms.py index b3a925a02..51d59ed3e 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -92,7 +92,7 @@ class InternalRecipeForm(forms.ModelForm): } widgets = {'keywords': MultiSelectWidget} help_texts = { - 'instructions': _('You can use markdown to format the instructions. See the docs here') + 'instructions': _('You can use markdown to format this field. See the docs here') } @@ -264,4 +264,9 @@ class MealPlanForm(forms.ModelForm): model = MealPlan fields = ('recipe', 'title', 'meal', 'note', 'date', 'shared') + help_texts = { + 'shared': _('You can list default users to share recipes with in the settings.'), + 'note': _('You can use markdown to format this field. See the docs here') + } + widgets = {'recipe': SelectWidget, 'date': DateWidget, 'shared': MultiSelectWidget} diff --git a/cookbook/models.py b/cookbook/models.py index e6b3b1c49..b6d04b44e 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -234,6 +234,10 @@ class MealPlan(models.Model): return self.title return str(self.recipe) + def get_meal_name(self): + meals = dict(self.MEAL_TYPES) + return meals.get(self.meal) + class CookLog(models.Model): recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE) diff --git a/cookbook/static/custom/css/markdown_blockquote.css b/cookbook/static/custom/css/markdown_blockquote.css new file mode 100644 index 000000000..17f2645f3 --- /dev/null +++ b/cookbook/static/custom/css/markdown_blockquote.css @@ -0,0 +1,21 @@ +/* css classes needed to render markdown blockquotes */ +blockquote { + background: #f9f9f9; + border-left: 4px solid #ccc; + margin: 1.5em 10px; + padding: .5em 10px; + quotes: none; +} + +blockquote:before { + color: #ccc; + content: open-quote; + font-size: 4em; + line-height: .1em; + margin-right: .25em; + vertical-align: -.4em; +} + +blockquote p { + display: inline; +} \ No newline at end of file diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index dbd849281..945d50fc1 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -70,7 +70,7 @@ class="sr-only">(current) -
  • +
  • {% for mp in days_value %} - {% if mp.recipe %} - - {{ mp.recipe }}
    - {% else %} - {{ mp.title }}
    - {% endif %} - + + {% if mp.recipe %} + {{ mp.recipe }} + {% else %} + {{ mp.title }} + {% endif %} +
    {% endfor %} {% endfor %} diff --git a/cookbook/templates/meal_plan_entry.html b/cookbook/templates/meal_plan_entry.html new file mode 100644 index 000000000..29d008ef7 --- /dev/null +++ b/cookbook/templates/meal_plan_entry.html @@ -0,0 +1,83 @@ +{% extends "base.html" %} +{% load static %} +{% load custom_tags %} +{% load i18n %} + +{% block title %}{% trans 'Meal Plan View' %}{% endblock %} + +{% block extra_head %} + +{% endblock %} + +{% block content %} +
    +
    +

    {{ plan.get_meal_name }} {{ plan.date }} +

    + {% trans 'Created by' %} {{ plan.created_by.get_user_name }} + {% if plan.shared.all %} +
    {% trans 'Shared with' %} + {% for x in plan.shared.all %}{{ x.get_user_name }}{% if not forloop.last %}, {% endif %} {% endfor %} + {% endif %} + +
    +
    +
    +
    + + {% if plan.title %} +
    +
    +

    {{ plan.title }}

    +
    +
    + {% endif %} + + {% if plan.recipe %} +
    +
    +
    +
    + {% recipe_rating plan.recipe request.user as rating %} +
    {{ plan.recipe }} {{ rating|safe }} +
    + {% recipe_last plan.recipe request.user as last_cooked %} + {% if last_cooked %} + {% trans 'Last cooked' %} {{ last_cooked|date }} + {% else %} + {% trans 'Never cooked before.' %} + {% endif %} + {% if plan.recipe.keywords %} +
    +
    + {{ plan.recipe.all_tags }} + {% endif %} +
    +
    +
    +
    + {% endif %} + + {% if plan.note %} +
    +
    +
    + {{ plan.note | markdown | safe }} +
    +
    + {% endif %} + + {% if same_day_plan %} +
    +

    {% trans 'Other meals on this day' %}

    + + {% endif %} + +{% endblock %} \ No newline at end of file diff --git a/cookbook/templates/recipe_view.html b/cookbook/templates/recipe_view.html index 708f1176c..a261ba898 100644 --- a/cookbook/templates/recipe_view.html +++ b/cookbook/templates/recipe_view.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static %} {% load crispy_forms_tags %} {% load i18n %} {% load l10n %} @@ -10,8 +11,8 @@ + - {% endblock %} diff --git a/cookbook/urls.py b/cookbook/urls.py index eade70319..5745bf542 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -11,6 +11,7 @@ urlpatterns = [ path('search/', views.search, name='view_search'), path('books/', views.books, name='view_books'), path('plan/', views.meal_plan, name='view_plan'), + path('plan/entry/', views.meal_plan_entry, name='view_plan_entry'), path('shopping/', views.shopping_list, name='view_shopping'), path('settings/', views.settings, name='view_settings'), diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py index 20fb40c4f..95b032296 100644 --- a/cookbook/views/edit.py +++ b/cookbook/views/edit.py @@ -272,7 +272,7 @@ class MealPlanUpdate(OwnerRequiredMixin, UpdateView): form_class = MealPlanForm def get_success_url(self): - return reverse('view_plan') + return reverse('view_plan_entry', kwargs={'pk': self.object.pk}) def get_context_data(self, **kwargs): context = super(MealPlanUpdate, self).get_context_data(**kwargs) diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 5de160da2..0ba262b3a 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -137,6 +137,19 @@ def meal_plan(request): return render(request, 'meal_plan.html', {'js_week': js_week, 'plan': plan, 'days': days, 'surrounding_weeks': surrounding_weeks}) +@group_required('user') +def meal_plan_entry(request, pk): + plan = MealPlan.objects.get(pk=pk) + + if plan.created_by != request.user and plan.shared != request.user: + messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!')) + return HttpResponseRedirect(reverse_lazy('index')) + + same_day_plan = MealPlan.objects.filter(date=plan.date).exclude(pk=plan.pk).filter(Q(created_by=request.user) | Q(shared=request.user)).order_by('meal').all() + + return render(request, 'meal_plan_entry.html', {'plan': plan, 'same_day_plan': same_day_plan}) + + @group_required('user') def shopping_list(request): markdown_format = True