From 5569321d15d2add04bfe4cc402139bcc70953824 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Dec 2012 10:37:37 +0530 Subject: [PATCH 1/3] fixed z-index and renamed all-app.js to all-app.min.js --- public/build.json | 4 ++-- website/templates/html/base.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/build.json b/public/build.json index 375150a6db..e616b593f9 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/website/templates/html/base.html b/website/templates/html/base.html index c684b25067..995d3b7b0f 100644 --- a/website/templates/html/base.html +++ b/website/templates/html/base.html @@ -4,7 +4,7 @@ {% block title %}{% endblock %} - + From be7fe472b6fe9a370e0901b0391fe543cd89bfc7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Dec 2012 11:01:09 +0530 Subject: [PATCH 2/3] import merge, remove Core --- home/page/latest_updates/latest_updates.js | 3 +++ public/js/modules.js | 1 - website/templates/pages/login.html | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index d1e46efe08..818c979c98 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/public/js/modules.js b/public/js/modules.js index 7dc8038589..45cc754d56 100644 --- a/public/js/modules.js +++ b/public/js/modules.js @@ -27,7 +27,6 @@ erpnext.modules = { 'Setup': 'Setup', 'Activity': 'activity', 'To Do': 'todo', - 'Core': 'setup', 'Calendar': 'calendar', 'Messages': 'messages', 'Knowledge Base': 'questions', diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html index 0828f65ae3..9dcff269e8 100644 --- a/website/templates/pages/login.html +++ b/website/templates/pages/login.html @@ -20,11 +20,11 @@ - + - + From 608a751b578207d5f52f2178a1f856535c786509 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Dec 2012 11:08:11 +0530 Subject: [PATCH 3/3] import merge, task list label --- projects/doctype/task/task_list.js | 3 ++- support/doctype/support_ticket/support_ticket_list.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/doctype/task/task_list.js b/projects/doctype/task/task_list.js index 536168631f..5221687ab2 100644 --- a/projects/doctype/task/task_list.js +++ b/projects/doctype/task/task_list.js @@ -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('%(status)s', data); diff --git a/support/doctype/support_ticket/support_ticket_list.js b/support/doctype/support_ticket/support_ticket_list.js index 9dc84827bc..e4dddc492c 100644 --- a/support/doctype/support_ticket/support_ticket_list.js +++ b/support/doctype/support_ticket/support_ticket_list.js @@ -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('%(status)s', data);