mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

Browse Source 
Conflicts:
	templates/client/organiser/add_event.html
remotes/origin/1203
pavel 11 years ago
parent 1c7d6c23b7 4937a1c083
commit 5222915057
7 changed files with 331 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      accounts/views.py
  2. 4
      company/edit_views.py
  3. 2
      registration/backends/default/views.py
  4. 26
      registration/forms.py
  5. 11
      templates/client/includes/accounts/current_user.html
  6. 8
      templates/client/includes/company/company_edit.html
  7. 293
      templates/client/organiser/add_event.html

6
accounts/views.py
Unescape View File

@ -244,7 +244,7 @@ class BaseProfileView(ProfileInvalidView):
def form_valid(self, form):
profile = self.request.user.profile
form = self.form_class(self.request.POST, instance=profile)
form.save()
profile = form.save()
response = {'success': True, 'rating': profile.user.rating}
return HttpResponse(json.dumps(response), content_type='application/json')
@ -276,7 +276,7 @@ class AvatarView(BaseProfileView):
def form_valid(self, form):
profile = self.request.user.profile
form = self.form_class(self.request.POST, self.request.FILES, instance=profile)
form.save()
profile = form.save()
if self.request.is_ajax():
im = get_thumbnail(profile.avatar, '100x100', crop='center')
response = {'success': True, 'url': im.url, 'rating': profile.user.rating}
@ -335,7 +335,7 @@ class NameView(ProfileInvalidView):
def form_valid(self, form):
user = self.request.user
form = self.form_class(self.request.POST, instance=user)
form.save()
user = form.save()
response = {'success': True, 'rating': user.rating}
return HttpResponse(json.dumps(response), content_type='application/json')

4
company/edit_views.py
Unescape View File

@ -24,7 +24,7 @@ class BaseView(ProfileInvalidView):
else:
form = self.form_class(self.request.POST, instance=company)
form.save()
company = form.save()
response = {'success': True, 'rating': company.rating}
return HttpResponse(json.dumps(response), content_type='application/json')
@ -47,7 +47,7 @@ class LogoView(BaseView):
if company.creator_id != self.request.user.id:
return HttpResponseForbidden()
form = self.form_class(self.request.POST, self.request.FILES, instance=company)
form.save()
company = form.save()
if self.request.is_ajax():
im = get_thumbnail(company.logo, '100x100', crop='center')
response = {'success': True, 'url': im.url, 'rating': company.rating}

2
registration/backends/default/views.py
Unescape View File

@ -199,7 +199,7 @@ def LogoutView(request):
def LoginView(request):
if request.POST:
form = AuthenticationForm(data=request.POST)
form = LoginForm(data=request.POST)
#return HttpResponse(form.username)

26
registration/forms.py
Unescape View File

@ -127,6 +127,28 @@ class RegistrationFormNoFreeEmail(RegistrationForm):
raise forms.ValidationError(_("Registration using free email addresses is prohibited. Please supply a different email address."))
return self.cleaned_data['email']
from django.contrib.auth import authenticate
class LoginForm(AuthenticationForm):
username = forms.CharField(max_length=254, widget=forms.TextInput(attrs={'placeholder': _(u'Ваш адрес электронной почты')}))
password = forms.CharField(label=_("Password"), widget=forms.PasswordInput(attrs={'placeholder': _(u'Ваш Пароль')}))
def clean(self):
username = self.cleaned_data.get('username')
password = self.cleaned_data.get('password')
if username and password:
self.user_cache = authenticate(username=username,
password=password)
if self.user_cache is None:
data = self.cleaned_data
self._errors['password'] = ErrorList([self.error_messages['invalid_login'] % {
'username': self.username_field.verbose_name
}])
del data['password']
return data
elif not self.user_cache.is_active:
raise forms.ValidationError(self.error_messages['inactive'])
self.check_for_test_cookie()
return self.cleaned_data

11
templates/client/includes/accounts/current_user.html
Unescape View File

@ -56,10 +56,10 @@
</div>
</div>
</div>
<div class="i-rating" title="{% trans 'Рейтинг' %}: 551" id="profile-rating">551</div>
<div class="i-rating" title="{% trans 'Рейтинг' %}: {{ user.rating }}" id="profile-rating">{{ user.rating }}</div>
<div class="reason_block">
<p>{% trans 'Заполните свой профиль, чтобы повысить рейтинг' %}</p>
<p>{% trans 'Чем выше рейтинг — тем больше преимуществ!' %}</p>
<p>Заполните свой<br>профиль, чтобы<br>повысить рейтинг</p>
<p>Чем выше<br>рейтинг —<br>тем больше<br>преимуществ!</p>
</div>
</aside>
{# END avatar #}
@ -550,10 +550,7 @@
addCompany:{
modalId:'pw-company',
formId:'create_company_form'
},
rating:{
id:'profile-rating'
}
}
});
</script>

8
templates/client/includes/company/company_edit.html
Unescape View File

@ -58,7 +58,7 @@
</div>
<!--!!-->
<div id="profile-rating" class="i-rating" title="{% trans 'Рейтинг' %}: 551">551</div>
<div class="i-rating" title="{% trans 'Рейтинг' %}: {{ company.rating }}">{{ company.rating }}</div>
</aside>
<div class="i-info">
@ -625,10 +625,10 @@
// some helper text in current language
lang:{
workIn:'в'// there must be 'at' in English
},
rating:{
id:'profile-rating'
}
});
</script>
{% endblock %}

293
templates/client/organiser/add_event.html
Unescape View File

@ -16,6 +16,7 @@
{% endblock %}
{% block page_body %}
<div class="page-body clearfix add-event-page">
<div class="set-sect p-form adm-form" id="step-1">
<div class="set-sect-title clearfix">
@ -779,6 +780,298 @@
</div>
</div>
=======
<div class="page-body clearfix">
<div class="set-sect p-form adm-form">
<div class="set-sect-title clearfix">
<h3>{% trans 'Шаг 1. Основная информация' %}</h3>
</div>
<form action="#">
<hr />
<div class="mf-line afs-type">
<label>Тип события:</label>
<div class="mf-field">
<label class="check"><input type="radio" name="nt" /> {% trans 'выставка' %}</label>
<label class="check"><input type="radio" name="nt" /> {% trans 'конференция' %}</label>
<label class="check"><input type="radio" name="nt" /> {% trans 'семинар' %}</label>
<label class="check"><input type="radio" name="nt" /> {% trans 'вебинар' %}</label>
</div>
</div>
<hr />
<div class="adm-form-body">
<div class="mf-line s-subj-tag">
<div class="mf-field">
<label>{% trans 'Тематика' %}:</label>
{{ form.theme }}
<div class="c-select-box select" data-placeholder="{% trans 'Выберите тематику' %}">
<div class="csb-selected-items"></div>
<div class="csb-menu-wrap">
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
<ul>
{% for val, choice in form.theme.field.choices %}
<li><label><input type="checkbox" name="theme" value="{{ val }}" />{{ choice }}</label></li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="mf-field">
<label>{% trans 'Теги' %}:</label>
<div class="c-select-box select" data-placeholder="{% trans 'Выберете ключевые теги' %}">
<div class="csb-selected-items"></div>
<div class="csb-menu-wrap">
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
<ul>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<hr />
<h2>{% trans 'Описание выставки' %}</h2>
<div class="mf-line">
<div class="mf-field">
{{ form.name }}
</div>
</div>
<div class="mf-line full-width">
<div class="mf-field">
{{ form.main_title }}
</div>
</div>
<div class="mf-line full-width">
<div class="mf-field">
<textarea name="description" cols="30" rows="10" placeholder="{% trans 'Полное описание выставки' %}"></textarea>
</div>
</div>
<hr />
<div id="dates-range" class="mf-line">
<label class="h2">{% trans 'Даты проведения' %}:</label>
<div class="mf-field">
<div class="period">
<div class="pwf-field">
<label>{% trans 'с' %}</label>
<input type="text" class="date dateFrom" name="dateFrom" placeholder="{% trans 'дд.мм.гггг' %}" />
</div>
<div class="pwf-field">
<label>{% trans 'по' %}</label>
<input type="text" class="date dateTo" name="dateTo" placeholder="{% trans 'дд.мм.гггг' %}" />
</div>
</div>
</div>
</div>
<hr />
<div class="mfs-location">
<h2>{% trans 'Локация' %}</h2>
<div class="mf-line">
<div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Место проведения' %}" />
</div>
</div>
<div class="mf-line">
<div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Страна' %}" />
</div>
<div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Город' %}" />
</div>
</div>
</div>
<hr />
<div class="mfs-additional">
<h2>{% trans 'Дополнительная информация' %}</h2>
<div class="mf-line mf-targets">
<label>{% trans 'Аудитория' %}:</label>
<div class="mf-field">
<div class="clearfix">
<div class="mff-col">
<label class="check"><input type="checkbox" name="c01" />{% trans 'специалисты' %}</label>
<label class="check"><input type="checkbox" name="c02" />{% trans 'специалисты и потребители' %}</label>
<label class="check"><input type="checkbox" name="c03" />{% trans 'широкая публика' %}</label>
</div>
<div class="mff-col">
<select name="period">
<option value="">{% trans 'Периодичность' %}</option>
<option value="1">{% trans 'Еженедельно' %}</option>
<option value="2">{% trans '2 раза в месяц' %}</option>
<option value="3">{% trans 'Ежемесячно' %}</option>
</select>
</div>
</div>
<hr />
</div>
</div>
<div class="mf-line mf-membership">
<label>{% trans 'Членства и знаки качества' %}:</label>
<div class="mf-field">
<label class="check"><input type="checkbox" name="c01" />{% trans 'Российско-Британская торговая палата' %}</label>
<label class="check"><input type="checkbox" name="c02" />{% trans 'Ассоциация Европейского Бизнеса' %}</label>
<label class="check"><input type="checkbox" name="c03" />{% trans 'Российский союз выставок и ярмарок' %}</label>
<label class="check"><input type="checkbox" name="c04" />{% trans 'Американская торговая палата' %}</label>
<label class="check"><input type="checkbox" name="c05" />{% trans 'UFI' %}</label>
<hr />
</div>
</div>
<div class="mf-line mf-prod">
<div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Веб-сайт (необязательно)' %}" />
<textarea name="pnprod" cols="30" rows="10" placeholder="{% trans 'Экспонируемые продукты' %}"></textarea>
<hr />
</div>
</div>
<div class="mf-line mf-time">
<label>{% trans 'Время работы' %}:</label>
<div id="work-time" class="mf-field">
<div class="w-time">
<div class="w-time-day">
<select name="d01">
<option value="12.04.2014">12.04.2014</option>
</select>
</div>
<div class="w-time-wrap">
<label>{% trans 'c' %}</label>
<select name="tFrom01">
<option value="">{% trans 'чч:мм' %}</option>
<option value="1">08:00</option>
<option value="2">09:00</option>
<option value="3">10:00</option>
<option value="4">11:00</option>
<option value="5">12:00</option>
<option value="6">13:00</option>
<option value="7">14:00</option>
<option value="8">15:00</option>
<option value="9">16:00</option>
<option value="10">17:00</option>
<option value="11">18:00</option>
<option value="12">19:00</option>
<option value="13">20:00</option>
</select>
</div>
<div class="w-time-wrap">
<label>{% trans 'до' %}</label>
<select name="tTo01">
<option value="">{% trans 'чч:мм' %}</option>
<option value="1">09:00</option>
<option value="2">10:00</option>
<option value="3">11:00</option>
<option value="4">12:00</option>
<option value="5">13:00</option>
<option value="6">14:00</option>
<option value="7">15:00</option>
<option value="8">16:00</option>
<option value="9">17:00</option>
<option value="10">18:00</option>
<option value="11">19:00</option>
<option value="12">20:00</option>
<option value="13">21:00</option>
</select>
</div>
<label class="check"><input type="checkbox" class="w-time-switcher" name="c05" checked />{% trans 'Один график на все дни' %}</label>
</div>
</div>
</div>
</div>
<hr />
<div class="mf-line mf-logo">
<label class="h2">{% trans 'Логотип' %}:</label>
<div class="mf-field">
<div class="input-file clearfix">
<div class="button big icon-clip">{% trans 'выберите файл' %}</div>
<div class="file-text" data-placeholder="{% trans 'Не выбрано ни одного файла' %}"></div>
<div class="if-field-wrap"><input type="file" name="avatar" /></div>
</div>
</div>
</div>
<hr />
</div>
<div class="a-bot-buttons-line clearfix">
<div class="abb-left">
<a class="button big icon-save" href="#">{% trans 'сохранить как черновик' %}</a>
</div>
<div class="abb-right">
<a class="button big orange a-more" href="#">{% trans 'далее' %}</a>
</div>
</div>
</form>
</div>
<div class="set-sect p-form adm-form not-active">
<div class="set-sect-title clearfix">
<h3>{% trans 'Шаг 2. Добавление фото' %}</h3>
</div>
</div>
<div class="set-sect p-form adm-form not-active">
<div class="set-sect-title clearfix">
<h3>{% trans 'Шаг 3. Статистика и условия участия' %}</h3>
</div>
</div>
</div>
<script src="{% static 'client/js/_modules/page.organizer.add.js' %}"></script>
<script>

Write Preview
Loading…
Cancel
Save