form, appframe ui fixes

This commit is contained in:
Rushabh Mehta 2012-09-28 18:47:47 +05:30
parent 90f4d9a608
commit 3c04193afb
21 changed files with 48 additions and 12 deletions

View File

@ -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'});

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1018 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 941 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -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;
}

View File

@ -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"
}
}