diff --git a/build.json b/build.json index 4d7fc0d0cb6..76e75b478e1 100644 --- a/build.json +++ b/build.json @@ -39,7 +39,7 @@ "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/dialog.css", - "lib/css/legacy/bootstrap-buttons.css", + "lib/css/bootstrap/bootstrap-buttons.css", "lib/css/bootstrap/bootstrap-topbar.css", "erpnext/startup/startup.css", "erpnext/website/css/website.css" @@ -61,7 +61,7 @@ "lib/css/legacy/tabs.css", "lib/css/legacy/bw-icons.css", "lib/css/legacy/sidebar.css", - "lib/css/legacy/bootstrap-buttons.css", + "lib/css/bootstrap/bootstrap-buttons.css", "lib/css/bootstrap/bootstrap-topbar.css", "erpnext/startup/startup.css" ] diff --git a/css/all-app.css b/css/all-app.css index 7faff74f9ff..18a99f5aa4c 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -12,6 +12,7 @@ body { font-family: Arial, Helvetica, Sans; font-size: 12px; color: #000; + background-color: #e2e2e2; } /* heading from bootstrap */ @@ -225,12 +226,30 @@ div.std-footer-item { color: #FFF; } -.layout_wrapper { - padding: 15px; +.layout_wrapper, .layout-wrapper { -moz-box-shadow: 1px 1px 6px #AAA; -webkit-box-shadow: 1px 1px 6px #AAA; box-shadow: 1px 1px 6px #AAA; + background-color: #fff; + padding: 15px; +} + +.layout-main-section { + width: 68%; + float: left; + padding: 13px; background-color: #FFF; + min-height: 450px; +} + +.layout-side-section { + width: 24%; + float: right; + margin-right: 15px; + color: #606060; + overflow-x: hidden; + padding: 13px; + min-height: 450px; } /* from bootstrap */ @@ -1612,8 +1631,6 @@ div.psidebar-head { } div.psidebar-section { - background-color: #fff; - border: 1px solid #b2b2b7; margin-bottom: 11px; overflow: hidden; } @@ -1621,14 +1638,7 @@ div.psidebar-section { 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 */ + border-bottom: 2px solid #444; } div.psidebar-section-body { @@ -1650,7 +1660,7 @@ div.follower-list { font-size: 11px; } /* - * lib/css/legacy/bootstrap-buttons.css + * lib/css/bootstrap/bootstrap-buttons.css */.btn.danger, .alert-message.danger, .btn.danger:hover, @@ -2222,7 +2232,6 @@ span, div, td, input, textarea, button, select { } body { - background-color: #e2e2e2; } .erpnext-footer { diff --git a/css/all-web.css b/css/all-web.css index 33501000a62..43e94e487d8 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -12,6 +12,7 @@ body { font-family: Arial, Helvetica, Sans; font-size: 12px; color: #000; + background-color: #e2e2e2; } /* heading from bootstrap */ @@ -225,12 +226,30 @@ div.std-footer-item { color: #FFF; } -.layout_wrapper { - padding: 15px; +.layout_wrapper, .layout-wrapper { -moz-box-shadow: 1px 1px 6px #AAA; -webkit-box-shadow: 1px 1px 6px #AAA; box-shadow: 1px 1px 6px #AAA; + background-color: #fff; + padding: 15px; +} + +.layout-main-section { + width: 68%; + float: left; + padding: 13px; background-color: #FFF; + min-height: 450px; +} + +.layout-side-section { + width: 24%; + float: right; + margin-right: 15px; + color: #606060; + overflow-x: hidden; + padding: 13px; + min-height: 450px; } /* from bootstrap */ @@ -433,7 +452,7 @@ div.dialog_row table td textarea { } /* - * lib/css/legacy/bootstrap-buttons.css + * lib/css/bootstrap/bootstrap-buttons.css */.btn.danger, .alert-message.danger, .btn.danger:hover, @@ -1005,7 +1024,6 @@ span, div, td, input, textarea, button, select { } body { - background-color: #e2e2e2; } .erpnext-footer { diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js index 4df78e35419..25c74ae9154 100644 --- a/erpnext/home/page/event_updates/event_updates.js +++ b/erpnext/home/page/event_updates/event_updates.js @@ -16,12 +16,14 @@ pscript.home_make_body = function() { var wrapper = page_body.pages['Event Updates']; // body - wrapper.main_tab = make_table(wrapper,1,2,'100%',['70%','30%']); - $y(wrapper.main_tab, {tableLayout:'fixed'}); - - wrapper.body = $a($td(wrapper.main_tab, 0, 0), 'div', 'layout_wrapper'); - + $(wrapper).addClass('layout-wrapper') + .css('background-color', wn.sidebar_background).css('padding', '0px'); + wrapper.style.backgroud + + wrapper.body = $a(wrapper, 'div', 'layout-main-section'); wrapper.head = $a(wrapper.body, 'div'); + wrapper.side_section =$a(wrapper, 'div', 'layout-side-section'); + $a(wrapper, 'div', '', {clear:'both'}); wrapper.banner_area = $a(wrapper.head, 'div'); @@ -46,7 +48,7 @@ pscript.home_set_banner = function(wrapper) { pscript.home_make_widgets = function() { var wrapper = page_body.pages['Event Updates']; - var cell = $td(wrapper.main_tab, 0, 1); + var cell = wrapper.side_section; // sidebar sidebar = new wn.widgets.PageSidebar(cell, { @@ -580,7 +582,7 @@ FeedItem.prototype.render_references = function(div, det) { HomeStatusBar = function() { var me = this; var parent = page_body.pages['Event Updates']; - this.wrapper = $a($td(parent.main_tab, 0, 1), 'div', 'home-status', {}, 'Loading...'); + this.wrapper = $a(parent.sidebar_section, 'div', 'home-status', {}, 'Loading...'); $br(this.wrapper, '3px'); this.render = function(r) { diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index 6e368ac483d..244af3f8eac 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -13,7 +13,6 @@ span, div, td, input, textarea, button, select { } body { - background-color: #e2e2e2; } .erpnext-footer { diff --git a/js/all-app.js b/js/all-app.js index 839b8ef6c07..e90debf2e9f 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -148,7 +148,7 @@ var sep=((args&&args.indexOf('?'))==-1)?'?':'&';var u=args?(url+sep+args):url;re /* * lib/js/wn/versions.js */ -wn.versions={check:function(){if(localStorage){if(window._version_number==-1||parseInt(localStorage._version_number)!=parseInt(window._version_number)){var localversion=localStorage._version_number;localStorage.clear();console.log("Cache cleared - version: "+localversion +wn.versions={check:function(){if(window.localStorage){if(window._version_number==-1||parseInt(localStorage._version_number)!=parseInt(window._version_number)){var localversion=localStorage._version_number;localStorage.clear();console.log("Cache cleared - version: "+localversion +' to '+_version_number)} localStorage.setItem('_version_number',window._version_number);}}} /* @@ -1161,8 +1161,8 @@ $c('webnotes.widgets.page.getpage',{'name':page_name,stylesheets:JSON.stringify( /* * lib/js/legacy/wn/page_layout.js */ -wn.PageLayout=function(args){$.extend(this,args) -this.wrapper=$a(this.parent,'div');this.wtab=make_table(this.wrapper,1,2,'100%',[this.main_width,this.sidebar_width]);this.main=$a($td(this.wtab,0,0),'div','layout_wrapper');this.sidebar_area=$a($td(this.wtab,0,1),'div');this.head=$a(this.main,'div');this.toolbar_area=$a(this.main,'div');this.body=$a(this.main,'div');this.footer=$a(this.main,'div');if(this.heading){this.page_head=new PageHeader(this.head,this.heading);}} +wn.sidebar_background='#f2f2f2';wn.PageLayout=function(args){$.extend(this,args) +this.wrapper=$a(this.parent,'div','layout-wrapper',{backgroundColor:wn.sidebar_background,padding:'0px'});this.main=$a(this.wrapper,'div','layout-main-section');this.sidebar_area=$a(this.wrapper,'div','layout-side-section');$a(this.wrapper,'div','',{clear:'both'});this.head=$a(this.main,'div');this.toolbar_area=$a(this.main,'div');this.body=$a(this.main,'div');this.footer=$a(this.main,'div');if(this.heading){this.page_head=new PageHeader(this.head,this.heading);}} /* * lib/js/legacy/wn/widgets/page_sidebar.js */ @@ -2163,8 +2163,7 @@ CommentItem.prototype.cmt_delete=function(cell,ri,ci,d){var me=this;if(d[ri][2]= * lib/js/legacy/wn/widgets/form/sidebar.js */ wn.widgets.form.sidebar={Sidebar:function(form){var me=this;this.form=form;this.opts={sections:[{title:'Actions',items:[{type:'link',label:'New',icon:'ic-doc_new',display:function(){return in_list(profile.can_create,form.doctype)},onclick:function(){new_doc(me.form.doctype)}},{type:'link',label:'Refresh',icon:'ic-playback_reload',onclick:function(){me.form.reload_doc()}},{type:'link',label:'Print',display:function(){return!(me.form.doc.__islocal||me.form.meta.allow_print);},icon:'ic-print',onclick:function(){me.form.print_doc()}},{type:'link',label:'Email',display:function(){return!(me.form.doc.__islocal||me.form.meta.allow_email);},icon:'ic-mail',onclick:function(){me.form.email_doc()}},{type:'link',label:'Copy',display:function(){return in_list(profile.can_create,me.form.doctype)&&!me.form.meta.allow_copy},icon:'ic-clipboard_copy',onclick:function(){me.form.copy_doc()}},{type:'link',label:'Delete',display:function(){return me.form.meta.allow_trash&&cint(me.form.doc.docstatus)!=2&&(!me.form.doc.__islocal)&&me.form.perm[0][CANCEL]},icon:'ic-trash',onclick:function(){me.form.savetrash()}}]},{title:'Assign To',render:function(wrapper){me.form.assign_to=new wn.widgets.form.sidebar.AssignTo(wrapper,me,me.form.doctype,me.form.docname);},display:function(){if(me.form.doc.__local)return false;else return true;}},{title:'Attachments',render:function(wrapper){me.form.attachments=new wn.widgets.form.sidebar.Attachments(wrapper,me,me.form.doctype,me.form.docname);},display:function(){return me.form.meta.allow_attach}},{title:'Comments',render:function(wrapper){new wn.widgets.form.sidebar.Comments(wrapper,me,me.form.doctype,me.form.docname);},display:function(){return!me.form.doc.__islocal}},{title:'Tags',render:function(wrapper){me.form.taglist=new TagList(wrapper,me.form.doc._user_tags?me.form.doc._user_tags.split(','):[],me.form.doctype,me.form.docname,0,function(){});},display:function(){return!me.form.doc.__islocal}}]} -this.refresh=function(){var parent=this.form.page_layout.sidebar_area;if(!this.sidebar){$y(parent,{paddingTop:'37px'}) -this.sidebar=new wn.widgets.PageSidebar(parent,this.opts);}else{this.sidebar.refresh();}}}} +this.refresh=function(){var parent=this.form.page_layout.sidebar_area;if(!this.sidebar){this.sidebar=new wn.widgets.PageSidebar(parent,this.opts);}else{this.sidebar.refresh();}}}} /* * lib/js/legacy/wn/widgets/form/comments.js */ diff --git a/js/all-web.js b/js/all-web.js index 663dd45a061..22e540019f3 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -74,7 +74,7 @@ var sep=((args&&args.indexOf('?'))==-1)?'?':'&';var u=args?(url+sep+args):url;re /* * lib/js/wn/versions.js */ -wn.versions={check:function(){if(localStorage){if(window._version_number==-1||parseInt(localStorage._version_number)!=parseInt(window._version_number)){var localversion=localStorage._version_number;localStorage.clear();console.log("Cache cleared - version: "+localversion +wn.versions={check:function(){if(window.localStorage){if(window._version_number==-1||parseInt(localStorage._version_number)!=parseInt(window._version_number)){var localversion=localStorage._version_number;localStorage.clear();console.log("Cache cleared - version: "+localversion +' to '+_version_number)} localStorage.setItem('_version_number',window._version_number);}}} /* @@ -884,8 +884,8 @@ $c('webnotes.widgets.page.getpage',{'name':page_name,stylesheets:JSON.stringify( /* * lib/js/legacy/wn/page_layout.js */ -wn.PageLayout=function(args){$.extend(this,args) -this.wrapper=$a(this.parent,'div');this.wtab=make_table(this.wrapper,1,2,'100%',[this.main_width,this.sidebar_width]);this.main=$a($td(this.wtab,0,0),'div','layout_wrapper');this.sidebar_area=$a($td(this.wtab,0,1),'div');this.head=$a(this.main,'div');this.toolbar_area=$a(this.main,'div');this.body=$a(this.main,'div');this.footer=$a(this.main,'div');if(this.heading){this.page_head=new PageHeader(this.head,this.heading);}} +wn.sidebar_background='#f2f2f2';wn.PageLayout=function(args){$.extend(this,args) +this.wrapper=$a(this.parent,'div','layout-wrapper',{backgroundColor:wn.sidebar_background,padding:'0px'});this.main=$a(this.wrapper,'div','layout-main-section');this.sidebar_area=$a(this.wrapper,'div','layout-side-section');$a(this.wrapper,'div','',{clear:'both'});this.head=$a(this.main,'div');this.toolbar_area=$a(this.main,'div');this.body=$a(this.main,'div');this.footer=$a(this.main,'div');if(this.heading){this.page_head=new PageHeader(this.head,this.heading);}} /* * lib/js/legacy/wn/widgets/footer.js */ diff --git a/version.num b/version.num index 1e27e32d42d..88bc40f5cc2 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -478 \ No newline at end of file +513 \ No newline at end of file