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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait 2013-07-15 16:33:46 +05:30
commit a9a914ce97
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stock/doctype/item/item.js
View File

@ -193,4 +193,6 @@ cur_frm.cscript.copy_from_item_group = function(doc) {
cur_frm.cscript.image = function() { cur_frm.cscript.image = function() {
refresh_field("image_view"); refresh_field("image_view");
if(!cur_frm.doc.description_html) cur_frm.cscript.add_image(cur_frm.doc);
} }

2
website/templates/html/outer.html
View File

@ -3,8 +3,10 @@
{% block body %} {% block body %}
<div class="container"> <div class="container">
<div class="pull-right" style="margin:4px;" id="user-tools"> <div class="pull-right" style="margin:4px;" id="user-tools">
{% if shopping_cart_enabled -%}
<a href="cart" title="Shopping Cart"><i class="icon-shopping-cart"></i> <a href="cart" title="Shopping Cart"><i class="icon-shopping-cart"></i>
<span class="cart-count"></span></a> | <span class="cart-count"></span></a> |
{%- endif %}
<a id="login-link" href="login">Login</a> <a id="login-link" href="login">Login</a>
</div> </div>
<div class="pull-right hide" style="margin:4px;" id="user-tools-post-login"> <div class="pull-right hide" style="margin:4px;" id="user-tools-post-login">