Skip to content

Commit

Permalink
fix in issues arising due to wn.require
Browse files Browse the repository at this point in the history
  • Loading branch information
Anand Doshi committed May 10, 2012
1 parent 45b187d commit 951d8ec
Show file tree
Hide file tree
Showing 11 changed files with 316 additions and 7 deletions.
11 changes: 10 additions & 1 deletion build.json
Expand Up @@ -16,5 +16,14 @@
"erpnext/startup/js/toolbar.js",
"erpnext/startup/js/feature_setup.js",
"conf.js"
]
],
"public/js/kb_common.js": [
"erpnext/utilities/page/kb_common/kb_common.js",
],
"public/js/complete_setup.js": [
"erpnext/startup/js/complete_setup.js",
],
"public/js/product_category.js": [
"erpnext/website/js/product_category.js",
],
}
2 changes: 1 addition & 1 deletion erpnext/startup/startup.js
Expand Up @@ -76,7 +76,7 @@ erpnext.startup.start = function() {

// complete registration
if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) {
wn.require("erpnext/startup/js/complete_setup.js");
wn.require("js/complete_setup.js");
erpnext.complete_setup.show();
}
if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
Expand Down
2 changes: 1 addition & 1 deletion erpnext/utilities/page/questions/questions.js
Expand Up @@ -220,4 +220,4 @@ KBQuestion = function(parent, det, kb) {
this.make()
}

wn.require('erpnext/utilities/page/kb_common/kb_common.js');
wn.require('js/kb_common.js');
2 changes: 1 addition & 1 deletion erpnext/website/page/products/products.js
Expand Up @@ -16,7 +16,7 @@

erpnext.products = {}

wn.require('erpnext/website/js/product_category.js');
wn.require('js/product_category.js');

pscript.onload_products = function(wrapper) {
erpnext.make_product_categories(wrapper);
Expand Down
134 changes: 134 additions & 0 deletions public/css/wn-web.css
@@ -0,0 +1,134 @@
#body_div {

background: url("../files/indian-textile-5.gif") repeat;


font-family: 'Arial', Verdana, Sans !important;


font-size: 14px !important;

}


.small {
font-size: 12px !important;
}



h1, h2, h3, h4, h5 {
font-family: 'Arial', Arial, 'Helvetica Neue' !important;
}


/* User CSS */

hr {
clear: both;
}

p {
margin-top: 2px;
}


.hand {
font-family: Pacifico;
font-size: 18px;
}

h1.top {
text-align: center;
}

.sub-head {
text-align: center;
color: #888;
font-size: 18px;
margin: 10px 0px;
}

.layout-main, .layout-main-section {
padding: 50px;
}

.layout-main-section {
width: 60%;
}

.layout-side-section {
padding-top: 50px;
}

h2 {
//font-family: Pacifico;
font-size: 20px;
font-weight: bold;
color: #CC0000;
padding: 25px 0px 25px 0px;
clear: both;
text-align: left;
}

.center {
text-align: center;
}

.left {
width: 375px;
padding-right: 25px;
float: left;
}

.right {
width: 375px;
padding-left: 25px;
float: left;
}

.page-footer {
clear: both;
margin: -50px;
margin-top: 50px;
background-color: #FFFAED;
padding: 50px;
}

.page-footer input {
width: 140px;
font-size: 17px;
padding: 4px;
margin-top: 2px;
}

.page-footer .section-head {
padding: 0px;
margin-bottom: 7px;
}

.green {
color: green;
}

.web-form input, .web-form textarea {
width: 400px;
font-size: 17px;
padding: 4px;
}

.link-big {
font-size: 140%;
}

.sticky {
background-color: #F0EDDD;
padding: 15px;
margin-left: 15px;
font-size: 12px;
color: #444;
width: 240px;
min-height: 120px;
float: right;
box-shadow: 2px 2px 6px #973;
}
2 changes: 1 addition & 1 deletion public/js/all-app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/all-web.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 951d8ec

Please sign in to comment.