diff --git a/JournalDesModifications.pdf b/JournalDesModifications.pdf index 088a09cd..d1be05ed 100644 Binary files a/JournalDesModifications.pdf and b/JournalDesModifications.pdf differ diff --git a/ReleaseNotes.pdf b/ReleaseNotes.pdf index 22443f42..c1f27226 100644 Binary files a/ReleaseNotes.pdf and b/ReleaseNotes.pdf differ diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index fcc3143b..66ecfc31 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -11,7 +11,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 2 VERSION_MIN = 00 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 09 +VERSION_PATCH = 10 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") diff --git a/resources/etc/Tutorial/tutorial_en/CSS/._grid.css b/resources/etc/Tutorial/tutorial_en/CSS/._grid.css deleted file mode 100644 index 5d324c27..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/CSS/._grid.css and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/CSS/._reset.css b/resources/etc/Tutorial/tutorial_en/CSS/._reset.css deleted file mode 100644 index 7a2e6f73..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/CSS/._reset.css and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/CSS/._typography.css b/resources/etc/Tutorial/tutorial_en/CSS/._typography.css deleted file mode 100644 index 5d324c27..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/CSS/._typography.css and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png b/resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png deleted file mode 100644 index 7a2e6f73..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/images/._manuel.png b/resources/etc/Tutorial/tutorial_en/images/._manuel.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/images/._manuel.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/images/._pedago.png b/resources/etc/Tutorial/tutorial_en/images/._pedago.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/images/._pedago.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/images/._tech.png b/resources/etc/Tutorial/tutorial_en/images/._tech.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/images/._tech.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_en/images/._video.png b/resources/etc/Tutorial/tutorial_en/images/._video.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_en/images/._video.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/CSS/._grid.css b/resources/etc/Tutorial/tutorial_fr/CSS/._grid.css deleted file mode 100644 index 5d324c27..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/CSS/._grid.css and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/CSS/._reset.css b/resources/etc/Tutorial/tutorial_fr/CSS/._reset.css deleted file mode 100644 index 7a2e6f73..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/CSS/._reset.css and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/CSS/._typography.css b/resources/etc/Tutorial/tutorial_fr/CSS/._typography.css deleted file mode 100644 index 5d324c27..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/CSS/._typography.css and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png b/resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png deleted file mode 100644 index 7a2e6f73..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/images/._manuel.png b/resources/etc/Tutorial/tutorial_fr/images/._manuel.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/images/._manuel.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/images/._pedago.png b/resources/etc/Tutorial/tutorial_fr/images/._pedago.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/images/._pedago.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/images/._tech.png b/resources/etc/Tutorial/tutorial_fr/images/._tech.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/images/._tech.png and /dev/null differ diff --git a/resources/etc/Tutorial/tutorial_fr/images/._video.png b/resources/etc/Tutorial/tutorial_fr/images/._video.png deleted file mode 100644 index b594fe38..00000000 Binary files a/resources/etc/Tutorial/tutorial_fr/images/._video.png and /dev/null differ diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index 6e439559..1893778a 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -24,7 +24,7 @@ - 3 + 0 @@ -608,19 +608,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -630,7 +617,7 @@ - Planète Sankoré ID + Planète Sankoré ID for exporting file @@ -693,9 +680,38 @@ + + + + + 0 + 0 + + + + Restore credentials on reboot + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -736,11 +752,11 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">The licences are in English to respect the official and legal approved translation.</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">The licences are in English to respect the official and legal approved translation.</span></p></td></tr></table></body></html> Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -772,12 +788,12 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;">The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;">See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact </span><a href="mailto:openssl-core@openssl.org"><span style=" font-family:'Ubuntu'; font-size:9pt; text-decoration: underline; color:#0000ff;">openssl-core@openssl.org</span></a><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;">.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"> </span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact </span><a href="mailto:openssl-core@openssl.org"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">openssl-core@openssl.org</span></a><span style=" font-size:9pt; color:#1a1a1a;">.</span><span style=" font-size:9pt;"> </span></p></td></tr></table></body></html> @@ -794,11 +810,11 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-family:'Ubuntu'; font-size:12pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"> </span></p></td></tr></table></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-size:12pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-size:9pt;"> </span></p></td></tr></table></body></html> @@ -815,11 +831,11 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt; color:#000000;">Xpdf is licensed under the GNU General Public License (GPL), version 2.</span></p></td></tr></table></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#000000;">Xpdf is licensed under the GNU General Public License (GPL), version 2.</span></p></td></tr></table></body></html> @@ -836,11 +852,11 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt;">GNU Library or Lesser General Public License (LGPL), zlib/libpng License</span></p></td></tr></table></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">GNU Library or Lesser General Public License (LGPL), zlib/libpng License</span></p></td></tr></table></body></html> @@ -1321,12 +1337,12 @@ DAMAGES. <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">&quot;</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:11pt;">&quot;</span></p></td></tr></table></body></html> @@ -1355,7 +1371,7 @@ p, li { white-space: pre-wrap; } 10 30 - 341 + 551 21 @@ -1381,52 +1397,52 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Crédits police scolaire Open-Sankoré : </span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police Andika Basic dispose d'une licence Open Font License </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Sil international</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Court </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Ligne Court</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier lignes pointillés</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier pointillés</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP pointillés</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Crédits police scolaire Open-Sankoré : </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La police Andika Basic dispose d'une licence Open Font License </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Sil international</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier Court </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier Ligne Court</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Ecolier lignes pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier CP</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Écolier CP pointillés</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Autorisation pour un usage non commercial</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices.html</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Autorisation pour un usage non commercial</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Source : http://pointecole.free.fr/polices.html</p></body></html> Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/resources/forms/youTubePublishingDialog.ui b/resources/forms/youTubePublishingDialog.ui index e7b83b67..b07f7994 100644 --- a/resources/forms/youTubePublishingDialog.ui +++ b/resources/forms/youTubePublishingDialog.ui @@ -123,7 +123,7 @@ - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -143,13 +143,23 @@ p, li { white-space: pre-wrap; } - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + Restore credentials on reboot + + + true + + + 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(); } diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index cad8daa5..18ae2076 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass images.wgt/css/basic.css @@ -4,7 +4,8 @@ html, body{ margin: 0; padding: 0; border-radius: 35px; - overflow: hidden; + overflow: hidden; + font-family: sans-serif; } .without_radius{ @@ -280,7 +281,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -290,7 +291,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -407,7 +408,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Ass sons.wgt/css/basic.css b/resources/library/interactivities/Ass sons.wgt/css/basic.css index 210ad969..d6bfe053 100644 --- a/resources/library/interactivities/Ass sons.wgt/css/basic.css +++ b/resources/library/interactivities/Ass sons.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -315,7 +316,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -325,7 +326,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -351,22 +352,6 @@ body{ text-shadow: #FFDCA9 0 1px 0; } -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; -} - .btl_pad{ background-image: url(../img/pad-top-left.png) !important; } @@ -463,7 +448,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Cat images.wgt/css/basic.css b/resources/library/interactivities/Cat images.wgt/css/basic.css index a808c635..af5b30e3 100644 --- a/resources/library/interactivities/Cat images.wgt/css/basic.css +++ b/resources/library/interactivities/Cat images.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -256,7 +257,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -266,7 +267,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -388,7 +389,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Cat text.wgt/css/basic.css b/resources/library/interactivities/Cat text.wgt/css/basic.css index 849093d5..e4560cb0 100644 --- a/resources/library/interactivities/Cat text.wgt/css/basic.css +++ b/resources/library/interactivities/Cat text.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -278,7 +279,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -288,7 +289,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -410,7 +411,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css index ad7c7371..d297aed8 100644 --- a/resources/library/interactivities/Choisir.wgt/css/basic.css +++ b/resources/library/interactivities/Choisir.wgt/css/basic.css @@ -18,6 +18,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -30,7 +31,7 @@ body{ border: none; background-image: url(../images/greySquare.png); font-weight: bold; - font-family: Verdana; + font-family: sans-serif; color: #00C6FF;; cursor: pointer; } @@ -45,7 +46,7 @@ body{ float: left; padding: 5px; margin: 2px; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: large; } @@ -68,7 +69,7 @@ body{ margin: 2px auto; padding: 5px; float: left; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; } .qstDivDisplay{ @@ -76,7 +77,7 @@ body{ margin: 5px 5%; padding: 5px; float: left; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; border: 2px solid #cccccc; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -146,7 +147,7 @@ body{ width: 95%; max-height: 100px; overflow-x: hidden; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: small; border: 3px solid #ccc; border-radius: 5px; @@ -162,7 +163,7 @@ body{ width: 95%; max-height: 120px; overflow-x: hidden; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; color: white; border: 1px solid #DFDFDE; border-top-left-radius: 10px; @@ -214,7 +215,7 @@ body{ .ansContent{ padding: 1px 3px 3px 3px; margin-left: 5px; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: small; width: 80%; max-height: 60px; @@ -230,7 +231,7 @@ body{ .ansContentDisplay{ padding: 1px 3px 3px 3px; margin-left: 5px; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: small; font-weight: bold; width: 80%; @@ -299,7 +300,7 @@ body{ color: #666666; float: left; font-size: small; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; margin: 3px 5px; padding: 5px; } @@ -347,7 +348,7 @@ body{ .textType{ width: 160px; font-size: small; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; color: #666; padding: 3px; margin-left: 20px; @@ -471,7 +472,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -481,7 +482,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -603,7 +604,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Contraste.wgt/css/basic.css b/resources/library/interactivities/Contraste.wgt/css/basic.css index 90530c69..65f6e82f 100644 --- a/resources/library/interactivities/Contraste.wgt/css/basic.css +++ b/resources/library/interactivities/Contraste.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -17,11 +18,9 @@ body{ border: none; background-image: url(../images/greySquare.png); font-weight: bold; - font-family: Verdana; + font-family: sans-serif; color: yellow; cursor: pointer; - -webkit-border-top-left-radius: 5px; - -webkit-border-bottom-left-radius: 5px; border-top-left-radius: 5px; border-bottom-left-radius: 5px; } @@ -101,7 +100,7 @@ body{ float: right; width: 70%; border: none; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; background-color: #ffc; -webkit-border-radius: 5px; -webkit-border-radius: 5px; @@ -116,7 +115,7 @@ body{ margin: 4px 5px; border: none; background-image: url(../images/greySquare2.png); - font-family: Verdana; + font-family: sans-serif; color: yellow; cursor: pointer; -webkit-border-radius: 5px; @@ -137,7 +136,7 @@ body{ padding: 2px; float: left; text-align: center; - font-family: Verdana,Arial,Helvetica,sans-serif; + font-family: sans-serif; font-weight: bold; font-size:24px; word-wrap: break-word; @@ -265,7 +264,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -275,7 +274,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -413,7 +412,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Etudier.wgt/css/basic.css b/resources/library/interactivities/Etudier.wgt/css/basic.css index f9516240..7ace46e4 100644 --- a/resources/library/interactivities/Etudier.wgt/css/basic.css +++ b/resources/library/interactivities/Etudier.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -354,7 +355,7 @@ li>div{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -364,7 +365,7 @@ li>div{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -479,7 +480,7 @@ li>div{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css index 930b66f4..2efef450 100644 --- a/resources/library/interactivities/Ordre images.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -237,7 +238,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -247,7 +248,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -369,7 +370,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index bd270ede..756f8a0b 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -5,6 +5,7 @@ html, body{ padding: 0; border-radius: 35px; overflow: hidden; + font-family: sans-serif; } body{ @@ -298,7 +299,7 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; color: #7F613F; text-shadow: #FFDCA9 0 1px 0; @@ -308,7 +309,7 @@ body{ cursor: pointer; margin: 10px 10px 0 0; float: right; - font-family: Arial,Helvetica,sans-serif; + font-family: sans-serif; font-size: 24px; line-height: 32px; } @@ -430,7 +431,7 @@ body{ .inline{ display: inline-block; - font-family: "helvetica neue"; + font-family: sans-serif; font-size: 14px; color: #666; } diff --git a/resources/library/interactivities/Ordre lettres.wgt/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/js/script.js index 045fca0a..9335dbab 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/js/script.js @@ -31,8 +31,8 @@ function start(){ $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ - if(sankore.preference("associer_sound","")){ - var data = jQuery.parseJSON(sankore.preference("associer_sound","")); + if(sankore.preference("ord_let","")){ + var data = jQuery.parseJSON(sankore.preference("ord_let","")); importData(data); } else @@ -263,15 +263,17 @@ function exportData(){ array_to_export.push(cont_obj); }); } - if(window.sankore) - sankore.setPreference("associer_sound", JSON.stringify(array_to_export)); + if(window.sankore){ + sankore.setPreference("ord_let", JSON.stringify(array_to_export)); + sankore.setPreference("ord_let_locale", "en"); + } if($("#wgt_display").hasClass("selected")){ if(window.sankore) - sankore.setPreference("associer_sound_state", "display"); + sankore.setPreference("ord_let_state", "display"); } else{ if(window.sankore) - sankore.setPreference("associer_sound_state", "edit"); + sankore.setPreference("ord_let_state", "edit"); } } @@ -308,8 +310,8 @@ function importData(data){ tmp_array.push(tmp_letter); } - if(sankore.preference("associer_sound_state","")){ - if(sankore.preference("associer_sound_state","") == "edit") + if(sankore.preference("ord_let_state","")){ + if(sankore.preference("ord_let_state","") == "edit") tmp_array = shuffle(tmp_array); } else tmp_array = shuffle(tmp_array); @@ -365,12 +367,12 @@ function addContainer(){ var sub_container = $("
").appendTo(container); $("
"+ ($(".cont").size() + 1) +"
").appendTo(sub_container); - var text = $("
").appendTo(sub_container); - text.attr("ondragenter", "return false;") - .attr("ondragleave", "$(this).removeClass('gray'); return false;") - .attr("ondragover", "$(this).addClass('gray'); return false;") - .attr("ondrop", "$(this).removeClass('gray'); return onDropAudio(this,event);"); + var text = $("
").appendTo(sub_container); var audio_block = $("
").appendTo(text); + audio_block.attr("ondragenter", "return false;") + .attr("ondragleave", "$(this).removeClass('audio_gray'); return false;") + .attr("ondragover", "$(this).addClass('audio_gray'); return false;") + .attr("ondrop", "$(this).removeClass('audio_gray'); return onDropAudio(this,event);"); $("
").appendTo(audio_block); $("
").appendTo(audio_block); var source = $("").attr("src", ""); @@ -505,12 +507,11 @@ function onDropAudio(obj, event) { var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent; var tmp_type = textData.getElementsByTagName("type")[0].firstChild.textContent; if(tmp_type.substr(0, 5) == "audio"){ - var audio_block = $(obj).find(".audio_block"); $(obj).find("audio").remove(); - audio_block.find(":first-child").removeClass("stop").addClass("play"); + $(obj).find(":first-child").removeClass("stop").addClass("play"); var source = $("").attr("src", tmp); - var audio = $("