Commits

Kai Diefenbach committed c0e66b7 Merge

Merge

Comments (0)

Files changed (14)

lfstheme/templates/lfs/cart/added_to_cart_items.html

File contents unchanged.

lfstheme/templates/lfs/cart/cart_inline.html

File contents unchanged.

lfstheme/templates/lfs/catalog/filter_navigation.html

                 <div class="portlet-item">
                     <div class="filter-title {% if forloop.first %}first{% endif %}">
                         <span>
-                            {{property_group.name}}
+                            {{ property_group.name }}
                         </span>
                         {% if property_group.show_reset %}
                             <a href="{% url lfs_reset_product_filter category.slug property_group.id %}">[x]</a>
                             {% if property_group.object.is_number_field %}
                                 {% if property_group.show_quantity %}
                                     <a href='{% url lfs_set_product_filter category.slug property_group.id property.min property.max %}'>
-                                        {{property.min|quantity}} - {{property.max|quantity}} {{ property_group.unit|safe }} ({{ property.quantity }})
+                                        {{ property.min|quantity }} - {{ property.max|quantity }} {{ property_group.unit|safe }} ({{ property.quantity }})
                                     </a>
                                 {% else %}
                                     <span>
-                                        {{property.min|quantity}} - {{property.max|quantity}} {{ property_group.unit|safe }}
+                                        {{ property.min|quantity }} - {{ property.max|quantity }} {{ property_group.unit|safe }}
                                     </span>
                                 {% endif %}
                             {% else %}
                                 {% if property.show_quantity %}
                                     <a href='{% url lfs_set_product_filter category.slug property_group.id property.value %}'>
-                                        {{property.name}} {{ property_group.unit|safe }} ({{ property.quantity }})
+                                        {{ property.title }} {{ property_group.unit|safe }} ({{ property.quantity }})
                                     </a>
                                 {% else %}
                                     <span>
-                                        {{property.name}} {{ property_group.unit|safe }}
+                                        {{ property.title }} {{ property_group.unit|safe }}
                                     </span>
                                 {% endif %}
                         
                 <div>
                     {% if price_filters.show_quantity %}
                         <a href="{% url lfs_set_price_filter category.slug %}?min={{ price_filter.min }}&amp;max={{ price_filter.max }}">
-                            {% trans 'Up to' %} {{price_filter.max|number}}
-                            ({{price_filter.quantity}})
+                            {% trans 'Up to' %} {{ price_filter.max|number }}
+                            ({{ price_filter.quantity }})
                         </a>
                     {% else %}
                         <span>
-                            {% trans 'Up to' %} {{price_filter.max|currency}}
+                            {% trans 'Up to' %} {{ price_filter.max|currency }}
                         </span>                            
                     {% endif %}
                 </div>
             {% endfor %}
         </div>
-        
-        {# <form action="{% url lfs_set_price_filter category.slug %}" #}
-        {#       method="post">         #}
-        {#     <div> #}
-        {#         <label>{% trans 'From' %}</label> #}
-        {#         <input type="text" #}
-        {#                name="min" #}
-        {#                value="{{price_filter.min}}" #}
-        {#                size="10" /> #}
-        {#     </div>                    #}
-        {#     <div> #}
-        {#         <label>{% trans 'To' %}</label> #}
-        {#         <input type="text" #}
-        {#                name="max"  #}
-        {#                value="{{price_filter.max}}" #}
-        {#                size="10" />                                           #}
-        {#     </div>        #}
-        {#     <div> #}
-        {#         <input type="submit" #}
-        {#                value="{% trans 'Go!' %}" /> #}
-        {#     </div> #}
-        {# </form> #}
-        
     </div>
         
     <div class="portlet-footer">

lfstheme/templates/lfs/catalog/products/product_inline.html

                                name="quantity"
                                size="3"
                                type="text"
-                               value="1" /> {{ product.price_unit }}
+                               value="1" /> {{ product.unit }}
                     </div>
 
                     <div class="packing-result">
                         </th>
                         {% for property in properties %}
                             <th>
-                                {{ property.name}}
+                                {{ property.title }}
                             </th>
                         {% endfor %}
                         <th class="number">
                     {% for property in properties %}
                         <div>
                             <div class="property-label">
-                                {{ property.name }}:
+                                {{ property.title }}:
                             </div>
                             <select class="property"
                                     name="property_{{ property.id }}">

lfstheme/templates/lfs/catalog/products/product_inline_topdescription.html

                         </th>
                         {% for property in properties %}
                             <th>
-                                {{ property.name}}
+                                {{ property.title }}
                             </th>
                         {% endfor %}
                         <th class="number">
                     {% for property in properties %}
                         <div>
                             <div class="property-label">
-                                {{ property.name }}:
+                                {{ property.title }}:
                             </div>
                             <select class="property"
                                     name="property_{{ property.id }}">

lfstheme/templates/lfs/catalog/products/product_inline_topprice.html

                         </th>
                         {% for property in properties %}
                             <th>
-                                {{ property.name}}
+                                {{ property.title }}
                             </th>
                         {% endfor %}
                         <th class="number">
                     {% for property in properties %}
                         <div>
                             <div class="property-label">
-                                {{ property.name }}:
+                                {{ property.title }}:
                             </div>
                             <select class="property"
                                     name="property_{{ property.id }}">

lfstheme/templates/lfs/mail/order_received_mail.html

                         {{ item.product_name }}
                         {% for property in item.product.get_displayed_properties %}
                             <div>
-                                {{ property.name }} : {{ property.value }} {{ property.unit|safe }}
+                                {{ property.title }} : {{ property.value }} {{ property.unit|safe }}
                             </div>
                         {% endfor %}
 
                         {% if item.product.is_configurable_product %}
                             {% for property in item.get_properties %}
                                 <div>
-                                    {{ property.name }} : {{ property.value }} {{ property.unit|safe }} ({{ property.price|currency }})
+                                    {{ property.title }} : {{ property.value }} {{ property.unit|safe }} ({{ property.price|currency }})
                                 </div>
                             {% endfor %}
                         {% endif %}
 
                     </td>
                     <td class="number">
-                        {{ item.product_amount }} {{ item.product.price_unit }}
+                        {{ item.product_amount }} {{ item.product.unit }}
                         {% if item.product.active_packing_unit %} 
                             <span class="packing-unit">
                                 ({{ item|packages }} {{ item.product.packing_unit_unit }})

lfstheme/templates/lfs/mail/order_received_mail.txt

 {% trans 'Order' %}: 
 ==============================================================================
 {% for item in order.items.all %}{% trans 'SKU' %}:  {{ item.product_sku }}
-{% trans 'Name' %}: {{ item.product_name }} {% for property in item.product.get_displayed_properties %}{{ property.name }} : {{ property.value }} {{ property.unit|safe }}\n{% endfor %}
-{% trans 'Amount' %}: {{ item.product_amount }} {{ item.product.price_unit }} {% if item.product.active_packing_unit %}{{ item|packages }} {{ item.product.packing_unit_unit }}{% endif %} 
+{% trans 'Name' %}: {{ item.product_name }} {% for property in item.product.get_displayed_properties %}{{ property.title }} : {{ property.value }} {{ property.unit|safe }}\n{% endfor %}
+{% trans 'Amount' %}: {{ item.product_amount }} {{ item.product.unit }} {% if item.product.active_packing_unit %}{{ item|packages }} {{ item.product.packing_unit_unit }}{% endif %} 
 {% trans 'Price' %}: {{ item.product_price_gross|currency }}
 {% trans 'Total' %}: {{ item.price_gross|currency }}
 {% endfor %}{% if order.voucher_number %}\n{% trans 'Voucher' %} ({{ order.voucher_number }})\n- {{ order.voucher_price|currency }}\n- {{ order.voucher_price|currency }}{% endif %}

lfstheme/templates/lfs/mail/order_sent_mail.html

                        {{ item.product_name }}
                         {% for property in item.product.get_displayed_properties %}
                             <div>
-                                {{ property.name }} : {{ property.value }} {{ property.unit|safe }}
+                                {{ property.title }} : {{ property.value }} {{ property.unit|safe }}
                             </div>
                         {% endfor %}
 
                         {% if item.product.is_configurable_product %}
                             {% for property in item.get_properties %}
                                 <div>
-                                    {{ property.name }} : {{ property.value }} {{ property.unit|safe }} ({{ property.price|currency }})
+                                    {{ property.title }} : {{ property.value }} {{ property.unit|safe }} ({{ property.price|currency }})
                                 </div>
                             {% endfor %}
                         {% endif %}
 
                     </td>
                     <td class="number">
-                        {{ item.product_amount }} {{ item.product.price_unit }}
+                        {{ item.product_amount }} {{ item.product.unit }}
                         {% if item.product.active_packing_unit %} 
                             <span class="packing-unit">
                                 ({{ item|packages }} {{ item.product.packing_unit_unit }})

lfstheme/templates/lfs/mail/order_sent_mail.txt

 {% trans 'Order' %}: 
 ==============================================================================
 {% for item in order.items.all %}{% trans 'SKU' %}:  {{ item.product_sku }}
-{% trans 'Name' %}: {{ item.product_name }} {% for property in item.product.get_displayed_properties %}{{ property.name }} : {{ property.value }} {{ property.unit|safe }}\n{% endfor %}
-{% trans 'Amount' %}: {{ item.product_amount }} {{ item.product.price_unit }} {% if item.product.active_packing_unit %}{{ item|packages }} {{ item.product.packing_unit_unit }}{% endif %} 
+{% trans 'Name' %}: {{ item.product_name }} {% for property in item.product.get_displayed_properties %}{{ property.title }} : {{ property.value }} {{ property.unit|safe }}\n{% endfor %}
+{% trans 'Amount' %}: {{ item.product_amount }} {{ item.product.unit }} {% if item.product.active_packing_unit %}{{ item|packages }} {{ item.product.packing_unit_unit }}{% endif %} 
 {% trans 'Price' %}: {{ item.product_price_gross|currency }}
 {% trans 'Total' %}: {{ item.price_gross|currency }}
 {% endfor %}{% if order.voucher_number %}\n{% trans 'Voucher' %} ({{ order.voucher_number }})\n- {{ order.voucher_price|currency }}\n- {{ order.voucher_price|currency }}{% endif %}

lfstheme/templates/lfs/order/lfs_order_tmpl.html

                 {{ item.product_name }} 
                 {% for property in item.product.get_displayed_properties %}
                     <div>
-                        {{ property.name }} : {{ property.value }} {{ property.unit|safe }}
+                        {{ property.title }} : {{ property.value }} {{ property.unit|safe }}
                     </div>
                 {% endfor %}
                 
                 {% if item.product.is_configurable_product %}
                     {% for property in item.get_properties %}
                         <div>
-                            {{ property.name }} : {{ property.value }} {{ property.unit|safe }} ({{ property.price|currency }})
+                            {{ property.title }} : {{ property.value }} {{ property.unit|safe }} ({{ property.price|currency }})
                         </div>
                     {% endfor %}
                 {% endif %}

lfstheme/templates/lfs/portlets/filter.html

                                     {% else %}
                                         {% if property.show_quantity %}
                                             <a href='{% url lfs_set_product_filter category.slug property_group.id property.value %}'>
-                                                {{ property.name }} {{ property_group.unit|safe }} ({{ property.quantity }})
+                                                {{ property.title }} {{ property_group.unit|safe }} ({{ property.quantity }})
                                             </a>
                                         {% else %}
                                             <span>
-                                                {{ property.name }} {{ property_group.unit|safe }}
+                                                {{ property.title }} {{ property_group.unit|safe }}
                                             </span>
                                         {% endif %}
 

lfstheme/templates/lfs/search/livesearch_results.html

                     </a>
                     {% for property in product.get_displayed_properties %}
                         <div>
-                            {{ property.name }} : {{ property.value }} {{ property.unit|safe }}
+                            {{ property.title }} : {{ property.value }} {{ property.unit|safe }}
                         </div>
                     {% endfor %}
                 </td>

lfstheme/templates/lfs/search/search_results.html

                     </a>
                     {% for property in product.get_displayed_properties %}
                         <div>
-                            {{ property.name }} : {{ property.value }} {{ property.unit|safe }}
+                            {{ property.title }} : {{ property.value }} {{ property.unit|safe }}
                         </div>
                     {% endfor %}
                 </div>