Merge branch 'master' into upgrade_odevzdavatka
# Conflicts: # data/sitetree.json
This commit is contained in:
commit
50ca3ac71f
2 changed files with 25 additions and 1 deletions
|
@ -1055,5 +1055,29 @@
|
||||||
},
|
},
|
||||||
"model": "sitetree.treeitem",
|
"model": "sitetree.treeitem",
|
||||||
"pk": 52
|
"pk": 52
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fields": {
|
||||||
|
"access_guest": false,
|
||||||
|
"access_loggedin": false,
|
||||||
|
"access_perm_type": 1,
|
||||||
|
"access_permissions": [],
|
||||||
|
"access_restricted": false,
|
||||||
|
"alias": null,
|
||||||
|
"description": "",
|
||||||
|
"hidden": false,
|
||||||
|
"hint": "",
|
||||||
|
"inbreadcrumbs": true,
|
||||||
|
"inmenu": true,
|
||||||
|
"insitetree": true,
|
||||||
|
"parent": 28,
|
||||||
|
"sort_order": 53,
|
||||||
|
"title": "Přidat PDF",
|
||||||
|
"tree": 1,
|
||||||
|
"url": "/admin/korektury/korekturovanepdf/add/",
|
||||||
|
"urlaspattern": false
|
||||||
|
},
|
||||||
|
"model": "sitetree.treeitem",
|
||||||
|
"pk": 53
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
<h2><strong>Termínářský souhrn</strong></h2>
|
<h2><strong>Termínářský souhrn</strong></h2>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li> Počty neobodovaných řešení:
|
<li> Stáří neobodovaných řešení:
|
||||||
<ul>
|
<ul>
|
||||||
{% for problem, pocet in pocty_neopravenych_reseni %}
|
{% for problem, pocet in pocty_neopravenych_reseni %}
|
||||||
<li>{{ problem }}: {{ pocet }}</li>
|
<li>{{ problem }}: {{ pocet }}</li>
|
||||||
|
|
Loading…
Reference in a new issue