2 col layout in form, docbrowser and home
This commit is contained in:
parent
09efcee290
commit
de076d3335
10 changed files with 36 additions and 26 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
BIN
images/icons/glyphicons-halflings-white.png
Normal file
BIN
images/icons/glyphicons-halflings-white.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
BIN
images/icons/glyphicons-halflings.png
Normal file
BIN
images/icons/glyphicons-halflings.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
2
js/core.min.js
vendored
2
js/core.min.js
vendored
|
|
@ -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);}}}
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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<img src="lib/images/ui/button-load.gif" style="margin-bottom: -2px; margin-left: 8px">';
|
||||
|
||||
// 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: [
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue