diff --git a/css/all-app.css b/css/all-app.css index a6dcdb73664..53b33d2801c 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -103,8 +103,19 @@ div.comment { color: #444; } div#body_div { position: relative; display: none; - margin-top: 56px; padding-right: 7px; + width: 900px; + margin: auto; + margin-top: 56px; +} + +footer { + width: 900px; + margin: auto; +} +header .container { + width: 900px; + margin: auto; } div.no_script { @@ -124,11 +135,6 @@ div.loading_div { border: 1px solid #FF4; } - -div#head_div { background-color: #FFF; } - -#head_banner { background-color: #FFF; } - div.std-footer { margin: 13px 0px; border-top: 1px solid #AAA; @@ -161,18 +167,6 @@ div.std-footer-item { 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, .layout-wrapper { -moz-box-shadow: 1px 1px 6px #AAA; -webkit-box-shadow: 1px 1px 6px #AAA; @@ -187,7 +181,7 @@ div.std-footer-item { } .layout-main-section { - width: 68%; + width: 70%; float: left; padding: 15px; background-color: #FFF; @@ -195,7 +189,7 @@ div.std-footer-item { } .layout-side-section { - width: 24%; + width: 22%; float: right; color: #606060; overflow-x: hidden; @@ -1290,17 +1284,16 @@ ul.box_tabs li { cursor: pointer; } -ul.box_tabs a { +ul.box_tabs li a { display:block; padding:3px 15px 3px 6px; - text-decoration:none; + text-decoration: none; } ul.box_tabs li.box_tab_mouseover { background-color: #BBB; } - ul.box_tabs li.box_tab_selected { background-color: #777; @@ -1312,9 +1305,8 @@ ul.box_tabs li.box_tab_selected { } ul.box_tabs li.box_tab_selected a { - + color: #fff; } - /* * lib/css/legacy/bw-icons.css */ diff --git a/css/all-web.css b/css/all-web.css index 1e1548932f2..d7cb10cbafc 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -103,8 +103,19 @@ div.comment { color: #444; } div#body_div { position: relative; display: none; - margin-top: 56px; padding-right: 7px; + width: 900px; + margin: auto; + margin-top: 56px; +} + +footer { + width: 900px; + margin: auto; +} +header .container { + width: 900px; + margin: auto; } div.no_script { @@ -124,11 +135,6 @@ div.loading_div { border: 1px solid #FF4; } - -div#head_div { background-color: #FFF; } - -#head_banner { background-color: #FFF; } - div.std-footer { margin: 13px 0px; border-top: 1px solid #AAA; @@ -161,18 +167,6 @@ div.std-footer-item { 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, .layout-wrapper { -moz-box-shadow: 1px 1px 6px #AAA; -webkit-box-shadow: 1px 1px 6px #AAA; @@ -187,7 +181,7 @@ div.std-footer-item { } .layout-main-section { - width: 68%; + width: 70%; float: left; padding: 15px; background-color: #FFF; @@ -195,7 +189,7 @@ div.std-footer-item { } .layout-side-section { - width: 24%; + width: 22%; float: right; color: #606060; overflow-x: hidden; @@ -1655,12 +1649,7 @@ body { /* * erpnext/website/css/website.css - */#body_div { - width: 900px; - margin: auto; -} - -.layout_wrapper { + */.layout_wrapper { padding: 20px; } @@ -1687,15 +1676,6 @@ pre { margin-bottom: 9px; } -footer { - width: 900px; - margin: auto; -} -header .topbar .container { - width: 900px; - margin: auto; -} - .web-content input[type="text"], .web-content input[type="password"], .web-content select { min-width: 180px; } diff --git a/erpnext/accounts/page/accounts_home/accounts_home.html b/erpnext/accounts/page/accounts_home/accounts_home.html index 27868e923bc..12c80ebe8f9 100644 --- a/erpnext/accounts/page/accounts_home/accounts_home.html +++ b/erpnext/accounts/page/accounts_home/accounts_home.html @@ -57,6 +57,13 @@ title = "Helper for managing return of goods (sales or purchase)" href="#!Form/Sales and Purchase Return Wizard/Sales and Purchase Return Wizard">Sales or Purchase Returns +
+ Trend Analyzer +
+ + @@ -83,6 +90,11 @@ title = "Seasonal distributions for budgets" href="#!List/Budget Distribution">Budget Distribution +
+ Order Terms Template +
Purchase Returns
+
+ Order Terms Template +
+ + +
+
Tools
+
+
+ Trend Analyzer +
diff --git a/erpnext/projects/page/projects_home/projects_home.html b/erpnext/projects/page/projects_home/projects_home.html index 5b364b94cee..37da61ffc86 100644 --- a/erpnext/projects/page/projects_home/projects_home.html +++ b/erpnext/projects/page/projects_home/projects_home.html @@ -22,13 +22,16 @@
- +
diff --git a/erpnext/selling/page/selling_home/selling_home.html b/erpnext/selling/page/selling_home/selling_home.html index adf4a2b638b..4216f4302eb 100644 --- a/erpnext/selling/page/selling_home/selling_home.html +++ b/erpnext/selling/page/selling_home/selling_home.html @@ -44,6 +44,11 @@ title = "Group items and accessories in one item code" href="#!List/Sales BOM">Sales BOM +
+ Order Terms Template +
Sales Dashboard + title = "Helper for managing return of goods (sales or purchase)" + href="#!Form/Sales and Purchase Return Wizard/Sales and Purchase Return Wizard">Sales Returns
Sales Returns + title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc" + href="#!Report/Profile/Trend Analyzer">Trend Analyzer +
+
+ Sales Dashboard
diff --git a/erpnext/setup/page/setup/setup.css b/erpnext/setup/page/setup/setup.css new file mode 100644 index 00000000000..bff44db14c9 --- /dev/null +++ b/erpnext/setup/page/setup/setup.css @@ -0,0 +1,6 @@ +.setup-column { + float: left; + width: 45%; + margin-right: 5%; + margin-bottom: 15px; +} \ No newline at end of file diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html index ec21ab7f881..7963cb9d9a6 100644 --- a/erpnext/setup/page/setup/setup.html +++ b/erpnext/setup/page/setup/setup.html @@ -1,3 +1,124 @@ -
-
Loading...
+
+ × +

Setup

+
+
+

Company

+

+ Companies
+ List of companies (not customers / suppliers) +

+

+ Fiscal Years
+ Financial Years for books of accounts +

+

+ Currencies
+ Currency Master +

+
+
+

Users and Permissions

+

+ Users
+ Add/remove users, set roles, passwords etc +

+

+ Permission Manager
+ Set permissions on transactions / masters +

+

+ Amount based Authorization Rules
+ Restrict submission rights based on amount +

+
+
+

Data

+

+ Import Data
+ Import data from spreadsheet (csv) files +

+

+ Global Defaults
+ Set default values for entry +

+

+ Recycle Bin
+ Un-trash items +

+

+ Rename Master
+ Rename a single master record +

+

+ Rename Many
+ Rename by uploading a csv file +

+
+
+

Email and Notifications

+

+ Email Settings
+ Out going mail server and support ticket mailbox +

+

+ Auto Notifications
+ Automatic email sending to customers and suppliers +

+

+ Email Digests
+ Daily, weekly, monthly email Digests +

+

+ SMS Setup
+ Setup outgoing SMS via your bulk SMS provider +

+

+ Send Bulk SMS
+ Send bulk SMS to leads, customers, contacts +

+
+
+

Customize ERPNext

+

+ Custom Fields
+ Add fields to forms +

+

+ Customize Forms
+ Change entry properties (hide fields, make mandatory etc) +

+

+ Numbering Series
+ Set multiple numbering series for transactions +

+

+ Disable Features
+ Simplify entry forms by disabling features +

+
+
+

Branding and Printing

+

+ Letter Heads
+ Letter heads for print +

+

+ Print Formats
+ HTML print formats for quotes, invoices etc +

+

+ Print Headings
+ Add headers for standard print formats +

+

+ Home Banner
+ Add a home page banner +

+

+ Style Settings
+ Change background fonts etc +

+
+
\ No newline at end of file diff --git a/erpnext/setup/page/setup/setup.js b/erpnext/setup/page/setup/setup.js index d58f11a1abc..5b8f17613ff 100644 --- a/erpnext/setup/page/setup/setup.js +++ b/erpnext/setup/page/setup/setup.js @@ -1,255 +1,3 @@ -pscript.onload_Setup = function() { - var parent = $i('setup_div'); - - var callback = function(r,rt){ - $('#setup_div').empty(); - // header - parent.page_head = new PageHeader(parent,'Setup'); - - // sections - var setup_data = new SetupData(r.message); - pscript.setup_make_sections(setup_data); - - } - $c_obj('Setup Wizard Control','get_country','',callback); -} - -pscript.setup_set_height = function() { - var parent = $i('setup_div'); - $y(parent.tray.body, {height: get_window_height() - parent.page_head.wrapper.offsetHeight + 'px', overflow:'auto'}) -} - -// Make sections -// =================================================== - -pscript.setup_make_sections = function(setup_data) { - var parent = $i('setup_div'); - parent.tray = new TrayPage(parent) - - // list of setup data - var lst = [setup_data.system, setup_data.general, setup_data.accounts, setup_data.selling, setup_data.buying, setup_data.stock, setup_data.hr, setup_data.maintenance, setup_data.production]; - - for(var s=0; s b[0]; }); - - // show links for item - for(var i=0; i\ +erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ Powered by ERPNext
');} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} @@ -2221,50 +2216,11 @@ $(document).bind('startup',function(){erpnext.startup.start();}); /* * erpnext/startup/modules.js */ -wn.provide('erpnext.module_page');erpnext.module_page.setup_page=function(module,wrapper){erpnext.module_page.hide_links(wrapper);erpnext.module_page.make_list(module,wrapper);$(wrapper).find("a").tooltip({delay:{show:500,hide:100}});} +wn.provide('erpnext.module_page');erpnext.module_page.setup_page=function(module,wrapper){erpnext.module_page.hide_links(wrapper);erpnext.module_page.make_list(module,wrapper);$(wrapper).find("a[title]").tooltip({delay:{show:500,hide:100}});} erpnext.module_page.hide_links=function(wrapper){$(wrapper).find('[href*="List/"]').each(function(){var href=$(this).attr('href');var dt=href.split('/')[1];if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(wrapper).find('[data-doctype]').each(function(){var dt=$(this).attr('data-doctype');if(wn.boot.profile.can_read.indexOf(dt)==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(wrapper).find('[href*="Form/"]').each(function(){var href=$(this).attr('href');var dt=href.split('/')[1];if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});} erpnext.module_page.make_list=function(module,wrapper){wrapper.list=new wn.widgets.Listing({parent:$(wrapper).find('.reports-list').get(0),method:'utilities.get_report_list',render_row:function(row,data){if(!data.parent_doc_type)data.parent_doc_type=data.doc_type;$(row).html(repl('\ %(criteria_name)s',data))},args:{module:module},no_refresh:true});wrapper.list.run();} -pscript.startup_make_sidebar=function(){$y(page_body.left_sidebar,{width:(100/6)+'%',paddingTop:'8px'});var callback=function(r,rt){var ml=r.message;page_body.left_sidebar.innerHTML='';for(var m=0;mMandatory fields required in '+ /* * lib/js/legacy/webpage/body.js */ -function Body(){this.left_sidebar=null;this.right_sidebar=null;this.status_area=null;var me=this;page_body=this;this.no_of_columns=function(){var n=2;if(cint(me&&me.cp&&me.cp.right_sidebar_width)) -n=n+1;return n;} -this.ready=function(){$dh('startup_div');$ds('body_div');} -this.setup_page_areas=function(){var n=this.no_of_columns();this.body_table=make_table(this.body,1,n,'100%');$y(this.body_table,{tableLayout:'fixed'});var c=0;this.left_sidebar=$td(this.body_table,0,c);$y(this.left_sidebar,{width:cint(this.cp.left_sidebar_width)+'px'});c++;this.center=$a($td(this.body_table,0,c),'div');c++;if(cint(this.cp.right_sidebar_width)){this.right_sidebar=$td(this.body_table,0,c);$y(this.right_sidebar,{width:cint(this.cp.right_sidebar_width)+'px'}) -c++;} -this.center.header=$a(this.center,'div');this.center.body=$a(this.center,'div');this.center.loading=$a(this.center,'div','',{margin:'200px 0px',fontSize:'14px',color:'#999',textAlign:'center'});this.center.loading.innerHTML='Loading...'} -this.setup_sidebar_menu=function(){if(this.left_sidebar&&this.cp.show_sidebar_menu){sidebar_menu=new SidebarMenu();sidebar_menu.make_menu('');}} +function Body(){this.left_sidebar=null;this.right_sidebar=null;this.status_area=null;var me=this;page_body=this;this.ready=function(){$dh('startup_div');$ds('body_div');} +this.setup_page_areas=function(){this.center=this.body;this.center.header=$a(this.center,'div');this.center.body=$a(this.center,'div');this.center.loading=$a(this.center,'div','',{margin:'200px 0px',fontSize:'14px',color:'#999',textAlign:'center'});this.center.loading.innerHTML='Loading...'} this.run_startup_code=function(){$(document).trigger('startup');try{if(this.cp.custom_startup_code) eval(this.cp.custom_startup_code);}catch(e){errprint(e);}} this.setup=function(){this.cp=wn.control_panel;this.wrapper=$a($i('body_div'),'div');this.body=$a(this.wrapper,'div');this.setup_page_areas();if(user=='Guest')user_defaults.hide_webnotes_toolbar=1;if(!cint(user_defaults.hide_webnotes_toolbar)||user=='Administrator'){this.wntoolbar=new wn.ui.toolbar.Toolbar();} @@ -1009,7 +1004,7 @@ var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function start if(r.dt_labels){for(key in r.dt_labels)session.rev_dt_labels[r.dt_labels[key]]=key;} wn.control_panel=r.control_panel;} var setup_history=function(r){rename_observers.push(nav_obj);} -var callback=function(r,rt){if(r.exc)console.log(r.exc);setup_globals(r);setup_history();var a=new Body();page_body.run_startup_code();page_body.setup_sidebar_menu();for(var i=0;i\ +erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ Powered by ERPNext
');} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} @@ -1082,6 +1077,12 @@ wn.provide('erpnext.navbar');erpnext.navbar.navbar=Class.extend({init:function() %(label)s',item))}} for(var i=0;i').click(function(){return false;});$parent_li.append('
    ');} item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(repl('
  • \ - %(label)s
    • ',item))}}}});erpnext.Footer=Class.extend({init:function(){alert(15);this.make_items();},make_items:function(){alert(16);var items=wn.boot.website_menus + %(label)s',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('
    \ +
      \ +
      %(address)s
      \ +
      © %(copyright)s
      \ +
      Powered by \ + erpnext.com
      \ +
      ',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus for(var i=0;i%(label)s',item))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.navbar();}) \ No newline at end of file diff --git a/version.num b/version.num index 748e6f1af54..70e36030cf4 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -637 \ No newline at end of file +648 \ No newline at end of file