mam
/
mamweb
11
0
Fork 0
Code Issues Pull Requests 6 Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb

remotes/origin/vysl
Aneta 9 years ago
parent
18fc4f98e8 2a8d542d1e
commit
b3abe947ff
14 changed files with 41 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      mamweb/templates/base.html
  2. 2
      mamweb/templates/flatpages/default.html
  3. 2
      mamweb/templates/menu.html
  4. 2
      seminar/templates/seminar/archiv/cisla.html
  5. 2
      seminar/templates/seminar/archiv/cislo.html
  6. 2
      seminar/templates/seminar/archiv/problem.html
  7. 2
      seminar/templates/seminar/archiv/rocnik.html
  8. 14
      seminar/templates/seminar/cojemam/organizatori.html
  9. 2
      seminar/templates/seminar/soustredeni/seznam_soustredeni.html
  10. 1
      seminar/templates/seminar/soustredeni/submenu.html
  11. 2
      seminar/templates/seminar/stav_databaze.html
  12. 2
      seminar/templates/seminar/zadani/AktualniZadani.html
  13. 3
      seminar/urls.py
  14. 12
      seminar/views.py

9
mamweb/templates/base.html
View File

@ -17,8 +17,9 @@
<script type="text/javascript" src="{{ STATIC_URL }}fluent_comments/js/ajaxcomments.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}fluent_comments/js/ajaxcomments.js"></script>
</head> </head>
<body class='{% if True %}org-logged-in{% endif %}'> <body class='{% if user.is_authenticated %}org-logged-in{% endif %}'>
<!-- TODO: only on org login --> {# TODO predelat pro pouze pro orgy (misto pro prihlasene) #}
{% if user.is_authenticated %}
<div class="login-bar" style='background: #F80;'> <div class="login-bar" style='background: #F80;'>
{% if view.object %} {% if view.object %}
Objekt {{ view.object }}: {{ view.object }} Objekt {{ view.object }}: {{ view.object }}
@ -29,6 +30,8 @@
<a href='{% url 'admin:flatpages_flatpage_change' flatpage.id %}'>[admin]</a> <a href='{% url 'admin:flatpages_flatpage_change' flatpage.id %}'>[admin]</a>
{% endif %} {% endif %}
</div> </div>
{% endif %}
<div class="container"> <div class="container">
<div class='row'> <div class='row'>
<div class='col-md-12'> <div class='col-md-12'>
@ -42,7 +45,7 @@
<div id="header"> <div id="header">
<div class='header-lg visible-lg-block'> <div class='header-lg visible-lg-block'>
<img class="logo" src="{% static 'images/logocb.png' %}" /> <img class="logo" src="{% static 'images/logocb.png' %}" />
<h1>Nadpis 1. úrovně</h1> <h1>{% block nadpis1 %}Nadpis 1. úrovně{% endblock %}</h1>
<img class="header" src="{% static 'images/liska6.png' %}" /> <img class="header" src="{% static 'images/liska6.png' %}" />
<!--<a href="/">Korespondenční seminář M&amp;M</a>--> <!--<a href="/">Korespondenční seminář M&amp;M</a>-->
</div> </div>

2
mamweb/templates/flatpages/default.html
View File

@ -3,7 +3,7 @@
{% block title %}{{ flatpage.title }}{% endblock title %} {% block title %}{{ flatpage.title }}{% endblock title %}
{% block content %} {% block content %}
<h2>{{ flatpage.title }}</h2> <h2>{% block nadpis1 %}{{ flatpage.title }}{% endblock %}</h2>
<div> <div>
{{ flatpage.content }} {{ flatpage.content }}
</div> </div>

2
mamweb/templates/menu.html
View File

@ -7,7 +7,7 @@
<li><a href="/zadani/aktualni/">Zadání</a> <li><a href="/zadani/aktualni/">Zadání</a>
<li><a href="/clanky/uvod/">Články</a> <li><a href="/clanky/uvod/">Články</a>
<li><a href="/archiv/cisla/">Archiv</a> <li><a href="/archiv/cisla/">Archiv</a>
<li><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a> <li>{#<a href="/odevzdat-reseni/muj-ucet">#}Odeslat řešení{#</a>#}
</ul> </ul>
<!-- TODO smazat <ul> <!-- TODO smazat <ul>

2
seminar/templates/seminar/archiv/cisla.html
View File

@ -6,7 +6,7 @@
{% block content %} {% block content %}
<div> <div>
<h2>Archiv čísel</h2> <h2>{% block nadpis1 %}Archiv čísel {% endblock %}</h2>
<ul> <ul>
{% for r in object_list %} {% for r in object_list %}

2
seminar/templates/seminar/archiv/cislo.html
View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div> <div>
<h2>Číslo {{ cislo }}</h2> <h2>{% block nadpis1 %}Číslo {{ cislo }}{% endblock%}</h2>
<p><a href='{{ cislo.rocnik.verejne_url }}'>Ročník {{ cislo.rocnik }}</a> <p><a href='{{ cislo.rocnik.verejne_url }}'>Ročník {{ cislo.rocnik }}</a>

2
seminar/templates/seminar/archiv/problem.html
View File

@ -5,7 +5,7 @@
{% block content %} {% block content %}
<div> <div>
{% if problem.cislo_zadani %} {% if problem.cislo_zadani %}
<h2>Problém {{ problem.kod_v_rocniku }}: {{ problem.nazev }}</h2> <h2>{% block nadpis1 %}Problém {{ problem.kod_v_rocniku }}: {{ problem.nazev }}{% endblock %}</h2>
<p>Zadáno v čísle <a href='{{ problem.cislo_zadani.verejne_url }}'>{{ problem.cislo_zadani.kod }}</a>. <p>Zadáno v čísle <a href='{{ problem.cislo_zadani.verejne_url }}'>{{ problem.cislo_zadani.kod }}</a>.
{% if problem.cislo_reseni %} {% if problem.cislo_reseni %}

2
seminar/templates/seminar/archiv/rocnik.html
View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div> <div>
<h2>Ročník {{ rocnik.roman }}</h2> <h2>{% block nadpis1 %} Ročník {{ rocnik.roman }} {% endblock %}</h2>
<p>Ročník číslo {{ rocnik.rocnik }} ({{ rocnik.prvni_rok }}/{{ rocnik.druhy_rok }}) <p>Ročník číslo {{ rocnik.rocnik }} ({{ rocnik.prvni_rok }}/{{ rocnik.druhy_rok }})

14
seminar/templates/seminar/cojemam/organizatori.html
View File

@ -1,9 +1,15 @@
{% extends "seminar/cojemam/base.html" %} {% extends "seminar/cojemam/base.html" %}
{% block nadpis1 %}
{% if aktivni %}
Organizátoři
{% else %}
Vysloužilí organizátoři
{% endif %}
{% endblock%}
{% block content %} {% block content %}
<div> <div>
<h2>Organizátoři</h2>
{% for org in object_list %} {% for org in object_list %}
{% if org.user.is_active %} {% if org.user.is_active %}
<b>Aktivní</b> <b>Aktivní</b>
@ -40,6 +46,10 @@
<hr> <hr>
{% endfor %} {% endfor %}
{% if aktivni%}
<a href="organizovali/">Vysloužilí organizátoři</a>
{% endif %}
</div> </div>
{% endblock content %} {% endblock content %}

2
seminar/templates/seminar/soustredeni/seznam_soustredeni.html
View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<h1> Soustředění </h1> <h1>{% block nadpis1 %}Soustředění{% endblock %}</h1>
{# Projdi vsechna soustredeni #} {# Projdi vsechna soustredeni #}
{% for soustredeni in object_list %} {% for soustredeni in object_list %}

1
seminar/templates/seminar/soustredeni/submenu.html
View File

@ -2,7 +2,6 @@
<ul> <ul>
<li><a href="{{cesta}}/uvod/">Úvod</a> <li><a href="{{cesta}}/uvod/">Úvod</a>
<li><a href="{{cesta}}/pristi/">Příští soustředění</a>
<li><a href="{{cesta}}/pripravujeme/">Připravujeme</a> <li><a href="{{cesta}}/pripravujeme/">Připravujeme</a>
<li><a href="{{cesta}}/probehlo/">Proběhlo</a> <li><a href="{{cesta}}/probehlo/">Proběhlo</a>
</ul> </ul>

2
seminar/templates/seminar/stav_databaze.html
View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div> <div>
<h2>Stav databáze</h2> <h2>{% block nadpis1 %}Stav databáze{% endblock %}</h2>
<h3>Řešitelé</h3> <h3>Řešitelé</h3>

2
seminar/templates/seminar/zadani/AktualniZadani.html
View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div> <div>
<h2>Aktuální zadání</h2> <h2>{% block nadpis1 %}Aktuální zadání{% endblock %}</h2>
{% for problem in nastaveni.aktualni_cislo.zadane_problemy.all %} {% for problem in nastaveni.aktualni_cislo.zadane_problemy.all %}
Problém {{problem}} <br> Problém {{problem}} <br>

3
seminar/urls.py
View File

@ -3,7 +3,8 @@ from . import views, export
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^co-je-MaM/organizatori/$', views.CojemamOrganizatoriView.as_view()), url(r'^co-je-MaM/organizatori/$', views.CojemamOrganizatoriView.as_view(), name='organizatori'),
url(r'^co-je-MaM/organizatori/organizovali/$', views.CojemamOrganizatoriStariView.as_view(), name='stari_organizatori'),
url(r'^archiv/cisla/$', views.CislaView.as_view()), url(r'^archiv/cisla/$', views.CislaView.as_view()),

12
seminar/views.py
View File

@ -18,9 +18,21 @@ def AktualniZadaniView(request):
### Co je M&M ### Co je M&M
## Organizatori
class CojemamOrganizatoriView(generic.ListView): class CojemamOrganizatoriView(generic.ListView):
model = Organizator model = Organizator
template_name='seminar/cojemam/organizatori.html' template_name='seminar/cojemam/organizatori.html'
queryset = Organizator.objects.filter(user__is_active=True).order_by('user__first_name')
def get_context_data(self, **kwargs):
context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
context['aktivni'] = True
return context
class CojemamOrganizatoriStariView(generic.ListView):
model = Organizator
template_name='seminar/cojemam/organizatori.html'
queryset = Organizator.objects.filter(user__is_active=False)
### Archiv ### Archiv

Write Preview
Loading…
Cancel
Save