From d4cb4b2b01a2148b50ed30fa5ca22909f32c977e Mon Sep 17 00:00:00 2001 From: maximXbs Date: Wed, 10 Oct 2012 14:23:35 +0200 Subject: [PATCH] fixed Sankore-1167 issue --- .../library/applications/Notes.wgt/config.xml | 2 +- .../applications/Notes.wgt/css/ubwidget.css | 328 +++++++++--------- .../Notes.wgt/js/jquery.ubwidget.js | 2 - .../applications/Notes.wgt/js/ubw-main.js | 44 +-- 4 files changed, 189 insertions(+), 187 deletions(-) diff --git a/resources/library/applications/Notes.wgt/config.xml b/resources/library/applications/Notes.wgt/config.xml index a95cee6f..a39df2ab 100644 --- a/resources/library/applications/Notes.wgt/config.xml +++ b/resources/library/applications/Notes.wgt/config.xml @@ -3,7 +3,7 @@ xmlns:ub="http://uniboard.mnemis.com/widgets" id="http://uniboard.mnemis.com/widgets/notes" version="1.2" - width="302" + width="320" height="260" ub:resizable="true"> diff --git a/resources/library/applications/Notes.wgt/css/ubwidget.css b/resources/library/applications/Notes.wgt/css/ubwidget.css index d0d52396..61fea953 100644 --- a/resources/library/applications/Notes.wgt/css/ubwidget.css +++ b/resources/library/applications/Notes.wgt/css/ubwidget.css @@ -1,215 +1,219 @@ * { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } -body{ - margin:0px; +body, html{ + margin:0px; + height: 96%; } .ubw-container{ - text-overflow: ellipsis; - left:0px; - top:0px; - margin:0px; - /*background-color: #edf7c0;*/ - background-image: url(../images/back.png); - overflow: hidden; - border-right: 1px solid rgb(252, 252, 220); - border-left: 1px solid rgb(232, 232, 220); + min-width: 280px; + min-height: 200px; + width: 99%; + height: 100%; + text-overflow: ellipsis; + left:0px; + top:0px; + margin:0px; + background-image: url(../images/back.png); + overflow: hidden; + border-right: 1px solid rgb(252, 252, 220); + border-left: 1px solid rgb(232, 232, 220); } .ubw-body{ } .head{ - border-top: 1px solid rgb(252, 252, 220); - position: relative; - background-color: transparent; - font-style: normal; - color: #263141; - font-size: 119%; - width: auto; - height: 20px; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - outline: none; - border-bottom: rgb(252, 252, 220); - - + border-top: 1px solid rgb(252, 252, 220); + position: relative; + background-color: transparent; + font-style: normal; + color: #263141; + font-size: 119%; + width: auto; + height: 20px; + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; + outline: none; + border-bottom: rgb(252, 252, 220); + + } .stickytitle{ - background-color: transparent; - min-width: 10px; - max-width: 70%; - width: 100%; - padding-top: 4px; - height: 20px; - float: left; - z-index: 3; - position: relative; - overflow:hidden; - margin-left: 10px; - margin-right: -2px; - font-style: normal; - color: #444444; - font-size: 88%; - border-style: none; - outline: none; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - text-align: left; - resize: none; + background-color: transparent; + min-width: 10px; + max-width: 70%; + width: 100%; + padding-top: 4px; + height: 20px; + float: left; + z-index: 3; + position: relative; + overflow:hidden; + margin-left: 10px; + margin-right: -2px; + font-style: normal; + color: #444444; + font-size: 88%; + border-style: none; + outline: none; + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; + text-align: left; + resize: none; } .textField{ - min-height: 50px; - overflow-y: auto; - overflow-x: hidden; - height: auto; - width: auto; - margin: 5px; - padding-right: 4%; - background-position: 0; - border-left-style: none; - border-bottom-style: none; - border-right-style: none; - border-top-style: none; - text-align: left; - list-style-type: none; - outline: none; - word-wrap: break-word; - font-style: normal; - font-weight: normal; - font-family: Arial, Helvetica, sans-serif; - color:#444444; + min-height: 50px; + overflow-y: auto; + overflow-x: hidden; + height: auto; + width: auto; + margin: 5px; + padding-right: 4%; + background-position: 0; + border-left-style: none; + border-bottom-style: none; + border-right-style: none; + border-top-style: none; + text-align: left; + list-style-type: none; + outline: none; + word-wrap: break-word; + font-style: normal; + font-weight: normal; + font-family: Arial, Helvetica, sans-serif; + color:#444444; } .ubw-inspector{ - position:absolute; - background-color:rgb(252, 252, 252); - border:1px solid #cccccc; - line-height:20px; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:20px; - color:#333333; + position:absolute; + background-color:rgb(252, 252, 252); + border:1px solid #cccccc; + line-height:20px; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:20px; + color:#333333; } .ubw-inpubox{ - min-width:28px; - min-height:37px; - color:#333333; - background-image: url(../images/button_out.png); - border-left:1px solid rgb(231, 231, 231); - border-right:1px solid rgb(231, 231, 231); - border-bottom:1px solid rgb(221, 221, 221); - border-top:1px solid rgb(241, 241, 241); + min-width:28px; + min-height:37px; + color:#333333; + background-image: url(../images/button_out.png); + border-left:1px solid rgb(231, 231, 231); + border-right:1px solid rgb(231, 231, 231); + border-bottom:1px solid rgb(221, 221, 221); + border-top:1px solid rgb(241, 241, 241); } /*BUTTONS*/ .ubw-button-wrapper{ - float:left; - position:relative; - /*border:solid 1px yellow;*/ - margin-right:-7px; - z-index:0; - font-family:Arial, Helvetica, sans-serif; - font-weight:normal; - font-size:30px; - overflow:visible; + float:left; + position:relative; + /*border:solid 1px yellow;*/ + margin-right:-7px; + z-index:0; + font-family:Arial, Helvetica, sans-serif; + font-weight:normal; + font-size:30px; + overflow:visible; } .ubw-button-canvas{ - width:auto; - float:left; - position:relative; - overflow:visible; + width:auto; + float:left; + position:relative; + overflow:visible; } table{ - line-height:90%; + line-height:90%; } .ubw-dropdown{ - margin: 0; - padding: 0; - font-size: 15px; - width:100px; - list-style: none; - cursor:pointer; - float:none; - margin-left:3px; -} - - .ubw-dropdown li.out{ - padding-left: 5px; - color:#444444; - border-left:1px solid rgb(231, 231, 233); - border-right:1px solid rgb(231, 231, 233); - background-image: url(../images/button_out.gif); - } - - .ubw-dropdown li.over{ - padding-left: 5px; - color:#eeeeee; - border-left:1px solid rgb(140, 140, 140); - border-right:1px solid rgb(140, 140, 140); - background-image: url(../images/button_out_dark.png); - } - - .ubw-dropdown li.ubw-dropdown-top-corners{ - border-top:1px solid rgb(241, 241, 244); - } - - .ubw-dropdown li.ubw-dropdown-bottom-corners{ - border-bottom:1px solid rgb(221, 221, 223); - } + margin: 0; + padding: 0; + font-size: 15px; + width:100px; + list-style: none; + cursor:pointer; + float:none; + margin-left:3px; +} + +.ubw-dropdown li.out{ + padding-left: 5px; + color:#444444; + border-left:1px solid rgb(231, 231, 233); + border-right:1px solid rgb(231, 231, 233); + background-image: url(../images/button_out.gif); +} + +.ubw-dropdown li.over{ + padding-left: 5px; + color:#eeeeee; + border-left:1px solid rgb(140, 140, 140); + border-right:1px solid rgb(140, 140, 140); + background-image: url(../images/button_out_dark.png); +} + +.ubw-dropdown li.ubw-dropdown-top-corners{ + border-top:1px solid rgb(241, 241, 244); +} + +.ubw-dropdown li.ubw-dropdown-bottom-corners{ + border-bottom:1px solid rgb(221, 221, 223); +} .ubw-button-body{ - position:relative; - float:left; - - width:auto; - height:auto; - overflow:visible - - text-align:center; - vertical-align:middle; - - cursor:pointer; + position:relative; + float:left; + + width:auto; + height:auto; + overflow:visible + + text-align:center; + vertical-align:middle; + + cursor:pointer; } .ubw-button-content{ - margin:2px; - height:auto; - width:auto; - text-align:center; - overflow:visible; + margin:2px; + height:auto; + width:auto; + text-align:center; + overflow:visible; } .ubw-button-over{ - color:#444444; - background-image: url(../images/button_out.gif); - border-left:1px solid rgb(221, 221, 221); - border-right:1px solid rgb(221, 221, 221); - border-bottom:1px solid rgb(211, 211, 211); - border-top:1px solid rgb(231, 231, 231); + color:#444444; + background-image: url(../images/button_out.gif); + border-left:1px solid rgb(221, 221, 221); + border-right:1px solid rgb(221, 221, 221); + border-bottom:1px solid rgb(211, 211, 211); + border-top:1px solid rgb(231, 231, 231); } .ubw-button-out{ - color:#555555; - background-image: url(../images/button_out.gif); - border-left:2px solid rgb(231, 231, 233); - border-right:2px solid rgb(231, 231, 233); - border-bottom:2px solid rgb(221, 221, 223); - border-top:2px solid rgb(241, 241, 244); + color:#555555; + background-image: url(../images/button_out.gif); + border-left:2px solid rgb(231, 231, 233); + border-right:2px solid rgb(231, 231, 233); + border-bottom:2px solid rgb(221, 221, 223); + border-top:2px solid rgb(241, 241, 244); } span.colored{ - color: #0080ff; + color: #0080ff; } @@ -217,8 +221,8 @@ span.colored{ .menuElement{ - position: relative; - float:right; + position: relative; + float:right; } diff --git a/resources/library/applications/Notes.wgt/js/jquery.ubwidget.js b/resources/library/applications/Notes.wgt/js/jquery.ubwidget.js index a4eba538..c27b5c10 100644 --- a/resources/library/applications/Notes.wgt/js/jquery.ubwidget.js +++ b/resources/library/applications/Notes.wgt/js/jquery.ubwidget.js @@ -29,8 +29,6 @@ // Default options jQuery.fn.ubwidget.defaults = { - width:250, - height:300 }; // Shadows diff --git a/resources/library/applications/Notes.wgt/js/ubw-main.js b/resources/library/applications/Notes.wgt/js/ubw-main.js index 4d799fc2..cf3af545 100644 --- a/resources/library/applications/Notes.wgt/js/ubw-main.js +++ b/resources/library/applications/Notes.wgt/js/ubw-main.js @@ -16,8 +16,8 @@ function init(){ var ubwidget = $("#ubwidget").ubwidget({ - width:360, - height:240 +// width:360, +// height:240 }); var checkMinimize = false; @@ -108,6 +108,7 @@ function init(){ minimize.click( function(){ + $('.ubw-container').css("min-height", "26px") $('.ubw-container').animate({ height:"26px" },500); @@ -123,11 +124,11 @@ function init(){ }); maximize.click( - function(){ + function(){ var lastHeight = String(minimizedHeight)+'px'; $('.ubw-container').animate({ height: lastHeight - },500); + },500, function(){$('.ubw-container').css("min-height", "200px").css("height","")}); maximize.hide(); minimize.show(); @@ -190,8 +191,8 @@ function init(){ text = window.sankore.preference('noteText', text); currentFontSize = window.sankore.preference('fontSize', defaultFontSize); $('.ubw-container').css({ - width:window.innerWidth - 2, - height:window.innerHeight - 20 +// width:window.innerWidth - 2, +// height:window.innerHeight - 20 }); if(checkMinimize){ @@ -212,25 +213,24 @@ function init(){ winwidth = window.innerWidth; winheight = window.innerHeight; - if(winwidth <= 290) - { - window.resizeTo(290,winheight); - } - if(winheight <= 100) - { - window.resizeTo(winwidth,100); - } - if(winheight > 600) - { - window.resizeTo(winwidth,600); - } +// if(winwidth <= 290) +// { +// window.resizeTo(290,winheight); +// } +// if(winheight <= 100) +// { +// window.resizeTo(winwidth,100); +// } +// if(winheight > 600) +// { +// window.resizeTo(winwidth,600); +// } - $('.ubw-container').width(winwidth-2); - +// $('.ubw-container').width(winwidth-2); +// if(checkMinimize) minimizedHeight = winheight-40; - else - $('.ubw-container').height(winheight-40); + controlTextField(); }