Skip to content

O
OpenBoard
Commit c8b054f4 authored by shibakaneki's avatar shibakaneki
Browse files
Options

Merge branch 'master' of github.com:Sankore/Sankore-3.1

parents cbbf77f0 32fcd0be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1520 additions and 0 deletions
resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml 0 → 100644
View file @ c8b054f4
<?xml version="1.0" encoding="UTF-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://uniboard.mnemis.com/widgets/notes"
version="1.2"
width="700"
height="400"
ub:resizable="true">
<name>Notes</name>
<author href="http://www.getuniboard.com"
email="info@mnemis.com">Mnemis SA</author>
<description>Ordonner des images</description>
<content src="index.html"/>
</widget>
resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css 0 → 100644
View file @ c8b054f4
html, body{
width: 100%;
height: 100%;
margin: 0;
padding: 0;
}
.toggle_mode{
width: 100%;
height: 25px;
border-bottom: 1px solid black;
background-color: #ccc;
position: fixed;
top: 0;
left: 0;
z-index: 2;
}
#display_img, #edit_img{
width: 15px;
height: 15px;
margin: 5px 10px;
}
.green_point{
background-image: url(../img/green_point.png);
}
.red_point{
background-image: url(../img/red_point.png);
}
#display_text, #edit_text{
height: 19px;
padding: 3px 0 0 0;
}
.selected{
background-color: #666;
}
#display:hover, #edit:hover{
background-color: #999;
}
.cont{
width: 100%;
border-bottom: 1px solid black;
margin: 0;
padding: 0;
position: relative;
}
.sub_cont{
width: 100%;
padding: 0;
margin: 20px 0 0 0;
min-height: 60px;
}
.imgs_cont{
width: 100%;
margin: 0;
}
.number_cont{
width: 40px;
height: 33px;
margin-left: 40px;
margin-right: 10px;
background-image: url(../img/circle.png);
background-repeat: no-repeat;
text-align: center;
float: left;
font-size: 130%;
padding-top: 7px;
font-weight: bold;
}
.text_cont{
width: 80%;
min-height: 40px;
float: right;
background-color: #ccc;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
padding-left: 10px;
}
.close_cont{
width: 20px;
height: 20px;
background-image: url(../img/close_cont.png);
cursor: pointer;
position: absolute;
top: -15px;
left: 5px;
}
.add_img{
width: 120px;
height: 120px;
margin: 10px 20px;
background-image: url(../img/add_img.png);
background-position: center;
background-repeat: no-repeat;
cursor: pointer;
display: inline-block;
}
.img_block{
width: 120px;
height: 120px;
margin: 10px 20px;
cursor: pointer;
display: inline-block;
position: relative;
border: 1px solid #ccc;
-moz-box-shadow: #ccc -1px 0 4px;
-webkit-box-shadow: #ccc -1px 0 4px;
box-shadow: #ccc -1px 0 4px;
background-color: white;
}
.close_img{
width: 30px;
height: 30px;
background-image: url(../img/close_img.png);
background-repeat: no-repeat;
position: absolute;
top: -15px;
right: -15px;
cursor: pointer;
}
.clear_img{
width: 30px;
height: 30px;
background-image: url(../img/clear_img.png);
background-repeat: no-repeat;
position: absolute;
top: 15px;
right: -15px;
cursor: pointer;
}
.fill_img{
width: 30px;
height: 30px;
background-image: url(../img/fill_hor.png);
background-repeat: no-repeat;
position: absolute;
top: -15px;
right: 17px;
cursor: pointer;
}
.add_block{
margin: 20px 0 0 20px;
width: 110px;
height: 25px;
background-image: url(../img/add_block.png);
background-repeat: no-repeat;
padding-left: 40px;
padding-top: 5px;
cursor: pointer;
background-color: #ccc;
-webkit-border-radius: 15px;
border-radius: 15px;
}
.black_overlay{
display: none;
position: absolute;
top: 0%;
left: 0%;
width: 100%;
height: 100%;
background-color: black;
z-index:1001;
-moz-opacity: 0.8;
opacity:.80;
filter: alpha(opacity=80);
}
.white_content {
display: none;
position:fixed;
top: 50%;
left: 50%;
width: 340px;
height: 480px;
padding: 16px;
background-color: white;
z-index:1002;
overflow: auto;
}
\ No newline at end of file
resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html 0 → 100644
View file @ c8b054f4
<!DOCTYPE html>
<html>
<head>
<title>D'n'd</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="css/basic.css"/>
<script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.9.custom.min.js"></script>
<script type="text/javascript" src="js/languages.js"></script>
<script type="text/javascript" src="js/script.js"></script>
<script type="text/javascript">
$(document).ready(function(){
start();
//here you can put your code
if(window.sankore)
sankore.enableDropOnWidget();
});
</script>
</head>
<body>
<!--<div class="dnd_container">
<div class="dnd_1" id="dnd_1" ondragenter="return false;" ondragleave="$(this).css('border-color','#ccc'); return false;" ondragover="$(this).css('border-color','orange'); return false;" ondrop="$(this).css('border-color','#ccc'); return onDropTarget1(event);">Drop the item here ...</div>
<div class="dnd_2" id="dnd_2" ondragenter="return false;" ondragleave="$(this).css('border-color','#ccc'); return false;" ondragover="$(this).css('border-color','orange'); return false;" ondrop="$(this).css('border-color','#ccc'); return onDropTarget2(event);">Drop the item here ...</div>
</div>
<div class='black_overlay' id='fade'></div>
<a href = "javascript:void(0)" onclick = "document.getElementById('light').style.display='block';document.getElementById('fade').style.display='block'">открыть</a></p>
<div id="light" class="white_content">
Содержание<a href = "javascript:void(0)" onclick = "document.getElementById('light').style.display='none';document.getElementById('fade').style.display='none'">закрыть</a></div>-->
<div class="toggle_mode">
<div style="width: 50%; height: 100%; float: left;">
<div id="display" style="float: right; width: 90px; cursor: pointer;" class="selected">
<div id="display_img" style="float: right;" class="green_point"></div>
<div id="display_text" style="float: right;">Display</div>
</div>
</div>
<div style="width: 50%; height: 100%; float: right;">
<div id="edit" style="float: left; width: 90px; cursor: pointer;">
<div id="edit_img" style="float: left;" class="red_point"></div>
<div id="edit_text" style="float: left;">Edit</div>
</div>
</div>
</div>
<div style="width: 100%; height: 25px;"></div>
</body>
</html>
resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js 0 → 100644
View file @ c8b054f4
This source diff could not be displayed because it is too large. You can view the blob instead.
resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/languages.js 0 → 100644
View file @ c8b054f4
var sankoreLang = {
"en":{
"short_desc": "Place the pictures in ascending order.",
"display":"Display",
"edit":"Edit",
"add":"Add new block"
},
"ru":{
"short_desc": "Расположите картинки в порядке возрастания цифр.",
"display":"Показать",
"edit":"Изменить",
"add":"Добавить новый блок"
},
"fr":{
"short_desc": "Placez les photos dans l'ordre croissant.",
"display":"D'affichage",
"edit":"Modifier",
"add":"Ajouter nouveau bloc"
}
};
\ No newline at end of file
resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.properties 0 → 100644
View file @ c8b054f4
copy.src.files=false
copy.src.target=
index.file=index.html
run.as=LOCAL
url=http://localhost/Ordonner_des_images/
resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.xml 0 → 100644
View file @ c8b054f4
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
</project-private>
resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.properties 0 → 100644
View file @ c8b054f4
include.path=${php.global.include.path}
php.version=PHP_5
source.encoding=UTF-8
src.dir=.
tags.asp=false
tags.short=true
web.root=.
resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.xml 0 → 100644
View file @ c8b054f4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.php.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/php-project/1">
<name>Ordonner_des_images.wgt</name>
</data>
</configuration>
</project>
src/board/UBBoardPaletteManager.cpp
View file @ c8b054f4
...@@ -823,6 +823,7 @@ void UBBoardPaletteManager::addItem(const QPixmap& pPixmap, const QPointF& pos, ...@@ -823,6 +823,7 @@ void UBBoardPaletteManager::addItem(const QPixmap& pPixmap, const QPointF& pos,
void UBBoardPaletteManager::addItemToCurrentPage() void UBBoardPaletteManager::addItemToCurrentPage()
{ {
UBApplication::applicationController->showBoard(); UBApplication::applicationController->showBoard();
UBApplication::applicationController->hideDesktop();
mAddItemPalette->hide(); mAddItemPalette->hide();
if(mPixmap.isNull()) if(mPixmap.isNull())
UBApplication::boardController->downloadURL(mItemUrl); UBApplication::boardController->downloadURL(mItemUrl);
......
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