diff --git a/.gitignore b/.gitignore index 5a290506..8312a361 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ plugins/cffadaptor/objects ##################### *.qm + +.DS_Store \ No newline at end of file diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss index 9663c03d..28938048 100644 --- a/Sankore 3.1.iss +++ b/Sankore 3.1.iss @@ -47,9 +47,6 @@ Type: files ; Name: "{app}\*.dll" Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}" Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -;Sankore plugins -;Source: "plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll"; DestDir: "{app}"; Flags: ignoreversion - ;OpenSSL Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion @@ -85,6 +82,15 @@ Source: "..\Qt-4.8\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformat Source: "..\Qt-4.8\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;qt multimedia plugins +Source: "c:\OpenSankore\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion +Source: "c:\OpenSankore\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion +Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion +Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion + +Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion +Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion + [Icons] Name: "{group}\Open-Sankoré"; Filename: "{app}\Open-Sankore.exe" Name: "{group}\{cm:UninstallProgram,Open-Sankoré}"; Filename: "{uninstallexe}" diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index ff2df4dd..6e439559 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -7,7 +7,7 @@ 0 0 601 - 619 + 686 @@ -24,7 +24,7 @@ - 0 + 3 @@ -568,11 +568,7 @@ 0 - - - QLineEdit::Password - - + @@ -582,7 +578,11 @@ - + + + QLineEdit::Password + + @@ -736,11 +736,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:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; 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-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-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> Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -772,12 +772,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:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; 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-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> +<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> @@ -794,11 +794,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:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; 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-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> +<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> @@ -815,11 +815,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:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; 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-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-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> @@ -836,11 +836,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:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; 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-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-family:'Ubuntu'; font-size:9pt;">GNU Library or Lesser General Public License (LGPL), zlib/libpng License</span></p></td></tr></table></body></html> @@ -1321,12 +1321,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:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; 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-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> +<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> @@ -1381,45 +1381,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:'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;"><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;"><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;"><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;"><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;"><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;"><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;"><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> +</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> Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/resources/images/toque.png b/resources/images/toque.png new file mode 100644 index 00000000..a976e147 Binary files /dev/null and b/resources/images/toque.png differ diff --git a/resources/library/applications/Nuancier.wgt/css/layout.css b/resources/library/applications/Nuancier.wgt/css/layout.css index f25d0c09..f81f88c1 100644 --- a/resources/library/applications/Nuancier.wgt/css/layout.css +++ b/resources/library/applications/Nuancier.wgt/css/layout.css @@ -34,6 +34,8 @@ html, body { font-size: 12px; line-height: 18px; color: #52697E; + width: 100%; + height: 100%; } body { text-align: center; diff --git a/resources/library/applications/Nuancier.wgt/index.html b/resources/library/applications/Nuancier.wgt/index.html index 073a6201..772d9e88 100644 --- a/resources/library/applications/Nuancier.wgt/index.html +++ b/resources/library/applications/Nuancier.wgt/index.html @@ -4,7 +4,7 @@ ColorPicker - jQuery plugin - + diff --git a/resources/library/applications/Nuancier.wgt/js/colorpicker.js b/resources/library/applications/Nuancier.wgt/js/colorpicker.js index 63bdb6db..0c7080ff 100644 --- a/resources/library/applications/Nuancier.wgt/js/colorpicker.js +++ b/resources/library/applications/Nuancier.wgt/js/colorpicker.js @@ -5,12 +5,16 @@ * * Dual licensed under the MIT and GPL licenses * - */ + */ (function ($) { var ColorPicker = function () { var ids = {}, penFlag = true, + tmpColor = { + a:"", + b:"" + }, inAction, charMin = 65, visible, @@ -108,7 +112,10 @@ } setSelector(col, cal.get(0)); setHue(col, cal.get(0)); - setNewColor(col, cal.get(0)); + //setNewColor(col, cal.get(0)); + $(cal.get(0)).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(col)); + tmpColor.a = cal.get(0); + tmpColor.b = col; cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]); }, blur = function (ev) { @@ -174,14 +181,25 @@ $(document).unbind('mousemove', moveHue); return false; }, - downSelector = function (ev) { + downSelector = function (ev) { var current = { cal: $(this).parent(), pos: $(this).offset() }; - current.preview = current.cal.data('colorpicker').livePreview; + current.preview = current.cal.data('colorpicker').livePreview; $(document).bind('mouseup', current, upSelector); $(document).bind('mousemove', current, moveSelector); + change.apply( + current.cal.data('colorpicker') + .fields + .eq(6) + .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - current.pos.top))))/150, 10)) + .end() + .eq(5) + .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - current.pos.left))))/150, 10)) + .get(0), + [current.preview] + ); }, moveSelector = function (ev) { change.apply( @@ -202,6 +220,18 @@ fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); $(document).unbind('mouseup', upSelector); $(document).unbind('mousemove', moveSelector); + if(penFlag){ + $("div.tools_change").removeClass("tools_compass"); + window.sankore.setTool('pen'); + window.sankore.setPenColor('#' + HSBToHex(tmpColor.b)); + sankore.returnStatus("PEN installed", penFlag); + } else { + $("div.tools_change").addClass("tools_compass"); + window.sankore.setTool('compass'); + window.sankore.setPenColor('#' + HSBToHex(tmpColor.b)); + sankore.returnStatus("Compass installed", penFlag); + } + //$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b)); return false; }, enterSubmit = function (ev) { @@ -249,7 +279,7 @@ cal.css({ left: left + 'px', top: top + 'px' - }); + }); if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) { cal.show(); } @@ -325,7 +355,7 @@ r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF) - }; + }; }, HexToHSB = function (hex) { return RGBToHSB(HexToRGB(hex)); @@ -379,43 +409,43 @@ rgb.r=t1; rgb.b=t2; rgb.g=t2+t3 - } + } else if(h<120) { rgb.g=t1; rgb.b=t2; rgb.r=t1-t3 - } + } else if(h<180) { rgb.g=t1; rgb.r=t2; rgb.b=t2+t3 - } + } else if(h<240) { rgb.b=t1; rgb.r=t2; rgb.g=t1-t3 - } + } else if(h<300) { rgb.b=t1; rgb.g=t2; rgb.r=t2+t3 - } + } else if(h<360) { rgb.r=t1; rgb.g=t2; rgb.b=t1-t3 - } + } else { rgb.r=0; rgb.g=0; rgb.b=0 - } + } } return { r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b) - }; + }; }, RGBToHex = function (rgb) { var hex = [ @@ -433,6 +463,9 @@ HSBToHex = function (hsb) { return RGBToHex(HSBToRGB(hsb)); }, + // changeCursor = function (flag) { + // alert(flag) + // }, restoreOriginal = function () { var cal = $(this).parent(); var col = cal.data('colorpicker').origColor; @@ -446,6 +479,15 @@ }; return { init: function (opt) { + if(window.sankore) + sankore.setTool("arrow"); + // $(document).mouseout(function(event){ + // if(event.target.tagName == "DIV" && event.target.className == "colorpicker") + // changeCursor(true) + // }) + // $("body").mouseleave(function(){ + // changeCursor(true) + // }) opt = $.extend({}, defaults, opt||{}); if (typeof opt.color == 'string') { opt.color = HexToHSB(opt.color); @@ -465,9 +507,13 @@ var cal = $(tpl).attr('id', id); if (options.flat) { cal.appendTo(this).show(); - } else { + } + else { cal.appendTo(document.body); } + // cal.bind("mouseover", function(){ + // window.sankore.setTool('arrow'); + // }) options.fields = cal .find('input') .bind('keyup', keyDown) diff --git a/resources/library/applications/Nuancier.wgt/js/jquery-1.8.1.min.js b/resources/library/applications/Nuancier.wgt/js/jquery-1.8.1.min.js new file mode 100644 index 00000000..ee68f35e --- /dev/null +++ b/resources/library/applications/Nuancier.wgt/js/jquery-1.8.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v@1.8.1 jquery.com | jquery.org/license */ +(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.1",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
t
",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="
",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j=0),h[l]&&j.push(k);j.length&&t.push({elem:f,matches:j})}n.length>o&&t.push({elem:this,matches:n.slice(o)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function $(a,b,c,d){c=c||[],b=b||q;var e,f,g,j,k=b.nodeType;if(k!==1&&k!==9)return[];if(!a||typeof a!="string")return c;g=h(b);if(!g&&!d)if(e=L.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&i(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return u.apply(c,t.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&X&&b.getElementsByClassName)return u.apply(c,t.call(b.getElementsByClassName(j),0)),c}return bk(a,b,c,d,g)}function _(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function ba(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bb(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bc(a,b,c,d){var e,g,h,i,j,k,l,m,n,p,r=!c&&b!==q,s=(r?"":"")+a.replace(H,"$1"),u=y[o][s];if(u)return d?0:t.call(u,0);j=a,k=[],m=0,n=f.preFilter,p=f.filter;while(j){if(!e||(g=I.exec(j)))g&&(j=j.slice(g[0].length),h.selector=l),k.push(h=[]),l="",r&&(j=" "+j);e=!1;if(g=J.exec(j))l+=g[0],j=j.slice(g[0].length),e=h.push({part:g.pop().replace(H," "),string:g[0],captures:g});for(i in p)(g=S[i].exec(j))&&(!n[i]||(g=n[i](g,b,c)))&&(l+=g[0],j=j.slice(g[0].length),e=h.push({part:i,string:g.shift(),captures:g}));if(!e)break}return l&&(h.selector=l),d?j.length:j?$.error(a):t.call(y(s,k),0)}function bd(a,b,e,f){var g=b.dir,h=s++;return a||(a=function(a){return a===e}),b.first?function(b){while(b=b[g])if(b.nodeType===1)return a(b)&&b}:f?function(b){while(b=b[g])if(b.nodeType===1&&a(b))return b}:function(b){var e,f=h+"."+c,i=f+"."+d;while(b=b[g])if(b.nodeType===1){if((e=b[o])===i)return b.sizset;if(typeof e=="string"&&e.indexOf(f)===0){if(b.sizset)return b}else{b[o]=i;if(a(b))return b.sizset=!0,b;b.sizset=!1}}}}function be(a,b){return a?function(c){var d=b(c);return d&&a(d===!0?c:d)}:b}function bf(a,b,c){var d,e,g=0;for(;d=a[g];g++)f.relative[d.part]?e=bd(e,f.relative[d.part],b,c):e=be(e,f.filter[d.part].apply(null,d.captures.concat(b,c)));return e}function bg(a){return function(b){var c,d=0;for(;c=a[d];d++)if(c(b))return!0;return!1}}function bh(a,b,c,d){var e=0,f=b.length;for(;e0?i(h,c,g):[]}function bj(a,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q,r,s=0,t=a.length,v=S.POS,w=new RegExp("^"+v.source+"(?!"+A+")","i"),x=function(){var a=1,c=arguments.length-2;for(;al){g+=k.slice(l,n.index),l=p,q=[c],J.test(g)&&(m&&(q=m),m=e);if(r=O.test(g))g=g.slice(0,-5).replace(J,"$&*"),l++;n.length>1&&n[0].replace(w,x),m=bi(g,n[1],n[2],q,m,r)}g=""}}o||(g+=k),o=!1}g?J.test(g)?bh(g,m||[c],d,e):$(g,c,d,e?e.concat(m):m):u.apply(d,m)}return t===1?d:$.uniqueSort(d)}function bk(a,b,e,g,h){a=a.replace(H,"$1");var i,k,l,m,n,o,p,q,r,s,v=bc(a,b,h),w=b.nodeType;if(S.POS.test(a))return bj(v,b,e,g);if(g)i=t.call(g,0);else if(v.length===1){if((o=t.call(v[0],0)).length>2&&(p=o[0]).part==="ID"&&w===9&&!h&&f.relative[o[1].part]){b=f.find.ID(p.captures[0].replace(R,""),b,h)[0];if(!b)return e;a=a.slice(o.shift().string.length)}r=(v=N.exec(o[0].string))&&!v.index&&b.parentNode||b,q="";for(n=o.length-1;n>=0;n--){p=o[n],s=p.part,q=p.string+q;if(f.relative[s])break;if(f.order.test(s)){i=f.find[s](p.captures[0].replace(R,""),r,h);if(i==null)continue;a=a.slice(0,a.length-q.length)+q.replace(S[s],""),a||u.apply(e,t.call(i,0));break}}}if(a){k=j(a,b,h),c=k.dirruns++,i==null&&(i=f.find.TAG("*",N.test(a)&&b.parentNode||b));for(n=0;m=i[n];n++)d=k.runs++,k(m)&&e.push(m)}return e}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=a.document,r=q.documentElement,s=0,t=[].slice,u=[].push,v=function(a,b){return a[o]=b||!0,a},w=function(){var a={},b=[];return v(function(c,d){return b.push(c)>f.cacheLength&&delete a[b.shift()],a[c]=d},a)},x=w(),y=w(),z=w(),A="[\\x20\\t\\r\\n\\f]",B="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",C=B.replace("w","w#"),D="([*^$|!~]?=)",E="\\["+A+"*("+B+")"+A+"*(?:"+D+A+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+C+")|)|)"+A+"*\\]",F=":("+B+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+E+")|[^:]|\\\\.)*|.*))\\)|)",G=":(nth|eq|gt|lt|first|last|even|odd)(?:\\(((?:-\\d)?\\d*)\\)|)(?=[^-]|$)",H=new RegExp("^"+A+"+|((?:^|[^\\\\])(?:\\\\.)*)"+A+"+$","g"),I=new RegExp("^"+A+"*,"+A+"*"),J=new RegExp("^"+A+"*([\\x20\\t\\r\\n\\f>+~])"+A+"*"),K=new RegExp(F),L=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,M=/^:not/,N=/[\x20\t\r\n\f]*[+~]/,O=/:not\($/,P=/h\d/i,Q=/input|select|textarea|button/i,R=/\\(?!\\)/g,S={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),NAME:new RegExp("^\\[name=['\"]?("+B+")['\"]?\\]"),TAG:new RegExp("^("+B.replace("w","w*")+")"),ATTR:new RegExp("^"+E),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+A+"*(even|odd|(([+-]|)(\\d*)n|)"+A+"*(?:([+-]|)"+A+"*(\\d+)|))"+A+"*\\)|)","i"),POS:new RegExp(G,"ig"),needsContext:new RegExp("^"+A+"*[>+~]|"+G,"i")},T=function(a){var b=q.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},U=T(function(a){return a.appendChild(q.createComment("")),!a.getElementsByTagName("*").length}),V=T(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),W=T(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),X=T(function(a){return a.innerHTML="",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),Y=T(function(a){a.id=o+0,a.innerHTML="
",r.insertBefore(a,r.firstChild);var b=q.getElementsByName&&q.getElementsByName(o).length===2+q.getElementsByName(o+0).length;return e=!q.getElementById(o),r.removeChild(a),b});try{t.call(r.childNodes,0)[0].nodeType}catch(Z){t=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}$.matches=function(a,b){return $(a,null,null,b)},$.matchesSelector=function(a,b){return $(b,null,null,[a]).length>0},g=$.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=g(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=g(b);return c},h=$.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},i=$.contains=r.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:r.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},$.attr=function(a,b){var c,d=h(a);return d||(b=b.toLowerCase()),f.attrHandle[b]?f.attrHandle[b](a):W||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},f=$.selectors={cacheLength:50,createPseudo:v,match:S,order:new RegExp("ID|TAG"+(Y?"|NAME":"")+(X?"|CLASS":"")),attrHandle:V?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:e?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:U?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(R,""),a[3]=(a[4]||a[5]||"").replace(R,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||$.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&$.error(a[0]),a},PSEUDO:function(a,b,c){var d,e;if(S.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(d=a[4])K.test(d)&&(e=bc(d,b,c,!0))&&(e=d.indexOf(")",d.length-e)-d.length)&&(d=d.slice(0,e),a[0]=a[0].slice(0,e)),a[2]=d;return a.slice(0,3)}},filter:{ID:e?function(a){return a=a.replace(R,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(R,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(R,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=x[o][a];return b||(b=x(a,new RegExp("(^|"+A+")"+a+"("+A+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=$.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return $.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=s++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[o]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[o]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e,g=f.pseudos[a]||f.pseudos[a.toLowerCase()];return g||$.error("unsupported pseudo: "+a),g[o]?g(b,c,d):g.length>1?(e=[a,a,"",b],function(a){return g(a,0,e)}):g}},pseudos:{not:v(function(a,b,c){var d=j(a.replace(H,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!f.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:v(function(a){return function(b){return(b.textContent||b.innerText||g(b)).indexOf(a)>-1}}),has:v(function(a){return function(b){return $(a,b).length>0}}),header:function(a){return P.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:_("radio"),checkbox:_("checkbox"),file:_("file"),password:_("password"),image:_("image"),submit:ba("submit"),reset:ba("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return Q.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e",a.querySelectorAll("[selected]").length||e.push("\\["+A+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="

",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+A+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bk=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return u.apply(f,t.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j,k,l,m=d.getAttribute("id"),n=m||o,p=N.test(a)&&d.parentNode||d;m?n=n.replace(c,"\\$&"):d.setAttribute("id",n),j=bc(a,d,h),n="[id='"+n+"']";for(k=0,l=j.length;k0})}(),f.setFilters.nth=f.setFilters.eq,f.filters=f.pseudos,$.attr=p.attr,p.find=$,p.expr=$.selectors,p.expr[":"]=p.expr.pseudos,p.unique=$.uniqueSort,p.text=$.getText,p.isXMLDoc=$.isXML,p.contains=$.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{cj=f.href}catch(cy){cj=e.createElement("a"),cj.href="",cj=cj.href}ck=ct.exec(cj.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("
").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:cj,isLocal:cn.test(ck[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,ck[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==ck[1]&&i[2]==ck[2]&&(i[3]||(i[1]==="http:"?80:443))==(ck[3]||(ck[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cQ.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window); \ No newline at end of file diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js index 45280242..e4d40a9b 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js @@ -9,7 +9,7 @@ var sankoreLang = { slate: "ardoise", pad: "tablette", none: "aucun", - help: "aide", + help: "Aide", help_content: "Ceci est un exemple de contenu de l'aide ..." }; diff --git a/resources/inDevelopmentWidgets/Balance.wgt/config.xml b/resources/library/interactivities/Balance.wgt/config.xml similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/config.xml rename to resources/library/interactivities/Balance.wgt/config.xml diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/demo.html b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/demo.html rename to resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/stylesheet.css b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/stylesheet.css rename to resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/demo.html b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/demo.html rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/balance.png b/resources/library/interactivities/Balance.wgt/css/images/balance.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/balance.png rename to resources/library/interactivities/Balance.wgt/css/images/balance.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/bg.png b/resources/library/interactivities/Balance.wgt/css/images/bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/bg.png rename to resources/library/interactivities/Balance.wgt/css/images/bg.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png b/resources/library/interactivities/Balance.wgt/css/images/delete.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png rename to resources/library/interactivities/Balance.wgt/css/images/delete.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png b/resources/library/interactivities/Balance.wgt/css/images/graduations.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png rename to resources/library/interactivities/Balance.wgt/css/images/graduations.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/pad-bd.png b/resources/library/interactivities/Balance.wgt/css/images/pad-bd.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/pad-bd.png rename to resources/library/interactivities/Balance.wgt/css/images/pad-bd.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png b/resources/library/interactivities/Balance.wgt/css/images/pivot.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png rename to resources/library/interactivities/Balance.wgt/css/images/pivot.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png b/resources/library/interactivities/Balance.wgt/css/images/scale.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png rename to resources/library/interactivities/Balance.wgt/css/images/scale.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png b/resources/library/interactivities/Balance.wgt/css/images/scales.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png rename to resources/library/interactivities/Balance.wgt/css/images/scales.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-bd.png b/resources/library/interactivities/Balance.wgt/css/images/slate-bd.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-bd.png rename to resources/library/interactivities/Balance.wgt/css/images/slate-bd.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-edit.png b/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-edit.png rename to resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-reload.png b/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-reload.png rename to resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png b/resources/library/interactivities/Balance.wgt/css/images/weight-add.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png rename to resources/library/interactivities/Balance.wgt/css/images/weight-add.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png b/resources/library/interactivities/Balance.wgt/css/images/weight.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png rename to resources/library/interactivities/Balance.wgt/css/images/weight.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/main.css b/resources/library/interactivities/Balance.wgt/css/main.css similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/main.css rename to resources/library/interactivities/Balance.wgt/css/main.css diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/ubw-help.css b/resources/library/interactivities/Balance.wgt/css/ubw-help.css similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/ubw-help.css rename to resources/library/interactivities/Balance.wgt/css/ubw-help.css diff --git a/resources/inDevelopmentWidgets/Balance.wgt/css/ubw-main.css b/resources/library/interactivities/Balance.wgt/css/ubw-main.css similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/css/ubw-main.css rename to resources/library/interactivities/Balance.wgt/css/ubw-main.css diff --git a/resources/inDevelopmentWidgets/Balance.wgt/help.html b/resources/library/interactivities/Balance.wgt/help.html similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/help.html rename to resources/library/interactivities/Balance.wgt/help.html diff --git a/resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages.properties b/resources/library/interactivities/Balance.wgt/i18n/Messages.properties similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages.properties rename to resources/library/interactivities/Balance.wgt/i18n/Messages.properties diff --git a/resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties b/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties similarity index 60% rename from resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties rename to resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties index ee6b23ad..c4ee9e73 100644 --- a/resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties +++ b/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties @@ -1,11 +1,11 @@ fr.njin.i18n.document.title = La Balance -fr.njin.i18n.toolbar.edit = Editer -fr.njin.i18n.toolbar.view = Fermer +fr.njin.i18n.toolbar.edit = Modifier +fr.njin.i18n.toolbar.view = Afficher fr.njin.i18n.toolbar.reload = Recharger fr.njin.i18n.toolbar.help = Aide -fr.njin.i18n.parameters.label.themes = ThÚme +fr.njin.i18n.parameters.label.themes = ThÚmes fr.njin.i18n.parameters.label.slate.themes = ardoise fr.njin.i18n.parameters.label.pad.themes = tablette fr.njin.i18n.parameters.label.none.themes = aucun diff --git a/resources/inDevelopmentWidgets/Balance.wgt/icon.png b/resources/library/interactivities/Balance.wgt/icon.png similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/icon.png rename to resources/library/interactivities/Balance.wgt/icon.png diff --git a/resources/inDevelopmentWidgets/Balance.wgt/index.html b/resources/library/interactivities/Balance.wgt/index.html similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/index.html rename to resources/library/interactivities/Balance.wgt/index.html diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/help-template.js b/resources/library/interactivities/Balance.wgt/js/help-template.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/help-template.js rename to resources/library/interactivities/Balance.wgt/js/help-template.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/help_fr-template.js b/resources/library/interactivities/Balance.wgt/js/help_fr-template.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/help_fr-template.js rename to resources/library/interactivities/Balance.wgt/js/help_fr-template.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-1.7.1.min.js b/resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-1.7.1.min.js rename to resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-css-transform.js b/resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-css-transform.js rename to resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js b/resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js rename to resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/modernizr.js b/resources/library/interactivities/Balance.wgt/js/lib/modernizr.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/modernizr.js rename to resources/library/interactivities/Balance.wgt/js/lib/modernizr.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/mustache.js b/resources/library/interactivities/Balance.wgt/js/lib/mustache.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/mustache.js rename to resources/library/interactivities/Balance.wgt/js/lib/mustache.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/lib/ubw-main.js b/resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/lib/ubw-main.js rename to resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/main.js b/resources/library/interactivities/Balance.wgt/js/main.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/main.js rename to resources/library/interactivities/Balance.wgt/js/main.js diff --git a/resources/inDevelopmentWidgets/Balance.wgt/js/templates.js b/resources/library/interactivities/Balance.wgt/js/templates.js similarity index 100% rename from resources/inDevelopmentWidgets/Balance.wgt/js/templates.js rename to resources/library/interactivities/Balance.wgt/js/templates.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/config.xml b/resources/library/interactivities/Cadran.wgt/config.xml similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/config.xml rename to resources/library/interactivities/Cadran.wgt/config.xml diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/demo.html b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/demo.html rename to resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/stylesheet.css b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/stylesheet.css rename to resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/demo.html b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/demo.html rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/bg.png b/resources/library/interactivities/Cadran.wgt/css/images/bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/bg.png rename to resources/library/interactivities/Cadran.wgt/css/images/bg.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/pad-bd.png b/resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/pad-bd.png rename to resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-bd.png b/resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-bd.png rename to resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-edit.png b/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-edit.png rename to resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-reload.png b/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/slate-toolbar-reload.png rename to resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/main.css b/resources/library/interactivities/Cadran.wgt/css/main.css similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/main.css rename to resources/library/interactivities/Cadran.wgt/css/main.css diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-help.css b/resources/library/interactivities/Cadran.wgt/css/ubw-help.css similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-help.css rename to resources/library/interactivities/Cadran.wgt/css/ubw-help.css diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-main.css b/resources/library/interactivities/Cadran.wgt/css/ubw-main.css similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/css/ubw-main.css rename to resources/library/interactivities/Cadran.wgt/css/ubw-main.css diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/help.html b/resources/library/interactivities/Cadran.wgt/help.html similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/help.html rename to resources/library/interactivities/Cadran.wgt/help.html diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages.properties b/resources/library/interactivities/Cadran.wgt/i18n/Messages.properties similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages.properties rename to resources/library/interactivities/Cadran.wgt/i18n/Messages.properties diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages_fr.properties b/resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties similarity index 57% rename from resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages_fr.properties rename to resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties index c2f8a829..939ff3d0 100644 --- a/resources/inDevelopmentWidgets/Cadran.wgt/i18n/Messages_fr.properties +++ b/resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties @@ -1,11 +1,11 @@ fr.njin.i18n.document.title = Cadran opératoire -fr.njin.i18n.toolbar.edit = Editer -fr.njin.i18n.toolbar.view = Fermer +fr.njin.i18n.toolbar.edit = Modifier +fr.njin.i18n.toolbar.view = Afficher fr.njin.i18n.toolbar.reload = Recharger fr.njin.i18n.toolbar.help = Aide -fr.njin.i18n.parameters.label.themes = ThÚme +fr.njin.i18n.parameters.label.themes = ThÚmes fr.njin.i18n.parameters.label.slate.themes = ardoise fr.njin.i18n.parameters.label.pad.themes = tablette fr.njin.i18n.parameters.label.none.themes = aucun \ No newline at end of file diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/icon.png b/resources/library/interactivities/Cadran.wgt/icon.png similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/icon.png rename to resources/library/interactivities/Cadran.wgt/icon.png diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/index.html b/resources/library/interactivities/Cadran.wgt/index.html similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/index.html rename to resources/library/interactivities/Cadran.wgt/index.html diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/help-template.js b/resources/library/interactivities/Cadran.wgt/js/help-template.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/help-template.js rename to resources/library/interactivities/Cadran.wgt/js/help-template.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/help_fr-template.js b/resources/library/interactivities/Cadran.wgt/js/help_fr-template.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/help_fr-template.js rename to resources/library/interactivities/Cadran.wgt/js/help_fr-template.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-1.7.1.min.js b/resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-1.7.1.min.js rename to resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-css-transform.js b/resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery-css-transform.js rename to resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/modernizr.js b/resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/lib/modernizr.js rename to resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/mustache.js b/resources/library/interactivities/Cadran.wgt/js/lib/mustache.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/lib/mustache.js rename to resources/library/interactivities/Cadran.wgt/js/lib/mustache.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/lib/ubw-main.js b/resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/lib/ubw-main.js rename to resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/main.js b/resources/library/interactivities/Cadran.wgt/js/main.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/main.js rename to resources/library/interactivities/Cadran.wgt/js/main.js diff --git a/resources/inDevelopmentWidgets/Cadran.wgt/js/templates.js b/resources/library/interactivities/Cadran.wgt/js/templates.js similarity index 100% rename from resources/inDevelopmentWidgets/Cadran.wgt/js/templates.js rename to resources/library/interactivities/Cadran.wgt/js/templates.js diff --git a/resources/library/interactivities/Calcul.wgt/i18n/Messages_fr.properties b/resources/library/interactivities/Calcul.wgt/i18n/Messages_fr.properties index f89c9066..a99defe0 100644 --- a/resources/library/interactivities/Calcul.wgt/i18n/Messages_fr.properties +++ b/resources/library/interactivities/Calcul.wgt/i18n/Messages_fr.properties @@ -1,7 +1,7 @@ fr.njin.i18n.document.title = Calcul rapide fr.njin.i18n.toolbar.edit = Modifier -fr.njin.i18n.toolbar.view = Editer +fr.njin.i18n.toolbar.view = Afficher fr.njin.i18n.toolbar.reload = Recharger fr.njin.i18n.toolbar.help = Aide diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/config.xml b/resources/library/interactivities/Morpion.wgt/config.xml similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/config.xml rename to resources/library/interactivities/Morpion.wgt/config.xml diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/demo.html b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/demo.html rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/stylesheet.css b/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/Lobster/stylesheet.css rename to resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/demo.html b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/demo.html rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/bg.png b/resources/library/interactivities/Morpion.wgt/css/images/bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/bg.png rename to resources/library/interactivities/Morpion.wgt/css/images/bg.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/pad-bd.png b/resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/pad-bd.png rename to resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/player1.png b/resources/library/interactivities/Morpion.wgt/css/images/player1.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/player1.png rename to resources/library/interactivities/Morpion.wgt/css/images/player1.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/player2.png b/resources/library/interactivities/Morpion.wgt/css/images/player2.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/player2.png rename to resources/library/interactivities/Morpion.wgt/css/images/player2.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/result-bg.png b/resources/library/interactivities/Morpion.wgt/css/images/result-bg.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/result-bg.png rename to resources/library/interactivities/Morpion.wgt/css/images/result-bg.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-bd.png b/resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-bd.png rename to resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-edit.png b/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-edit.png rename to resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-reload.png b/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/slate-toolbar-reload.png rename to resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/submit.png b/resources/library/interactivities/Morpion.wgt/css/images/submit.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/submit.png rename to resources/library/interactivities/Morpion.wgt/css/images/submit.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/main.css b/resources/library/interactivities/Morpion.wgt/css/main.css similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/main.css rename to resources/library/interactivities/Morpion.wgt/css/main.css diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-help.css b/resources/library/interactivities/Morpion.wgt/css/ubw-help.css similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-help.css rename to resources/library/interactivities/Morpion.wgt/css/ubw-help.css diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-main.css b/resources/library/interactivities/Morpion.wgt/css/ubw-main.css similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/css/ubw-main.css rename to resources/library/interactivities/Morpion.wgt/css/ubw-main.css diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/help.html b/resources/library/interactivities/Morpion.wgt/help.html similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/help.html rename to resources/library/interactivities/Morpion.wgt/help.html diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages.properties b/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages.properties rename to resources/library/interactivities/Morpion.wgt/i18n/Messages.properties diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages_fr.properties b/resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties similarity index 66% rename from resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages_fr.properties rename to resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties index a854b849..5790d783 100644 --- a/resources/inDevelopmentWidgets/Morpion.wgt/i18n/Messages_fr.properties +++ b/resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties @@ -1,11 +1,11 @@ fr.njin.i18n.document.title = Morpion -fr.njin.i18n.toolbar.edit = Editer -fr.njin.i18n.toolbar.view = Fermer +fr.njin.i18n.toolbar.edit = Modifier +fr.njin.i18n.toolbar.view = Afficher fr.njin.i18n.toolbar.reload = Recharger fr.njin.i18n.toolbar.help = Aide -fr.njin.i18n.parameters.label.themes = ThÚme +fr.njin.i18n.parameters.label.themes = ThÚmes fr.njin.i18n.parameters.label.slate.themes = ardoise fr.njin.i18n.parameters.label.pad.themes = tablette fr.njin.i18n.parameters.label.none.themes = aucun diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/icon.png b/resources/library/interactivities/Morpion.wgt/icon.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/icon.png rename to resources/library/interactivities/Morpion.wgt/icon.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/images/failed.png b/resources/library/interactivities/Morpion.wgt/images/failed.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/images/failed.png rename to resources/library/interactivities/Morpion.wgt/images/failed.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/images/succeed.png b/resources/library/interactivities/Morpion.wgt/images/succeed.png similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/images/succeed.png rename to resources/library/interactivities/Morpion.wgt/images/succeed.png diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/index.html b/resources/library/interactivities/Morpion.wgt/index.html similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/index.html rename to resources/library/interactivities/Morpion.wgt/index.html diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/help-template.js b/resources/library/interactivities/Morpion.wgt/js/help-template.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/help-template.js rename to resources/library/interactivities/Morpion.wgt/js/help-template.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/help_fr-template.js b/resources/library/interactivities/Morpion.wgt/js/help_fr-template.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/help_fr-template.js rename to resources/library/interactivities/Morpion.wgt/js/help_fr-template.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery-1.7.1.min.js b/resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery-1.7.1.min.js rename to resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/modernizr.js b/resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/lib/modernizr.js rename to resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/mustache.js b/resources/library/interactivities/Morpion.wgt/js/lib/mustache.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/lib/mustache.js rename to resources/library/interactivities/Morpion.wgt/js/lib/mustache.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/lib/ubw-main.js b/resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/lib/ubw-main.js rename to resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/main.js b/resources/library/interactivities/Morpion.wgt/js/main.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/main.js rename to resources/library/interactivities/Morpion.wgt/js/main.js diff --git a/resources/inDevelopmentWidgets/Morpion.wgt/js/templates.js b/resources/library/interactivities/Morpion.wgt/js/templates.js similarity index 100% rename from resources/inDevelopmentWidgets/Morpion.wgt/js/templates.js rename to resources/library/interactivities/Morpion.wgt/js/templates.js diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 26583dd9..4573addc 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -64,12 +64,6 @@ body{ min-height: 60px; } -.imgs_cont{ - width: 100%; - min-height: 62px; - margin: 0; -} - .imgs_answers_gray{ } @@ -115,19 +109,41 @@ body{ left: 5px; } -.img_block{ - width: 50px; +#sortable{ +/* width: 100%; + min-height: 62px; + margin: 0;*/ + list-style-type: none; + margin: 10px 0 10px 20px; + padding: 0; +} + +#sortable li{ +/* width: 50px; height: 50px; margin: 5px 10px; cursor: pointer; + float: left; display: inline-block; position: relative; background-color: white; border: 1px solid #ccc; - -moz-box-shadow: #ccc -1px 0 4px; -webkit-box-shadow: #ccc -1px 0 4px; box-shadow: #ccc -1px 0 4px; + font-size: 230%;*/ + margin: 5px 10px; + display: inline-table; + width: 50px; + height: 50px; + background-color: white; font-size: 230%; + -webkit-box-shadow: #ccc -1px 0 4px; + box-shadow: #ccc -1px 0 4px; + text-align: center; +} + +.highlight { + background-color: #999 !important; } .add_block{ diff --git a/resources/library/interactivities/Ordre lettres.wgt/index.html b/resources/library/interactivities/Ordre lettres.wgt/index.html index 1aec98d8..1ccdeec9 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/index.html @@ -6,8 +6,8 @@ - - + + - + + - + + - +
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js index e9fb0b36..3377a85c 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js @@ -68,8 +68,8 @@ function start(){ $("#wgt_reload").click(function(){ if($("#wgt_display").hasClass("selected")){ - $("#wgt_edit").trigger("click"); - $("#wgt_display").trigger("click"); + setTimeout('$("#wgt_display").trigger("click")', 10) + $("#wgt_edit").trigger("click"); } else { $("#wgt_display").trigger("click"); } @@ -95,7 +95,7 @@ function start(){ $(".cont").each(function(){ var container = $(this); var tmp_array = []; - var imgs_container = container.find(".imgs_cont"); + var ans_container = container.find(".audio_answer"); container.find(".text_cont .audio_desc").removeAttr("contenteditable"); container.find(".audio_block").removeAttr("ondragenter") @@ -103,19 +103,18 @@ function start(){ .removeAttr("ondragover") .removeAttr("ondrop") container.find(".close_cont").remove(); - var answer = imgs_container.find(".audio_answer").text(); - imgs_container.find(".audio_answer").remove(); - imgs_container.find("input").val(answer); + var answer = ans_container.text(); + ans_container.prev().val(answer) + ans_container.remove(); + var ul_cont = $("
    ").insertAfter(container.find(".sub_cont")); for(var j in answer){ - var tmp_letter = $("
    " + answer[j] + "
    "); + var tmp_letter = $("
  • " + answer[j] + "
  • "); tmp_array.push(tmp_letter); } tmp_array = shuffle(tmp_array); for(var i = 0; i").appendTo(container); - container.find(".imgs_cont").removeClass("imgs_answers_red") + container.find("#sortable").removeClass("imgs_answers_red") .removeClass("imgs_answers_green") .addClass("imgs_answers_gray") .sortable("destroy"); @@ -139,11 +137,10 @@ function start(){ container.find(".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);"); - container.find(".img_block").remove(); - $("
    " + container.find(".imgs_cont input").val() + "
    ").appendTo(container.find(".imgs_cont")); + .attr("ondrop", "$(this).removeClass('audio_gray'); return onDropAudio(this,event);"); + $("
    " + container.find("ul").next().val() + "
    ").appendTo(container); + container.find("ul").remove(); }); - $("
    " + sankoreLang.add + "
    ").appendTo("#data"); $(this).css("display", "none"); $("#wgt_display").css("display", "block"); @@ -257,8 +254,8 @@ function exportData(){ var cont_obj = new Object(); cont_obj.text = $(this).find(".audio_desc").text(); cont_obj.audio = $(this).find("source").attr("src").replace("../../",""); - cont_obj.answer = $(this).find(".imgs_cont input").val(); - cont_obj.cur_answer = getAnswer($(this).find(".imgs_cont")); + cont_obj.answer = $(this).find("ul").next().val(); + cont_obj.cur_answer = getAnswer($(this).find("ul")); array_to_export.push(cont_obj); }); } @@ -277,7 +274,7 @@ function importData(data){ var tmp_array = []; var container = $("
    ").appendTo("#data"); var sub_container = $("
    ").appendTo(container); - var imgs_container = $("
    ").appendTo(container); + var imgs_container = $("
      ").appendTo(container); $("
      "+ (++tmp) +"
      ").appendTo(sub_container); var text = $("
      ").appendTo(sub_container); @@ -289,15 +286,15 @@ function importData(data){ audio.append(source); $("").appendTo(audio_block); $("
      " + data[i].text + "
      ").appendTo(text); - $("").appendTo(imgs_container); + $("").appendTo(container); if(data[i].cur_answer) for(var j in data[i].cur_answer){ - var tmp_letter = $("
      " + data[i].cur_answer[j] + "
      "); + var tmp_letter = $("
    • " + data[i].cur_answer[j] + "
    • "); tmp_array.push(tmp_letter); } else for(j in data[i].answer){ - tmp_letter = $("
      " + data[i].answer[j] + "
      "); + tmp_letter = $("
    • " + data[i].answer[j] + "
    • "); tmp_array.push(tmp_letter); } @@ -310,7 +307,7 @@ function importData(data){ for(j = 0; j").appendTo("#data"); var sub_container = $("
      ").appendTo(container); - var imgs_container = $("
      ").appendTo(container); + var imgs_container = $("
        ").appendTo(container); var number = $("
        1
        ").appendTo(sub_container); var text = $("
        ").appendTo(sub_container); var audio_block = $("
        ").appendTo(text); $("
        ").appendTo(audio_block); $("
        ").appendTo(audio_block); - var source = $("").attr("src", "objects/example.mp3"); + var source = $("").attr("src", "objects/beep.mp3"); var audio = $("