diff --git a/build.json b/build.json index 67dcfba86f4..0a63ee545ae 100644 --- a/build.json +++ b/build.json @@ -8,9 +8,15 @@ "lib/js/wn/require.js", "lib/js/wn/dom.js", "lib/js/wn/model.js", - "lib/js/wn/page.js", "lib/js/wn/misc/user.js", "lib/js/lib/json2.js", + "lib/js/wn/router.js", + "lib/js/wn/ui/listing.js", + "lib/js/wn/views/container.js", + "lib/js/wn/views/doclistview.js", + "lib/js/wn/views/pageview.js", + "lib/js/wn/views/formview.js", + "lib/js/wn/views/reportview.js", "lib/js/wn/request.js", "lib/js/core.js" ] @@ -63,6 +69,7 @@ "lib/css/legacy/sidebar.css", "lib/css/Aristo/aristo.selected.css", "lib/css/ui/list.css", + "lib/css/ui/fonts.css", "lib/css/bootstrap/headings.css", "lib/css/bootstrap/buttons.css", "lib/css/bootstrap/navbar.css", @@ -70,7 +77,8 @@ "lib/css/bootstrap/tooltip.css", "lib/css/bootstrap/label.css", "lib/css/bootstrap/icons.css", - "erpnext/startup/startup.css" + "lib/css/bootstrap/popover.css", + "erpnext/startup/startup.css" ] }, @@ -89,11 +97,11 @@ "lib/js/legacy/utils/shortcut.js", "lib/js/legacy/widgets/form/fields.js", "lib/js/wn/ui/dialog.js", + "lib/js/wn/ui/button.js", "lib/js/legacy/widgets/dialog.js", "lib/js/wn/ui/listing.js", "lib/js/legacy/widgets/layout.js", "lib/js/legacy/webpage/page_header.js", - "lib/js/legacy/webpage/history.js", "lib/js/legacy/webpage/search.js", "lib/js/legacy/webpage/spinner.js", "lib/js/legacy/webpage/error_console.js", @@ -104,7 +112,6 @@ "lib/js/legacy/wn/widgets/footer.js", "lib/js/legacy/model/local_data.js", "lib/js/legacy/model/doclist.js", - "lib/js/legacy/webpage/body.js", "lib/js/legacy/app.js", "js/app.js", "erpnext/startup/startup.js", @@ -132,14 +139,13 @@ "lib/js/legacy/utils/printElement.js", "lib/js/legacy/widgets/form/fields.js", "lib/js/wn/ui/dialog.js", + "lib/js/wn/ui/button.js", "lib/js/legacy/widgets/dialog.js", - "lib/js/legacy/widgets/listing.js", "lib/js/legacy/widgets/layout.js", "lib/js/legacy/widgets/tabbedpage.js", "lib/js/legacy/webpage/page_header.js", "lib/js/legacy/widgets/tags.js", "lib/js/legacy/widgets/export_query.js", - "lib/js/legacy/webpage/history.js", "lib/js/legacy/webpage/search.js", "lib/js/legacy/webpage/spinner.js", "lib/js/legacy/webpage/error_console.js", @@ -152,9 +158,8 @@ "lib/js/legacy/model/local_data.js", "lib/js/legacy/model/doclist.js", "lib/js/wn/ui/toolbar.min.js:concat", - "lib/js/legacy/webpage/body.js", "lib/js/legacy/widgets/form/fields.js", - "lib/js/legacy/widgets/form/form_container.js", + "lib/js/legacy/widgets/form/form_dialog.js", "lib/js/legacy/widgets/form/form_header.js", "lib/js/legacy/widgets/form/form.js", "lib/js/legacy/widgets/form/form_fields.js", diff --git a/css/all-app.css b/css/all-app.css index 496f93af808..5e74fa2ef86 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -29,7 +29,7 @@ select, input, textarea { border: 1px solid #ccc; -moz-border-radius: 4px; -webkit-border-radius: 4px; - font-size: 13px; + font-size: inherit; padding: 4px; color: #444; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -41,7 +41,7 @@ textarea { font-family: inherit; height: 120px; width: 90%; - font-size: 12px; + font-size: inherit; white-space: normal; } @@ -104,6 +104,15 @@ div.fix_ff_cursor { overflow: auto; } div.comment { color: #444; } +.small { + font-size: 11px; +} + +.help { + margin: 3px 0px; + color: #888; +} + div#body_div { position: relative; display: none; @@ -113,15 +122,65 @@ div#body_div { margin-top: 56px; } -footer { +.content { width: 900px; - margin: auto; + margin-bottom: 30px; + position: absolute; + -webkit-transition:all 0.5s ease-in-out; + -moz-transition:all 0.5s ease-in-out; + -o-transition:all 0.5s ease-in-out; + -ms-transition:all 0.5s ease-in-out; + transition:all 0.5s ease-in-out; +} + +.background-fade-in { + -webkit-transition: background 1s ease-in; /* property duration timing-function delay */ + -moz-transition: background 1s ease-in; + -o-transition: background 1s ease-in; + transition: background 1s ease-in; +} + +/* selector for open pages */ +#opened-page-selector { + width: 900px; + height: 900px; + position: absolute; + z-index: 100; + opacity: 0; + background-color: #bdf; +} + +#opened-page-selector.active { + opacity: 0.6; + cursor: pointer; +} + +.popover-container { + height: 400px; +} + +footer { + position: absolute; + bottom: 0px; + width: 100%; } header .container { width: 900px; margin: auto; } +@media (max-width: 1200px) { + div#body_div, header .container, .content, #opened-page-selector, footer { + width: 900px; + } +} + +@media (min-width: 1200px) { + div#body_div, header .container, .content, #opened-page-selector, footer { + width: 1100px; + } +} + div.no_script { display: none; } @@ -135,7 +194,6 @@ div.loading_div { display: none; text-align: center; padding: 2px; - font-size: 12px; border: 1px solid #FF4; } @@ -160,27 +218,18 @@ div.std-footer-item { -moz-border-radius: 5px; border-radius: 5px; } -.gradient { - background: #ededed; /* Old browsers */ - background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */ -} .layout_wrapper, .layout-wrapper { - -moz-box-shadow: 1px 1px 8px #555; - -webkit-box-shadow: 1px 1px 8px #555; - box-shadow: 1px 1px 8px #555; + -moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.3); + -webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.3); + box-shadow: 0px 0px 6px rgba(0,0,0,0.3); background-color: #fff; padding: 15px; + margin-bottom: 30px; } .layout-wrapper-background { - background-color: #f2f2f2 !important; + background-color: #fafafa !important; padding: 0px; } @@ -189,7 +238,7 @@ div.std-footer-item { float: left; padding: 15px; background-color: #FFF; - min-height: 450px; + min-height: 600px; -moz-box-shadow: 7px 0px 6px -2px #ddd; -webkit-box-shadow: 7px 0px 6px -2px #ddd; box-shadow: 7px 0px 6px -2px #ddd; @@ -198,10 +247,10 @@ div.std-footer-item { .layout-side-section { width: 22%; /*float: right;*/ - color: #606060; + color: #606060; overflow-x: hidden; padding: 15px; - min-height: 450px; + min-height: 600px; } /* from bootstrap */ @@ -236,12 +285,14 @@ div.std-footer-item { .avatar-small { display: inline-block; - min-width: 29px; + width: 24px; + height: 20px; + vertical-align: middle; + overflow: hidden; + margin: 0px 3px; } .avatar-small img { - height: 24px; - margin-bottom: -7px; - max-width: 24px; + width: 24px; } /* @@ -348,24 +399,6 @@ div.grid_tbarlinks { } -div.frm_tip_box { - margin: 0px; - padding: 8px; - background-color: #FFC; - display: none; - font-size: 11px; - border: 1px solid #FFB; -} - -div.frm_tip_box table { - border-collapse: collapse; - vertical-align: top; -} - -td.frm_tray_area { - width: 122px; -} - div.dialog_frm { position: relative; margin: 10px; @@ -462,12 +495,6 @@ div.time_field select{ .datainputcell { padding: 2px 0px; } -.field_description, .help { - margin: 3px 0px; - font-size: 11px; - color: #888; -} - .help ol { padding-left: 19px; } @@ -476,9 +503,6 @@ div.time_field select{ margin-bottom: 3px; } -.field_label { - font-size:11px; -} .input_area input, select, textarea { font-size: 14px; padding: 2px; @@ -529,7 +553,6 @@ div.sidebar-comment-wrapper input { } div.sidebar-comment-message { margin-top: 8px; - font-size: 11px; color: #777; } @@ -540,7 +563,6 @@ div.sidebar-comment-text { color: #444; } div.sidebar-comment-info { - font-size: 10px; color: #777; } @@ -673,17 +695,7 @@ div.sidebar-comment-info { /* * lib/css/legacy/listing.css */ -/* listing 2.0 */ -div.listing-more { - margin: 7px 0px 17px 0px; - text-align: center; - display: none; -} - -div.listing-toolbar { - margin: 7px 0px; -} /* SRS */ @@ -727,47 +739,6 @@ div.srs_filter_area td { vertical-align: middle; } - -/* stats */ - -div.stat-grid { - border: 2px solid #bbb; - background-color: white; - margin-bottom: 19px; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - overflow: hidden; -} - -div.stat-label { - position: relative; - padding: 3px; - text-align: center; -} -div.stat-label, div.stat-label a { - z-index: 5; -} - -div.stat-item { - position: relative; - border-bottom: 1px solid #ddd; -} -div.stat-item:last-child { - border-bottom: 0px solid #ddd; -} - -div.stat-bar { - position: absolute; - left: 0px; - background-color: #def; - height: 100%; - z-index: 0; -} - - - - /* * lib/css/legacy/report.css */ @@ -1110,9 +1081,8 @@ div.psidebar div.section { } div.psidebar div.section-head { - font-size: 12px; padding: 5px 11px; - border-bottom: 2px solid #444; + border-bottom: 1px solid #aaa; } div.psidebar div.section-body { @@ -1124,7 +1094,6 @@ div.psidebar div.section-item { } div.psidebar div.section-item, div.psidebar .section-link { - font-size: 11px; color: #666; } @@ -1524,7 +1493,6 @@ div.psidebar div.section-item, div.psidebar .section-link { margin: -1px; background: #5f83b9; color: #FFFFFF; - text-shadow: 0px 1px 1px #234386; border-color: #466086; -moz-border-radius: 0; -webkit-border-radius: 0; @@ -1631,14 +1599,33 @@ div.psidebar div.section-item, div.psidebar .section-link { margin-top: 8px; } +/* list-row */ div.list-row { border-bottom: 1px solid #eee; - padding: 3px 0px; + padding: 5px 0px; } div.list-row:hover { background-color: #eef } +div.list-row .label { + margin-right: 4px; +} + +div.list-row table { + table-layout: fixed; + border-collapse: collapse; + width: 100%; +} + +div.list-row table td { + overflow: hidden; + padding-right: 3px; + vertical-align: middle; + height: 24px; + max-height: 24px; +} + div.paging-button { text-align: center; padding: 11px 0px; @@ -1674,6 +1661,8 @@ div.list_filter input, div.list_filter select { margin-right: 7px; } +/* bar */ + span.bar-outer { display: inline-block; margin: 0px 7px; @@ -1688,12 +1677,77 @@ span.bar-inner { background-color: #bdf; height: 100%; margin-bottom: 2px; + float: left; } span.bar-complete { - background-color: green; + background-color: #009900; +} +span.bar-empty { + background-color: #990000; } +/* stats */ + +div.stat-wrapper { + margin-bottom: 19px; +} + +div.stat-grid { + border: 2px solid #bbb; + background-color: white; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + overflow: hidden; +} + +div.stat-label { + position: relative; + padding: 3px; + text-align: center; +} +div.stat-label, div.stat-label a { + z-index: 5; +} + +div.stat-item { + position: relative; + border-bottom: 1px solid #ddd; +} +div.stat-item:last-child { + border-bottom: 0px solid #ddd; +} + +div.stat-bar { + position: absolute; + left: 0px; + background-color: #def; + height: 100%; + z-index: 0; +} + + + + + +/* + * lib/css/ui/fonts.css + */ +@font-face { + font-family: 'Pontano Sans'; + font-style: normal; + font-weight: 800; + src: url('../lib/css/fonts/pontanosans.woff') format('woff'); +} + +@font-face { + font-family: 'Droid Sans'; + font-style: normal; + font-weight: normal; + src: local('Droid Sans'), local('DroidSans'), url('../lib/css/fonts/droidsans.woff') format('woff'); +} + /* * lib/css/bootstrap/headings.css */ @@ -1763,6 +1817,7 @@ h6 { * lib/css/bootstrap/buttons.css */ .close { + font-family: Helvetica, Sans; float: right; font-size: 20px; font-weight: bold; @@ -3314,6 +3369,102 @@ button.btn.small, input[type="submit"].btn.small { background-position: -456px -118px; } +/* + * lib/css/bootstrap/popover.css + */ +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; + display: none; + padding: 5px; +} +.popover.top { + margin-top: -5px; +} +.popover.right { + margin-left: 5px; +} +.popover.bottom { + margin-top: 5px; +} +.popover.left { + margin-left: -5px; +} +.popover.top .arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} +.popover.right .arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-right: 5px solid #000000; +} +.popover.bottom .arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-bottom: 5px solid #000000; +} +.popover.left .arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid #000000; +} +.popover .arrow { + position: absolute; + width: 0; + height: 0; +} +.popover-inner { + padding: 3px; + width: 280px; + overflow: hidden; + background: #000000; + background: rgba(0, 0, 0, 0.8); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); +} +.popover-title { + padding: 9px 15px; + line-height: 1; + background-color: #f5f5f5; + border-bottom: 1px solid #eee; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} +.popover-content { + padding: 14px; + background-color: #ffffff; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.popover-content p, .popover-content ul, .popover-content ol { + margin-bottom: 0; +} + /* * erpnext/startup/startup.css */ diff --git a/css/all-web.css b/css/all-web.css index 58433859756..03a92e49575 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -29,7 +29,7 @@ select, input, textarea { border: 1px solid #ccc; -moz-border-radius: 4px; -webkit-border-radius: 4px; - font-size: 13px; + font-size: inherit; padding: 4px; color: #444; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -41,7 +41,7 @@ textarea { font-family: inherit; height: 120px; width: 90%; - font-size: 12px; + font-size: inherit; white-space: normal; } @@ -104,6 +104,15 @@ div.fix_ff_cursor { overflow: auto; } div.comment { color: #444; } +.small { + font-size: 11px; +} + +.help { + margin: 3px 0px; + color: #888; +} + div#body_div { position: relative; display: none; @@ -113,15 +122,65 @@ div#body_div { margin-top: 56px; } -footer { +.content { width: 900px; - margin: auto; + margin-bottom: 30px; + position: absolute; + -webkit-transition:all 0.5s ease-in-out; + -moz-transition:all 0.5s ease-in-out; + -o-transition:all 0.5s ease-in-out; + -ms-transition:all 0.5s ease-in-out; + transition:all 0.5s ease-in-out; +} + +.background-fade-in { + -webkit-transition: background 1s ease-in; /* property duration timing-function delay */ + -moz-transition: background 1s ease-in; + -o-transition: background 1s ease-in; + transition: background 1s ease-in; +} + +/* selector for open pages */ +#opened-page-selector { + width: 900px; + height: 900px; + position: absolute; + z-index: 100; + opacity: 0; + background-color: #bdf; +} + +#opened-page-selector.active { + opacity: 0.6; + cursor: pointer; +} + +.popover-container { + height: 400px; +} + +footer { + position: absolute; + bottom: 0px; + width: 100%; } header .container { width: 900px; margin: auto; } +@media (max-width: 1200px) { + div#body_div, header .container, .content, #opened-page-selector, footer { + width: 900px; + } +} + +@media (min-width: 1200px) { + div#body_div, header .container, .content, #opened-page-selector, footer { + width: 1100px; + } +} + div.no_script { display: none; } @@ -135,7 +194,6 @@ div.loading_div { display: none; text-align: center; padding: 2px; - font-size: 12px; border: 1px solid #FF4; } @@ -160,27 +218,18 @@ div.std-footer-item { -moz-border-radius: 5px; border-radius: 5px; } -.gradient { - background: #ededed; /* Old browsers */ - background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */ -} .layout_wrapper, .layout-wrapper { - -moz-box-shadow: 1px 1px 8px #555; - -webkit-box-shadow: 1px 1px 8px #555; - box-shadow: 1px 1px 8px #555; + -moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.3); + -webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.3); + box-shadow: 0px 0px 6px rgba(0,0,0,0.3); background-color: #fff; padding: 15px; + margin-bottom: 30px; } .layout-wrapper-background { - background-color: #f2f2f2 !important; + background-color: #fafafa !important; padding: 0px; } @@ -189,7 +238,7 @@ div.std-footer-item { float: left; padding: 15px; background-color: #FFF; - min-height: 450px; + min-height: 600px; -moz-box-shadow: 7px 0px 6px -2px #ddd; -webkit-box-shadow: 7px 0px 6px -2px #ddd; box-shadow: 7px 0px 6px -2px #ddd; @@ -198,10 +247,10 @@ div.std-footer-item { .layout-side-section { width: 22%; /*float: right;*/ - color: #606060; + color: #606060; overflow-x: hidden; padding: 15px; - min-height: 450px; + min-height: 600px; } /* from bootstrap */ @@ -236,12 +285,14 @@ div.std-footer-item { .avatar-small { display: inline-block; - min-width: 29px; + width: 24px; + height: 20px; + vertical-align: middle; + overflow: hidden; + margin: 0px 3px; } .avatar-small img { - height: 24px; - margin-bottom: -7px; - max-width: 24px; + width: 24px; } /* @@ -448,6 +499,7 @@ h6 { * lib/css/bootstrap/buttons.css */ .close { + font-family: Helvetica, Sans; float: right; font-size: 20px; font-weight: bold; diff --git a/css/style-app.css b/css/style-app.css deleted file mode 100644 index f5447cf80dc..00000000000 --- a/css/style-app.css +++ /dev/null @@ -1,1850 +0,0 @@ - -/* - * lib/css/legacy/body.css - */html { - margin: 0px; - padding: 0px; -} - -body { - margin: 0px; - padding: 0px; - font-family: Arial, Helvetica, Sans; - font-size: 12px; - color: #000; -} - -/* heading from bootstrap */ - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-weight: bold; - color: #333333; - text-rendering: optimizelegibility; - margin-bottom: 0.3em; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, h5, h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} - -pre { margin: 0px; padding: 0px; } - -button { margin: 2px; margin-left: 0px; } - -label { - padding-top: 15px; - color: #404040; -} - -select, input, textarea { - border: 1px solid #AAA; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - font-size: 13px; - padding: 4px; - color: #222; -} - -textarea { - font-family: inherit; - height: 120px; - width: 90%; - font-size: 12px; - white-space: normal; -} - -table { padding: 0px; border-collapse: 'collapse'} - -td { - padding:0px; - margin: 0px; - vertical-align: top; -} - -p { - margin: 0px 0px 9px 0px; - line-height: 1.5em; -} - -li { - line-height: 1.5em; -} - -a:active { outline:none; } - -:focus { -moz-outline-style:none; } - -table.simpletable { border-collapse: collapse; margin-bottom: 10px;} -table.simpletable td {border: 1pt solid #000; vertical-align: top; padding: 2px; } - -div.fix_ff_cursor { overflow: auto; } - -/* --- Layout --- */ - -div.comment { color: #444; } - -div#body_div { - position: relative; - display: none; - margin-top: 56px; - padding-right: 7px; -} - -div.no_script { - display: none; -} - -div.loading_div { - position: absolute; - background-color: #FFFFCC; - z-index: 1999; - right: 5px; - width: 90px; - display: none; - text-align: center; - padding: 2px; - font-size: 12px; - border: 1px solid #FF4; -} - - -div#head_div { background-color: #FFF; } - -#head_banner { background-color: #FFF; } - -.link_type { - padding:2px; - color: #00b; - text-decoration: underline; - cursor: pointer; -} - -.link_type:hover { - color: #fff !important; - background-color: #07b; - text-decoration: none; -} - -div.std-footer { - margin: 13px 0px; - border-top: 1px solid #AAA; - padding: 13px; -} - -div.std-footer-item { - margin: 0px 13px 13px 0px; -} - -.shadow { - -moz-box-shadow: 0px 2px 2px #888; - -webkit-box-shadow: 0px 2px 2px #888; - box-shadow: 0px 2px 2px #888; -} - -.round { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.gradient { - background: #ededed; /* Old browsers */ - background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */ -} - -.header-gradient { - background: #84827c; /* Old browsers */ - background: -moz-linear-gradient(top, #84827c 0%, #27211c 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#84827c), color-stop(100%,#27211c)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #84827c 0%,#27211c 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #84827c 0%,#27211c 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #84827c 0%,#27211c 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#84827c', endColorstr='#27211c',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #84827c 0%,#27211c 100%); /* W3C */ - color: #FFF; -} - -.layout_wrapper { - padding: 15px; - -moz-box-shadow: 1px 1px 6px #AAA; - -webkit-box-shadow: 1px 1px 6px #AAA; - box-shadow: 1px 1px 6px #AAA; - background-color: #FFF; -} - -/* from bootstrap */ -.container { - margin-left: auto; - margin-right: auto; - zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; - zoom: 1; -} -.container:after { - clear: both; -} - -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; -} - -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } -/* - * lib/css/legacy/messages.css - */ -/* FLOATING MESSAGE */ - -.btn-img { cursor: pointer; } - -div.fetching { color: #888; text-align:right; } - -div.notice { - postion: absolute; - background-color: #000; - -moz-border-radius: 5px; -webkit-border-radius: 5px; - opacity: 0.6; - right: 0; - top: 0; - margin-top: 8px; - z-index: -1; - padding: 8px; -} - -/** help **/ - -.info-box { - background-color: #F8F8F8; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - line-height: 1.6em; - overflow: auto; - padding: 6px 10px; - margin-bottom: 9px; -} - -.help_box, .help-box { - background-color:#FFC; - font-size: 13px; - color: #864; - padding: 7px; - margin: 11px 0px; - border: 1px solid #EEB; -} - -.help_box_big { - background-color:#FFC; - color: #864; - padding: 7px; - margin: 7px 0px; - border: 1px solid #EEB; - text-align: center; - font-size: 14px; -} -/* - * lib/css/legacy/forms.css - *//* FORMS */ - - -div.frm_print_wrapper { - background-color:#FFF; - border:1px solid #444; - padding: 40px; - - box-shadow:1px 1px 8px #229; - -moz-box-shadow: 1px 1px 8px #229; - -webkit-box-shadow: 1px 1px 8px #229; -} - -div.page_break { - margin: 24px 0px; - border-top: 1px dashed #888; -} - -div.grid_tbarlinks { - border-bottom: 0px; - background-color: #CCC; - padding: 4px 4px 2px 4px; - width: 180px; - float: right; - - -moz-border-radius-topleft: 5px; -moz-border-radius-topright: 5px; - -webkit-border-top-left-radius: 5px; -webkit-border-top-right-radius: 5px; -} - - -div.frm_tip_box { - margin: 0px; - padding: 8px; - background-color: #FFC; - display: none; - font-size: 11px; - border: 1px solid #FFB; -} - -div.frm_tip_box table { - border-collapse: collapse; - vertical-align: top; -} - -td.frm_tray_area { - width: 122px; -} - -div.dialog_frm { - position: relative; - margin: 10px; -} - - - -/*------------------*/ - -.top_cell { - height: 50px; -} - -div.attach_area { - padding: 8px; - margin: 8px; - background-color: #EEE; -} - -div.attach_area table { - width: 100%; -} - -.tablabel_normal { - margin: 0 4px 0 0; - padding: 3px 5px; - line-height: 1.3em; - display: inline; - cursor: pointer; -} - -.tablabel_selected { - margin: 0 4px 0 0; - padding: 3px 5px; - line-height: 1.3em; - font-weight: bold; - display: inline; - cursor: pointer; - color: #000; -} - -.scrollhead_wrapper { - position: absolute; - z-index: 1; - height: 30px; -} - -.treeimg { - cursor: pointer; - margin-right: 3px; -} - - -.sectionCell { - padding: 5px; - vertical-align: top; -} - -.code_area { - width: 80%; - margin: 8px; - padding: 4px; - background-color: #F8F8F8; - border: 1px solid #CCC; - overflow-x: auto; -} - -.code_text { - width: 100%; - height: 360px; - margin-top: 3px; - font-family: Courier, Fixed; - font-size: 12px; -} - -div.time_field select{ - display: inline; - margin: 2px; - width: 45px; -} - -/* Documents */ - -.frm_field_table { - width: 100%; - border-collapse: collapse; -} - -.datalabelcell { - padding: 2px 0px; - width: 160px; - vertical-align: top; -} -.datainputcell { padding: 2px 0px; } - - -.field_description, .help { - margin: 3px 0px 11px 0px; - color: #888; - font-style: italic; -} - -.field_description_top { - margin-bottom: 3px; -} - -.field_label { - font-size:11px; -} -.input_area input, select, textarea { - font-size: 14px; - padding: 2px; -} - -.input_area input { - width: 80%; - margin: 0px; -} -.input_area select { - width: 80%; -} -.input_area textarea { - width: 90%; -} - -.disp_area { - width: 80%; - padding: 2px 0px; - font-size: 12px; -} -.disp_area_no_val { - height: 14px; -} - -.no_img { - padding: 40px; - width: 100px; - height: 20px; - color: #888; - text-align: center; - border: 1px solid #AAA; -} - -.input-mandatory { - font-size: 14px !important; - font-weight: bold; -} - -.field-to-update { - background-color:#FEE; -} - -/* sidebar */ - -div.sidebar-comment-wrapper input { - width: 50%; -} -div.sidebar-comment-message { - margin-top: 8px; - font-size: 11px; - color: #777; -} - -div.sidebar-comment-text { - font-size: 12px; - font-weight: bold; - margin-top: 8px; - color: #444; -} -div.sidebar-comment-info { - font-size: 10px; - color: #777; -} -/* - * lib/css/legacy/grid.css - */ - -/* Grid */ - - -/* --- Simple --- */ -.grid_wrapper_simple { - width: 100%; - margin-bottom: 8px; - border: 1px solid #AA9; -} - -.grid_head_wrapper_simple { - padding: 0px; - border-bottom: 2px solid #AAA; -} - -.grid_head_wrapper_simple td { - border-right: 1px solid #AA9; -} - -.grid_head_wrapper_simple td div { - padding: 2px; -} - -.grid_tab_wrapper_simple { -} - -.grid_cell_simple { - padding: 2px; - background-color: #fff; - border-right: 1px solid #AA9; -} - - -/* --- Normal --- */ -.grid_wrapper { - position: relative; - overflow: auto; - border: 1px solid #AAA; - width: 100%; - margin-bottom: 8px; - background-color: #fff; -} - -.grid_tab_wrapper { - position: absolute; - top: 40px; - border-bottom: 1px solid #DDD; -} - -.grid_table, .grid_head_table { - table-layout: fixed; - border-collapse: collapse; - /*width: 100%;*/ -} - -.grid_cell { - border-right: 1px solid #ddd; - padding: 0px; - background-color: #fff; -} - -.grid_head_wrapper { - position: absolute; - z-index: 1; - height: 40px; - padding: 0px; - overflow: hidden; - /*background-color: #fff;*/ -} - -.grid_head_table td { - background-color: #EEE; - border-right: 1px solid #AAA; - border-bottom: 1px solid #AAA; - height: 40px; - padding: 0px; -} - -.grid_head_table td div { - color: #222; - font-weight: bold; - overflow: hidden; - padding: 2px 0px; - text-align: center; -} - -.grid_selector { - padding: 1px; - border-right: 1px solid #DDD; - width: 20px; - background-color: #fff; -} - -.grid_cell_div { - padding: 2px; - cursor: pointer; - overflow: hidden; - border: 2px solid #FFF; -} - -.grid_cell_div_selected { - border: 2px solid #88f; -} - -.grid_cell_div input, .grid_cell_div select, .grid_cell_div div input { - margin: 0px; - border: 0px; - width: 100%; - margin: 0px; - } - -.grid_cell_div textarea { - border: 3px solid #abf; - height:200px; - width: 300px; - z-index: 10; - position:absolute; -} - -.gridDivSelected option { border: 0px; } -/* - * lib/css/legacy/listing.css - *//* listing 2.0 */ - -div.listing-more { - margin: 7px 0px 17px 0px; - text-align: center; - display: none; -} - -div.listing-toolbar { - margin: 7px 0px; -} - -/* SRS */ - -table.srs_result_tab { - border: 2px solid #AAA; - border-collapse: collapse; -} - -/* firefox bug fix for disappering borders */ -table.srs_result_tab td, table.srs_result_tab tr, table.srs_result_tab tbody, table.srs_result_tab div { - position: static; -} - -table.srs_result_tab td { - padding: 3px 2px; - position: static; -} - -div.srs_body_area { -} - -div.srs_results_area { -} - -div.srs_filter_wrapper { - border: 1px solid #CCF; - - background-color: #EEF; - margin:0px 0px 8px 0px; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -div.srs_filter_area { - padding: 8px; -} - -div.srs_filter_area td { - vertical-align: middle; -} - - - - -/* - * lib/css/legacy/report.css - */ -/* Reports */ - -div.report_grid_area { - position: relative; - padding: 8px; -} - - -div.report_tab { - border: 1px solid #AAA; - position: relative; - overflow: auto; -} - -div.report_no_data { - padding: 8px; - background-color: #EEE; - border: 1px solid #DDD; - position: absolute; - margin-left: 40%; - margin-top: 50px; - display: none; -} - -div.report_htitle { - float: left; - padding: 2px; - font-size: 14px; - font-weight: bold; - margin-left: 4px; - color: #665; - /*font-weight: bold;*/ -} - -div.report_tbar { - /*background: url('../images/ui/blue-back.gif') repeat-x; */ - background-color: #EEF; - border: 1px solid #CCF; - border-bottom: 0px; - height: 28px; -} - -div.report_tbar table{ - width: 100%; -} -div.report_tbar table td { - -} -div.report_tbar table td div { - position: relative; -} -div.report_tbar button, div.report_tbar select, div.report_tbar img { - font-size: 11px; - margin: 0px; -} - -div.report_head_wrapper { - position: absolute; - height: 24px; - top: 0px; - z-index: 1; -} - -div.report_tab_wrapper { - position: absolute; - border-bottom: 1px solid #AAA; - border-top: 1px solid #AAA; -} - -div.report_tab_wrapper table, div.report_head_wrapper table { - table-layout: fixed; - border-collapse: collapse; - /*width: 100%;*/ -} - -div.report_tab_wrapper table td, div.report_head_wrapper table td { - border-left: 1px solid #AAA; - border-right: 1px solid #AAA; - border-bottom: 1px solid #AAA; - overflow: hidden; - padding: 0px; -} - -div.report_tab_wrapper table td div, div.report_head_wrapper table td div { - padding: 3px; - overflow: hidden; -} - -.report_head_cell { - background-color: #EEE; - border-bottom: 1px solid #AA9; - text-align: center; - font-weight: bold; -} -.report_head_cell div { - color:#222; - height: 18px; -} - - -/* FINDER */ - -div.finder_wrapper { -} - -div.finder_body_area { - margin: 16px; -} - -div.finder_body { - display: none; -} - -div.finder_advanced_area table { - width: 80%; -} - -div.finder_advanced_area textarea { - width: 80%; -} - -div.finder_filter_area { - position: relative; -} - -div.filter_head { - font-size: 14px; - margin-bottom: 2px; -} -div.filter_dt_head { - font-size: 14px; - font-weight: bold; - margin-bottom: 2px; -} -table.filter_tab { - width: 96%; - border-collapse: collapse; -} - -table.filter_tab td { - width: 50%; -} - -div.finder_picker_area { - -} -div.builder_field { - margin: 0px; -} -div.builder_dt_head { - font-size: 14px; - font-weight: bold; - margin-bottom: 2px; -} - -div.builder_field table { - width: 90%; - border-collapse: collapse; -} - -div.builder_label { - height: 20px; -} - -div.builder_head { - font-size: 16px; - font-weight: bold; - color: #AB6; -} - -table.builder_tab { - width: 96%; - border-collapse: collapse; -} - -table.builder_tab td { - width: 33%; - padding: 2px; -} -/* - * lib/css/legacy/calendar.css - *//**** CALENDAR ****/ - -.caldiv { - position:absolute; - visibility:hidden; - background-color:white; - width: 144px; - z-index: 301; /* always on top(?) */ -} - - - -div.cal_wrapper { } -div.cal_body { - margin: 16px; - background-color: #DDD; - position: relative; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.cal_head { - margin: 16px; - margin-bottom: 0px; -} -div.cal_head div { - font-size: 18px; - color: #666; - padding-top: 8px; -} - -div.cal_view_body { - margin: 16px; -} - -div.cal_view_body_plain { - margin: 16px; -} - -div.cal_month_head { -} - -div.cal_month_body { - border-top: 1px solid #888; -} - -.cal_month_headtable { - /*table-layout:fixed;*/ - width: 100%; -} - -.cal_month_name { - width: 100%; - color: #888; - font-size: 14px; - font-weight: bold; - text-align: center; - padding: 4px; -} - -.cal_month_headtable tr td{ - font-size: 12px; - font-weight: bold; - text-align: center; - padding: 4px; -} - -table.cal_month_table { - border-collapse: collapse; - /*table-layout:fixed;*/ - height: 100%; - width: 100%; -} - -table.cal_month_table td { - width: 14.29%; - height: 20%; - /*overflow:hidden;*/ - padding:0px; -} - -div.cal_month_date { - width:100%; - height:25%; - font-size: 10px; - overflow:hidden; - /*background-color: #EEF;*/ -} - -div.cal_month_date_holiday { - /*background-color: #FFF;*/ -} - -div.cal_month_unit { - width:100%; - height:75%; - overflow:hidden; - cursor:pointer; - /*background-color:#FFF;*/ -} - -div.cal_vu_disabled { - background-color:#FFF; - cursor:default; -} - -table.cal_day_table { - border-collapse: collapse; - width: 100%; -} - -table.cal_day_table td { -} - -div.cal_day_body { - width: 100%; - height: 80%; - overflow-y: auto; - overflow-x: hidden; - border-top: 1px solid #AAA; -} - -div.cal_day_unit{ - width:100%; - cursor:pointer; -} - -table.cal_week_table { - border-collapse: collapse; - width: 100%; -} - -table.cal_week_table td { - width: 12.5%; -} - -div.cal_week_body { - width: 100%; - height: 80%; - overflow-y: auto; - overflow-x: hidden; - border-top: 1px solid #888; -} - -div.cal_week_unit{ - width: 100%; - cursor:pointer; -} - -div.cal_event { - width: 100%; - height: 12px; - overflow: hidden; - font-size: 11px; - color: #00B; - margin-bottom: 2px; - text-decoration: underline; -} - -div.cal_event_Public { - color: GREEN; -} - -div.cal_event_Private { - color: BLUE; -} - -div.cal_event_hover { - text-decoration: underline; -} - -/* - * lib/css/legacy/autosuggest.css - *//* -================================================ -autosuggest, inquisitor style -================================================ -*/ - -div.autosuggest -{ - position: absolute; - margin-top: 3px; - border: 1px solid #222; -} - -div.autosuggest ul -{ - list-style: none; - margin: 0px; - padding: 2px; - overflow: hidden; - background-color: #FFF; -} - -div.autosuggest ul li -{ - color: #444; - padding: 0; - margin: 0; - text-align: left; -} - -div.autosuggest ul li a -{ - color: #444; - display: block; - text-decoration: none; - position: relative; - padding: 0; - width: 100%; -} -div.autosuggest ul li a:hover -{ - -} -div.autosuggest ul li.as_highlight a:hover -{ - background-color: #45A; - color: #FFF; -} - -div.autosuggest ul li a span -{ - display: block; - padding: 3px 6px; - color: #444; - border-bottom:1px solid #DDD; -} - -div.autosuggest ul li a span small -{ - display: block; - font-weight: normal; - color: #444; -} - -div.autosuggest ul li.as_highlight a span small -{ - color: #FFF; -} - -div.autosuggest ul li.as_highlight a span { - color: #FFF; -} - -div.autosuggest ul li.as_highlight a -{ - color: #FFF; - background-color: #45A; - cursor: pointer; -} - -div.autosuggest ul li.as_warning -{ - font-weight: bold; - text-align: center; -} - -div.autosuggest ul em -{ - font-style: normal; - font-weight: bold; -} - -/* - * lib/css/legacy/dialog.css - *//***** Dialogs *******/ - -div.dialog_wrapper { - position: absolute; - width: 440px; - display: none; - z-index: 90; - background-color: #FFF; - border: 3px solid #222; - box-shadow:1px 1px 5px #777; - -moz-box-shadow: 1px 1px 5px #777; - -webkit-box-shadow: 1px 1px 5px #777; - - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.dialog_head { - height: 22px; - padding: 4px; - background-color: #222; - color: #FFF; -} - -div.dialog_body { - padding: 8px 4px 16px 4px; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.dialog_back { - position: fixed; - display: none; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; - background-color: #EEE; - opacity: 0.6; - z-index: 50; - text-align: center; -} - -div.dialog_message { - display: none; - position: absolute; - width: 250px; - font-size: 12px; - z-index: 91; - background-color:#FFF; - padding: 12px; - border: 1px solid #444; -} - -div.dialog_row { - padding: 8px 8px 0px 8px; -} - -div.dialog_row table { - width: 100%; -} - -div.dialog_row table td { -} - -div.dialog_row input[type="text"], div.dialog_row input[type="password"], div.dialog_row textarea, div.dialog_row select { - width: 80%; - font-size: 14px; -} - -div.dialog_row table td textarea { - width: 80%; - height: 200px; - font-size: 12px; -} - -/* - * lib/css/legacy/tabs.css - */ -/******* TABS ********/ - -div.box_label_wrapper { - border-bottom: 6px solid #777; -} - -div.box_label_body { - height: 22px; -} - -ul.box_tabs { - margin: 0px; - padding: 0px; - list-style: none; -} - -ul.box_tabs li { - height: 22px; - float:left; - font-size: 12px; - text-decoration: underline; - - background-color: #DDD; - - margin:0; - margin-left: 4px; - padding:0 0 0 9px; - cursor: pointer; -} - -ul.box_tabs a { - display:block; - padding:3px 15px 3px 6px; - text-decoration:none; -} - -ul.box_tabs li.box_tab_mouseover { - background-color: #BBB; -} - - -ul.box_tabs li.box_tab_selected { -/* background:url("../images/ui/rc/tab-left-CCC.gif") no-repeat left top; - background-color: #ABABAB; */ - - background-color: #777; - - background: -webkit-gradient(linear, left top, left bottom, from(#999), to(#777)); - background: -moz-linear-gradient(top, #999, #777); - - color: #FFF; - font-weight:bold; - -} -ul.box_tabs li.box_tab_selected a { -/* background:url("../images/ui/rc/tab-right-CCC.gif") no-repeat right top; */ -} - -/* - * lib/css/legacy/bw-icons.css - */ -/** general icons **/ - -.wn-icon { background: url('lib/images/icons/icons.png'); width: 16px; height: 16px; cursor: pointer; } -.ic-2x2_grid { background-position: 0 0; } -.ic-3x3_grid { background-position: 0 -36px; } -.ic-3x3_grid_2 { background-position: 0 -72px; } -.ic-air_signal { background-position: 0 -108px; } -.ic-align_center { background-position: 0 -144px; } -.ic-align_just { background-position: 0 -180px; } -.ic-align_left { background-position: 0 -216px; } -.ic-align_right { background-position: 0 -252px; } -.ic-app_window { background-position: 0 -288px; } -.ic-arrow_bottom { background-position: 0 -324px; } -.ic-arrow_bottom_left { background-position: 0 -360px; } -.ic-arrow_bottom_right { background-position: 0 -396px; } -.ic-arrow_l { background-position: 0 -432px; } -.ic-arrow_left { background-position: 0 -468px; } -.ic-arrow_r { background-position: 0 -504px; } -.ic-arrow_right { background-position: 0 -540px; } -.ic-arrow_top { background-position: 0 -576px; } -.ic-arrow_top_left { background-position: 0 -612px; } -.ic-arrow_top_right { background-position: 0 -648px; } -.ic-arrow_two_head { background-position: 0 -684px; } -.ic-arrow_two_head_2 { background-position: 0 -720px; } -.ic-attention { background-position: 0 -756px; } -.ic-battery { background-position: 0 -792px; } -.ic-bell { background-position: 0 -828px; } -.ic-book { background-position: 0 -864px; } -.ic-bookmark_1 { background-position: 0 -900px; } -.ic-bookmark_2 { background-position: 0 -936px; } -.ic-box { background-position: 0 -972px; } -.ic-br_down { background-position: 0 -1008px; } -.ic-br_next { background-position: 0 -1044px; } -.ic-br_prev { background-position: 0 -1080px; } -.ic-br_up { background-position: 0 -1116px; } -.ic-brackets { background-position: 0 -1152px; } -.ic-browser { background-position: 0 -1188px; } -.ic-brush { background-position: 0 -1224px; } -.ic-bug { background-position: 0 -1260px; } -.ic-burst { background-position: 0 -1296px; } -.ic-calc { background-position: 0 -1332px; } -.ic-calendar_1 { background-position: 0 -1368px; } -.ic-calendar_2 { background-position: 0 -1404px; } -.ic-cancel { background-position: 0 -1440px; } -.ic-case { background-position: 0 -1476px; } -.ic-cc { background-position: 0 -1512px; } -.ic-cert { background-position: 0 -1548px; } -.ic-chart_bar { background-position: 0 -1584px; } -.ic-chart_line { background-position: 0 -1620px; } -.ic-chart_line_2 { background-position: 0 -1656px; } -.ic-chart_pie { background-position: 0 -1692px; } -.ic-checkbox_checked { background-position: 0 -1728px; } -.ic-checkbox_unchecked { background-position: 0 -1764px; } -.ic-checkmark { background-position: 0 -1800px; } -.ic-clip { background-position: 0 -1836px; } -.ic-clipboard_copy { background-position: 0 -1872px; } -.ic-clipboard_cut { background-position: 0 -1908px; } -.ic-clipboard_past { background-position: 0 -1944px; } -.ic-clock { background-position: -36px 0; } -.ic-cloud { background-position: -36px -36px; } -.ic-cloud_rain { background-position: -36px -72px; } -.ic-cog { background-position: -36px -108px; } -.ic-comp { background-position: -36px -144px; } -.ic-compass { background-position: -36px -180px; } -.ic-contact_card { background-position: -36px -216px; } -.ic-cube { background-position: -36px -252px; } -.ic-cur_bp { background-position: -36px -288px; } -.ic-cur_dollar { background-position: -36px -324px; } -.ic-cur_euro { background-position: -36px -360px; } -.ic-cur_yen { background-position: -36px -396px; } -.ic-cursor_H_split { background-position: -36px -432px; } -.ic-cursor_V_split { background-position: -36px -468px; } -.ic-cursor_arrow { background-position: -36px -504px; } -.ic-cursor_drag_arrow { background-position: -36px -540px; } -.ic-cursor_drag_arrow_2 { background-position: -36px -576px; } -.ic-cursor_drag_hand { background-position: -36px -612px; } -.ic-cursor_hand { background-position: -36px -648px; } -.ic-db { background-position: -36px -684px; } -.ic-delete { background-position: -36px -720px; } -.ic-doc_delete { background-position: -36px -756px; } -.ic-doc_edit { background-position: -36px -792px; } -.ic-doc_empty { background-position: -36px -828px; } -.ic-doc_export { background-position: -36px -864px; } -.ic-doc_import { background-position: -36px -900px; } -.ic-doc_lines { background-position: -36px -936px; } -.ic-doc_lines_stright { background-position: -36px -972px; } -.ic-doc_minus { background-position: -36px -1008px; } -.ic-doc_new { background-position: -36px -1044px; } -.ic-doc_plus { background-position: -36px -1080px; } -.ic-document { background-position: -36px -1116px; } -.ic-download { background-position: -36px -1152px; } -.ic-emotion_sad { background-position: -36px -1188px; } -.ic-emotion_smile { background-position: -36px -1224px; } -.ic-expand { background-position: -36px -1260px; } -.ic-eye { background-position: -36px -1296px; } -.ic-eye_inv { background-position: -36px -1332px; } -.ic-facebook { background-position: -36px -1368px; } -.ic-filter { background-position: -36px -1404px; } -.ic-fire { background-position: -36px -1440px; } -.ic-flag { background-position: -36px -1476px; } -.ic-folder { background-position: -36px -1512px; } -.ic-folder_arrow { background-position: -36px -1548px; } -.ic-folder_delete { background-position: -36px -1584px; } -.ic-folder_minus { background-position: -36px -1620px; } -.ic-folder_open { background-position: -36px -1656px; } -.ic-folder_plus { background-position: -36px -1692px; } -.ic-font_bold { background-position: -36px -1728px; } -.ic-font_italic { background-position: -36px -1764px; } -.ic-font_size { background-position: -36px -1800px; } -.ic-font_strokethrough { background-position: -36px -1836px; } -.ic-font_underline { background-position: -36px -1872px; } -.ic-game_pad { background-position: -36px -1908px; } -.ic-globe_1 { background-position: -36px -1944px; } -.ic-globe_2 { background-position: -72px 0; } -.ic-globe_3 { background-position: -72px -36px; } -.ic-google { background-position: -72px -72px; } -.ic-hand_1 { background-position: -72px -108px; } -.ic-hand_2 { background-position: -72px -144px; } -.ic-hand_contra { background-position: -72px -180px; } -.ic-hand_pro { background-position: -72px -216px; } -.ic-headphones { background-position: -72px -252px; } -.ic-heart { background-position: -72px -288px; } -.ic-heart_empty { background-position: -72px -324px; } -.ic-home { background-position: -72px -360px; } -.ic-image_text { background-position: -72px -396px; } -.ic-inbox { background-position: -72px -432px; } -.ic-indent_decrease { background-position: -72px -468px; } -.ic-indent_increase { background-position: -72px -504px; } -.ic-info { background-position: -72px -540px; } -.ic-iphone { background-position: -72px -576px; } -.ic-key { background-position: -72px -612px; } -.ic-layers_1 { background-position: -72px -648px; } -.ic-layers_2 { background-position: -72px -684px; } -.ic-lightbulb { background-position: -72px -720px; } -.ic-lighting { background-position: -72px -756px; } -.ic-link { background-position: -72px -792px; } -.ic-list_bullets { background-position: -72px -828px; } -.ic-list_num { background-position: -72px -864px; } -.ic-magic_wand { background-position: -72px -900px; } -.ic-mail { background-position: -72px -936px; } -.ic-mail_2 { background-position: -72px -972px; } -.ic-mic { background-position: -72px -1008px; } -.ic-monitor { background-position: -72px -1044px; } -.ic-movie { background-position: -72px -1080px; } -.ic-music { background-position: -72px -1116px; } -.ic-net_comp { background-position: -72px -1152px; } -.ic-network { background-position: -72px -1188px; } -.ic-notepad { background-position: -72px -1224px; } -.ic-notepad_2 { background-position: -72px -1260px; } -.ic-on-off { background-position: -72px -1296px; } -.ic-openid { background-position: -72px -1332px; } -.ic-padlock_closed { background-position: -72px -1368px; } -.ic-padlock_open { background-position: -72px -1404px; } -.ic-page_layout { background-position: -72px -1440px; } -.ic-paragraph { background-position: -72px -1476px; } -.ic-pencil { background-position: -72px -1512px; } -.ic-phone { background-position: -72px -1548px; } -.ic-phone_1 { background-position: -72px -1584px; } -.ic-phone_2 { background-position: -72px -1620px; } -.ic-phone_touch { background-position: -72px -1656px; } -.ic-photo { background-position: -72px -1692px; } -.ic-picture { background-position: -72px -1728px; } -.ic-pin { background-position: -72px -1764px; } -.ic-pin_2 { background-position: -72px -1800px; } -.ic-pin_map { background-position: -72px -1836px; } -.ic-pin_map_down { background-position: -72px -1872px; } -.ic-pin_map_left { background-position: -72px -1908px; } -.ic-pin_map_right { background-position: -72px -1944px; } -.ic-pin_map_top { background-position: -108px 0; } -.ic-pin_sq_down { background-position: -108px -36px; } -.ic-pin_sq_left { background-position: -108px -72px; } -.ic-pin_sq_right { background-position: -108px -108px; } -.ic-pin_sq_top { background-position: -108px -144px; } -.ic-playback_ff { background-position: -108px -180px; } -.ic-playback_next { background-position: -108px -216px; } -.ic-playback_pause { background-position: -108px -252px; } -.ic-playback_play { background-position: -108px -288px; } -.ic-playback_prev { background-position: -108px -324px; } -.ic-playback_rec { background-position: -108px -360px; } -.ic-playback_reload { background-position: -108px -396px; } -.ic-playback_rew { background-position: -108px -432px; } -.ic-playback_stop { background-position: -108px -468px; } -.ic-preso { background-position: -108px -504px; } -.ic-print { background-position: -108px -540px; } -.ic-question { background-position: -108px -576px; } -.ic-redo { background-position: -108px -612px; } -.ic-rnd_br_down { background-position: -108px -648px; } -.ic-rnd_br_first { background-position: -108px -684px; } -.ic-rnd_br_last { background-position: -108px -720px; } -.ic-rnd_br_next { background-position: -108px -756px; } -.ic-rnd_br_prev { background-position: -108px -792px; } -.ic-rnd_br_up { background-position: -108px -828px; } -.ic-round { background-position: -108px -864px; } -.ic-round_and_up { background-position: -108px -900px; } -.ic-round_arrow_left { background-position: -108px -936px; } -.ic-round_arrow_right { background-position: -108px -972px; } -.ic-round_checkmark { background-position: -108px -1008px; } -.ic-round_delete { background-position: -108px -1044px; } -.ic-round_minus { background-position: -108px -1080px; } -.ic-round_plus { background-position: -108px -1116px; } -.ic-rss { background-position: -108px -1152px; } -.ic-rss_sq { background-position: -108px -1188px; } -.ic-sand { background-position: -108px -1224px; } -.ic-sat_dish { background-position: -108px -1260px; } -.ic-save { background-position: -108px -1296px; } -.ic-server { background-position: -108px -1332px; } -.ic-share { background-position: -108px -1368px; } -.ic-shop_cart { background-position: -108px -1404px; } -.ic-sound_high { background-position: -108px -1440px; } -.ic-sound_low { background-position: -108px -1476px; } -.ic-sound_mute { background-position: -108px -1512px; } -.ic-spechbubble { background-position: -108px -1548px; } -.ic-spechbubble_2 { background-position: -108px -1584px; } -.ic-spechbubble_sq { background-position: -108px -1620px; } -.ic-spechbubble_sq_line { background-position: -108px -1656px; } -.ic-sq_br_down { background-position: -108px -1692px; } -.ic-sq_br_first { background-position: -108px -1728px; } -.ic-sq_br_last { background-position: -108px -1764px; } -.ic-sq_br_next { background-position: -108px -1800px; } -.ic-sq_br_prev { background-position: -108px -1836px; } -.ic-sq_br_up { background-position: -108px -1872px; } -.ic-sq_down { background-position: -108px -1908px; } -.ic-sq_minus { background-position: -108px -1944px; } -.ic-sq_next { background-position: -144px 0; } -.ic-sq_plus { background-position: -144px -36px; } -.ic-sq_prev { background-position: -144px -72px; } -.ic-sq_up { background-position: -144px -108px; } -.ic-square_shape { background-position: -144px -144px; } -.ic-star { background-position: -144px -180px; } -.ic-star_fav { background-position: -144px -216px; } -.ic-star_fav_empty { background-position: -144px -252px; } -.ic-sun { background-position: -144px -288px; } -.ic-tag { background-position: -144px -324px; } -.ic-tape { background-position: -144px -360px; } -.ic-target { background-position: -144px -396px; } -.ic-text_curstor { background-position: -144px -432px; } -.ic-text_letter_t { background-position: -144px -468px; } -.ic-top_right_expand { background-position: -144px -504px; } -.ic-trash { background-position: -144px -540px; } -.ic-twitter { background-position: -144px -576px; } -.ic-twitter_2 { background-position: -144px -612px; } -.ic-undo { background-position: -144px -648px; } -.ic-user { background-position: -144px -684px; } -.ic-users { background-position: -144px -720px; } -.ic-wrench { background-position: -144px -756px; } -.ic-wrench_plus { background-position: -144px -792px; } -.ic-wrench_plus_2 { background-position: -144px -828px; } -.ic-zoom { background-position: -144px -864px; } - - -/* - * lib/css/legacy/sidebar.css - */div.psidebar-wrapper { - margin: 0px 8px; -} - -div.psidebar-head { - font-size: 14px; - font-weight: bold; - color: #555; - margin-bottom: 12px; -} - -div.psidebar-section { - background-color: #fff; - border: 1px solid #b2b2b7; - margin-bottom: 11px; - overflow: hidden; -} - -div.psidebar-section-head { - font-size: 12px; - padding: 5px 11px; - background: #eeeeee; /* Old browsers */ - background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */ - background: linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */ -} - -div.psidebar-section-body { - margin: 7px 11px 11px 11px; -} - -div.psidebar-section-item { - margin-bottom: 7px; -} - -.psidebar-section-link { - font-size: 11px; - color: #666; -} - -div.follower-list { - color: #666; - margin-top: 7px; - font-size: 11px; -} -/* - * lib/css/legacy/bootstrap-buttons.css - */.btn.danger, -.alert-message.danger, -.btn.danger:hover, -.alert-message.danger:hover, -.btn.error, -.alert-message.error, -.btn.error:hover, -.alert-message.error:hover, -.btn.success, -.alert-message.success, -.btn.success:hover, -.alert-message.success:hover, -.btn.info, -.alert-message.info, -.btn.info:hover, -.alert-message.info:hover { - color: #ffffff; -} -.btn .close, .alert-message .close { - font-family: Arial, sans-serif; - line-height: 18px; -} -.btn.danger, -.alert-message.danger, -.btn.error, -.alert-message.error { - background-color: #c43c35; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #c43c35 #c43c35 #882a25; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.success, .alert-message.success { - background-color: #57a957; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #57a957 #57a957 #3d773d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.info, .alert-message.info { - background-color: #339bb9; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #339bb9 #339bb9 #22697d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn { - cursor: pointer; - display: inline-block; - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 11px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; -} -.btn:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; -} -.btn:focus { - outline: 1px dotted #666; -} -.btn.primary { - color: #ffffff; - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.active, .btn :active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn.disabled { - cursor: default; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn[disabled] { - cursor: default; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn.large { - font-size: 15px; - line-height: normal; - padding: 9px 14px 9px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.btn.small { - padding: 5px 7px 5px; - font-size: 11px; -} -:root .alert-message, :root .btn { - border-radius: 0 \0; -} -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -/* CLose */ - -.close { - float: right; - color: #000000; - font-size: 15px; - font-weight: bold; - line-height: 13.5px; - margin-bottom: -2px; - text-shadow: 0 1px 0 #ffffff; - filter: alpha(opacity=25); - -khtml-opacity: 0.25; - -moz-opacity: 0.25; - opacity: 0.25; - text-decoration: none; -} -.close:hover { - color: #000000; - text-decoration: none; - filter: alpha(opacity=40); - -khtml-opacity: 0.4; - -moz-opacity: 0.4; - opacity: 0.4; - cursor: pointer; - font-weight: bold; -} \ No newline at end of file diff --git a/css/style-web.css b/css/style-web.css deleted file mode 100644 index a80fa2d31da..00000000000 --- a/css/style-web.css +++ /dev/null @@ -1,629 +0,0 @@ - -/* - * lib/css/legacy/body.css - */html { - margin: 0px; - padding: 0px; -} - -body { - margin: 0px; - padding: 0px; - font-family: Arial, Helvetica, Sans; - font-size: 12px; - color: #000; -} - -/* heading from bootstrap */ - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-weight: bold; - color: #333333; - text-rendering: optimizelegibility; - margin-bottom: 0.3em; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, h5, h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} - -pre { margin: 0px; padding: 0px; } - -button { margin: 2px; margin-left: 0px; } - -label { - padding-top: 15px; - color: #404040; -} - -select, input, textarea { - border: 1px solid #AAA; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - font-size: 13px; - padding: 4px; - color: #222; -} - -textarea { - font-family: inherit; - height: 120px; - width: 90%; - font-size: 12px; - white-space: normal; -} - -table { padding: 0px; border-collapse: 'collapse'} - -td { - padding:0px; - margin: 0px; - vertical-align: top; -} - -p { - margin: 0px 0px 9px 0px; - line-height: 1.5em; -} - -li { - line-height: 1.5em; -} - -a:active { outline:none; } - -:focus { -moz-outline-style:none; } - -table.simpletable { border-collapse: collapse; margin-bottom: 10px;} -table.simpletable td {border: 1pt solid #000; vertical-align: top; padding: 2px; } - -div.fix_ff_cursor { overflow: auto; } - -/* --- Layout --- */ - -div.comment { color: #444; } - -div#body_div { - position: relative; - display: none; - margin-top: 56px; - padding-right: 7px; -} - -div.no_script { - display: none; -} - -div.loading_div { - position: absolute; - background-color: #FFFFCC; - z-index: 1999; - right: 5px; - width: 90px; - display: none; - text-align: center; - padding: 2px; - font-size: 12px; - border: 1px solid #FF4; -} - - -div#head_div { background-color: #FFF; } - -#head_banner { background-color: #FFF; } - -.link_type { - padding:2px; - color: #00b; - text-decoration: underline; - cursor: pointer; -} - -.link_type:hover { - color: #fff !important; - background-color: #07b; - text-decoration: none; -} - -div.std-footer { - margin: 13px 0px; - border-top: 1px solid #AAA; - padding: 13px; -} - -div.std-footer-item { - margin: 0px 13px 13px 0px; -} - -.shadow { - -moz-box-shadow: 0px 2px 2px #888; - -webkit-box-shadow: 0px 2px 2px #888; - box-shadow: 0px 2px 2px #888; -} - -.round { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.gradient { - background: #ededed; /* Old browsers */ - background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */ -} - -.header-gradient { - background: #84827c; /* Old browsers */ - background: -moz-linear-gradient(top, #84827c 0%, #27211c 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#84827c), color-stop(100%,#27211c)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #84827c 0%,#27211c 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #84827c 0%,#27211c 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #84827c 0%,#27211c 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#84827c', endColorstr='#27211c',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #84827c 0%,#27211c 100%); /* W3C */ - color: #FFF; -} - -.layout_wrapper { - padding: 15px; - -moz-box-shadow: 1px 1px 6px #AAA; - -webkit-box-shadow: 1px 1px 6px #AAA; - box-shadow: 1px 1px 6px #AAA; - background-color: #FFF; -} - -/* from bootstrap */ -.container { - margin-left: auto; - margin-right: auto; - zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; - zoom: 1; -} -.container:after { - clear: both; -} - -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; -} - -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } -/* - * lib/css/legacy/messages.css - */ -/* FLOATING MESSAGE */ - -.btn-img { cursor: pointer; } - -div.fetching { color: #888; text-align:right; } - -div.notice { - postion: absolute; - background-color: #000; - -moz-border-radius: 5px; -webkit-border-radius: 5px; - opacity: 0.6; - right: 0; - top: 0; - margin-top: 8px; - z-index: -1; - padding: 8px; -} - -/** help **/ - -.info-box { - background-color: #F8F8F8; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - line-height: 1.6em; - overflow: auto; - padding: 6px 10px; - margin-bottom: 9px; -} - -.help_box, .help-box { - background-color:#FFC; - font-size: 13px; - color: #864; - padding: 7px; - margin: 11px 0px; - border: 1px solid #EEB; -} - -.help_box_big { - background-color:#FFC; - color: #864; - padding: 7px; - margin: 7px 0px; - border: 1px solid #EEB; - text-align: center; - font-size: 14px; -} -/* - * lib/css/legacy/dialog.css - *//***** Dialogs *******/ - -div.dialog_wrapper { - position: absolute; - width: 440px; - display: none; - z-index: 90; - background-color: #FFF; - border: 3px solid #222; - box-shadow:1px 1px 5px #777; - -moz-box-shadow: 1px 1px 5px #777; - -webkit-box-shadow: 1px 1px 5px #777; - - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.dialog_head { - height: 22px; - padding: 4px; - background-color: #222; - color: #FFF; -} - -div.dialog_body { - padding: 8px 4px 16px 4px; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.dialog_back { - position: fixed; - display: none; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; - background-color: #EEE; - opacity: 0.6; - z-index: 50; - text-align: center; -} - -div.dialog_message { - display: none; - position: absolute; - width: 250px; - font-size: 12px; - z-index: 91; - background-color:#FFF; - padding: 12px; - border: 1px solid #444; -} - -div.dialog_row { - padding: 8px 8px 0px 8px; -} - -div.dialog_row table { - width: 100%; -} - -div.dialog_row table td { -} - -div.dialog_row input[type="text"], div.dialog_row input[type="password"], div.dialog_row textarea, div.dialog_row select { - width: 80%; - font-size: 14px; -} - -div.dialog_row table td textarea { - width: 80%; - height: 200px; - font-size: 12px; -} - -/* - * lib/css/legacy/bootstrap-buttons.css - */.btn.danger, -.alert-message.danger, -.btn.danger:hover, -.alert-message.danger:hover, -.btn.error, -.alert-message.error, -.btn.error:hover, -.alert-message.error:hover, -.btn.success, -.alert-message.success, -.btn.success:hover, -.alert-message.success:hover, -.btn.info, -.alert-message.info, -.btn.info:hover, -.alert-message.info:hover { - color: #ffffff; -} -.btn .close, .alert-message .close { - font-family: Arial, sans-serif; - line-height: 18px; -} -.btn.danger, -.alert-message.danger, -.btn.error, -.alert-message.error { - background-color: #c43c35; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #c43c35 #c43c35 #882a25; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.success, .alert-message.success { - background-color: #57a957; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #57a957 #57a957 #3d773d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.info, .alert-message.info { - background-color: #339bb9; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #339bb9 #339bb9 #22697d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn { - cursor: pointer; - display: inline-block; - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 11px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; -} -.btn:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; -} -.btn:focus { - outline: 1px dotted #666; -} -.btn.primary { - color: #ffffff; - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.active, .btn :active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn.disabled { - cursor: default; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn[disabled] { - cursor: default; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn.large { - font-size: 15px; - line-height: normal; - padding: 9px 14px 9px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.btn.small { - padding: 5px 7px 5px; - font-size: 11px; -} -:root .alert-message, :root .btn { - border-radius: 0 \0; -} -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -/* CLose */ - -.close { - float: right; - color: #000000; - font-size: 15px; - font-weight: bold; - line-height: 13.5px; - margin-bottom: -2px; - text-shadow: 0 1px 0 #ffffff; - filter: alpha(opacity=25); - -khtml-opacity: 0.25; - -moz-opacity: 0.25; - opacity: 0.25; - text-decoration: none; -} -.close:hover { - color: #000000; - text-decoration: none; - filter: alpha(opacity=40); - -khtml-opacity: 0.4; - -moz-opacity: 0.4; - opacity: 0.4; - cursor: pointer; - font-weight: bold; -} \ No newline at end of file diff --git a/erpnext/accounts/Module Def/Accounts/Accounts.txt b/erpnext/accounts/Module Def/Accounts/Accounts.txt deleted file mode 100644 index f9c36c823f9..00000000000 --- a/erpnext/accounts/Module Def/Accounts/Accounts.txt +++ /dev/null @@ -1,411 +0,0 @@ -# Module Def, Accounts -[ - - # These values are common in all dictionaries - { - 'creation': '2010-09-25 10:50:37', - 'docstatus': 0, - 'modified': '2011-12-07 16:18:28', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Module Def Role - { - 'doctype': 'Module Def Role', - 'name': '__common__', - 'parent': 'Accounts', - 'parentfield': 'roles', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def Item - { - 'doctype': 'Module Def Item', - 'name': '__common__', - 'parent': 'Accounts', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def - { - 'disabled': 'No', - 'doctype': u'Module Def', - 'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher', - 'file_list': 'finance.gif,FileData/00210', - 'is_hidden': 'No', - 'last_updated_date': '2010-12-08 10:13:30', - 'module_desc': 'Data about your payables, receivables and books of accounts', - 'module_icon': 'Accounts.gif', - 'module_label': 'Accounts', - 'module_name': 'Accounts', - 'module_seq': 5, - 'name': '__common__' - }, - - # Module Def, Accounts - { - 'doctype': u'Module Def', - 'name': 'Accounts' - }, - - # Module Def Item - { - 'click_function': "show_chart_browser('Accounts Browser','Account')", - 'description': 'Manage your accounts', - 'display_name': 'Chart of Accounts', - 'doc_name': 'Accounts Browser', - 'doc_type': 'Pages', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'click_function': "show_chart_browser('Accounts Browser','Cost Center')", - 'description': 'Manage your cost centers', - 'display_name': 'Chart of Cost Centers', - 'doc_name': 'Accounts Browser', - 'doc_type': 'Pages', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Regular journal entry', - 'display_name': 'Journal Voucher', - 'doc_name': 'Journal Voucher', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit' - }, - - # Module Def Item - { - 'description': 'Outgoing Invoice to your customers', - 'display_name': 'Sales Invoice', - 'doc_name': 'Receivable Voucher', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount' - }, - - # Module Def Item - { - 'description': 'Incoming invoice from your service providers', - 'display_name': 'Purchase Invoice', - 'doc_name': 'Payable Voucher', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount' - }, - - # Module Def Item - { - 'description': 'Lease Agreement for Vehicles', - 'display_name': 'Lease Agreement', - 'doc_name': 'Lease Agreement', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Profit & Loss and Balance Sheet builder', - 'display_name': 'Financial Statements', - 'doc_name': 'Financial Statements', - 'doc_type': 'Pages', - 'doctype': 'Module Def Item', - 'icon': 'table.gif' - }, - - # Module Def Item - { - 'description': 'Update your actual clearance dates and find out if bank ledger tallies with your bank statement.', - 'display_name': 'Bank Reconciliation', - 'doc_name': 'Bank Reconciliation', - 'doc_type': 'Single DocType', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Link your invoices and payment vouchers to clear/update outstanding amount', - 'display_name': 'Internal Reconciliation', - 'doc_name': 'Internal Reconciliation', - 'doc_type': 'Single DocType', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'TDS Payment', - 'doc_name': 'TDS Payment', - 'doc_type': 'Setup Forms', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'TDS Return Acknowledgement', - 'doc_name': 'TDS Return Acknowledgement', - 'doc_type': 'Setup Forms', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Form 16A', - 'doc_name': 'Form 16A', - 'doc_type': 'Setup Forms', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Account closing entry (Profit Booking) on any date', - 'display_name': 'Period Closing Voucher', - 'doc_name': 'Period Closing Voucher', - 'doc_type': 'Setup Forms', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'You can export balance of selected ledgers within a specific period', - 'display_name': 'Ledger Balance Export', - 'doc_name': 'Ledger Balance Export', - 'doc_type': 'Single DocType', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Track C-Form received from customers', - 'display_name': 'C-Form', - 'doc_name': 'C-Form', - 'doc_type': 'Setup Forms', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'General Ledger', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Accounts Receivable', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Accounts Payable', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Bank Reconciliation Statement', - 'doc_name': 'Journal Voucher Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Trial Balance', - 'doc_name': 'Account', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Sales Register', - 'doc_name': 'Receivable Voucher', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Purchase Register', - 'doc_name': 'Payable Voucher', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Bank Clearance report', - 'doc_name': 'Journal Voucher Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Monthly Ledger Summary Report', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Collection Report', - 'doc_name': 'Journal Voucher Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Total amout collection for a period - Customerwise', - 'doc_name': 'Account', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Payment Report', - 'doc_name': 'Journal Voucher Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Itemwise Sales Register', - 'doc_name': 'RV Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Itemwise Purchase Register', - 'doc_name': 'PV Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Cost Center wise Expense', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'TDS Return', - 'doc_name': 'TDS Payment Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Budget Variance Report', - 'doc_name': 'Budget Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Payment Receipt Report', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Track total commission given to your Business Associate', - 'display_name': 'Business Associate Commission Report', - 'doc_name': 'Receivable Voucher', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Lease Agreement List', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Lease Monthly Future Installment Inflows', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Lease Overdue Age Wise', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Lease Overdue List', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Lease Receipts Client Wise', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Lease Yearly Future Installment Inflows', - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Voucher wise tax details', - 'doc_name': 'RV Tax Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Accounts Manager' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Accounts User' - } -] \ No newline at end of file diff --git a/erpnext/accounts/Role/Accounts Manager/Accounts Manager.txt b/erpnext/accounts/Role/Accounts Manager/Accounts Manager.txt deleted file mode 100644 index 6f6759cdd92..00000000000 --- a/erpnext/accounts/Role/Accounts Manager/Accounts Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Accounts Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-03-19 14:57:46', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Accounts', - 'name': '__common__', - 'role_name': 'Accounts Manager' - }, - - # Role, Accounts Manager - { - 'doctype': 'Role', - 'name': 'Accounts Manager' - } -] \ No newline at end of file diff --git a/erpnext/accounts/Role/Accounts User/Accounts User.txt b/erpnext/accounts/Role/Accounts User/Accounts User.txt deleted file mode 100644 index 519924e3340..00000000000 --- a/erpnext/accounts/Role/Accounts User/Accounts User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Accounts User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 12:05:21', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Accounts', - 'name': '__common__', - 'role_name': 'Accounts User' - }, - - # Role, Accounts User - { - 'doctype': 'Role', - 'name': 'Accounts User' - } -] \ No newline at end of file diff --git a/erpnext/accounts/__init__.py b/erpnext/accounts/__init__.py index 44d6aec5e22..9df72409659 100644 --- a/erpnext/accounts/__init__.py +++ b/erpnext/accounts/__init__.py @@ -18,6 +18,11 @@ import webnotes from webnotes.utils import flt from webnotes.model.code import get_obj +install_docs = [ + {"doctype":"Role", "name":"Accounts Manager"}, + {"doctype":"Role", "name":"Accounts User"} +] + @webnotes.whitelist() def get_default_bank_account(): """ diff --git a/erpnext/accounts/doctype/journal_voucher/listview.js b/erpnext/accounts/doctype/journal_voucher/listview.js index 03c87f806ea..5d7f85a7d99 100644 --- a/erpnext/accounts/doctype/journal_voucher/listview.js +++ b/erpnext/accounts/doctype/journal_voucher/listview.js @@ -1,13 +1,34 @@ -wn.doclistviews['Journal Voucher'] = wn.pages.ListView.extend({ - init: function(doctype) { - this._super(doctype); +wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({ + init: function(d) { + this._super(d); this.fields = this.fields.concat([ - '`tabJournal Voucher`.voucher_type' + '`tabJournal Voucher`.voucher_type', + '`tabJournal Voucher`.remark', + '`tabJournal Voucher`.total_debit' ]); this.stats = this.stats.concat(['voucher_type']); }, - render: function(row, data) { - this._super(row, data); - this.$main.html(data.voucher_type); - } + prepare_data: function(data) { + this._super(data); + if(!data.remark) data.remark = ''; + if(data.remark.length> 30) { + data.remark = '' + data.remark.substr(0,30) + + '...'; + } + }, + columns: [ + {width: '5%', content:'avatar'}, + {width: '3%', content:'docstatus'}, + {width: '12%', content:'name'}, + {width: '15%', content:'voucher_type'}, + {width: '38%', content:'tags+remark', css: {'color':'#aaa'}}, + { + width: '18%', + content: function(parent, data) { + $(parent).html(sys_defaults.currency + ' ' + fmt_money(data.total_debit)) + }, + css: {'text-align':'right'} + }, + {width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} + ], }); \ No newline at end of file diff --git a/erpnext/accounts/doctype/receivable_voucher/listview.js b/erpnext/accounts/doctype/receivable_voucher/listview.js new file mode 100644 index 00000000000..d30431ff322 --- /dev/null +++ b/erpnext/accounts/doctype/receivable_voucher/listview.js @@ -0,0 +1,32 @@ +// render +wn.doclistviews['Receivable Voucher'] = wn.views.ListView.extend({ + init: function(d) { + this._super(d) + this.fields = this.fields.concat([ + "`tabReceivable Voucher`.customer", + "ifnull(`tabReceivable Voucher`.outstanding_amount,0) as outstanding_amount", + "ifnull(`tabReceivable Voucher`.grand_total,0) as grand_total", + "`tabReceivable Voucher`.currency", + "ifnull(`tabReceivable Voucher`.grand_total_export,0) as grand_total_export" + ]); + }, + prepare_data: function(data) { + this._super(data); + data.paid = flt((data.grand_total - data.outstanding_amount) / data.grand_total * 100, 2); + }, + columns: [ + {width: '5%', content:'avatar'}, + {width: '3%', content:'docstatus'}, + {width: '15%', content:'name'}, + {width: '37%', content:'tags+customer', css: {color:'#aaa'}}, + { + width: '18%', + content: function(parent, data) { + $(parent).html(data.currency + ' ' + fmt_money(data.grand_total_export)) + }, + css: {'text-align':'right'} + }, + {width: '10%', content: 'paid', type:'bar-graph', label:'Paid'}, + {width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} + ] +}); diff --git a/erpnext/buying/Module Def/Buying/Buying.txt b/erpnext/buying/Module Def/Buying/Buying.txt deleted file mode 100644 index 16cae81509b..00000000000 --- a/erpnext/buying/Module Def/Buying/Buying.txt +++ /dev/null @@ -1,155 +0,0 @@ -# Module Def, Buying -[ - - # These values are common in all dictionaries - { - 'creation': '2011-07-01 17:40:38', - 'docstatus': 0, - 'modified': '2012-01-10 17:52:19', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Module Def Role - { - 'doctype': 'Module Def Role', - 'name': '__common__', - 'parent': 'Buying', - 'parentfield': 'roles', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def Item - { - 'doctype': 'Module Def Item', - 'name': '__common__', - 'parent': 'Buying', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def - { - 'disabled': 'No', - 'doctype': u'Module Def', - 'doctype_list': 'DocType Mapper, Purchase Receipt-Payable Voucher\nDocType Mapper, Purchase Order-Payable Voucher\nDocType Mapper, Purchase Order-Purchase Receipt\nDocType Mapper, Indent-Purchase Order\nPrint Format, Purchase Order Format\nPrint Format, Purchase Receipt Format\nDocType Label, Indent', - 'file_list': 'scm.gif,FileData/00209', - 'is_hidden': 'No', - 'module_desc': '

All details about your Suppliers and past transactions

', - 'module_icon': 'Buying.gif', - 'module_label': 'Buying', - 'module_name': 'Buying', - 'module_seq': 4, - 'name': '__common__' - }, - - # Module Def, Buying - { - 'doctype': u'Module Def', - 'name': 'Buying' - }, - - # Module Def Item - { - 'description': 'Your Supplier Database', - 'display_name': 'Supplier', - 'doc_name': 'Supplier', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'id\nsupplier_type\nsupplier_status\ncompany' - }, - - # Module Def Item - { - 'description': 'Buy requests from various people in your company', - 'display_name': 'Indent', - 'doc_name': 'Indent', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\ntransaction_date\nsales_order_no\nremark' - }, - - # Module Def Item - { - 'description': 'Orders you have placed to your suppliers', - 'display_name': 'Purchase Order', - 'doc_name': 'Purchase Order', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\nsupplier\ntransaction_date\ngrand_total' - }, - - # Module Def Item - { - 'display_name': 'Itemwise Receipt Details', - 'doc_name': 'Purchase Receipt Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Purchase in Transit', - 'doc_name': 'PV Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Pending PO Items To Receive', - 'doc_name': 'PO Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Pending PO Items To Bill', - 'doc_name': 'PO Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Itemwise Purchase Details', - 'doc_name': 'PO Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Ledger details of your creditors', - 'display_name': "Creditor's Ledger", - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'icon': 'accept.gif' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Purchase User' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Purchase Manager' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Administrator' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Purchase Master Manager' - } -] \ No newline at end of file diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js index 2ac62f2c114..ebf359362a0 100644 --- a/erpnext/buying/doctype/supplier/supplier.js +++ b/erpnext/buying/doctype/supplier/supplier.js @@ -58,15 +58,6 @@ cur_frm.cscript.make_address = function() { parent: cur_frm.fields_dict['Address HTML'].wrapper, page_length: 2, new_doctype: "Address", - new_doc_onload: function(dn) { - ndoc = locals["Address"][dn]; - ndoc.supplier = cur_frm.doc.name; - ndoc.supplier_name = cur_frm.doc.supplier_name; - ndoc.address_type = 'Office'; - }, - new_doc_onsave: function(dn) { - cur_frm.address_list.run() - }, get_query: function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, @@ -100,14 +91,6 @@ cur_frm.cscript.make_contact = function() { parent: cur_frm.fields_dict['Contact HTML'].wrapper, page_length: 2, new_doctype: "Contact", - new_doc_onload: function(dn) { - ndoc = locals["Contact"][dn]; - ndoc.supplier = cur_frm.doc.name; - ndoc.supplier_name = cur_frm.doc.supplier_name; - }, - new_doc_onsave: function(dn) { - cur_frm.contact_list.run() - }, get_query: function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, @@ -128,6 +111,7 @@ cur_frm.cscript.make_contact = function() { // make purchase order list cur_frm.cscript.make_po_list = function(parent, doc){ + wn.require('lib/js/legacy/widgets/listing.js'); var lst = new Listing(); lst.colwidths = ['5%','25%','20%','25%','25%']; lst.colnames = ['Sr.','Id','Status','PO Date','Grand Total']; @@ -142,6 +126,7 @@ cur_frm.cscript.make_po_list = function(parent, doc){ // make purchase receipt list cur_frm.cscript.make_pr_list = function(parent,doc){ + wn.require('lib/js/legacy/widgets/listing.js'); var lst = new Listing(); lst.colwidths = ['5%','20%','20%','20%','15%','20%']; lst.colnames = ['Sr.','Id','Status','Receipt Date','% Billed','Grand Total']; @@ -156,6 +141,7 @@ cur_frm.cscript.make_pr_list = function(parent,doc){ // make purchase invoice list cur_frm.cscript.make_pi_list = function(parent,doc){ + wn.require('lib/js/legacy/widgets/listing.js'); var lst = new Listing(); lst.colwidths = ['5%','20%','20%','20%','15%','20%']; lst.colnames = ['Sr.','Id','Posting Date','Credit To','Bill Date','Grand Total']; diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css index cc6126e2001..874f11b2121 100644 --- a/erpnext/home/page/desktop/desktop.css +++ b/erpnext/home/page/desktop/desktop.css @@ -46,10 +46,10 @@ width: 56px; height: 56px; border: 4px solid white; - box-shadow: 0 0 10px 1px black; - -moz-box-shadow: 0 0 10px 1px black; - -webkit-box-shadow: 0 0 10px 1px black; - -o-box-shadow: 0 0 10px 1px black; + box-shadow: 0 0 4px 1px black; + -moz-box-shadow: 0 0 4px 1px black; + -webkit-box-shadow: 0 0 4px 1px black; + -o-box-shadow: 0 0 4px 1px black; margin: auto; } @@ -65,14 +65,14 @@ /*font-size: 12px;*/ padding-top: 10px; text-align: center; - text-shadow: 1px 1px 5px #000, 3px 3px 5px #000; + text-shadow: 0px 0px 3px #000, 0px 0px 3px #000, 0px 0px 2px #000; } /* Hover and click effects */ .case-border:hover, .circle:hover, .hover-effect { - box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; - -moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; - -webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; + box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important; + -moz-box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important; + -webkit-box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important; -o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important; } @@ -105,10 +105,10 @@ margin-top: -74px; margin-right: 10px; border: 2px solid white; - box-shadow: 0 0 10px 1px black; - -moz-box-shadow: 0 0 10px 1px black; - -webkit-box-shadow: 0 0 10px 1px black; - -o-box-shadow: 0 0 10px 1px black; + box-shadow: 0 0 4px 1px black; + -moz-box-shadow: 0 0 4px 1px black; + -webkit-box-shadow: 0 0 4px 1px black; + -o-box-shadow: 0 0 4px 1px black; } .circle-text { diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js index 084ff0c8136..797d8e95c9d 100644 --- a/erpnext/home/page/event_updates/event_updates.js +++ b/erpnext/home/page/event_updates/event_updates.js @@ -600,7 +600,7 @@ pscript.home_make_status = function() { // get values $c_page('home', 'event_updates', 'get_status_details', user, function(r,rt) { - //page_body.wntoolbar.set_new_comments(r.message.unread_messages); + //wn.container.wntoolbar.set_new_comments(r.message.unread_messages); // render online users pscript.online_users_obj.render(r.message.online_users); diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js index d6780771387..9f5f717e1f6 100644 --- a/erpnext/selling/doctype/customer/customer.js +++ b/erpnext/selling/doctype/customer/customer.js @@ -72,15 +72,6 @@ cur_frm.cscript.make_address = function() { parent: cur_frm.fields_dict['Address HTML'].wrapper, page_length: 2, new_doctype: "Address", - new_doc_onload: function(dn) { - ndoc = locals["Address"][dn]; - ndoc.customer = cur_frm.doc.name; - ndoc.customer_name = cur_frm.doc.customer_name; - ndoc.address_type = 'Office'; - }, - new_doc_onsave: function(dn) { - cur_frm.address_list.run() - }, get_query: function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, @@ -114,17 +105,6 @@ cur_frm.cscript.make_contact = function() { parent: cur_frm.fields_dict['Contact HTML'].wrapper, page_length: 2, new_doctype: "Contact", - new_doc_onload: function(dn) { - ndoc = locals["Contact"][dn]; - ndoc.customer = cur_frm.doc.name; - ndoc.customer_name = cur_frm.doc.customer_name; - if(cur_frm.doc.customer_type == 'Individual') { - ndoc.first_name = cur_frm.doc.customer_name; - } - }, - new_doc_onsave: function(dn) { - cur_frm.contact_list.run() - }, get_query: function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, @@ -174,6 +154,7 @@ cur_frm.fields_dict['lead_name'].get_query = function(doc,dt,dn){ // make quotation list // -------------------- cur_frm.cscript.make_qtn_list = function(parent,doc){ + wn.require('lib/js/legacy/widgets/listing.js'); var lst = new Listing(); lst.colwidths = ['5%','20%','20%','20%','20%','15%']; @@ -191,6 +172,8 @@ cur_frm.cscript.make_qtn_list = function(parent,doc){ // make so list // ------------- cur_frm.cscript.make_so_list = function(parent,doc){ + wn.require('lib/js/legacy/widgets/listing.js'); + var lst = new Listing(); lst.colwidths = ['5%','20%','20%','30%','25%']; lst.colnames = ['Sr.','Id','Status','Sales Order Date','Grand Total']; @@ -207,6 +190,8 @@ cur_frm.cscript.make_so_list = function(parent,doc){ // make dn list // ------------- cur_frm.cscript.make_dn_list = function(parent,doc){ + wn.require('lib/js/legacy/widgets/listing.js'); + var lst = new Listing(); lst.colwidths = ['5%','20%','20%','20%','20%','15%']; lst.colnames = ['Sr.','Id','Status','Delivery Note Date','Territory','Grand Total']; @@ -223,6 +208,8 @@ cur_frm.cscript.make_dn_list = function(parent,doc){ // make si list // ------------- cur_frm.cscript.make_si_list = function(parent,doc){ + wn.require('lib/js/legacy/widgets/listing.js'); + var lst = new Listing(); lst.colwidths = ['5%','20%','20%','20%','20%','15%']; lst.colnames = ['Sr.','Id','Posting Date','Due Date','Debit To','Grand Total']; diff --git a/erpnext/selling/doctype/sales_order/listview.js b/erpnext/selling/doctype/sales_order/listview.js index e5d574f2fcd..c0b3895d8a2 100644 --- a/erpnext/selling/doctype/sales_order/listview.js +++ b/erpnext/selling/doctype/sales_order/listview.js @@ -1,7 +1,7 @@ // render -wn.doclistviews['Sales Order'] = wn.pages.ListView.extend({ - init: function(doctype) { - this._super(doctype) +wn.doclistviews['Sales Order'] = wn.views.ListView.extend({ + init: function(d) { + this._super(d) this.fields = this.fields.concat([ "`tabSales Order`.customer_name", "ifnull(`tabSales Order`.per_delivered,0) as per_delivered", @@ -9,40 +9,24 @@ wn.doclistviews['Sales Order'] = wn.pages.ListView.extend({ "`tabSales Order`.currency", "ifnull(`tabSales Order`.grand_total_export,0) as grand_total_export" ]); + this.stats = this.stats.concat(['status']); }, - render: function(row, data, listobj) { - - // bar color for billed - data.bar_class_delivered = ''; data.bar_class_billed = ''; - if(data.per_delivered == 100) data.bar_class_delivered = 'bar-complete'; - if(data.per_billed == 100) data.bar_class_billed = 'bar-complete'; - - // lock for docstatus - data.icon = ''; - data.item_color = 'grey'; - if(data.docstatus==0) { - data.customer_name = '[Draft] ' + data.customer_name; - } else if(data.docstatus==1) { - data.icon = ' '; - data.item_color = 'blue'; - } else if(data.docstatus==2) { - data.icon = ' '; - data.item_color = 'red'; - } - - this._super(row, data); - this.$main.html(repl('%(customer_name)s\ - \ - \ - \ - \ - \ - \ - %(currency)s %(grand_total_export)s\ - ', data)) - } + + columns: [ + {width: '5%', content:'avatar'}, + {width: '3%', content:'docstatus'}, + {width: '15%', content:'name'}, + {width: '37%', content:'tags+customer_name', css: {color:'#aaa'}}, + { + width: '18%', + content: function(parent, data) { + $(parent).html(data.currency + ' ' + fmt_money(data.grand_total_export)) + }, + css: {'text-align':'right'} + }, + {width: '8%', content: 'per_delivered', type:'bar-graph', label:'Delivered'}, + {width: '8%', content: 'per_billed', type:'bar-graph', label:'Billed'}, + {width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} + ] + }); diff --git a/erpnext/setup/doctype/contact_control/contact_control.js b/erpnext/setup/doctype/contact_control/contact_control.js index b6825ebdb6c..f58e75d9d99 100755 --- a/erpnext/setup/doctype/contact_control/contact_control.js +++ b/erpnext/setup/doctype/contact_control/contact_control.js @@ -1,14 +1,6 @@ // common partner functions // ========================= -/* -// make shipping list body -// ------------------------ -cur_frm.cscript.make_sl_body = function(){ - cur_frm.fields_dict['Shipping HTML'].wrapper.innerHTML = ''; - cur_frm.shipping_html = $a(cur_frm.fields_dict['Shipping HTML'].wrapper,'div'); -} -*/ // make history list body // ----------------------- @@ -18,35 +10,6 @@ cur_frm.cscript.make_hl_body = function(){ } -/* -// set shipping list message -// -------------------------- -cur_frm.cscript.set_sl_msg = function(doc){ - cur_frm.shipping_html.innerHTML = 'Shipping Address Details will appear only when you save the ' + doc.doctype.toLowerCase(); -} -*/ -/* -// set history list message -// ------------------------- -cur_frm.cscript.set_hl_msg = function(doc){ - cur_frm.history_html.innerHTML= 'History Details will appear only when you save the ' + doc.doctype.toLowerCase(); -} -*/ - - -/* -// make shipping address -// ------------- -cur_frm.cscript.make_shipping_address = function(doc, dt, dn){ - cur_frm.shipping_html.innerHTML = ''; - - var dsn = cur_frm.doc.customer_name; - var dsa = cur_frm.doc.address; - cl = new AddressList(cur_frm.shipping_html,dt,dn,dsn,dsa); -} -*/ - - // make history // ------------- cur_frm.cscript.make_history = function(doc,dt,dn){ @@ -157,406 +120,4 @@ if(cur_frm.fields_dict['territory']){ cur_frm.fields_dict['territory'].get_query = function(doc,dt,dn) { return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50'; } -} - - -// ======================================================================================================= - -// contact list -// -------------- -ContactList = function(parent,dt,dn,dsn){ - - var me = this; - - this.dt = dt; - this.dn = dn; - this.dsn = dsn ? dsn : dn; - - this.wrapper = $a(parent,'div'); - me.get_list(); -} - -// add contact -// ------------ -ContactList.prototype.add_contact = function(){ - var me = this; - - // onload - set default values - var cont = LocalDB.create('Contact'); - - var c = locals['Contact'][cont]; - - if(me.dt == 'Customer') { - c.is_customer = 1; - c.customer = me.dn; - c.customer_name = me.dsn; - } - else if(me.dt == 'Supplier'){ - c.is_supplier = 1; - c.supplier = me.dn; - c.supplier_name = me.dsn; - } - else if(me.dt == 'Sales Partner'){ - c.is_sales_partner = 1; - c.sales_partner = me.dn; - //c.sales_partner_name = me.dsn; - } - - loaddoc('Contact',c.name); -} - -// get contact list -// ----------------- -ContactList.prototype.get_list = function(){ - var me = this; - - me.make_list(); - - var dt = me.dt.toLowerCase().split(' ').join('_'); - - // build query - me.lst.get_query = function(){ - this.query = repl("select name, first_name, last_name, concat_ws(' ', first_name, last_name), email_id, contact_no, department, designation, is_primary_contact, has_login, disable_login from tabContact where %(dt)s = '%(dn)s' and docstatus != 2",{'dt':dt, 'dn':me.dn}); - - this.query_max = repl("select count(name) from tabContact where %(dt)s = '%(dn)s' and docstatus != 2",{'dt':dt, 'dn':me.dn}); - } - - // render list ui - me.lst.show_cell = function(cell,ri,ci,d){ - me.render_list(cell,ri,ci,d); - } - - // run query - me.lst.run(); - - // onrun - me.lst.onrun = function(){ - if(!this.has_data()){ - this.rec_label.innerHTML = ''; - - $a(this.rec_label,'span').innerHTML = "You do not have any contact. "; - $($a(this.rec_label,'span')).html('Add a new contact').addClass('link_type').click(function(){ me.add_contact(); }); - - $dh(this.results); - } - else{ - $ds(this.results); - } - } -} - -// make list -// ----------- -ContactList.prototype.make_list = function(){ - var me = this; - - var l = new Listing(); - l.colwidths = ['5%','30%','30%','20%','20%']; - l.colnames = ['Sr.','Contact Name','Email Id','Contact No', 'Action']; - l.page_len = 10; - - me.lst = l; - - l.make(me.wrapper); - - // Add contact button - me.add_btn = $btn(l.btn_area,'+ Add Contact', function(){ me.add_contact();}, {fontWeight:'bold'}); -} - -// make contact cell -// ------------------ -ContactList.prototype.render_list = function(cell,ri,ci,d){ - var me = this; - - // name - if(ci == 0){ - var nm = $a($a(cell,'div'),'span','',{cursor:'pointer'}); - nm.innerHTML = d[ri][3]; - nm.id = d[ri][0]; - - nm.onclick = function(){ - loaddoc('Contact', this.id); - - // on save callback - refresh list - } - - // department and designation - var des = d[ri][7] ? d[ri][7] : ''; - var dep = d[ri][6] ? d[ri][6] : ''; - - var sp = $a(cell,'div','comment'); - sp.innerHTML = des + (dep ? (', ' + dep) : ''); - } - - // email id, contact no, department, designation - // ----------------------------------------------------- - if(ci == 1) cell.innerHTML = d[ri][4] ? d[ri][4] : '-'; - if(ci == 2) cell.innerHTML = d[ri][5] ? d[ri][5] : '-'; - - // actions - // -------------------------------------- - if(ci== 3) me.make_actions(cell,ri,ci,d); -} - -// make actions -// --------------- -ContactList.prototype.make_actions = function(cell,ri,ci,d){ - var me = this; - - var tab = make_table(cell,1,2,'100%',['40%','60%']); - - // Edit and Delete - var t = make_table($td(tab,0,0),1,2); - - var edit = $a($td(t,0,0),'div','wn-icon ic-doc_edit'); - $(edit).click(function(){ loaddoc('Contact',d[ri][0]); }); - - edit.setAttribute('title','Edit'); - -// Below code should be uncommented once customer/venodr invitation process is stable -// =========================================================================== -/* - var del = $a($td(t,0,1),'div','wn-icon ic-trash'); - $(del).click(function(){ me.delete_contact(d[ri][0],d[ri][4]) }); - - set_custom_tooltip(del, 'Delete'); - - // Invite, Enable and Disable - Integrate after gateway logic incorporated - - if(d[ri][9] == 'Yes') { - if(d[ri][10] == 'Yes'){ - var enb = $a($td(tab,0,1),'div','wn-icon ic-checkmark'); - $(enb).click(function(){ me.enable_login(d[ri][0], d[ri][4]); }); - } - else{ - var dsb = $a($td(tab,0,1),'div','wn-icon ic-delete'); - $(dsb).click(function(){ me.disable_login(d[ri][0], d[ri][4]) }); - } - } - else{ - var inv = $a($td(tab,0,1),'div','wn-icon ic-mail'); - $(inv).click(function(){ me.invite_contact(d[ri][0], d[ri][4], d[ri][1], d[ri][2]) }); - }*/ -} - -// enable login -// ---------------------------------------------------------- -ContactList.prototype.enable_login = function(id, email_id){ - var me = this; - - var callback = function(r,rt){ - me.get_list(); - - if(!r.exc) msgprint('Login for contact enabled',1); - else errprint(r.exc); - } - - var args = {}; - args.contact = id; - args.email = email_id; - - $c_obj('Contact Control','enable_login',JSON.stringify(args),callback); -} - -// disable login -// ------------------------------------------------------------- -ContactList.prototype.disable_login = function(id, email_id){ - var me = this; - - var callback = function(r,rt){ - me.get_list(); - - if(!r.exc) msgprint('Login for contact disabled',1); - else errprint(r.exc); - } - - var args = {}; - args.contact = id; - args.email = email_id; - - $c_obj('Contact Control','disable_login',JSON.stringify(args),callback); -} - -// delete contact -// ----------------- -ContactList.prototype.delete_contact = function(id,email_id,has_login){ - var me = this; - - var callback = function(r,rt){ - me.get_list(); - - if(!r.exc) msgprint('Contact deleted successfully'); - else errprint(r.exc); - } - - var args = {}; - args.contact = id; - args.email = email_id; - args.has_login = has_login; - - $c_obj('Contact Control','delete_contact',JSON.stringify(args),callback); -} - -// invite user -// -------------------------------------------------------- -ContactList.prototype.invite_contact = function(id,email_id,first_name,last_name){ - var me = this; - - if(!email_id){ - msgprint("Please add email id and save the contact first. You can then invite contact to view transactions.") - } - else{ - var callback = function(r,rt){ - if(!r.exc) msgprint('Invitation sent'); - else errprint(r.exc); - } - - var args = { - 'contact' : id, - 'email' : email_id, - 'first_name' : first_name ? first_name : '', - 'last_name' : last_name ? last_name : '', - 'usert_type' : 'Partner' - }; - - $c_obj('Contact Control','invite_contact',JSON.stringify(args),callback); - } -} - - -// address list -// -------------- -AddressList = function(parent,dt,dn,dsn,dsa){ - - var me = this; - - this.dt = dt; - this.dn = dn; - this.dsn = dsn ? dsn : dn; - this.dsa = dsa ? dsa : ''; - - this.wrapper = $a(parent,'div'); - me.get_addr_list(); -} - - -// add contact -// ------------ -AddressList.prototype.add_address = function(){ - var me = this; - - // onload - set default values - var addr = LocalDB.create('Shipping Address'); - - var a = locals['Shipping Address'][addr]; - - a.customer = me.dn; - a.customer_name = me.dsn; - a.customer_address = me.dsa; - loaddoc('Shipping Address',a.name); -} - - -// get address list -// ----------------- -AddressList.prototype.get_addr_list = function(){ - var me = this; - - me.make_addr_list(); - - var dt = me.dt.toLowerCase().split(' ').join('_'); - - // build query - me.lst.get_query = function(){ - this.query = repl("select name, ship_to, shipping_address, is_primary_address, shipping_details from `tabShipping Address` where %(dt)s = '%(dn)s' and docstatus != 2",{'dt':dt, 'dn':me.dn}); - - this.query_max = repl("select count(name) from `tabShipping Address` where %(dt)s = '%(dn)s'",{'dt':dt, 'dn':me.dn}); - } - - // render list ui - me.lst.show_cell = function(cell,ri,ci,d){ - me.render_list(cell,ri,ci,d); - } - - // run query - me.lst.run(); - - // onrun - me.lst.onrun = function(){ - if(!this.has_data()){ - this.rec_label.innerHTML = ''; - - $a(this.rec_label,'span').innerHTML = "You do not have any shipping address."; - $($a(this.rec_label,'span')).html('Add a new address').addClass('link_type').click(function(){ me.add_address(); }); - - $dh(this.results); - } - else{ - $ds(this.results); - } - } -} - - -// make list -// ----------- -AddressList.prototype.make_addr_list = function(){ - var me = this; - - var l = new Listing(); - l.colwidths = ['5%', '15%', '25%','10%','35%','10%']; - l.colnames = ['Sr.', 'Ship To', 'Shipping Address','Primary Address', 'Shipping Details', 'Action']; - l.page_len = 10; - - me.lst = l; - - l.make(me.wrapper); - - // Add address button - me.add_btn = $btn(l.btn_area,'+ Add Address', function(){ me.add_address();}, {fontWeight:'bold'}); -} - - - -// make address cell -// ------------------ -AddressList.prototype.render_list = function(cell,ri,ci,d){ - var me = this; - - // name - if(ci == 0){ - var nm = $a($a(cell,'div'),'span','',{cursor:'pointer'}); - nm.innerHTML = d[ri][1]; - nm.id = d[ri][0]; - - nm.onclick = function(){ - loaddoc('Shipping Address', this.id); - } - } - - // shipping address, primary address, shipping details - // ---------------------------------------------------- - if(ci == 1) cell.innerHTML = d[ri][2] ? d[ri][2] : '-'; - if(ci == 2) cell.innerHTML = d[ri][3] ? d[ri][3] : '-'; - if(ci == 3) cell.innerHTML = d[ri][4] ? d[ri][4] : '-'; - - // actions - // -------------------------------------- - if(ci== 4) me.make_actions(cell,ri,ci,d); -} - -// make actions -// --------------- -AddressList.prototype.make_actions = function(cell,ri,ci,d){ - var me = this; - - var tab = make_table(cell,1,2,'100%',['40%','60%']); - - // Edit and Delete - var t = make_table($td(tab,0,0),1,2); - - var edit = $a($td(t,0,0),'div','wn-icon ic-doc_edit'); - $(edit).click(function(){ loaddoc('Shipping Address',d[ri][0]); }); - - edit.setAttribute('title','Edit'); -} +} \ No newline at end of file diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js index 0c315f62705..30ab18a324c 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.js +++ b/erpnext/setup/doctype/sales_partner/sales_partner.js @@ -51,15 +51,7 @@ cur_frm.cscript.make_address = function() { cur_frm.address_list = new wn.ui.Listing({ parent: cur_frm.fields_dict['Address HTML'].wrapper, page_length: 2, - new_doctype: "Address", - new_doc_onload: function(dn) { - ndoc = locals["Address"][dn]; - ndoc.sales_partner = cur_frm.doc.name; - ndoc.address_type = 'Office'; - }, - new_doc_onsave: function(dn) { - cur_frm.address_list.run() - }, + new_doctype: "Address", get_query: function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, @@ -84,13 +76,6 @@ cur_frm.cscript.make_contact = function() { parent: cur_frm.fields_dict['Contact HTML'].wrapper, page_length: 2, new_doctype: "Contact", - new_doc_onload: function(dn) { - ndoc = locals["Contact"][dn]; - ndoc.sales_partner = cur_frm.doc.name; - }, - new_doc_onsave: function(dn) { - cur_frm.contact_list.run() - }, get_query: function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, diff --git a/erpnext/startup/js/complete_setup.js b/erpnext/startup/js/complete_setup.js index ac89affa5c6..c643813a2dd 100644 --- a/erpnext/startup/js/complete_setup.js +++ b/erpnext/startup/js/complete_setup.js @@ -85,7 +85,7 @@ erpnext.complete_setup = function() { wn.boot.user_info[user].fullname = user_fullname; d.hide(); $('header').toggle(true); - page_body.wntoolbar.set_user_name(); + wn.container.wntoolbar.set_user_name(); }); } diff --git a/erpnext/startup/js/toolbar.js b/erpnext/startup/js/toolbar.js index 7bf9c6a04e6..eb3bff80a3c 100644 --- a/erpnext/startup/js/toolbar.js +++ b/erpnext/startup/js/toolbar.js @@ -48,7 +48,7 @@ erpnext.toolbar.setup = function() { $('#toolbar-user').append('
  • Billing
  • ') } - $.extend(page_body.wntoolbar, { + $.extend(wn.container.wntoolbar, { set_new_comments: function(new_comments) { var navbar_nc = $('.navbar-new-comments'); if(new_comments && new_comments.length>0) { @@ -66,7 +66,7 @@ erpnext.toolbar.setup = function() { } }); - page_body.wntoolbar.set_new_comments(); + wn.container.wntoolbar.set_new_comments(); } erpnext.toolbar.add_modules = function() { diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index c00770c4d97..95c792483ff 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -73,8 +73,8 @@ erpnext.startup.start = function() { // border to the body // ------------------ - $('footer').html(''); + //$('footer').html(''); // complete registration if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) { @@ -107,14 +107,14 @@ show_chart_browser = function(nm, chart_type){ var update_messages = function(reset) { // Updates Team Messages - if(inList(['Guest'], user)) { return; } + if(inList(['Guest'], user) || !wn.session_alive) { return; } if(!reset) { $c_page('home', 'event_updates', 'get_global_status_messages', null, function(r,rt) { if(!r.exc) { // This function is defined in toolbar.js - page_body.wntoolbar.set_new_comments(r.message.unread_messages); + wn.container.wntoolbar.set_new_comments(r.message.unread_messages); var show_in_circle = function(parent_id, msg) { var parent = $('#'+parent_id); @@ -139,7 +139,7 @@ var update_messages = function(reset) { } ); } else { - page_body.wntoolbar.set_new_comments(0); + wn.container.wntoolbar.set_new_comments(0); $('#unread_messages').toggle(false); } } diff --git a/erpnext/support/DocType Label/Ticket/Ticket.txt b/erpnext/support/DocType Label/Ticket/Ticket.txt deleted file mode 100644 index 8707e8fff4b..00000000000 --- a/erpnext/support/DocType Label/Ticket/Ticket.txt +++ /dev/null @@ -1 +0,0 @@ -[{'modified_by': 'Administrator', 'name': 'Ticket', 'parent': None, 'dt_label': 'Task', 'creation': '2010-06-28 12:55:47', 'modified': '2010-06-28 12:55:47', 'module': 'Accounts', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Ticket', 'parentfield': None}] \ No newline at end of file diff --git a/erpnext/support/Module Def/Support/Support.txt b/erpnext/support/Module Def/Support/Support.txt deleted file mode 100644 index 9c66c3d1c3d..00000000000 --- a/erpnext/support/Module Def/Support/Support.txt +++ /dev/null @@ -1,149 +0,0 @@ -# Module Def, Support -[ - - # These values are common in all dictionaries - { - 'creation': '2011-07-01 17:42:15', - 'docstatus': 0, - 'modified': '2011-10-10 16:59:49', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Module Def Role - { - 'doctype': 'Module Def Role', - 'name': '__common__', - 'parent': 'Support', - 'parentfield': 'roles', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def Item - { - 'doctype': 'Module Def Item', - 'name': '__common__', - 'parent': 'Support', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def - { - 'disabled': 'No', - 'doctype': u'Module Def', - 'doctype_list': 'DocType Label, Ticket', - 'is_hidden': 'No', - 'module_desc': 'Manage maintenance quotes, orders, schedule etc.', - 'module_icon': 'Maintenance.gif', - 'module_label': 'Support', - 'module_name': 'Support', - 'module_seq': 8, - 'name': '__common__' - }, - - # Module Def, Support - { - 'doctype': u'Module Def', - 'name': 'Support' - }, - - # Module Def Item - { - 'description': "Database of Support Ticket's raised by Customers", - 'display_name': 'Support Ticket', - 'doc_name': 'Support Ticket', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\nopening_date\ncustomer\nallocated_to' - }, - - # Module Def Item - { - 'description': 'Create schedule based on maintenance order', - 'display_name': 'Maintenance Schedule', - 'doc_name': 'Maintenance Schedule', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\ntransaction_date\ncustomer\nsales_order_no' - }, - - # Module Def Item - { - 'description': 'Database of issues raised your Customers', - 'display_name': 'Customer Issue', - 'doc_name': 'Customer Issue', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on' - }, - - # Module Def Item - { - 'display_name': 'Maintenance Visit', - 'doc_name': 'Maintenance Visit', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status' - }, - - # Module Def Item - { - 'description': 'List of all scheduled mainteance. You can filter by sales person, date, serial no etc. ', - 'display_name': 'Maintenance Schedule Details', - 'doc_name': 'Maintenance Schedule Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'List of all issues raised by customer', - 'display_name': 'Customer Issues', - 'doc_name': 'Customer Issue', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Warranty/AMC Expiry Details', - 'doc_name': 'Serial No', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Warranty/AMC Summary', - 'doc_name': 'Serial No', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Maintenance Orderwise Pending Amount To Bill', - 'doc_name': 'Sales Order Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Administrator' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Maintenance User' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Maintenance Manager' - } -] \ No newline at end of file diff --git a/erpnext/support/Role/Maintenance Manager/Maintenance Manager.txt b/erpnext/support/Role/Maintenance Manager/Maintenance Manager.txt deleted file mode 100644 index 291a52c8449..00000000000 --- a/erpnext/support/Role/Maintenance Manager/Maintenance Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Maintenance Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-07-22 15:19:33', - 'modified_by': 'Administrator', - 'owner': 'ashwini@webnotestech.com' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Support', - 'name': '__common__', - 'role_name': 'Maintenance Manager' - }, - - # Role, Maintenance Manager - { - 'doctype': 'Role', - 'name': 'Maintenance Manager' - } -] \ No newline at end of file diff --git a/erpnext/support/Role/Maintenance User/Maintenance User.txt b/erpnext/support/Role/Maintenance User/Maintenance User.txt deleted file mode 100644 index c0a9e4e30b7..00000000000 --- a/erpnext/support/Role/Maintenance User/Maintenance User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Maintenance User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-07-22 15:19:19', - 'modified_by': 'Administrator', - 'owner': 'ashwini@webnotestech.com' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Support', - 'name': '__common__', - 'role_name': 'Maintenance User' - }, - - # Role, Maintenance User - { - 'doctype': 'Role', - 'name': 'Maintenance User' - } -] \ No newline at end of file diff --git a/erpnext/support/Role/Support Manager/Support Manager.txt b/erpnext/support/Role/Support Manager/Support Manager.txt deleted file mode 100644 index 409280fd998..00000000000 --- a/erpnext/support/Role/Support Manager/Support Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Support Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-12-28 17:02:39', - 'docstatus': 0, - 'modified': '2010-12-28 15:17:40', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Support', - 'name': '__common__', - 'role_name': 'Support Manager' - }, - - # Role, Support Manager - { - 'doctype': 'Role', - 'name': 'Support Manager' - } -] \ No newline at end of file diff --git a/erpnext/support/Role/Support Team/Support Team.txt b/erpnext/support/Role/Support Team/Support Team.txt deleted file mode 100644 index f5bcca664ac..00000000000 --- a/erpnext/support/Role/Support Team/Support Team.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Support Team -[ - - # These values are common in all dictionaries - { - 'creation': '2010-12-28 17:02:39', - 'docstatus': 0, - 'modified': '2010-12-28 15:19:11', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Support', - 'name': '__common__', - 'role_name': 'Support Team' - }, - - # Role, Support Team - { - 'doctype': 'Role', - 'name': 'Support Team' - } -] \ No newline at end of file diff --git a/erpnext/support/__init__.py b/erpnext/support/__init__.py index e69de29bb2d..b94538b23fb 100644 --- a/erpnext/support/__init__.py +++ b/erpnext/support/__init__.py @@ -0,0 +1,6 @@ +install_docs = [ + {'doctype':'Role', 'name':'Support Team'}, + {'doctype':'Role', 'name':'Support Manager'}, + {'doctype':'Role', 'name':'Maintenance User'}, + {'doctype':'Role', 'name':'Maintenance Manager'} +] \ No newline at end of file diff --git a/erpnext/support/doctype/support_ticket/listview.js b/erpnext/support/doctype/support_ticket/listview.js new file mode 100644 index 00000000000..91cb4483069 --- /dev/null +++ b/erpnext/support/doctype/support_ticket/listview.js @@ -0,0 +1,44 @@ +// render +wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({ + init: function(d) { + this._super(d) + this.fields = this.fields.concat([ + "`tabSupport Ticket`.status", + "`tabSupport Ticket`.subject", + "`tabSupport Ticket`.description" + ]); + this.stats = this.stats.concat(['status']); + }, + + prepare_data: function(data) { + this._super(data); + if(data.status=='Open' || data.status=='To Reply') { + data.label_type = 'important' + } + else if(data.status=='Closed') { + data.label_type = 'success' + } + else if(data.status=='Hold') { + data.label_type = 'info' + } + else if(data.status=='Waiting for Customer') { + data.label_type = 'info' + } + data.status_html = repl('%(status)s', data); + + // description + if(data.description && data.description.length > 30) { + data.description = '' + data.description.substr(0,30) + '...'; + } + }, + + columns: [ + {width: '5%', content:'avatar'}, + {width: '3%', content:'docstatus'}, + {width: '12%', content:'name'}, + {width: '8%', content:'status_html'}, + {width: '62%', content:'tags+subject+description', css: {color:'#aaa'}}, + {width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} + ] + +}); diff --git a/erpnext/utilities/doctype/address/address.js b/erpnext/utilities/doctype/address/address.js index fc274ef8da9..f607d51afbb 100644 --- a/erpnext/utilities/doctype/address/address.js +++ b/erpnext/utilities/doctype/address/address.js @@ -17,5 +17,28 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if(doc.customer) cur_frm.add_fetch('customer', 'customer_name', 'customer_name'); if(doc.supplier) cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name'); + + var route = wn.get_route(); + if(route[1]=='Supplier') { + var supplier = locals.Supplier[route[2]] + doc.supplier = supplier.name; + doc.supplier_name = supplier.supplier_name; + doc.address_type = 'Office'; + } else if(route[1]=='Customer') { + var customer = locals.Customer[route[2]] + doc.supplier = customer.name; + doc.customer_name = customer.customer_name; + doc.address_type = 'Office'; + } else if(route[1]=='Sales Partner') { + var sp = locals['Sales Partner'][route[2]]; + doc.sales_partner = sp.name; + ndoc.address_type = 'Office'; + } } +cur_frm.cscript.hide_dialog = function() { + var route = wn.get_route(); + cur_frm.address_list.run(); +} + + diff --git a/erpnext/utilities/doctype/contact/contact.js b/erpnext/utilities/doctype/contact/contact.js index 2aa89c1bec1..3cbc1de7a55 100644 --- a/erpnext/utilities/doctype/contact/contact.js +++ b/erpnext/utilities/doctype/contact/contact.js @@ -18,54 +18,28 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if(doc.customer) cur_frm.add_fetch('customer', 'customer_name', 'customer_name'); if(doc.supplier) cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name'); -} -/* -//---------- on refresh ---------------------- -cur_frm.cscript.refresh = function(doc,cdt,cdn){ - -} - - -//------------- Trigger on customer --------------------- -cur_frm.cscript.is_customer = function(doc,cdt,cdn){ - if(!doc.is_customer){ - doc.customer = doc.customer_name = doc.customer_address = doc.customer_group = ''; - refresh_many(['customer','customer_name','customer_address','customer_group']); + var route = wn.get_route(); + if(route[1]=='Supplier') { + var supplier = locals.Supplier[route[2]] + doc.supplier = supplier.name; + doc.supplier_name = supplier.supplier_name; + } else if(route[1]=='Customer') { + var customer = locals.Customer[route[2]]; + doc.customer = customer.name; + doc.customer_name = customer.customer_name; + if(customer.customer_type == 'Individual') { + doc.first_name = customer.customer_name; + } + } else if(route[1]=='Sales Partner') { + var sp = locals['Sales Partner'][route[2]]; + doc.sales_partner = sp.name; } } -//------------- Trigger on supplier ----------------------- -cur_frm.cscript.is_supplier = function(doc,cdt,cdn){ - if(!doc.is_supplier){ - doc.supplier = doc.supplier_name = doc.supplier_address = doc.supplier_type = ''; - refresh_many(['supplier','supplier_address','supplier_name','supplier_type']); - } -} - -//--------------- Trigger on sales partner --------------------- -cur_frm.cscript.is_sales_partner = function(doc,cdt,cdn){ - if(!doc.is_sales_partner){ - doc.sales_partner = doc.sales_partner_address = doc.partner_type = ''; - refresh_many(['sales_partner','sales_partner_address','partner_type']); - } +cur_frm.cscript.hide_dialog = function() { + var route = wn.get_route(); + cur_frm.contact_list.run(); } -//----------- Trigger on supplier name ------------------------ -cur_frm.cscript.supplier = function(doc,cdt,cdn){ - arg = {'dt':'Supplier','dn':doc.supplier,'nm':'supplier_name','fld':'supplier_address','type':'supplier_type'}; - get_server_fields('get_address',docstring(arg),'',doc,cdt,cdn,1); -} -//------------ Trigger on customer name ------------------------ -cur_frm.cscript.customer = function(doc,cdt,cdn){ - arg = {'dt':'Customer','dn':doc.customer,'nm':'customer_name','fld':'customer_address','type':'customer_group'}; - get_server_fields('get_address',docstring(arg),'',doc,cdt,cdn,1); -} - -//------------ Trigger on sales partner ------------------------ -cur_frm.cscript.sales_partner = function(doc,cdt,cdn){ - arg = {'dt':'Sales Partner','dn':doc.sales_partner,'nm':'partner_name','fld':'sales_partner_address','type':'partner_type'}; - get_server_fields('get_address',docstring(arg),'',doc,cdt,cdn,1); -} -*/ diff --git a/erpnext/utilities/page/calendar/calendar.js b/erpnext/utilities/page/calendar/calendar.js index ac1ac8837b8..9aa5df87dc3 100644 --- a/erpnext/utilities/page/calendar/calendar.js +++ b/erpnext/utilities/page/calendar/calendar.js @@ -24,7 +24,11 @@ pscript.onload_calendar = function(wrapper) { if(!erpnext.calendar) { erpnext.calendar = new Calendar(); erpnext.calendar.init(wrapper); - rename_observers.push(erpnext.calendar); + + var me = this; + $(document).bind('rename', function(event, dt, old_name, new_name) { + erpnext.calendar.rename_notify(dt, old_name, new_name) + }); } } @@ -63,7 +67,7 @@ Calendar.prototype.init=function (parent) { Calendar.prototype.rename_notify = function(dt, old_name, new_name) { // calendar - if(dt = 'Event'){ + if(dt = 'Event'){ if(this.events_by_name[old_name]) { delete this.events_by_name[old_name]; } diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js index 7e74fef6579..4cc7a522db7 100644 --- a/erpnext/utilities/page/messages/messages.js +++ b/erpnext/utilities/page/messages/messages.js @@ -76,7 +76,7 @@ erpnext.messages = { // check for updates every 5 seconds if page is active refresh: function() { setTimeout(erpnext.messages.refresh, 10000); - if(page_body.cur_page_label != 'messages') return; + if(wn.container.page.label != 'messages') return; erpnext.messages.show(); }, get_contact: function() { diff --git a/erpnext/website/doctype/style_settings/custom_template.css b/erpnext/website/doctype/style_settings/custom_template.css index 8eb3d6396f5..72c15a19295 100644 --- a/erpnext/website/doctype/style_settings/custom_template.css +++ b/erpnext/website/doctype/style_settings/custom_template.css @@ -5,13 +5,19 @@ body { background-color: #{{ doc.background_color }}; {% endif %} {% if doc.font %} - font-family: {{ doc.font }} !important; + font-family: '{{ doc.font }}', Verdana, Sans !important; {% endif %} {% if doc.font_size %} font-size: {{ doc.font_size }} !important; {% endif %} } +{% if doc.font_size %} +.small { + font-size: {{ doc.small_font_size }} !important; +} +{% endif %} + {% if doc.footer_font_color %} footer { color: {{ doc.footer_font_color }}; @@ -26,6 +32,6 @@ footer a, footer a:visited, footer a:hover { {% if doc.heading_font %} h1, h2, h3, h4, h5 { - font-family: {{ doc.heading_font}} !important; + font-family: '{{ doc.heading_font}}', Arial, 'Helvetica Neue' !important; } {% endif %} diff --git a/erpnext/website/doctype/style_settings/style_settings.py b/erpnext/website/doctype/style_settings/style_settings.py index 83961e055cf..282cd93fd4a 100644 --- a/erpnext/website/doctype/style_settings/style_settings.py +++ b/erpnext/website/doctype/style_settings/style_settings.py @@ -25,9 +25,13 @@ class DocType: with open('erpnext/website/doctype/style_settings/custom_template.css', 'r') as f: temp = Template(f.read()) + self.doc.small_font_size = str(int(self.doc.font_size[:-2])-2) + 'px' + self.doc.custom_css = temp.render(doc = self.doc) from webnotes.session_cache import clear_cache clear_cache('Guest') + del self.doc.fields['small_font_size'] + \ No newline at end of file diff --git a/erpnext/website/doctype/style_settings/style_settings.txt b/erpnext/website/doctype/style_settings/style_settings.txt index f07a9479ca1..18bd24c4a5a 100644 --- a/erpnext/website/doctype/style_settings/style_settings.txt +++ b/erpnext/website/doctype/style_settings/style_settings.txt @@ -5,150 +5,150 @@ { 'creation': '2012-02-02 09:57:25', 'docstatus': 0, - 'modified': '2012-02-02 10:47:38', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-03-21 10:53:38', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': '1328159294', + '_last_update': u'1330594969', 'allow_attach': 1, - 'colour': 'White:FFF', - 'description': 'Set your background color, font and image (tiled)', + 'colour': u'White:FFF', + 'description': u'Set your background color, font and image (tiled)', 'doctype': 'DocType', 'issingle': 1, 'max_attachments': 1, - 'module': 'Website', + 'module': u'Website', 'name': '__common__', - 'section_style': 'Simple', + 'section_style': u'Simple', 'show_in_menu': 0, - 'version': 9 + 'version': 15 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Style Settings', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Style Settings', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Style Settings', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Style Settings', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'read': 1, - 'role': 'Website Manager' + 'role': u'Website Manager' }, # DocType, Style Settings { 'doctype': 'DocType', - 'name': 'Style Settings' + 'name': u'Style Settings' }, # DocPerm { 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, 'write': 1 }, # DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Solid background color (default light gray)', - 'doctype': 'DocField', - 'fieldname': 'background_color', - 'fieldtype': 'Data', - 'label': 'Background Color', + 'colour': u'White:FFF', + 'description': u'Solid background color (default light gray)', + 'doctype': u'DocField', + 'fieldname': u'background_color', + 'fieldtype': u'Data', + 'label': u'Background Color', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'If image is selected, color will be ignored (attach first)', - 'doctype': 'DocField', - 'fieldname': 'background_image', - 'fieldtype': 'Select', - 'label': 'Background Image', - 'options': 'attach_files:', + 'colour': u'White:FFF', + 'description': u'If image is selected, color will be ignored (attach first)', + 'doctype': u'DocField', + 'fieldname': u'background_image', + 'fieldtype': u'Select', + 'label': u'Background Image', + 'options': u'attach_files:', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'font', - 'fieldtype': 'Select', - 'label': 'Font', - 'options': '\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma', + 'doctype': u'DocField', + 'fieldname': u'font', + 'fieldtype': u'Select', + 'label': u'Font', + 'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nPontano Sans\nDroid Sans\nGill Sans', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'font_size', - 'fieldtype': 'Select', - 'label': 'Font Size', - 'options': '\n12px\n13px\n14px', + 'doctype': u'DocField', + 'fieldname': u'font_size', + 'fieldtype': u'Select', + 'label': u'Font Size', + 'options': u'\n12px\n13px\n14px\n15px\n16px', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'heading_font', - 'fieldtype': 'Select', - 'label': 'Heaing Font', - 'options': '\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma', + 'doctype': u'DocField', + 'fieldname': u'heading_font', + 'fieldtype': u'Select', + 'label': u'Heading Font', + 'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nPontano Sans\nDroid Sans\nGill Sans', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select a white footer foreground color if you have a dark background', - 'doctype': 'DocField', - 'fieldname': 'footer_font_color', - 'fieldtype': 'Select', - 'label': 'Footer Font Color', - 'options': '\nwhite', + 'colour': u'White:FFF', + 'description': u'Select a white footer foreground color if you have a dark background', + 'doctype': u'DocField', + 'fieldname': u'footer_font_color', + 'fieldtype': u'Select', + 'label': u'Footer Font Color', + 'options': u'\nwhite', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Auto generated', - 'doctype': 'DocField', - 'fieldname': 'custom_css', - 'fieldtype': 'Code', - 'label': 'Custom CSS', + 'colour': u'White:FFF', + 'description': u'Auto generated', + 'doctype': u'DocField', + 'fieldname': u'custom_css', + 'fieldtype': u'Code', + 'label': u'Custom CSS', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'file_list', - 'fieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'file_list', + 'fieldtype': u'Text', 'hidden': 1, - 'label': 'File List', + 'label': u'File List', 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 diff --git a/erpnext/website/js/topbar.js b/erpnext/website/js/topbar.js index 90ad3e825ba..6fe9671eb83 100644 --- a/erpnext/website/js/topbar.js +++ b/erpnext/website/js/topbar.js @@ -112,6 +112,6 @@ erpnext.Footer = Class.extend({ }); $(document).bind('startup', function() { - erpnext.footer = new erpnext.Footer(); - erpnext.navbar.navbar = new erpnext.navbar.navbar(); +// erpnext.footer = new erpnext.Footer(); +// erpnext.navbar.navbar = new erpnext.navbar.navbar(); }) diff --git a/js/all-app.js b/js/all-app.js index b38b1ec26f8..d9068de42c9 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -12,22 +12,6 @@ */ (function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('