diff --git a/home/page/profile_settings/profile_settings.js b/home/page/profile_settings/profile_settings.js index a0bb49ad09..3c74e4d3e9 100644 --- a/home/page/profile_settings/profile_settings.js +++ b/home/page/profile_settings/profile_settings.js @@ -29,9 +29,12 @@ MyProfile = function(wrapper) { this.wrapper.appframe.add_button('Change Background', this.change_background); this.wrapper.appframe.add_label("Set Theme:"); this.wrapper.appframe.add_select("Theme", - ["Default", "Desert", "Sky", "Tropic", "Snow", "Sun"]).change(function() { - erpnext.set_theme($(this).val().toLowerCase()); - }).change(function() { + keys(erpnext.themes).sort()) + .change(function() { + erpnext.set_theme($(this).val()); + }).val(wn.boot.profile.defaults.theme ? + wn.boot.profile.defaults.theme[0] : "Default") + .change(function() { wn.call({ module: "home", page: "profile_settings", @@ -39,6 +42,7 @@ MyProfile = function(wrapper) { args: {theme: $(this).val() } }) }); + this.tab = make_table($a($(this.wrapper).find('.layout-main').get(0), 'div', '', {marginTop:'19px'}), 1, 2, '90%', ['50%', '50%'], {padding:'11px'}) this.img = $a($td(this.tab, 0, 0), 'img', '', {width: '120px', maxHeight:'200px'}); diff --git a/public/images/module-icons-small.png b/public/images/module-icons-small.png new file mode 100644 index 0000000000..c5dc26d65d Binary files /dev/null and b/public/images/module-icons-small.png differ diff --git a/public/images/module-icons.png b/public/images/module-icons.png deleted file mode 100644 index 869cb8848e..0000000000 Binary files a/public/images/module-icons.png and /dev/null differ diff --git a/public/images/module_icons/accounts.png b/public/images/module_icons/accounts.png new file mode 100644 index 0000000000..5a05c4dad0 Binary files /dev/null and b/public/images/module_icons/accounts.png differ diff --git a/public/images/module_icons/buying.png b/public/images/module_icons/buying.png new file mode 100644 index 0000000000..5878748d97 Binary files /dev/null and b/public/images/module_icons/buying.png differ diff --git a/public/images/module_icons/calendar.png b/public/images/module_icons/calendar.png new file mode 100644 index 0000000000..254ba0f84e Binary files /dev/null and b/public/images/module_icons/calendar.png differ diff --git a/public/images/module_icons/dashboard.png b/public/images/module_icons/dashboard.png new file mode 100644 index 0000000000..1e12ea0552 Binary files /dev/null and b/public/images/module_icons/dashboard.png differ diff --git a/public/images/module_icons/feed.png b/public/images/module_icons/feed.png new file mode 100644 index 0000000000..d4d5eababa Binary files /dev/null and b/public/images/module_icons/feed.png differ diff --git a/public/images/module_icons/hr.png b/public/images/module_icons/hr.png new file mode 100644 index 0000000000..34fa2f8893 Binary files /dev/null and b/public/images/module_icons/hr.png differ diff --git a/public/images/module_icons/kb.png b/public/images/module_icons/kb.png new file mode 100644 index 0000000000..9ea18424bc Binary files /dev/null and b/public/images/module_icons/kb.png differ diff --git a/public/images/module_icons/messages.png b/public/images/module_icons/messages.png new file mode 100644 index 0000000000..77556e108f Binary files /dev/null and b/public/images/module_icons/messages.png differ diff --git a/public/images/module_icons/production.png b/public/images/module_icons/production.png new file mode 100644 index 0000000000..309b7bcaa3 Binary files /dev/null and b/public/images/module_icons/production.png differ diff --git a/public/images/module_icons/projects.png b/public/images/module_icons/projects.png new file mode 100644 index 0000000000..65c87ee1a7 Binary files /dev/null and b/public/images/module_icons/projects.png differ diff --git a/public/images/module_icons/selling.png b/public/images/module_icons/selling.png new file mode 100644 index 0000000000..9e5d1f2a39 Binary files /dev/null and b/public/images/module_icons/selling.png differ diff --git a/public/images/module_icons/setup.png b/public/images/module_icons/setup.png new file mode 100644 index 0000000000..18061df959 Binary files /dev/null and b/public/images/module_icons/setup.png differ diff --git a/public/images/module_icons/stock.png b/public/images/module_icons/stock.png new file mode 100644 index 0000000000..42c1453998 Binary files /dev/null and b/public/images/module_icons/stock.png differ diff --git a/public/images/module_icons/support.png b/public/images/module_icons/support.png new file mode 100644 index 0000000000..a4075057f4 Binary files /dev/null and b/public/images/module_icons/support.png differ diff --git a/public/images/module_icons/todo.png b/public/images/module_icons/todo.png new file mode 100644 index 0000000000..b7c056b7fe Binary files /dev/null and b/public/images/module_icons/todo.png differ diff --git a/public/images/module_icons/website.png b/public/images/module_icons/website.png new file mode 100644 index 0000000000..11064de9f9 Binary files /dev/null and b/public/images/module_icons/website.png differ diff --git a/public/js/startup.css b/public/js/startup.css index b413d9dc87..f61e648325 100644 --- a/public/js/startup.css +++ b/public/js/startup.css @@ -61,4 +61,26 @@ span, div, td, input, textarea, button, select { .show-all-reports { margin-top: 5px; font-size: 11px; +} + +.small-module-icons-accounts{ background-position: 0 0; width: 14px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-selling{ background-position: 0 -67px; width: 14px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-calendar{ background-position: 0 -134px; width: 15px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-dashboard{ background-position: 0 -201px; width: 17px; height: 12px; } +.small-module-icons-feed{ background-position: 0 -263px; width: 14px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-hr{ background-position: 0 -330px; width: 17px; height: 14px; margin-top: -1px; } +.small-module-icons-kb{ background-position: 0 -394px; width: 10px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-messages{ background-position: 0 -461px; width: 17px; height: 11px; } +.small-module-icons-production{ background-position: 0 -522px; width: 17px; height: 14px; margin-top: -1px; } +.small-module-icons-projects{ background-position: 0 -586px; width: 17px; height: 10px; } +.small-module-icons-buying{ background-position: 0 -646px; width: 17px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-setup{ background-position: 0 -713px; width: 16px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-stock{ background-position: 0 -780px; width: 14px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-support{ background-position: 0 -847px; width: 17px; height: 17px; margin-top: -2px; margin-bottom: -2px; } +.small-module-icons-todo{ background-position: 0 -914px; width: 17px; height: 15px; margin-top: -1px; margin-bottom: -1px; } +.small-module-icons-website{ background-position: 0 -979px; width: 17px; height: 17px; margin-top: -2px; margin-bottom: -2px; } + +.small-module-icons { + background-image: url("../app/images/module-icons-small.png"); + display: inline-block; } \ No newline at end of file diff --git a/public/js/startup.js b/public/js/startup.js index 0b43183758..a934063fb3 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -59,7 +59,7 @@ erpnext.startup.start = function() { erpnext.set_user_background(wn.boot.user_background); } if(wn.boot.profile.defaults.theme) { - erpnext.set_theme(wn.boot.profile.defaults.theme[0].toLowerCase()); + erpnext.set_theme(wn.boot.profile.defaults.theme[0]); } // always allow apps @@ -213,35 +213,45 @@ Mousetrap.bind(["command+s", "ctrl+s"], function() { // theme setter erpnext.themes = { - metal: { + "Default": { sidebar: "#f2f2f2", titlebar: "#dfdfdf", toolbar: "#e9e9e9" }, - desert: { + Desert: { sidebar: "#FFFDF7", titlebar: "#DAD4C2", toolbar: "#FAF6E9" }, - tropic: { + Tropic: { sidebar: "#FAFFF7", toolbar: "#EEFAE9", titlebar: "#D7ECD1" }, - sky: { + Sky: { sidebar: "#F7FFFE", toolbar: "#E9F9FA", titlebar: "#D7F5F7" }, - snow: { + Snow: { sidebar: "#fff", titlebar: "#fff", toolbar: "#fff" }, - sun: { + Sunny: { sidebar: "#FFFFEF", - titlebar: "lightYellow", - toolbar: "#FFFDCA" + titlebar: "#FFFDCA", + toolbar: "lightYellow" + }, + Floral: { + sidebar: "#FFF7F7", + titlebar: "#F7CBCB", + toolbar: "#FAE9EA" + }, + Ocean: { + sidebar: "#F2FFFE", + titlebar: "#8ACFC7", + toolbar: "#C3F3EE" } }