Author: qmoriceau Date: 2013-06-19 17:31:37 +0200 (Wed, 19 Jun 2013) New Revision: 48 Url: http://chorem.org/projects/incubator/repository/revisions/48 Log: L?\195?\169g?\195?\168res modification sur le code de l'interface Modified: jtimerhtml5/src/main/resources/html/css/index.css jtimerhtml5/src/main/resources/html/index.html jtimerhtml5/src/main/resources/nuiton-js/wro.xml Modified: jtimerhtml5/src/main/resources/html/css/index.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/index.css 2013-06-19 09:50:36 UTC (rev 47) +++ jtimerhtml5/src/main/resources/html/css/index.css 2013-06-19 15:31:37 UTC (rev 48) @@ -4,11 +4,11 @@ } footer { - width:100%; - position:fixed; - bottom:0px; - margin:0; - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + width:100%; + position:fixed; + bottom:0px; + margin:0; + box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; } @@ -24,8 +24,8 @@ #headTasks span { border-style:solid; - border-width:2px; - border-color:#339999; + border-width:2px; + border-color:#339999; } .colHT { @@ -67,95 +67,95 @@ } #divRight{ - width:50%; - height:100%; - float:right; - margin:0; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; + width:50%; + height:100%; + float:right; + margin:0; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; } #divLeft{ - width:49%; - float:left; - margin:0; - height:100%; + width:49%; + float:left; + margin:0; + height:100%; } #selectThisWeek{ - background: url(img/date_current.png); - background-repeat:no-repeat; - background-position:center center; - width: 40px; - height: 22px; + background: url(img/date_current.png); + background-repeat:no-repeat; + background-position:center center; + width: 40px; + height: 22px; } #selectLastWeek{ - background: url(img/date_previous.png); - background-repeat:no-repeat; - background-position:center center; - width: 40px; - height: 22px; + background: url(img/date_previous.png); + background-repeat:no-repeat; + background-position:center center; + width: 40px; + height: 22px; } #endDate{ - margin-left:7px; - width:70%; + margin-left:7px; + width:70%; } #startDate{ - width:70%; + width:70%; } #textReport{ - width:96%; - height:500px; - margin-left:5px; - margin-top:10px; + width:96%; + height:500px; + margin-left:5px; + margin-top:10px; } #generReport{ - width:24%; - min-height:30px; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; - display:inline-block; - text-align:center; - bottom:5px; + width:24%; + min-height:30px; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; + cursor:pointer; + display:inline-block; + text-align:center; + bottom:5px; } #mailReport{ - width:24%; - min-height:30px; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; - display:inline-block; - text-align:center; - bottom:5px; + width:24%; + min-height:30px; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; + cursor:pointer; + display:inline-block; + text-align:center; + bottom:5px; } #optionsReport{ - border-style:solid; - border-width:2px; - border-color:#339999; - height:100%; - border-radius: 4px; + border-style:solid; + border-width:2px; + border-color:#339999; + height:100%; + border-radius: 4px; } #projectsReport{ - border-style:solid; - border-width:2px; - border-color:#339999; - height:100%; - border-radius: 4px; + border-style:solid; + border-width:2px; + border-color:#339999; + height:100%; + border-radius: 4px; } form { @@ -163,65 +163,65 @@ } .subtask{ - list-style-type: none; - margin:0; + list-style-type: none; + margin:0; } #treeTasks { - list-style-type: none; - margin:0; + list-style-type: none; + margin:0; } #editionApply { - width:49%; - height: 30px; - display:inline-block; + width:49%; + height: 30px; + display:inline-block; } #editionCancel { - width:49%; - height: 30px; - display:inline-block; + width:49%; + height: 30px; + display:inline-block; } #dataText { - margin-left:5px; + margin-left:5px; } #frame { - width:99%; - min-height:155px; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; + width:99%; + min-height:155px; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; } #bt1{ - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; - background-color:#339999; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; + cursor:pointer; + background-color:#339999; } #bt2{ - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; + cursor:pointer; } #alertCancel{ - width:70px; - height:30px; + width:70px; + height:30px; } #alertSave { - width:70px; - height:30px; + width:70px; + height:30px; } Modified: jtimerhtml5/src/main/resources/html/index.html =================================================================== --- jtimerhtml5/src/main/resources/html/index.html 2013-06-19 09:50:36 UTC (rev 47) +++ jtimerhtml5/src/main/resources/html/index.html 2013-06-19 15:31:37 UTC (rev 48) @@ -1,153 +1,153 @@ <!DOCTYPE html> <html lang="fr"> - <head> - <meta charset="UTF-8"/> - <title>jTimer</title> - <link rel="stylesheet" href="jtimer.css"/> - <script src="jtimer.js"></script> - </head> - <body onload="getProjects()"> - - - - <header class="navbar navbar navbar-fixed-top"> - <div class="navbar-inner"> + <head> + <meta charset="UTF-8"/> + <title>jTimer</title> + <link rel="stylesheet" href="jtimer.css"/> + <script src="jtimer.js"></script> + </head> + <body onload="getProjects()"> + + + + <header class="navbar navbar navbar-fixed-top"> + <div class="navbar-inner"> <div class="container"> <a class="brand" href="#">jTimer</a> <div class="nav-collapse collapse"> <ul class="nav"> - <li class="optH" id="options"><a title="Options général" href="javascript:options()">Options</a></li> - <li class="optH" id="report"><a title="Création d'un rapport" href="javascript:report()">Rapport</a></li> - <li class="optH" id="about"><a title="À propos de jTimer" data-toggle="modal" href="#aboutPopUp">À propos</a></li> - <!--<li class="optH" id="quit"><a title="Quitter l'application" href="javascript:window.close()">Quitter</a></li>--> - </ul> + <li class="optH" id="options"><a title="Options général" href="javascript:options()">Options</a></li> + <li class="optH" id="report"><a title="Création d'un rapport" href="javascript:report()">Rapport</a></li> + <li class="optH" id="about"><a title="À propos de jTimer" data-toggle="modal" href="#aboutPopUp">À propos</a></li> + <!--<li class="optH" id="quit"><a title="Quitter l'application" href="javascript:window.close()">Quitter</a></li>--> + </ul> </div> </div> </div> - </header> - - - - <div id="jtimer"> - <div id="opts"> - <span><label title="Affiche les projets et tâches fermer"><input type="checkbox" onchange="javascript:displayHidden()">Afficher les cachés</a></label></span> - <span><label title="Réduit l'application dans le systray au lieu de le fermer"><input type="checkbox" onchange="javascript:systray()">Fermer vers le systray</label></span> - <span>Rapport - Premier jour de la semaine : - <select name="day" onchange="dStartWeek()"> - <option>lundi - <option>mardi - <option>mercredi - <option>jeudi - <option>vendredi - <option>samedi - <option>dimanche - </select></span> - </div> - - - - <div class="buttons"> - Nouveau projet : <input class="input-medium" id="newProject" title="Nom du nouveau Projet"><button id="createP" class="btn btn-primary" onclick="newProject()"> Créer le projet</button> - </div> - - - - <div id="tabTask"> - <!-- Arborescence des Tasks --> - <div id="headTasks"><span class='colHT'>Projet et tâches</span><span class='colHT'>Aujourd'hui</span><span class='colHT'>Total</span></div> - <ul id="treeTasks"> - </ul> - </div> - <footer class="footer"> - <!-- footer à garder tel quel --> - <div id="framefooter"><span id="statutTasks">Inactif</span><span id="recapToday">Aujourd'hui : xx:xx:xx</span></div> - </footer> - </div> - - - - <div id="reportpage"> - <div id="divLeft"> - <div id="optionsReport"> - Options :<br><br> - De : <input type="text" class="datepicker"> - <input type="button" name="Semaine courante" id="selectThisWeek" value=" "><br> - A : <input type="text" class="datepicker"> - <input type="button" name="Semaine précédente" id="selectLastWeek" value=" "><br> - <form> - <label><input type="radio" name="formatChoice" value="day">Par jour</label> - <label><input type="radio" name="formatChoice" value="month">Par mois</label> - <label><input type="radio" name="formatChoice" value="week">Par semaine</label> - <label><input type="radio" name="formatChoice" value="year">Par année</label> - <label><input type="radio" name="formatChoice" value="project">Par projet</label> - </form> - <label><input type="checkbox" id="includeAnno" onchange="checkTimeMark()">Inclure les annotations</label> - <span id="withTimeMark" style="display:none;"><label><input type="checkbox">avec l'heure</label></span> - </div><br> - <div id="projectsReport"> - Projets :<br><br> - <label><input type="checkbox" id="displayHiddenReport">Afficher les cachés</label> - <div id="treeReport"> - </div> - </div> - </div> - <div id="divRight"> - Raport :<br> - <span id="zoneTexteReport"><textarea id="textReport"></textarea></span> - <footer> - <span id="generReport"><img src="img/applications-system.png" alt="apply">Générer</span> - <span id="mailReport"><img src="img/mail-forward.png" alt="mail">Envoyer par email</span> - </footer> - </div> - </div> - - - - <div id="editionTask" title="Edition de la tâche"> - <input type="text" id="nameTask" name="newNameTask" value="x"> - <!-- Calendrier à date selectionnable --> - <div id="datepicker2"></div> - Temps: - <input id="spinnerh" type="text" name="hour" value="00" maxlength="2">: - <input id="spinnerm" type="text" name="minutes" value="00" maxlength="2">: - <input id="spinners" type="text" name="seconds" value="00" maxlength="2"><br> - Note:<textarea rows="4" id="noteTache"></textarea><br> - <input type="button" id="editionApply" value="Appliquer"> - <input type="reset" id="editionCancel" value="Annuler"> - </div> - - - - <div class="modal hide" id="aboutPopUp"> - <div class="modal-header"><a class="close" data-dismiss="modal">×</a> - <h3>A propos de jTimer</h3> - </div> - <div class="modal-body"> - <img src="img/jtimer-logo-orange.jpg" alt="logo"/><br> - <span id="bt1" onclick="action(1)">A propos de jTimer</span> - <span id="bt2" onclick="action(2)">Licence</span><br> - <div id="frame"><p id="dataText"><b>jTimer - 2.0-SNAPSHOT</b><br><br>Copyright 2007 - 2013, Code Lutin.<br><br><a href="http://maven-site.chorem.org/jtimer">http://maven-site.chorem.org/jtimer</a><br><br>Merci de rapporter les bugs de jTimer.</p></div> - </div> - </div> - - - - <div id="alerts" title="Alertes de la tâche"> - <span id="blockAlerte"> - <b>Listes des alertes :</b> - <input type="button" id="alertSave" value="Sauver"> - </span> - <br> - <br> - <div id="listAlerts">Type & Durée<br><br> - </div> - <input type="button" id="alertAdd" value="Ajouter" onclick="add()"> - </div> - - - - </body> - <script>init();</script> + </header> + + + + <div id="jtimer"> + <div id="opts"> + <span><label title="Affiche les projets et tâches fermer"><input type="checkbox" onchange="javascript:displayHidden()">Afficher les cachés</a></label></span> + <span><label title="Réduit l'application dans le systray au lieu de le fermer"><input type="checkbox" onchange="javascript:systray()">Fermer vers le systray</label></span> + <span>Rapport - Premier jour de la semaine : + <select name="day" onchange="dStartWeek()"> + <option>lundi + <option>mardi + <option>mercredi + <option>jeudi + <option>vendredi + <option>samedi + <option>dimanche + </select></span> + </div> + + + + <div class="buttons"> + Nouveau projet : <input class="input-medium" id="newProject" title="Nom du nouveau Projet"><button id="createP" class="btn btn-primary" onclick="newProject()"> Créer le projet</button> + </div> + + + + <div id="tabTask"> + <!-- Arborescence des Tasks --> + <div id="headTasks"><span class='colHT'>Projet et tâches</span><span class='colHT'>Aujourd'hui</span><span class='colHT'>Total</span></div> + <ul id="treeTasks"> + </ul> + </div> + <footer class="footer"> + <!-- footer à garder tel quel --> + <div id="framefooter"><span id="statutTasks">Inactif</span><span id="recapToday">Aujourd'hui : xx:xx:xx</span></div> + </footer> + </div> + + + + <div id="reportpage"> + <div id="divLeft"> + <div id="optionsReport"> + Options :<br><br> + De : <input type="text" class="datepicker"> + <input type="button" name="Semaine courante" id="selectThisWeek" value=" "><br> + A : <input type="text" class="datepicker"> + <input type="button" name="Semaine précédente" id="selectLastWeek" value=" "><br> + <form> + <label><input type="radio" name="formatChoice" value="day">Par jour</label> + <label><input type="radio" name="formatChoice" value="month">Par mois</label> + <label><input type="radio" name="formatChoice" value="week">Par semaine</label> + <label><input type="radio" name="formatChoice" value="year">Par année</label> + <label><input type="radio" name="formatChoice" value="project">Par projet</label> + </form> + <label><input type="checkbox" id="includeAnno" onchange="checkTimeMark()">Inclure les annotations</label> + <span id="withTimeMark" style="display:none;"><label><input type="checkbox">avec l'heure</label></span> + </div><br> + <div id="projectsReport"> + Projets :<br><br> + <label><input type="checkbox" id="displayHiddenReport">Afficher les cachés</label> + <div id="treeReport"> + </div> + </div> + </div> + <div id="divRight"> + Raport :<br> + <span id="zoneTexteReport"><textarea id="textReport"></textarea></span> + <footer> + <span id="generReport"><img src="img/applications-system.png" alt="apply">Générer</span> + <span id="mailReport"><img src="img/mail-forward.png" alt="mail">Envoyer par email</span> + </footer> + </div> + </div> + + + + <div id="editionTask" title="Edition de la tâche"> + <input type="text" id="nameTask" name="newNameTask" value="x"> + <!-- Calendrier à date selectionnable --> + <div id="datepicker2"></div> + Temps: + <input id="spinnerh" type="text" name="hour" value="00" maxlength="2">: + <input id="spinnerm" type="text" name="minutes" value="00" maxlength="2">: + <input id="spinners" type="text" name="seconds" value="00" maxlength="2"><br> + Note:<textarea rows="4" id="noteTache"></textarea><br> + <input type="button" id="editionApply" value="Appliquer"> + <input type="reset" id="editionCancel" value="Annuler"> + </div> + + + + <div class="modal hide" id="aboutPopUp"> + <div class="modal-header"><a class="close" data-dismiss="modal">×</a> + <h3>A propos de jTimer</h3> + </div> + <div class="modal-body"> + <img src="img/jtimer-logo-orange.jpg" alt="logo"/><br> + <span id="bt1" onclick="action(1)">A propos de jTimer</span> + <span id="bt2" onclick="action(2)">Licence</span><br> + <div id="frame"><p id="dataText"><b>jTimer - 2.0-SNAPSHOT</b><br><br>Copyright 2007 - 2013, Code Lutin.<br><br><a href="http://maven-site.chorem.org/jtimer">http://maven-site.chorem.org/jtimer</a><br><br>Merci de rapporter les bugs de jTimer.</p></div> + </div> + </div> + + + + <div id="alerts" title="Alertes de la tâche"> + <span id="blockAlerte"> + <b>Listes des alertes :</b> + <input type="button" id="alertSave" value="Sauver"> + </span> + <br> + <br> + <div id="listAlerts">Type & Durée<br><br> + </div> + <input type="button" id="alertAdd" value="Ajouter" onclick="add()"> + </div> + + + + </body> + <script>init();</script> </html> Modified: jtimerhtml5/src/main/resources/nuiton-js/wro.xml =================================================================== --- jtimerhtml5/src/main/resources/nuiton-js/wro.xml 2013-06-19 09:50:36 UTC (rev 47) +++ jtimerhtml5/src/main/resources/nuiton-js/wro.xml 2013-06-19 15:31:37 UTC (rev 48) @@ -3,6 +3,7 @@ <group-ref>jquery</group-ref> <group-ref>jquery-ui</group-ref> <group-ref>jquery-ui-base</group-ref> + <group-ref>bootstrap</group-ref> <!-- js et css specifique a l'application --> <css>/css/*.css</css> <js>/js/*.js</js>