Commit c47e1abb authored by  JosephK's avatar JosephK

Slide et texte d'accueil + fix perturbations au drag&drop

parent f4a71051
Copyright (c) 2106, JosephK - Framasoft
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
......@@ -27,21 +27,21 @@
<div id="carousel-maestro" data-interval="7000" class="carousel slide" role="presentation">
<div class="carousel-inner">
<div class="item active">
<img src="static/slide-framaestro01.png" alt="" />
<img src="static/slide-framaestro01.jpg" alt="" />
<div class="carousel-caption">
<p class="h3"><b class="violet">Fra</b><b class="vert">maestro</b> : organisez une session de travail collaboratif</p>
</div>
</div>
<div class="item">
<img src="static/slide-framaestro02.png" alt=""/>
<img src="static/slide-framaestro02.jpg" alt=""/>
<div class="carousel-caption">
<p class="h3">Blablabla</p>
<p class="h3">ou ensemble de pages web à présenter</p>
</div>
</div>
<div class="item">
<img src="static/slide-framaestro03.png" alt="" />
<img src="static/slide-framaestro03.jpg" alt="" />
<div class="carousel-caption">
<p class="h3">Blablabla</p>
<p class="h3">et partagez-les avec vos collaborateurs</p>
</div>
</div>
</div><!-- /.carousel-inner -->
......@@ -73,9 +73,13 @@
<div class="col-md-4">
<p>
<b class="violet">Fra</b><b class="vert">maestro</b> vous permet d’afficher sur une même page différents sites web ou outils collaboratifs en ligne.<br>
Blablabla</br>
Blablabla
Vous pouvez ainsi présenter, communiquer et travailler à plusieurs sur différents documents en même temps.
Exemples d’utilisation :
</p>
<ul>
<li>un <a href="/p/#frama123/demo/0,20,1150,640,https%3A%2F%2Fquotidien.framapad.org%2Fp%2Fbac-a-sable2;50,100,1150,640,https%3A%2F%2Fframacalc.org%2FCalcDeTest;&togetherjs=frama12301">travail collaboratif</a> (calc, pad et tchat) ;</li>
<li>une <a href="/p/#frama456/demo/0,20,640,377,https%3A%2F%2Fdegooglisons-internet.org%2Falternatives%2F;0,679,640,377,https%3A%2F%2Fdegooglisons-internet.org%2Fpresentation%2F;426,20,640,377,https%3A%2F%2Fframatube.org%2Fmedia%2Fopen-world-forum-2014-intervention-de-pierre-yves-%2Fembed_player;426,679,640,377,https%3A%2F%2Fframindmap.org%2Fc%2Fmaps%2F33653%2Fpublic;">présentation</a> de la campagne <a href="https://degooglisons-internet.org">Dégooglisons Internet</a> (diaporama, vidéo, carte mentale et page web)</li>
</ul>
</div>
</div>
</div>
......@@ -96,8 +100,10 @@
<div class="col-md-4" id="le-logiciel">
<h2>Le logiciel</h2>
<p class="text-center" role="presentation"><i class="glyphicon glyphicon-cloud"></i></p>
<p><b class="violet">Fra</b><b class="vert">maestro</b> est développé par <b class="violet">Frama</b><b class="orange">soft</b> et fait appel à plusieurs bibliothèques JavaScript et notamment <a href="http://togetherjs.com/">TogetherJS</a>.</p>
<p>Le logiciel est sous licence <a href="">TBMC</a></p>
<p><b class="violet">Fra</b><b class="vert">maestro</b> est développé par
<b class="violet">Frama</b><b class="orange">soft</b> et fait appel à plusieurs
bibliothèques JavaScript, notamment <a href="http://jspanel.de/">jsPanel</a> et <a href="http://togetherjs.com/">TogetherJS</a>.</p>
<p>Le logiciel est sous licence <a href="https://framagit.org/framasoft/framaestro/blob/master/LICENSE.md">MIT</a></p>
</div>
<div class="col-md-4" id="jardin">
......
......@@ -355,7 +355,7 @@ $(document).ready(function() {
setInterval(function(){
$('main .jsPanel').each(function() {
id = $(this).attr('id').replace('jsPanel-','');
if($('#jsPanel-'+id).css('left') != panels[ id ].option.position.left) {
if($('#jsPanel-'+id).css('left') != panels[ id ].option.position.left && !$('#jsPanel-'+id).hasClass('ui-draggable-dragging')) {
panels[id].reposition({
top: panels[ id ].option.position.top,
left: panels[ id ].option.position.left
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment