mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

Update templates (remove CMS), improve testdata gen

Browse source
This commit is contained in:
Tomas Gavenciak 2015-03-14 23:31:29 +01:00
parent ef9d3e9f69
commit 4b855c6f77
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mamweb/templates/base.html
View file

@ -1,4 +1,4 @@
{% load cms_tags staticfiles sekizai_tags menu_tags %} {% load staticfiles sekizai_tags %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang='cs'> <html lang='cs'>
<head> <head>
@ -12,7 +12,6 @@
<script src="{% static 'js/jquery-1.11.1.js' %}"></script> <script src="{% static 'js/jquery-1.11.1.js' %}"></script>
</head> </head>
<body class='{% if True %}org-logged-in{% endif %}'> <body class='{% if True %}org-logged-in{% endif %}'>
{% cms_toolbar %}
<div class="container"> <div class="container">
<div class='header'> <div class='header'>
Korespondenční seminář M&amp;M Korespondenční seminář M&amp;M

6
seminar/templates/seminar/problem.html
View file

@ -1,17 +1,17 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load cms_tags staticfiles sekizai_tags menu_tags %} {% load staticfiles sekizai_tags %}
{% block content %} {% block content %}
<div> <div>
<h2>Problém {{ problem.nazev }}</h2> <h2>Problém {{ problem.nazev }}</h2>
<h3>Text</h3> <h3>Text</h3>
{% render_placeholder problem.text_problemu %} {{ problem.text_problemu |safe }}
{% if True %} {% if True %}
<div class='mam-org-only'> <div class='mam-org-only'>
<h3>Text - org</h3> <h3>Text - org</h3>
{% render_placeholder problem.text_problemu_org %} {{ problem.text_problemu_org |safe }}
</div> </div>
{% endif %} {% endif %}

4
seminar/tests.py
View file

@ -60,6 +60,10 @@ def create_test_data():
p = Problem.objects.create(autor = rnd.choice(orgs), cislo_zadani=cs[ci-2], cislo_reseni=cs[ci], p = Problem.objects.create(autor = rnd.choice(orgs), cislo_zadani=cs[ci-2], cislo_reseni=cs[ci],
opravovatel = rnd.choice(orgs), kod = str(pi), nazev = u'Dummy úloha %s-%s' % (seq[ci], seq[pi]), opravovatel = rnd.choice(orgs), kod = str(pi), nazev = u'Dummy úloha %s-%s' % (seq[ci], seq[pi]),
stav = Problem.STAV_ZADANY, typ = Problem.TYP_ULOHA, body = rnd.randint(1, 5)) stav = Problem.STAV_ZADANY, typ = Problem.TYP_ULOHA, body = rnd.randint(1, 5))
p.text_problemu = (u"<p>Text problému <strong>%s.%s %s</strong><em> [id %d]</em> za %d body.</p>" %
(p.cislo_zadani.kod(), p.kod, p.nazev, p.id, p.body))
p.text_problemu_org = u"<p><strong>Neveřejný</strong> text problému.</p>"
p.save()
for resi in range(rnd.randint(0, 7)): for resi in range(rnd.randint(0, 7)):
res = Reseni.objects.create(problem = p, resitel = rnd.choice(Resitel.objects.all()), res = Reseni.objects.create(problem = p, resitel = rnd.choice(Resitel.objects.all()),