diff --git a/kukv1.py b/kukv1.py index fb22067..e17cd95 100644 --- a/kukv1.py +++ b/kukv1.py @@ -130,9 +130,9 @@ def addme(): @app.route('/') def index(): - return render_template('meal_list.html', leaderboard=getLeaderboard(), meals=getUpcomingMeals(), now=datetime.datetime.now()) + return render_template('meal_list.html', leaderboard=getLeaderboard(), meals=getUpcomingMeals()) -@app.route('/view_meal') +@app.route('/viewmeal') def view_meal(): meal_id = request.args.get('meal') meal = getMeal(meal_id) diff --git a/templates/meal_list.html b/templates/meal_list.html index d52e91c..0024ca9 100644 --- a/templates/meal_list.html +++ b/templates/meal_list.html @@ -41,7 +41,7 @@ {% if meal.needs_confirmation %}
{% else %} -
+
{% endif %} {{meal.meal_time}}

{% if meal.needs_confirmation %}Did  {% endif %}{% if meal.kuk != "" %}   {% if not meal.needs_confirmation %}WILL{% endif %}{% else %}   {% if not meal.needs_confirmation %}SHOULD{% endif %}{% endif%} cook for
{% for e in meal.eaters %}  {% endfor %}{% if meal.needs_confirmation %}?{% endif %}