form toolbar ui fixes and added themes

This commit is contained in:
Rushabh Mehta 2012-09-28 16:11:57 +05:30
parent 534a7a92fe
commit b0d32b7a25
9 changed files with 112 additions and 9 deletions

View File

@ -27,7 +27,18 @@ MyProfile = function(wrapper) {
this.wrapper.appframe = new wn.ui.AppFrame($(this.wrapper).find('.layout-appframe'), 'Profile Settings');
this.wrapper.appframe.add_button('Change Password', this.change_password);
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() {
wn.call({
module: "home",
page: "profile_settings",
method: "set_user_theme",
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'});

View File

@ -110,3 +110,7 @@ def set_user_background():
webnotes.conn.set_value('Profile', user, 'background_image', fid)
return fid
@webnotes.whitelist()
def set_user_theme():
webnotes.conn.set_default("theme", webnotes.form_dict.theme, webnotes.session.user)

View File

@ -1,20 +1,20 @@
{
"public/css/all-web.css": [
"app/startup/startup.css",
"app/public/js/startup.css",
"app/website/css/website.css"
],
"public/css/all-app.css": [
"app/startup/startup.css"
"app/public/js/startup.css"
],
"public/js/all-web.js": [
"app/startup/startup.js",
"app/public/js/startup.js",
"app/public/js/conf.js"
],
"public/js/all-app.js": [
"app/startup/startup.js",
"app/startup/js/modules.js",
"app/startup/js/toolbar.js",
"app/startup/js/feature_setup.js",
"app/public/js/startup.js",
"app/public/js/modules.js",
"app/public/js/toolbar.js",
"app/public/js/feature_setup.js",
"app/public/js/conf.js"
],
}

View File

@ -58,6 +58,9 @@ erpnext.startup.start = function() {
if(wn.boot.user_background) {
erpnext.set_user_background(wn.boot.user_background);
}
if(wn.boot.profile.defaults.theme) {
erpnext.set_theme(wn.boot.profile.defaults.theme[0].toLowerCase());
}
// always allow apps
wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat(
@ -205,4 +208,48 @@ Mousetrap.bind(["command+s", "ctrl+s"], function() {
if(cur_frm)
cur_frm.save();
return false;
});
});
// theme setter
erpnext.themes = {
metal: {
sidebar: "#f2f2f2",
titlebar: "#dfdfdf",
toolbar: "#e9e9e9"
},
desert: {
sidebar: "#FFFDF7",
titlebar: "#DAD4C2",
toolbar: "#FAF6E9"
},
tropic: {
sidebar: "#FAFFF7",
toolbar: "#EEFAE9",
titlebar: "#D7ECD1"
},
sky: {
sidebar: "#F7FFFE",
toolbar: "#E9F9FA",
titlebar: "#D7F5F7"
},
snow: {
sidebar: "#fff",
titlebar: "#fff",
toolbar: "#fff"
},
sun: {
sidebar: "#FFFFEF",
titlebar: "lightYellow",
toolbar: "#FFFDCA"
}
}
erpnext.set_theme = function(theme) {
wn.dom.set_style(repl(".layout-wrapper-background { \
background-color: %(sidebar)s !important; }\
.appframe-toolbar { \
background-color: %(toolbar)s !important; }\
.appframe-titlebar { \
background-color: %(titlebar)s !important; }", erpnext.themes[theme]));
}

41
public/js/themes.js Normal file
View File

@ -0,0 +1,41 @@
erpnext.themes = {
metal: {
sidebar: "#f2f2f2",
titlebar: "#dfdfdf",
toolbar: "#e9e9e9"
},
desert: {
sidebar: "#FFFDF7",
titlebar: "#DAD4C2",
toolbar: "#FAF6E9"
},
tropic: {
sidebar: "#FAFFF7",
toolbar: "#EEFAE9",
titlebar: "#D7ECD1"
},
sky: {
sidebar: "#F7FFFE",
toolbar: "#E9F9FA",
titlebar: "#D7F5F7"
},
snow: {
sidebar: "#fff",
titlebar: "#fff",
toolbar: "#fff"
},
sun: {
sidebar: "#FFFFEF",
titlebar: "lightYellow",
toolbar: "#FFFDCA"
}
}
erpnext.set_theme = function(theme) {
wn.dom.set_style(repl(".layout-wrapper-background { \
background-color: %(sidebar)s !important; }\
.appframe-toolbar { \
background-color: %(toolbar)s !important; }\
.appframe-titlebar { \
background-color: %(titlebar)s !important; }", erpnext.themes[theme]));
}