merged with stage5

remotes/origin/stage6
Alexander Burdeiny 9 years ago
commit bcfac98255
  1. 2
      expobanner/forms.py
  2. 9
      static/client/css/main.css
  3. 2
      static/client/css_min/main.min.css
  4. 3
      templates/client/exposition/exposition_by.html

@ -235,7 +235,7 @@ class BasePaidUpdateForm(forms.ModelForm):
fields = ['logo', 'organiser', 'public'] fields = ['logo', 'organiser', 'public']
def save(self, commit=True): def save(self, commit=True):
paid = super(PaidUpdateForm, self).save(commit=False) paid = super(BasePaidUpdateForm, self).save(commit=False)
if commit: if commit:
tickets = self.cleaned_data['tickets'] tickets = self.cleaned_data['tickets']
b_tickets = paid.tickets b_tickets = paid.tickets

@ -9159,7 +9159,8 @@ hr+.rq-note {
} }
.leter-list .leter { .leter-list .leter {
color: #f60; color: #f60;
margin-bottom: 1em margin-bottom: 1em;
list-style: none;
} }
.about_pic { .about_pic {
float: left; float: left;
@ -13198,6 +13199,12 @@ label[for="id_date_to"],
display: none; display: none;
} }
#expo_b_aside_2 > a{
display: block;
text-align: center;
margin-top: 15px;
}

File diff suppressed because one or more lines are too long

@ -31,7 +31,7 @@
{% endif %} {% endif %}
{% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %} {% if cur_word|slice:":1"|lower != prev_word|slice:":1"|lower %}
<ul class="leter-list"> <ul class="leter-list">
<div class="leter"><font size="5">{{ cur_word|slice:":1"|upper }}</font></div> <li class="leter"><font size="5">{{ cur_word|slice:":1"|upper }}</font></li>
{% endif %} {% endif %}
<li> <li>
<a href="{{ expo_catalog }}{{ catalog }}{{ obj.url }}/">{{ obj.name }}&nbsp;({{ obj.expo_count }})</a> <a href="{{ expo_catalog }}{{ catalog }}{{ obj.url }}/">{{ obj.name }}&nbsp;({{ obj.expo_count }})</a>
@ -41,4 +41,3 @@
{% endwith %} {% endwith %}
{% endblock %} {% endblock %}

Loading…
Cancel
Save