[fix] [minor] [website]

This commit is contained in:
Anand Doshi 2013-09-16 19:28:06 +05:30
parent 43e2bc84a8
commit 3966c4cc5b
5 changed files with 19 additions and 12 deletions

View File

@ -14,10 +14,6 @@
<label>Full Name</label>
<input class="form-control" type="text" id="fullname" placeholder="Your Name">
</fieldset>
<fieldset>
<label>Password</label>
<input class="form-control" type="password" id="password" placeholder="Password">
</fieldset>
<fieldset>
<label>Company Name</label>
<input class="form-control" type="text" id="company_name" placeholder="Company Name" value="{{ company_name }}">
@ -42,7 +38,6 @@ $(document).ready(function() {
type: "POST",
args: {
fullname: $("#fullname").val(),
password: $("#password").val(),
company_name: $("#company_name").val(),
mobile_no: $("#mobile_no").val(),
phone: $("#phone").val()

View File

@ -3,6 +3,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes import _
from webnotes.utils import cstr
no_cache = True
@ -28,5 +29,11 @@ def update_profile(fullname, password=None, company_name=None, mobile_no=None, p
from selling.utils.cart import update_party
update_party(fullname, company_name, mobile_no, phone)
from core.doctype.profile import profile
return profile.update_profile(fullname, password)
if not fullname:
return _("Name is required")
webnotes.conn.set_value("Profile", webnotes.session.user, "first_name", fullname)
webnotes.add_cookies["full_name"] = fullname
return _("Updated")

View File

@ -2,9 +2,11 @@
{% block javascript -%}
<script>
$(document).ready(function() {
global_number_format = "{{ global_number_format }}";
currency = "{{ currency }}";
wn.currency_symbols = {{ currency_symbols }};
});
</script>
{{ super() }}

View File

@ -24,8 +24,12 @@ $(document).ready(function() {
// update login
erpnext.cart.set_cart_count();
$("#user-tools a").tooltip({"placement":"bottom"});
$("#user-tools-post-login a").tooltip({"placement":"bottom"});
// update profile
if(full_name) {
$('.navbar li[data-label="Profile"] a')
.html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
}
});
// shopping cart

View File

@ -12,7 +12,6 @@
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="account">My Account</a></li>
<li><a href="tickets">My Tickets</a></li>
<li class="active"><i class="icon-ticket icon-fixed-width"></i> {{ doc.name }}</li>
</ul>
@ -34,8 +33,8 @@
<div class="col-md-8">
<div class="row col-md-12">{{ doc.subject }}</div>
</div>
<div class="col-md-2 pull-right">
<span class="text-muted">{{ utils.formatdate(doc.creation) }}</span>
<div class="col-md-2">
<span class="text-muted pull-right">{{ utils.formatdate(doc.creation) }}</span>
</div>
</div>
<div class="row">