diff --git a/css/legacy/bootstrap-buttons.css b/css/bootstrap/bootstrap-buttons.css similarity index 100% rename from css/legacy/bootstrap-buttons.css rename to css/bootstrap/bootstrap-buttons.css diff --git a/css/legacy/body.css b/css/legacy/body.css index 6aa0ce0904..4868662a1e 100644 --- a/css/legacy/body.css +++ b/css/legacy/body.css @@ -9,6 +9,7 @@ body { font-family: Arial, Helvetica, Sans; font-size: 12px; color: #000; + background-color: #e2e2e2; } /* heading from bootstrap */ @@ -222,12 +223,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 */ diff --git a/css/legacy/sidebar.css b/css/legacy/sidebar.css index 36a72cdee8..c740975d20 100644 --- a/css/legacy/sidebar.css +++ b/css/legacy/sidebar.css @@ -10,8 +10,6 @@ div.psidebar-head { } div.psidebar-section { - background-color: #fff; - border: 1px solid #b2b2b7; margin-bottom: 11px; overflow: hidden; } @@ -19,14 +17,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 { diff --git a/images/icons/glyphicons-halflings-white.png b/images/icons/glyphicons-halflings-white.png new file mode 100644 index 0000000000..a20760bfde Binary files /dev/null and b/images/icons/glyphicons-halflings-white.png differ diff --git a/images/icons/glyphicons-halflings.png b/images/icons/glyphicons-halflings.png new file mode 100644 index 0000000000..92d4445dfd Binary files /dev/null and b/images/icons/glyphicons-halflings.png differ diff --git a/js/core.min.js b/js/core.min.js index 3077287c38..ffde7ae92e 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -22,7 +22,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);}}} /* diff --git a/js/legacy/webpage/docbrowser.js b/js/legacy/webpage/docbrowser.js index 2e5bff59f3..70b91fac0a 100644 --- a/js/legacy/webpage/docbrowser.js +++ b/js/legacy/webpage/docbrowser.js @@ -71,7 +71,7 @@ ItemBrowser = function(parent, dt, label, field_list) { heading: l }) - this.layout.no_records = $a($td(this.layout.wtab,0,0), 'div'); + this.layout.no_records = $a(this.layout.main, 'div'); $dh(this.layout.page_head.separator); @@ -79,7 +79,7 @@ ItemBrowser = function(parent, dt, label, field_list) { this.no_result_area = $a(this.layout.no_records, 'div','layout_wrapper',{fontSize:'14px', textAlign:'center', padding:'200px 0px'}); // loading... - this.layout.loading = $a($td(this.layout.wtab,0,0), 'div','layout_wrapper',{padding:'200px 0px', textAlign:'center', fontSize:'14px', color:'#444', display:'none'}); + this.layout.loading = $a(this.layout.main, 'div','',{padding:'200px 0px', textAlign:'center', fontSize:'14px', color:'#444', display:'none'}); this.layout.loading.innerHTML = 'Loading'; // setup toolbar @@ -101,10 +101,7 @@ ItemBrowser.prototype.show_area = function(area) { ItemBrowser.prototype.setup_sidebar = function() { var me = this; - - // table - $y(this.layout.sidebar_area, {paddingTop:'53px'}); - + // sidebar this.sidebar = new wn.widgets.PageSidebar(this.layout.sidebar_area, { sections: [ diff --git a/js/legacy/wn/page_layout.js b/js/legacy/wn/page_layout.js index 041d01e65a..8e6b898152 100644 --- a/js/legacy/wn/page_layout.js +++ b/js/legacy/wn/page_layout.js @@ -9,13 +9,16 @@ + sidebar_area */ + +wn.sidebar_background = '#f2f2f2'; 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.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'); diff --git a/js/legacy/wn/widgets/form/sidebar.js b/js/legacy/wn/widgets/form/sidebar.js index cc8bf57e7d..c612f5a325 100644 --- a/js/legacy/wn/widgets/form/sidebar.js +++ b/js/legacy/wn/widgets/form/sidebar.js @@ -109,7 +109,7 @@ wn.widgets.form.sidebar = { Sidebar: function(form) { this.refresh = function() { var parent = this.form.page_layout.sidebar_area; if(!this.sidebar) { - $y(parent, {paddingTop:'37px'}) + //$y(parent, {paddingTop:'37px'}) this.sidebar = new wn.widgets.PageSidebar(parent, this.opts); } else { this.sidebar.refresh(); diff --git a/js/wn/versions.js b/js/wn/versions.js index 302923a6d3..4a684cbe3e 100644 --- a/js/wn/versions.js +++ b/js/wn/versions.js @@ -3,7 +3,7 @@ wn.versions = { check: function() { - if(localStorage) { + if(window.localStorage) { if(window._version_number==-1 || parseInt(localStorage._version_number) != parseInt(window._version_number)) { var localversion = localStorage._version_number;