From d3c9fb6b3b0814cbb3d5cd9f99838501b71fc8fa Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 21 Dec 2012 18:27:40 +0530 Subject: [PATCH] changed desktop modules now using font-awesome instead of noun project fonts --- home/page/activity/activity.js | 2 ++ home/page/latest_updates/latest_updates.js | 1 + hr/doctype/leave_application/leave_application.js | 2 +- public/js/modules.js | 5 ++++- setup/page/setup/setup.js | 5 ++++- utilities/page/messages/messages.js | 3 +++ utilities/page/question_view/question_view.js | 4 +++- utilities/page/questions/questions.js | 2 ++ utilities/page/todo/todo.js | 2 ++ 9 files changed, 22 insertions(+), 4 deletions(-) diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js index 6746919640..3443cc245f 100644 --- a/home/page/activity/activity.js +++ b/home/page/activity/activity.js @@ -1,5 +1,7 @@ wn.pages['activity'].onload = function(wrapper) { wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_breadcrumb(wn.modules["Activity"].icon); wrapper.appframe.title('Activity'); var list = new wn.ui.Listing({ diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index f996b350c4..47d08c7c85 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -2,6 +2,7 @@ erpnext.updates = [ ["21st December 2012", [ "Manufacturing: For Material Transfer against Production Order, \ fetch quantity pending to be transferred for each item." + "Desktop: New Icons and now sortable by dragging." ]], ["20th December 2012", [ "Website: Create Product Search Page, Product Group Page on the website.", diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js index 7253bdba0a..63b5e6e0f6 100755 --- a/hr/doctype/leave_application/leave_application.js +++ b/hr/doctype/leave_application/leave_application.js @@ -47,7 +47,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { } else { cur_frm.set_intro("This Leave Application is pending approval. Only the Leave Apporver can update status.") cur_frm.toggle_enable("status", false); - if(!doc.__islocal) cur_frm.frm_head.appframe.buttons.Submit.toggle(false); + if(!doc.__islocal) cur_frm.frm_head.appframe.buttons.Submit.remove(); } } else { if(doc.status=="Approved") { diff --git a/public/js/modules.js b/public/js/modules.js index c90aac6785..752d3699fd 100644 --- a/public/js/modules.js +++ b/public/js/modules.js @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +wn.home_page = "desktop"; $.extend(wn.modules, { "Selling": { link: "selling-home", @@ -62,7 +63,7 @@ $.extend(wn.modules, { icon: "icon-group" }, "Setup": { - link: "hr-home", + link: "Setup", color: "#484848", icon: "icon-wrench" }, @@ -102,6 +103,8 @@ erpnext.module_page.setup_page = function(module, wrapper) { $(wrapper).find("a[title]").tooltip({ delay: { show: 500, hide: 100 } }); + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_breadcrumb(wn.modules[module].icon); } // hide list links where the user does diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index 16c60adcac..a1b9f2df3f 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -15,7 +15,10 @@ // along with this program. If not, see . pscript.onload_Setup = function(wrapper) { - wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'Setup'); + wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'Setup'); + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_breadcrumb(wn.modules["Setup"].icon); + erpnext.module_page.hide_links(wrapper); if(wn.boot.expires_on) { $(wrapper).find(".layout-main") diff --git a/utilities/page/messages/messages.js b/utilities/page/messages/messages.js index 1da5bf4a06..4d77e16e6d 100644 --- a/utilities/page/messages/messages.js +++ b/utilities/page/messages/messages.js @@ -31,6 +31,9 @@ wn.pages.messages.onload = function(wrapper) {
\ \
').appendTo($(wrapper).find('.layout-main-section')); + + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_breadcrumb(wn.modules["Messages"].icon); erpnext.messages = new erpnext.Messages(wrapper); erpnext.toolbar.set_new_comments(0); diff --git a/utilities/page/question_view/question_view.js b/utilities/page/question_view/question_view.js index 4b63c99e9e..ea1a2dc70a 100644 --- a/utilities/page/question_view/question_view.js +++ b/utilities/page/question_view/question_view.js @@ -17,7 +17,9 @@ pscript['onload_question-view'] = function(wrapper) { wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); wrapper.appframe.title('Question'); - wrapper.appframe.add_module_tab('Knowledge Base'); + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_module_breadcrumb("Knowledge Base"); + wrapper.appframe.add_breadcrumb("icon-file"); wrapper.add_answer_area = $('.add-answer-area').get(0); } diff --git a/utilities/page/questions/questions.js b/utilities/page/questions/questions.js index fced563d66..0e88728d22 100644 --- a/utilities/page/questions/questions.js +++ b/utilities/page/questions/questions.js @@ -18,6 +18,8 @@ pscript.onload_questions = function(wrapper) { body = $(wrapper).find('.layout-main-section').get(0); wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_breadcrumb(wn.modules["Knowledge Base"].icon); wrapper.appframe.title('Knowledge Base'); // kb diff --git a/utilities/page/todo/todo.js b/utilities/page/todo/todo.js index 0617b4e292..cad5fbd28b 100644 --- a/utilities/page/todo/todo.js +++ b/utilities/page/todo/todo.js @@ -185,6 +185,8 @@ erpnext.todo.save = function(btn) { wn.pages.todo.onload = function(wrapper) { // create app frame wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'To Do'); + wrapper.appframe.add_home_breadcrumb(); + wrapper.appframe.add_breadcrumb(wn.modules["To Do"].icon); wrapper.appframe.add_button('Refresh', erpnext.todo.refresh, 'icon-refresh'); wrapper.appframe.add_button('Add', function() { erpnext.todo.make_dialog({