Skip to content

O
OpenBoard
Commit d4cb4b2b authored by maximXbs's avatar maximXbs
Browse files
Options

fixed Sankore-1167 issue

parent 8154be27
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 187 deletions
resources/library/applications/Notes.wgt/config.xml
View file @ d4cb4b2b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:ub="http://uniboard.mnemis.com/widgets" xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://uniboard.mnemis.com/widgets/notes" id="http://uniboard.mnemis.com/widgets/notes"
version="1.2" version="1.2"
width="302" width="320"
height="260" height="260"
ub:resizable="true"> ub:resizable="true">
......
resources/library/applications/Notes.wgt/css/ubwidget.css
View file @ d4cb4b2b
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
body{ body, html{
margin:0px; margin:0px;
height: 96%;
} }
.ubw-container{ .ubw-container{
text-overflow: ellipsis; min-width: 280px;
left:0px; min-height: 200px;
top:0px; width: 99%;
margin:0px; height: 100%;
/*background-color: #edf7c0;*/ text-overflow: ellipsis;
background-image: url(../images/back.png); left:0px;
overflow: hidden; top:0px;
border-right: 1px solid rgb(252, 252, 220); margin:0px;
border-left: 1px solid rgb(232, 232, 220); 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{ .ubw-body{
} }
.head{ .head{
border-top: 1px solid rgb(252, 252, 220); border-top: 1px solid rgb(252, 252, 220);
position: relative; position: relative;
background-color: transparent; background-color: transparent;
font-style: normal; font-style: normal;
color: #263141; color: #263141;
font-size: 119%; font-size: 119%;
width: auto; width: auto;
height: 20px; height: 20px;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-weight: normal; font-weight: normal;
outline: none; outline: none;
border-bottom: rgb(252, 252, 220); border-bottom: rgb(252, 252, 220);
} }
.stickytitle{ .stickytitle{
background-color: transparent; background-color: transparent;
min-width: 10px; min-width: 10px;
max-width: 70%; max-width: 70%;
width: 100%; width: 100%;
padding-top: 4px; padding-top: 4px;
height: 20px; height: 20px;
float: left; float: left;
z-index: 3; z-index: 3;
position: relative; position: relative;
overflow:hidden; overflow:hidden;
margin-left: 10px; margin-left: 10px;
margin-right: -2px; margin-right: -2px;
font-style: normal; font-style: normal;
color: #444444; color: #444444;
font-size: 88%; font-size: 88%;
border-style: none; border-style: none;
outline: none; outline: none;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-weight: normal; font-weight: normal;
text-align: left; text-align: left;
resize: none; resize: none;
} }
.textField{ .textField{
min-height: 50px; min-height: 50px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
height: auto; height: auto;
width: auto; width: auto;
margin: 5px; margin: 5px;
padding-right: 4%; padding-right: 4%;
background-position: 0; background-position: 0;
border-left-style: none; border-left-style: none;
border-bottom-style: none; border-bottom-style: none;
border-right-style: none; border-right-style: none;
border-top-style: none; border-top-style: none;
text-align: left; text-align: left;
list-style-type: none; list-style-type: none;
outline: none; outline: none;
word-wrap: break-word; word-wrap: break-word;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
color:#444444; color:#444444;
} }
.ubw-inspector{ .ubw-inspector{
position:absolute; position:absolute;
background-color:rgb(252, 252, 252); background-color:rgb(252, 252, 252);
border:1px solid #cccccc; border:1px solid #cccccc;
line-height:20px; line-height:20px;
font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif;
font-weight:normal; font-weight:normal;
font-size:20px; font-size:20px;
color:#333333; color:#333333;
} }
.ubw-inpubox{ .ubw-inpubox{
min-width:28px; min-width:28px;
min-height:37px; min-height:37px;
color:#333333; color:#333333;
background-image: url(../images/button_out.png); background-image: url(../images/button_out.png);
border-left:1px solid rgb(231, 231, 231); border-left:1px solid rgb(231, 231, 231);
border-right:1px solid rgb(231, 231, 231); border-right:1px solid rgb(231, 231, 231);
border-bottom:1px solid rgb(221, 221, 221); border-bottom:1px solid rgb(221, 221, 221);
border-top:1px solid rgb(241, 241, 241); border-top:1px solid rgb(241, 241, 241);
} }
/*BUTTONS*/ /*BUTTONS*/
.ubw-button-wrapper{ .ubw-button-wrapper{
float:left; float:left;
position:relative; position:relative;
/*border:solid 1px yellow;*/ /*border:solid 1px yellow;*/
margin-right:-7px; margin-right:-7px;
z-index:0; z-index:0;
font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif;
font-weight:normal; font-weight:normal;
font-size:30px; font-size:30px;
overflow:visible; overflow:visible;
} }
.ubw-button-canvas{ .ubw-button-canvas{
width:auto; width:auto;
float:left; float:left;
position:relative; position:relative;
overflow:visible; overflow:visible;
} }
table{ table{
line-height:90%; line-height:90%;
} }
.ubw-dropdown{ .ubw-dropdown{
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 15px; font-size: 15px;
width:100px; width:100px;
list-style: none; list-style: none;
cursor:pointer; cursor:pointer;
float:none; float:none;
margin-left:3px; margin-left:3px;
} }
.ubw-dropdown li.out{ .ubw-dropdown li.out{
padding-left: 5px; padding-left: 5px;
color:#444444; color:#444444;
border-left:1px solid rgb(231, 231, 233); border-left:1px solid rgb(231, 231, 233);
border-right:1px solid rgb(231, 231, 233); border-right:1px solid rgb(231, 231, 233);
background-image: url(../images/button_out.gif); background-image: url(../images/button_out.gif);
} }
.ubw-dropdown li.over{ .ubw-dropdown li.over{
padding-left: 5px; padding-left: 5px;
color:#eeeeee; color:#eeeeee;
border-left:1px solid rgb(140, 140, 140); border-left:1px solid rgb(140, 140, 140);
border-right:1px solid rgb(140, 140, 140); border-right:1px solid rgb(140, 140, 140);
background-image: url(../images/button_out_dark.png); background-image: url(../images/button_out_dark.png);
} }
.ubw-dropdown li.ubw-dropdown-top-corners{ .ubw-dropdown li.ubw-dropdown-top-corners{
border-top:1px solid rgb(241, 241, 244); border-top:1px solid rgb(241, 241, 244);
} }
.ubw-dropdown li.ubw-dropdown-bottom-corners{ .ubw-dropdown li.ubw-dropdown-bottom-corners{
border-bottom:1px solid rgb(221, 221, 223); border-bottom:1px solid rgb(221, 221, 223);
} }
.ubw-button-body{ .ubw-button-body{
position:relative; position:relative;
float:left; float:left;
width:auto; width:auto;
height:auto; height:auto;
overflow:visible overflow:visible
text-align:center; text-align:center;
vertical-align:middle; vertical-align:middle;
cursor:pointer; cursor:pointer;
} }
.ubw-button-content{ .ubw-button-content{
margin:2px; margin:2px;
height:auto; height:auto;
width:auto; width:auto;
text-align:center; text-align:center;
overflow:visible; overflow:visible;
} }
.ubw-button-over{ .ubw-button-over{
color:#444444; color:#444444;
background-image: url(../images/button_out.gif); background-image: url(../images/button_out.gif);
border-left:1px solid rgb(221, 221, 221); border-left:1px solid rgb(221, 221, 221);
border-right:1px solid rgb(221, 221, 221); border-right:1px solid rgb(221, 221, 221);
border-bottom:1px solid rgb(211, 211, 211); border-bottom:1px solid rgb(211, 211, 211);
border-top:1px solid rgb(231, 231, 231); border-top:1px solid rgb(231, 231, 231);
} }
.ubw-button-out{ .ubw-button-out{
color:#555555; color:#555555;
background-image: url(../images/button_out.gif); background-image: url(../images/button_out.gif);
border-left:2px solid rgb(231, 231, 233); border-left:2px solid rgb(231, 231, 233);
border-right:2px solid rgb(231, 231, 233); border-right:2px solid rgb(231, 231, 233);
border-bottom:2px solid rgb(221, 221, 223); border-bottom:2px solid rgb(221, 221, 223);
border-top:2px solid rgb(241, 241, 244); border-top:2px solid rgb(241, 241, 244);
} }
span.colored{ span.colored{
color: #0080ff; color: #0080ff;
} }
...@@ -217,8 +221,8 @@ span.colored{ ...@@ -217,8 +221,8 @@ span.colored{
.menuElement{ .menuElement{
position: relative; position: relative;
float:right; float:right;
} }
......
resources/library/applications/Notes.wgt/js/jquery.ubwidget.js
View file @ d4cb4b2b
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
// Default options // Default options
jQuery.fn.ubwidget.defaults = { jQuery.fn.ubwidget.defaults = {
width:250,
height:300
}; };
// Shadows // Shadows
......
resources/library/applications/Notes.wgt/js/ubw-main.js
View file @ d4cb4b2b
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
function init(){ function init(){
var ubwidget = $("#ubwidget").ubwidget({ var ubwidget = $("#ubwidget").ubwidget({
width:360, // width:360,
height:240 // height:240
}); });
var checkMinimize = false; var checkMinimize = false;
...@@ -108,6 +108,7 @@ function init(){ ...@@ -108,6 +108,7 @@ function init(){
minimize.click( minimize.click(
function(){ function(){
$('.ubw-container').css("min-height", "26px")
$('.ubw-container').animate({ $('.ubw-container').animate({
height:"26px" height:"26px"
},500); },500);
...@@ -123,11 +124,11 @@ function init(){ ...@@ -123,11 +124,11 @@ function init(){
}); });
maximize.click( maximize.click(
function(){ function(){
var lastHeight = String(minimizedHeight)+'px'; var lastHeight = String(minimizedHeight)+'px';
$('.ubw-container').animate({ $('.ubw-container').animate({
height: lastHeight height: lastHeight
},500); },500, function(){$('.ubw-container').css("min-height", "200px").css("height","")});
maximize.hide(); maximize.hide();
minimize.show(); minimize.show();
...@@ -190,8 +191,8 @@ function init(){ ...@@ -190,8 +191,8 @@ function init(){
text = window.sankore.preference('noteText', text); text = window.sankore.preference('noteText', text);
currentFontSize = window.sankore.preference('fontSize', defaultFontSize); currentFontSize = window.sankore.preference('fontSize', defaultFontSize);
$('.ubw-container').css({ $('.ubw-container').css({
width:window.innerWidth - 2, // width:window.innerWidth - 2,
height:window.innerHeight - 20 // height:window.innerHeight - 20
}); });
if(checkMinimize){ if(checkMinimize){
...@@ -212,25 +213,24 @@ function init(){ ...@@ -212,25 +213,24 @@ function init(){
winwidth = window.innerWidth; winwidth = window.innerWidth;
winheight = window.innerHeight; winheight = window.innerHeight;
if(winwidth <= 290) // if(winwidth <= 290)
{ // {
window.resizeTo(290,winheight); // window.resizeTo(290,winheight);
} // }
if(winheight <= 100) // if(winheight <= 100)
{ // {
window.resizeTo(winwidth,100); // window.resizeTo(winwidth,100);
} // }
if(winheight > 600) // if(winheight > 600)
{ // {
window.resizeTo(winwidth,600); // window.resizeTo(winwidth,600);
} // }
$('.ubw-container').width(winwidth-2); // $('.ubw-container').width(winwidth-2);
//
if(checkMinimize) if(checkMinimize)
minimizedHeight = winheight-40; minimizedHeight = winheight-40;
else
$('.ubw-container').height(winheight-40);
controlTextField(); controlTextField();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment