Merge branch 'master' of github.com:webnotes/erpnext into production
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index d1e46ef..818c979 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -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."
]],
diff --git a/projects/doctype/task/task_list.js b/projects/doctype/task/task_list.js
index 5361686..5221687 100644
--- a/projects/doctype/task/task_list.js
+++ b/projects/doctype/task/task_list.js
@@ -25,7 +25,8 @@
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);
diff --git a/public/build.json b/public/build.json
index 375150a..e616b59 100644
--- a/public/build.json
+++ b/public/build.json
@@ -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",
diff --git a/public/js/modules.js b/public/js/modules.js
index b1a86ba..37554a2 100644
--- a/public/js/modules.js
+++ b/public/js/modules.js
@@ -27,7 +27,6 @@
'Setup': 'Setup',
'Activity': 'activity',
'To Do': 'todo',
- 'Core': 'setup',
'Calendar': 'calendar',
'Messages': 'messages',
'Knowledge Base': 'questions',
diff --git a/support/doctype/support_ticket/support_ticket_list.js b/support/doctype/support_ticket/support_ticket_list.js
index 9dc8482..e4dddc4 100644
--- a/support/doctype/support_ticket/support_ticket_list.js
+++ b/support/doctype/support_ticket/support_ticket_list.js
@@ -15,7 +15,7 @@
label_style: {
"status": {
- "Open": "important",
+ "Open": "danger",
"Closed": "success",
"Hold": "info",
"Waiting for Customer": "info"
@@ -26,6 +26,8 @@
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);
diff --git a/website/templates/html/base.html b/website/templates/html/base.html
index c684b25..995d3b7 100644
--- a/website/templates/html/base.html
+++ b/website/templates/html/base.html
@@ -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">
diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html
index 0828f65..9dcff26 100644
--- a/website/templates/pages/login.html
+++ b/website/templates/pages/login.html
@@ -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>