diff --git a/home/page/desktop/desktop.css b/home/page/desktop/desktop.css index 1fb4414ca0..ed3a1b3209 100644 --- a/home/page/desktop/desktop.css +++ b/home/page/desktop/desktop.css @@ -68,7 +68,7 @@ background: #B00D07; padding: 3px; float: right; - margin-top: -74px; + margin-top: -12px; margin-right: 10px; border: 2px solid white; box-shadow: 0 0 4px 1px black; diff --git a/home/page/desktop/desktop.js b/home/page/desktop/desktop.js index 37011bbca2..df7d23eb67 100644 --- a/home/page/desktop/desktop.js +++ b/home/page/desktop/desktop.js @@ -24,13 +24,18 @@ erpnext.desktop.render = function() { module.label = wn._(module.label); module.gradient_css = wn.get_gradient_css(module.color, 45); - $('#icon-grid').append(repl('\ -
\ + $module_icon = $(repl('\ +
\
\ \ -
\ +
\
%(label)s
\ -
', module)); + ', module)).click(function() { + wn.set_route($(this).attr("data-link")); + }).css({ + cursor:"pointer" + }).appendTo("#icon-grid"); } // modules @@ -52,7 +57,7 @@ erpnext.desktop.render = function() { erpnext.desktop.show_pending_notifications = function() { var add_circle = function(str_module, id, title) { var module = $('#'+str_module); - module.find('a:first').append( + module.prepend( repl('', {id: id, title: wn._(title)})); diff --git a/public/js/modules.js b/public/js/modules.js index 5fcd64b5a3..9f71a1693e 100644 --- a/public/js/modules.js +++ b/public/js/modules.js @@ -61,7 +61,7 @@ $.extend(wn.modules, { "HR": { link: "hr-home", color: "#018d6c", - label: "Human Resources", + label: wn._("Human Resources"), icon: "icon-group" }, "Setup": { @@ -72,26 +72,31 @@ $.extend(wn.modules, { "Activity": { link: "activity", color: "#633501", - icon: "icon-play" + icon: "icon-play", + label: wn._("Activity"), }, "To Do": { link: "todo", color: "#febf04", + label: wn._("To Do"), icon: "icon-check" }, "Calendar": { link: "calendar", color: "#026584", + label: wn._("Calendar"), icon: "icon-calendar" }, "Messages": { link: "messages", color: "#8d016e", + label: wn._("Messages"), icon: "icon-comments" }, "Knowledge Base": { link: "questions", color: "#01372b", + label: wn._("Knowledge Base"), icon: "icon-question-sign" },