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

After merge bug fixed

Browse Source
remotes/origin/1203
pavel 11 years ago
parent fa921b67af
commit a7d3d15b0e
3 changed files with 23 additions and 308 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. 5
      templates/client/includes/accounts/current_user.html
  2. 3
      templates/client/includes/company/company_edit.html
  3. 323
      templates/client/organiser/add_event.html

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

@ -550,7 +550,10 @@
addCompany:{ addCompany:{
modalId:'pw-company', modalId:'pw-company',
formId:'create_company_form' formId:'create_company_form'
} },
rating:{
id:'profile-rating'
}
}); });
</script> </script>

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

@ -625,6 +625,9 @@
// some helper text in current language // some helper text in current language
lang:{ lang:{
workIn:'в'// there must be 'at' in English workIn:'в'// there must be 'at' in English
},
rating:{
id:'profile-rating'
} }

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

@ -780,311 +780,20 @@
</div> </div>
</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 src="{% static 'client/js/_modules/page.organizer.add.js' %}"></script>
<script> <script>
EXPO.organizer.add.init({ EXPO.organizer.add.init({
steps: [ steps: [
{ {
id: 'summary-form', id: 'summary-form',
formBodyClass: 'adm-form-body', formBodyClass: 'adm-form-body',
typeClass: 'event-type', typeClass: 'event-type',
typeInputName: 'nt', typeInputName: 'nt',
dateClasses: ['dateFrom', 'dateTo', 'dateFromLast'] dateClasses: ['dateFrom', 'dateTo', 'dateFromLast']
} }
] ]
}); });
</script> </script>
{% endblock %} {% endblock %}

Write Preview
Loading…
Cancel
Save