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

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

Browse source
This commit is contained in:
Tomas "Jethro" Pokorny 2015-11-15 15:14:42 +01:00
commit 237a88ceed
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
galerie/forms.py
View file

@ -8,4 +8,4 @@ class KomentarForm(forms.Form):
class NewGalerieForm(forms.Form): class NewGalerieForm(forms.Form):
nazev = forms.CharField(label = "Název galerie", max_length = 100) nazev = forms.CharField(label = "Název galerie", max_length = 100)
popis = forms.CharField(label = "Popis", required = False, max_length = 2000, widget = forms.Textarea) #popis = forms.CharField(label = "Popis", required = False, max_length = 2000, widget = forms.Textarea)

8
galerie/templates/galerie/GalerieNahled.html
View file

@ -56,13 +56,13 @@ Galerie {{galerie.nazev}}
</div> </div>
<!--</div>--> <!--</div>-->
</a> </a>
{% comment %}
{% if user.is_staff and galerie.zobrazit > 0 %} {% if user.is_staff and galerie.zobrazit > 0 %}
<div class="mam-org-only-galerie">
({{galerie.poradi}}) ({{galerie.poradi}})
<span class="plus"><a href="plus/{{galerie.pk}}/">+</a></span> <span class="plus"><a href="plus/{{galerie.pk}}/">+</a></span>
<span class="minus"><a href="minus/{{galerie.pk}}/">-</a></span> <span class="minus"><a href="minus/{{galerie.pk}}/">-</a></span>
</div>
{% endif %} {% endif %}
{% endcomment %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>

2
galerie/views.py
View file

@ -171,7 +171,7 @@ def new_galerie(request, galerie, soustredeni):
# vytvoreni nove galerie # vytvoreni nove galerie
gal = Galerie() gal = Galerie()
gal.nazev = form.cleaned_data['nazev'] gal.nazev = form.cleaned_data['nazev']
gal.popis = form.cleaned_data['popis'] #gal.popis = form.cleaned_data['popis'] # popis nepouzivame
gal.zobrazit = 1 # galerie je v procesu vytvareni gal.zobrazit = 1 # galerie je v procesu vytvareni
''' pokud je to podgalerie pridej nadrazenou galerii ''' pokud je to podgalerie pridej nadrazenou galerii
a nadrazene soustredeni nechej volne, a nadrazene soustredeni nechej volne,

18
mamweb/static/css/mamweb.css
View file

@ -601,6 +601,24 @@ div.zadani_azad_termin {
margin-bottom: 15px; margin-bottom: 15px;
} }
/* plus a minus tlacitka */
.mam-org-only-galerie {
background: #fff0d7;
padding: 10px;
margin: 10px 10px 10px -20px;
border: orange 2px dashed;
float: left;
}
.mam-org-only-galerie a{
padding: 3px 5px;
margin: 5px;
border-radius: 20px;
background-color: lightblue;
color: black;
float: left;
}
/* Odkazy na předchozí a následující podgalerii */ /* Odkazy na předchozí a následující podgalerii */
.galerie_predchozi_nasledujici { .galerie_predchozi_nasledujici {