Commits

Alex Ulianytskyi committed d0590d5

Некотрые исправления верстки

Comments (0)

Files changed (7)

db/development.sqlite

Binary file modified.

locale/en/LC_MESSAGES/django.mo

Binary file modified.

locale/en/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-15 23:15+0200\n"
+"POT-Creation-Date: 2010-01-17 17:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 msgid "file"
 msgstr ""
 
-#: banners/forms.py:40 catalogue/models.py:181
+#: banners/forms.py:40 catalogue/models.py:194
 msgid "start"
 msgstr ""
 
-#: banners/forms.py:41 catalogue/models.py:182
+#: banners/forms.py:41 catalogue/models.py:195
 msgid "end"
 msgstr ""
 
 msgid "price"
 msgstr ""
 
-#: catalogue/forms.py:42 catalogue/models.py:98
+#: catalogue/forms.py:42 catalogue/models.py:115
 msgid "rooms"
 msgstr ""
 
-#: catalogue/forms.py:43 catalogue/models.py:108
+#: catalogue/forms.py:43 catalogue/models.py:125
 msgid "layout"
 msgstr ""
 
 msgid "street"
 msgstr ""
 
-#: catalogue/forms.py:45 catalogue/models.py:106
+#: catalogue/forms.py:45 catalogue/models.py:123
 msgid "level"
 msgstr ""
 
-#: catalogue/forms.py:60
+#: catalogue/forms.py:63
 msgid "ID"
 msgstr ""
 
-#: catalogue/forms.py:87
+#: catalogue/forms.py:90
 msgid "Number of choices must be greater then one"
 msgstr ""
 
-#: catalogue/forms.py:102
+#: catalogue/forms.py:105
 msgid "The apartment not found"
 msgstr ""
 
-#: catalogue/forms.py:109
+#: catalogue/forms.py:112
 msgid "Start later then end"
 msgstr ""
 
-#: catalogue/forms.py:110 catalogue/forms.py:119
+#: catalogue/forms.py:113 catalogue/forms.py:122
 msgid ""
 "The apartment occupied during this period, please select a different dates."
 msgstr ""
 
-#: catalogue/forms.py:118
+#: catalogue/forms.py:121
 msgid "Check-in date later then departure date"
 msgstr ""
 
-#: catalogue/forms.py:121 catalogue/models.py:114 catalogue/models.py:171
-#: catalogue/models.py:180 catalogue/models.py:212
+#: catalogue/forms.py:124 catalogue/models.py:131 catalogue/models.py:184
+#: catalogue/models.py:193 catalogue/models.py:225
 #: templates/wizard/apartment_edit.html:9
 msgid "apartment"
 msgstr ""
 
-#: catalogue/forms.py:122
+#: catalogue/forms.py:125
 msgid "check-in date"
 msgstr ""
 
-#: catalogue/forms.py:123
+#: catalogue/forms.py:126
 msgid "departure date"
 msgstr ""
 
-#: catalogue/forms.py:124
+#: catalogue/forms.py:127
 msgid "first name"
 msgstr ""
 
-#: catalogue/forms.py:125
+#: catalogue/forms.py:128
 msgid "last name"
 msgstr ""
 
-#: catalogue/forms.py:126
+#: catalogue/forms.py:129
 msgid "phone number"
 msgstr ""
 
-#: catalogue/forms.py:127
+#: catalogue/forms.py:130
 msgid "email"
 msgstr ""
 
-#: catalogue/forms.py:128
+#: catalogue/forms.py:131
 msgid "I am agree"
 msgstr ""
 
-#: catalogue/models.py:18 catalogue/models.py:200 posts/models.py:6
+#: catalogue/models.py:18 catalogue/models.py:213 posts/models.py:6
 #: templates/wizard/street_select.html:9
 msgid "name"
 msgstr ""
 msgid "streets"
 msgstr ""
 
-#: catalogue/models.py:26 catalogue/models.py:84
+#: catalogue/models.py:26 catalogue/models.py:97
 #: templates/wizard/building_select.html:7
 msgid "number"
 msgstr ""
 
-#: catalogue/models.py:30 catalogue/models.py:88
+#: catalogue/models.py:30 catalogue/models.py:101
 #: templates/wizard/apartment_index.html:11
 #: templates/wizard/building_edit.html:9
 msgid "building"
 msgid "adjoining rooms"
 msgstr ""
 
-#: catalogue/models.py:86
+#: catalogue/models.py:99
 msgid "apartment ID"
 msgstr ""
 
-#: catalogue/models.py:87
+#: catalogue/models.py:100
 msgid "map link"
 msgstr ""
 
-#: catalogue/models.py:90
+#: catalogue/models.py:105 catalogue/models.py:183
+msgid "image"
+msgstr ""
+
+#: catalogue/models.py:107
 msgid "price in USD"
 msgstr ""
 
-#: catalogue/models.py:92
+#: catalogue/models.py:109
 msgid "price in EURO"
 msgstr ""
 
-#: catalogue/models.py:94
+#: catalogue/models.py:111
 msgid "price in UAH"
 msgstr ""
 
-#: catalogue/models.py:96
+#: catalogue/models.py:113
 msgid "price in RUR"
 msgstr ""
 
-#: catalogue/models.py:101
+#: catalogue/models.py:118
 msgid "floor"
 msgstr ""
 
-#: catalogue/models.py:103
+#: catalogue/models.py:120
 msgid "floors"
 msgstr ""
 
-#: catalogue/models.py:105
+#: catalogue/models.py:122
 msgid "entrance"
 msgstr ""
 
-#: catalogue/models.py:110 posts/models.py:16
+#: catalogue/models.py:127 posts/models.py:16
 msgid "created at"
 msgstr ""
 
-#: catalogue/models.py:111 posts/models.py:17
+#: catalogue/models.py:128 posts/models.py:17
 msgid "updated at"
 msgstr ""
 
-#: catalogue/models.py:115
+#: catalogue/models.py:132
 msgid "apartments"
 msgstr ""
 
-#: catalogue/models.py:118 templates/wizard/apartment_select.html:12
+#: catalogue/models.py:136 templates/wizard/apartment_select.html:12
 msgid "description"
 msgstr ""
 
-#: catalogue/models.py:122
+#: catalogue/models.py:140
 msgid "num."
 msgstr ""
 
-#: catalogue/models.py:170
-msgid "image"
-msgstr ""
-
-#: catalogue/models.py:174
+#: catalogue/models.py:187 templates/catalogue/apartment.html:53
 msgid "apartment image"
 msgstr ""
 
-#: catalogue/models.py:175
+#: catalogue/models.py:188
 msgid "apartment images"
 msgstr ""
 
-#: catalogue/models.py:186
+#: catalogue/models.py:199
 msgid "reservation period"
 msgstr ""
 
-#: catalogue/models.py:187
+#: catalogue/models.py:200
 msgid "reservation periods"
 msgstr ""
 
-#: catalogue/models.py:192
+#: catalogue/models.py:205
 msgid "boolean"
 msgstr ""
 
-#: catalogue/models.py:193
+#: catalogue/models.py:206
 msgid "integer"
 msgstr ""
 
-#: catalogue/models.py:194
+#: catalogue/models.py:207
 msgid "float"
 msgstr ""
 
-#: catalogue/models.py:195
+#: catalogue/models.py:208
 msgid "choices"
 msgstr ""
 
-#: catalogue/models.py:201
+#: catalogue/models.py:214
 msgid "field"
 msgstr ""
 
-#: catalogue/models.py:202
+#: catalogue/models.py:215
 msgid "options"
 msgstr ""
 
-#: catalogue/models.py:203
+#: catalogue/models.py:216
 msgid "icon"
 msgstr ""
 
-#: catalogue/models.py:206 catalogue/models.py:213
+#: catalogue/models.py:219 catalogue/models.py:226
 msgid "bonus type"
 msgstr ""
 
-#: catalogue/models.py:207
+#: catalogue/models.py:220
 msgid "bonus types"
 msgstr ""
 
-#: catalogue/models.py:214
+#: catalogue/models.py:227
 msgid "value"
 msgstr ""
 
-#: catalogue/models.py:218
+#: catalogue/models.py:231
 msgid "bonus"
 msgstr ""
 
-#: catalogue/models.py:219
+#: catalogue/models.py:232
 msgid "bonuses"
 msgstr ""
 
 msgid "Language"
 msgstr ""
 
-#: templates/catalogue/apartment.html:52
+#: templates/catalogue/apartment.html:31
 msgid "permalink"
 msgstr ""
 
-#: templates/catalogue/apartment.html:66
+#: templates/catalogue/apartment.html:45
 msgid "view on map"
 msgstr ""
 
+#: templates/catalogue/apartment.html:58
+msgid "apartment image thumbnail"
+msgstr ""
+
+#: templates/catalogue/apartment.html:63
+#: templates/partials/reservation_form.html:3
+msgid "reserve"
+msgstr ""
+
 #: templates/catalogue/base.html:2
 msgid "Catalogue"
 msgstr ""
 msgid "next"
 msgstr ""
 
-#: templates/partials/reservation_form.html:3
-msgid "reserve"
-msgstr ""
-
 #: templates/partials/search_form.html:4
 msgid "search"
 msgstr ""

locale/ru/LC_MESSAGES/django.mo

Binary file modified.

locale/ru/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-15 23:15+0200\n"
-"PO-Revision-Date: 2010-01-15 23:16+0200\n"
+"POT-Creation-Date: 2010-01-17 17:05+0200\n"
+"PO-Revision-Date: 2010-01-17 17:07+0200\n"
 "Last-Translator: Александр Ульяницкий <asux@i.ua>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "MIME-Version: 1.0\n"
 msgid "file"
 msgstr "файл"
 
-#: banners/forms.py:40 catalogue/models.py:181
+#: banners/forms.py:40 catalogue/models.py:194
 msgid "start"
 msgstr "начало"
 
-#: banners/forms.py:41 catalogue/models.py:182
+#: banners/forms.py:41 catalogue/models.py:195
 msgid "end"
 msgstr "конец"
 
 msgid "price"
 msgstr "цена"
 
-#: catalogue/forms.py:42 catalogue/models.py:98
+#: catalogue/forms.py:42 catalogue/models.py:115
 msgid "rooms"
 msgstr "комнат"
 
-#: catalogue/forms.py:43 catalogue/models.py:108
+#: catalogue/forms.py:43 catalogue/models.py:125
 msgid "layout"
 msgstr "планировка"
 
 msgid "street"
 msgstr "улица"
 
-#: catalogue/forms.py:45 catalogue/models.py:106
+#: catalogue/forms.py:45 catalogue/models.py:123
 msgid "level"
 msgstr "уровень"
 
-#: catalogue/forms.py:60
+#: catalogue/forms.py:63
 msgid "ID"
 msgstr "ID"
 
-#: catalogue/forms.py:87
+#: catalogue/forms.py:90
 msgid "Number of choices must be greater then one"
 msgstr "Количество вариантов должно быть более одного"
 
-#: catalogue/forms.py:102
+#: catalogue/forms.py:105
 msgid "The apartment not found"
 msgstr "Не найдена не одна квартира"
 
-#: catalogue/forms.py:109
+#: catalogue/forms.py:112
 msgid "Start later then end"
 msgstr "Начало позже чем конец"
 
-#: catalogue/forms.py:110 catalogue/forms.py:119
+#: catalogue/forms.py:113 catalogue/forms.py:122
 msgid ""
 "The apartment occupied during this period, please select a different dates."
 msgstr "Квартира занята за этот период, пожалуйста выберите другие даты."
 
-#: catalogue/forms.py:118
+#: catalogue/forms.py:121
 msgid "Check-in date later then departure date"
 msgstr "Дата заселения позже чем выселения"
 
-#: catalogue/forms.py:121 catalogue/models.py:114 catalogue/models.py:171
-#: catalogue/models.py:180 catalogue/models.py:212
+#: catalogue/forms.py:124 catalogue/models.py:131 catalogue/models.py:184
+#: catalogue/models.py:193 catalogue/models.py:225
 #: templates/wizard/apartment_edit.html:9
 msgid "apartment"
 msgstr "квартира"
 
-#: catalogue/forms.py:122
+#: catalogue/forms.py:125
 msgid "check-in date"
 msgstr "дата заселения"
 
-#: catalogue/forms.py:123
+#: catalogue/forms.py:126
 msgid "departure date"
 msgstr "дата выселения"
 
-#: catalogue/forms.py:124
+#: catalogue/forms.py:127
 msgid "first name"
 msgstr "имя"
 
-#: catalogue/forms.py:125
+#: catalogue/forms.py:128
 msgid "last name"
 msgstr "фамилия"
 
-#: catalogue/forms.py:126
+#: catalogue/forms.py:129
 msgid "phone number"
 msgstr "телефонный номер"
 
-#: catalogue/forms.py:127
+#: catalogue/forms.py:130
 msgid "email"
 msgstr "емейл"
 
-#: catalogue/forms.py:128
+#: catalogue/forms.py:131
 msgid "I am agree"
 msgstr "Я согласен"
 
-#: catalogue/models.py:18 catalogue/models.py:200 posts/models.py:6
+#: catalogue/models.py:18 catalogue/models.py:213 posts/models.py:6
 #: templates/wizard/street_select.html:9
 msgid "name"
 msgstr "имя"
 msgid "streets"
 msgstr "улицы"
 
-#: catalogue/models.py:26 catalogue/models.py:84
+#: catalogue/models.py:26 catalogue/models.py:97
 #: templates/wizard/building_select.html:7
 msgid "number"
 msgstr "номер"
 
-#: catalogue/models.py:30 catalogue/models.py:88
+#: catalogue/models.py:30 catalogue/models.py:101
 #: templates/wizard/apartment_index.html:11
 #: templates/wizard/building_edit.html:9
 msgid "building"
 msgid "adjoining rooms"
 msgstr "смежные комнаты"
 
-#: catalogue/models.py:86
+#: catalogue/models.py:99
 msgid "apartment ID"
 msgstr "ID квартиры"
 
-#: catalogue/models.py:87
+#: catalogue/models.py:100
 msgid "map link"
 msgstr "ссылка на карту"
 
-#: catalogue/models.py:90
+#: catalogue/models.py:105 catalogue/models.py:183
+msgid "image"
+msgstr "изображение"
+
+#: catalogue/models.py:107
 msgid "price in USD"
 msgstr "цена в долларах"
 
-#: catalogue/models.py:92
+#: catalogue/models.py:109
 msgid "price in EURO"
 msgstr "цена в евро"
 
-#: catalogue/models.py:94
+#: catalogue/models.py:111
 msgid "price in UAH"
 msgstr "цена в гривне"
 
-#: catalogue/models.py:96
+#: catalogue/models.py:113
 msgid "price in RUR"
 msgstr "цена в рублях"
 
-#: catalogue/models.py:101
+#: catalogue/models.py:118
 msgid "floor"
 msgstr "этаж"
 
-#: catalogue/models.py:103
+#: catalogue/models.py:120
 msgid "floors"
 msgstr "этажность"
 
-#: catalogue/models.py:105
+#: catalogue/models.py:122
 msgid "entrance"
 msgstr "подъезд"
 
-#: catalogue/models.py:110 posts/models.py:16
+#: catalogue/models.py:127 posts/models.py:16
 msgid "created at"
 msgstr "создан"
 
-#: catalogue/models.py:111 posts/models.py:17
+#: catalogue/models.py:128 posts/models.py:17
 msgid "updated at"
 msgstr "обновлен"
 
-#: catalogue/models.py:115
+#: catalogue/models.py:132
 msgid "apartments"
 msgstr "квартиры"
 
-#: catalogue/models.py:118 templates/wizard/apartment_select.html:12
+#: catalogue/models.py:136 templates/wizard/apartment_select.html:12
 msgid "description"
 msgstr "описание"
 
-#: catalogue/models.py:122
+#: catalogue/models.py:140
 msgid "num."
 msgstr "кв."
 
-#: catalogue/models.py:170
-msgid "image"
-msgstr "изображение"
-
-#: catalogue/models.py:174
+#: catalogue/models.py:187 templates/catalogue/apartment.html:53
 msgid "apartment image"
 msgstr "изображение квартиры"
 
-#: catalogue/models.py:175
+#: catalogue/models.py:188
 msgid "apartment images"
 msgstr "изображения квартир"
 
-#: catalogue/models.py:186
+#: catalogue/models.py:199
 msgid "reservation period"
 msgstr "период брони"
 
-#: catalogue/models.py:187
+#: catalogue/models.py:200
 msgid "reservation periods"
 msgstr "периоды брони"
 
-#: catalogue/models.py:192
+#: catalogue/models.py:205
 msgid "boolean"
 msgstr "да/нет"
 
-#: catalogue/models.py:193
+#: catalogue/models.py:206
 msgid "integer"
 msgstr "целое число"
 
-#: catalogue/models.py:194
+#: catalogue/models.py:207
 msgid "float"
 msgstr "число с плавающей точкой"
 
-#: catalogue/models.py:195
+#: catalogue/models.py:208
 msgid "choices"
 msgstr "варианты"
 
-#: catalogue/models.py:201
+#: catalogue/models.py:214
 msgid "field"
 msgstr "поле"
 
-#: catalogue/models.py:202
+#: catalogue/models.py:215
 msgid "options"
 msgstr "опции"
 
-#: catalogue/models.py:203
+#: catalogue/models.py:216
 msgid "icon"
 msgstr "иконка"
 
-#: catalogue/models.py:206 catalogue/models.py:213
+#: catalogue/models.py:219 catalogue/models.py:226
 msgid "bonus type"
 msgstr "тип бонуса"
 
-#: catalogue/models.py:207
+#: catalogue/models.py:220
 msgid "bonus types"
 msgstr "типы бонусов"
 
-#: catalogue/models.py:214
+#: catalogue/models.py:227
 msgid "value"
 msgstr "значение"
 
-#: catalogue/models.py:218
+#: catalogue/models.py:231
 msgid "bonus"
 msgstr "бонус"
 
-#: catalogue/models.py:219
+#: catalogue/models.py:232
 msgid "bonuses"
 msgstr "бонусы"
 
 msgid "Language"
 msgstr "Язык"
 
-#: templates/catalogue/apartment.html:52
+#: templates/catalogue/apartment.html:31
 msgid "permalink"
 msgstr "постоянная ссылка"
 
-#: templates/catalogue/apartment.html:66
+#: templates/catalogue/apartment.html:45
 msgid "view on map"
 msgstr "посмотреть на карте"
 
+#: templates/catalogue/apartment.html:58
+msgid "apartment image thumbnail"
+msgstr "эскиз изображения квартиры"
+
+#: templates/catalogue/apartment.html:63
+#: templates/partials/reservation_form.html:3
+msgid "reserve"
+msgstr "зарезервировать"
+
 #: templates/catalogue/base.html:2
 msgid "Catalogue"
 msgstr "Каталог"
 msgid "next"
 msgstr "следующий"
 
-#: templates/partials/reservation_form.html:3
-msgid "reserve"
-msgstr "зарезервировать"
-
 #: templates/partials/search_form.html:4
 msgid "search"
 msgstr "поиск"

media/css/common.css

 .calendarnav-next {
     float: right;
     margin: 2px;
+}
+#reserve {
+    display:  none;
 }

templates/catalogue/apartment.html

 {{ reservation_form.media }}
 <script src="{{ MEDIA_URL }}js/jquery.form.js" type="text/javascript"></script>
 <script type="text/javascript">
-    jQuery("#apartment_images").tabs();
     jQuery(function(){
         jQuery("#apartment_images").tabs();
+        jQuery('#do_reserve').click(function(){
+            jQuery('#reserve').slideToggle();
+        });
         reservationForm = jQuery('#reservation_form');
         reservationForm.find('input').live('change', function(event){
             reservationForm.submit();
 {% endblock %}
 
 {% block content %}
-
 <div id="image_orig" id="flat_photo_middle"></div> 
 <div id="flat_info"> 
     <h2>{{ apartment.building }}</h2>
-    <p><a href="{{ apartment.get_absolute_url }}" title="{% trans 'permalink'%}">ID {{ apartment.id|stringformat:"03d" }}</a></p>
+    <p><a href="{{ apartment.get_absolute_url }}" title="{% trans 'permalink'%}">ID {{ apartment.code }}</a></p>
     {% if banner.description_any %}
-    <p class="apartment-field">
     <p class="apartment-value">{{ apartment.description_any }}</p>
+    {% endif %}
 </div>
-{% endif %}
 <p>Цена за сутки:
     {% if apartment.price_usd %}<span class="apartment-value">{{ apartment.price_usd }} $</span>
     {% endif %}
     {% if apartment.price_uah %}<span class="apartment-value">{{ apartment.price_uah }} грн.</span>
     {% endif %}
 </p> 
+{% if apartment.map_link %}
 <p><a href="{{ apartment.map_link }}">{% trans 'view on map' %}</a></p>
+{% endif %}
 <div id="nofloat"></div>
 
-
+{% ifnotequal apartment.apartmentimage_set.count 0 %}
 <div id="apartment_images">
     {% for image in apartment.apartmentimage_set.all %}
     <div id="image-{{ image.id }}">
         {% endfor %}
     </ul>
 </div>
-
-<div class="reserve">
+{% endifnotequal %}
+<a id="do_reserve" href="#reserve">{% trans 'reserve' %}</a>
+<div id="reserve">
     <form action="{% url catalogue:reserve %}" method="post" id="reservation_form">
         <div id="reservation_form_body">
             {% include 'partials/reservation_form.html' %}