Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3640 from anandpdoshi/anand-july-13

Browse Source 
Fixes to Issues
This commit is contained in:
Rushabh Mehta 2015-07-13 15:37:11 +05:30
commit cf26964deb
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/change_log/current/paranthesis_in_images.md Normal file
View File

@ -0,0 +1 @@
- Display images in website's Item and Item List pages when the filename has paranthesis in its name

3
erpnext/change_log/current/readme.md Normal file
View File

@ -0,0 +1,3 @@
Leave change log files in this folder for user release notes.
(this file is just a place holder, don't delete it)

5
erpnext/templates/includes/macros.html
View File

@ -1,6 +1,6 @@
{% macro product_image_square(website_image, css_class="") %} {% macro product_image_square(website_image, css_class="") %}
<div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}" <div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
{% if website_image -%} style="background-image: url({{ website_image }});" {%- endif %}> {% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) }}');" {%- endif %}>
{% if not website_image -%}<i class="centered octicon octicon-device-camera"></i>{%- endif %} {% if not website_image -%}<i class="centered octicon octicon-device-camera"></i>{%- endif %}
</div> </div>
{% endmacro %} {% endmacro %}
@ -8,10 +8,9 @@
{% macro product_image(website_image, css_class="") %} {% macro product_image(website_image, css_class="") %}
<div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"> <div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}">
{% if website_image -%} {% if website_image -%}
<img src="{{ website_image }}" class="img-responsive"> <img src="{{ frappe.utils.quoted(website_image) }}" class="img-responsive">
{%- else -%} {%- else -%}
<i class="centered octicon octicon-device-camera"></i> <i class="centered octicon octicon-device-camera"></i>
{%- endif %} {%- endif %}
</div> </div>
{% endmacro %} {% endmacro %}