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

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

Browse Source
This commit is contained in:
Anand Doshi 2012-12-20 12:42:53 +05:30
commit ab5cf08c14
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
home/page/latest_updates/latest_updates.js
View File

@ -1,4 +1,7 @@
erpnext.updates = [
["20th December 2012", [
"Website: Create Product Search Page, Product Group Page on the website."
]],
["14th December 2012", [
"Website Module: Major Refactor - removed framework code from website."
]],

3
projects/doctype/task/task_list.js
View File

@ -25,7 +25,8 @@ wn.doclistviews['Task'] = wn.views.ListView.extend({
this._super(data);
data.label_style = this.label_style.status[data.status];
if(data.label_style=="danger")
data.label_style = "important"
data.status_html = repl('<span class="label \
label-%(label_style)s">%(status)s</span>', data);

4
public/build.json
View File

@ -6,10 +6,10 @@
"public/css/all-app.css": [
"app/public/js/startup.css"
],
"public/js/all-web.js": [
"public/js/all-web.min.js": [
"app/public/js/website_utils.js"
],
"public/js/all-app.js": [
"public/js/all-app.min.js": [
"app/public/js/startup.js",
"app/public/js/conf.js",
"app/public/js/modules.js",

1
public/js/modules.js
View File

@ -27,7 +27,6 @@ erpnext.modules = {
'Setup': 'Setup',
'Activity': 'activity',
'To Do': 'todo',
'Core': 'setup',
'Calendar': 'calendar',
'Messages': 'messages',
'Knowledge Base': 'questions',

4
support/doctype/support_ticket/support_ticket_list.js
View File

@ -15,7 +15,7 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
label_style: {
"status": {
"Open": "important",
"Open": "danger",
"Closed": "success",
"Hold": "info",
"Waiting for Customer": "info"
@ -26,6 +26,8 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
this._super(data);
data.label_style = this.label_style.status[data.status];
if(data.label_style=="danger")
data.label_style = "important"
data.status_html = repl('<span class="label \
label-%(label_style)s">%(status)s</span>', data);

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

@ -4,7 +4,7 @@
<title>{% block title %}{% endblock %}</title>
<meta name="generator" content="wnframework">
<script type="text/javascript" src="lib/js/lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="js/all-web.js"></script>
<script type="text/javascript" src="js/all-web.min.js"></script>
<script type="text/javascript" src="js/wn-web.js"></script>
<link type="text/css" rel="stylesheet" href="css/all-web.css">
<link type="text/css" rel="stylesheet" href="css/wn-web.css">

4
website/templates/pages/login.html
View File

@ -20,11 +20,11 @@
<table border="0" class="login-box">
<tbody>
<tr>
<td style="text-align: right;">Login Id</td>
<td style="text-align: right; padding: 3px;">Login Id</td>
<td><input id="login_id" type="text" style="width: 180px"/></td>
</tr>
<tr>
<td style="text-align: right;">Password</td>
<td style="text-align: right; padding: 3px;">Password</td>
<td><input id="password" type="password" style="width: 180px" /></td>
</tr>
<tr>