home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug of relationships writing for todo_children writing in wrong column.
[plomtask]
/
templates
/
calendar.html
diff --git
a/templates/calendar.html
b/templates/calendar.html
index 715131af6de410b266fa71c0f29743cebeb74f19..46742624270f9c1c8b10a528c2af18d4f6a2cd32 100644
(file)
--- a/
templates/calendar.html
+++ b/
templates/calendar.html
@@
-1,13
+1,36
@@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+
+
{% block css %}
{% block css %}
-tr.week_row td { height: 0.1em; background-color: black; padding: 0; margin: 0; }
-tr.month_row td { border: 0.1em solid black; text-align: center; }
+tr.week_row td {
+ height: 0.3em;
+ background-color: black;
+ padding: 0;
+ margin: 0;
+}
+tr.month_row td {
+ border: 0.1em solid black;
+ text-align: center;
+ color: white;
+ background-color: #555555;
+}
+tr.day_row td {
+ background-color: #cccccc;
+}
+td.day_name {
+ padding-right: 0.5em;
+}
+td.today {
+ font-weight: bold;
+}
{% endblock %}
{% block content %}
{% endblock %}
{% block content %}
+<h3>calendar</h3>
+
<form action="calendar" method="GET">
from <input name="start" value="{{start}}" />
to <input name="end" value="{{end}}" />
<form action="calendar" method="GET">
from <input name="start" value="{{start}}" />
to <input name="end" value="{{end}}" />
@@
-18,21
+41,25
@@
to <input name="end" value="{{end}}" />
{% if day.first_of_month %}
<tr class="month_row">
{% if day.first_of_month %}
<tr class="month_row">
-<td colspan=
3
>{{ day.month_name }}</td>
+<td colspan=
2
>{{ day.month_name }}</td>
</tr>
{% endif %}
{% if day.weekday == "Monday" %}
<tr class="week_row">
</tr>
{% endif %}
{% if day.weekday == "Monday" %}
<tr class="week_row">
-<td colspan=
3
></td>
+<td colspan=
2
></td>
</tr>
{% endif %}
</tr>
{% endif %}
+<tr class="day_row">
+<td class="day_name {% if day.date == today %}today{% endif %}"><a href="day?date={{day.date}}">{{day.weekday|truncate(2,True,'',0)}} {% if day.date == today %} {% endif %}{{day.date}}</a> {{day.comment|e}}</td>
+</tr>
+
+{% for todo in day.calendarized_todos %}
<tr>
<tr>
-<td>{{day.weekday|truncate(2,True,'',0)}}</td>
-<td><a href="day?date={{day.date}}">{{day.date}}</a></td>
-<td>{{day.comment|e}}</td>
+<td>[{% if todo.is_done %}X{% else %} {% endif %}] <a href="todo?id={{todo.id_}}">{{todo.title_then|e}}</a>{% if todo.comment %} · {{todo.comment|e}}{% endif %}</td>
</tr>
</tr>
+{% endfor %}
{% endfor %}
</table>
{% endfor %}
</table>