Incubator-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- 26 discussions
r28 - in jtimerhtml5: . src src/cssJavaFX src/html src/html/resourcescss src/html/resourcescss/resourcesjs src/html/resourcescss/resourcesjs/resourcesimg
by qmoriceau＠users.chorem.org April 26, 2013
by qmoriceau＠users.chorem.org April 26, 2013
April 26, 2013
Author: qmoriceau
Date: 2013-04-26 17:26:52 +0200 (Fri, 26 Apr 2013)
New Revision: 28
Url: http://chorem.org/projects/incubator/repository/revisions/28
Log:
correction de quelques probl?\195?\168mes et d?\195?\169but des tests de comunication par url
Added:
jtimerhtml5/src/
jtimerhtml5/src/JTimer.java
jtimerhtml5/src/cssJavaFX/
jtimerhtml5/src/cssJavaFX/alert_box.css
jtimerhtml5/src/cssJavaFX/confirm_box.css
jtimerhtml5/src/cssJavaFX/prompt_box.css
jtimerhtml5/src/html/
jtimerhtml5/src/html/about.html
jtimerhtml5/src/html/alerts.html
jtimerhtml5/src/html/editionTask.html
jtimerhtml5/src/html/index.html
jtimerhtml5/src/html/report.html
jtimerhtml5/src/html/resourcescss/
jtimerhtml5/src/html/resourcescss/about.css
jtimerhtml5/src/html/resourcescss/alerts.css
jtimerhtml5/src/html/resourcescss/editionT.css
jtimerhtml5/src/html/resourcescss/jtimer.css
jtimerhtml5/src/html/resourcescss/report.css
jtimerhtml5/src/html/resourcescss/resourcesjs/
jtimerhtml5/src/html/resourcescss/resourcesjs/actionsMenus.js
jtimerhtml5/src/html/resourcescss/resourcesjs/alerts.js
jtimerhtml5/src/html/resourcescss/resourcesjs/menu.js
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/applications-system.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/bell.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/bookmark-new.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/date_current.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/date_previous.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/document-new.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/go-next.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/jtimer-logo-orange.jpg
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/mail-forward.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/notes.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/process-stop.png
jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/running.gif
jtimerhtml5/src/html/resourcescss/style.css
Removed:
jtimerhtml5/TestWebEngine.java
jtimerhtml5/alertes.html
jtimerhtml5/apropos.html
jtimerhtml5/aspect/
jtimerhtml5/cssJavaFX/
jtimerhtml5/editionTache.html
jtimerhtml5/index.html
jtimerhtml5/javascript/
jtimerhtml5/rapport.html
Deleted: jtimerhtml5/TestWebEngine.java
===================================================================
--- jtimerhtml5/TestWebEngine.java 2013-04-25 16:03:02 UTC (rev 27)
+++ jtimerhtml5/TestWebEngine.java 2013-04-26 15:26:52 UTC (rev 28)
@@ -1,294 +0,0 @@
-import java.net.URL;
-
-import netscape.javascript.JSObject;
-
-import javafx.application.Application;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.concurrent.Worker.State;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.effect.BoxBlur;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.HBoxBuilder;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.web.PopupFeatures;
-import javafx.scene.web.PromptData;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebEvent;
-import javafx.scene.web.WebView;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-import javafx.util.Callback;
-
-public class TestWebEngine extends Application {
-
- @Override
- public void start(final Stage stage) {
- stage.setTitle("jTimer");
-
- Scene scene = new Scene(new Group(), 450, 500);
-
- VBox root = new VBox();
-
- final WebView browser = new WebView();
- final WebEngine webEngine = browser.getEngine();
-
- // les différentes initialisation nécéssaire aux boites de dialogue
- final VBox confirmationResults = new VBox();
- confirmationResults.getStyleClass().add("confirmation-results");
- confirmationResults.setMinWidth(100);
- HBox layout = new HBox();
- layout.getChildren().addAll(confirmationResults, browser);
- stage.setScene(new Scene(layout));
- stage.show();
- stage.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/alert_box.css").toExternalForm());
-
- // processus au chargement de la page, on crée le pont de Javascript vers javaFX
- // Mais ne répond pas entièrement au problème.
- /*webEngine.getLoadWorker().stateProperty().addListener(
- new ChangeListener<State>() {
- @Override
- public void changed(ObservableValue<? extends State> ov,
- State oldState, State newState) {
- JSObject jsobj = (JSObject) webEngine.executeScript("window");
- jsobj.setMember("java", new Bridge());
- }
- }
- );*/
-
- // permet d'ouvrir des popup.
- webEngine.setCreatePopupHandler(new Callback<PopupFeatures, WebEngine>() {
- public WebEngine call(PopupFeatures popupFeatures) {
- final WebView popupWebView = new WebView();
- final Scene popupScene = new Scene(popupWebView);
- final Stage popupStage = new Stage();
- popupStage.setScene(popupScene);
- popupStage.setResizable(popupFeatures.isResizable());
- popupStage.show();
-
- WebEngine popupEngine = popupWebView.getEngine();
-
- popupEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() {
- public void handle(WebEvent<Boolean> we) {
- if (!we.getData()){
- popupStage.close();
- }
- }
- });
-
- popupEngine.getLoadWorker().stateProperty().addListener(
- new ChangeListener<State>() {
- @Override
- public void changed(ObservableValue<? extends State> ov,
- State oldState, State newState) {
- JSObject jsobj = (JSObject) webEngine.executeScript("window");
- jsobj.setMember("java", new Bridge());
- }
- }
- );
-
- return popupEngine;
- }
- });
-
- // permet de fermer la fenêtre
- webEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() {
- public void handle(WebEvent<Boolean> we) {
- if (!we.getData()){
- stage.close();
- }
- }
- });
-
- webEngine.setOnAlert(new EventHandler<WebEvent<String>>(){
- @Override
- public void handle(WebEvent<String> we) {
- alert(stage, we.getData());
- }
- });
-
- webEngine.setConfirmHandler(new Callback<String, Boolean>(){
- public Boolean call(String str){
- Boolean confirmed = confirm(stage, str);
- confirmationResults.getChildren().add(new Label("Confirmed? " + confirmed));
- return confirmed;
- }
- });
-
- webEngine.setPromptHandler(new Callback<PromptData, String>(){
- public String call(PromptData pdata){
- String result = prompt(stage, pdata.getMessage(), pdata.getDefaultValue());
- return result;
- }
- });
-
- URL maPage = getClass().getResource("index.html");
- webEngine.load(maPage.toExternalForm());
-
- root.getChildren().addAll(browser);
- scene.setRoot(root);
-
- stage.setScene(scene);
- stage.show();
- }
-
- // JavaJX n'a pas d'outils prédéfini pour les boites de dialogue, on les construits donc "manuelement"
- // On retrouve donc a la suite des boîtes de dialogue personalisable.
-
- // boite de dialogue de question ouverte
- private String prompt(final Stage parent, String msg, String dft) {
-
- final StringProperty reponse = new SimpleStringProperty();
- final Stage dialog = new Stage(StageStyle.TRANSPARENT);
- dialog.initOwner(parent);
- dialog.initModality(Modality.WINDOW_MODAL);
-
- Label label = new Label(msg);
- final TextField textField = new TextField(dft);
- Button buttonOk = new Button("OK");
- Button buttonAnn = new Button("Annuler");
-
- Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,textField,buttonOk,buttonAnn).build(), Color.TRANSPARENT);
- dialog.setScene(scn);
-
- buttonOk.setOnAction(new EventHandler<ActionEvent>() {
- @Override
- public void handle(ActionEvent arg0) {
- reponse.setValue(textField.getCharacters().toString());
- parent.getScene().getRoot().setEffect(null);
- dialog.close();
- }
- });
-
- buttonAnn.setOnAction(new EventHandler<ActionEvent>() {
- @Override
- public void handle(ActionEvent arg0) {
- reponse.setValue(null);
- parent.getScene().getRoot().setEffect(null);
- dialog.close();
- }
- });
-
- dragged(dialog);
-
- // style and show the dialog.
- dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/prompt_box.css").toExternalForm());
- parent.getScene().getRoot().setEffect(new BoxBlur());
- dialog.showAndWait();
-
- return reponse.get();
- }
-
- // boite de dialogue d'alerte
- private void alert(final Stage parent, String msg) {
- // initialize the alert dialog
- final Stage dialog = new Stage(StageStyle.TRANSPARENT);
- dialog.initOwner(parent);
- dialog.initModality(Modality.WINDOW_MODAL);
-
- Label label = new Label(msg);
- Button buttonOk = new Button("OK");
-
- Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk).build(), Color.TRANSPARENT);
- dialog.setScene(scn);
-
- buttonOk.setOnAction(new EventHandler<ActionEvent>() {
- @Override
- public void handle(ActionEvent arg0) {
- parent.getScene().getRoot().setEffect(null);
- dialog.close();
- }
- });
-
- dragged(dialog);
-
- // style and show the dialog.
- dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/alert_box.css").toExternalForm());
- parent.getScene().getRoot().setEffect(new BoxBlur());
- dialog.showAndWait();
- }
-
- // boite de dialogue de confirmation
- private Boolean confirm(final Stage parent, String msg) {
- final BooleanProperty confirmationResult = new SimpleBooleanProperty();
- // initialize the confirmation dialog
- final Stage dialog = new Stage(StageStyle.TRANSPARENT);
- dialog.initOwner(parent);
- dialog.initModality(Modality.WINDOW_MODAL);
-
- Label label = new Label(msg);
- Button buttonOk = new Button("OK");
- Button buttonAnn = new Button("Annuler");
-
- Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk,buttonAnn).build(), Color.TRANSPARENT);
- dialog.setScene(scn);
-
- buttonOk.setOnAction(new EventHandler<ActionEvent>() {
- @Override
- public void handle(ActionEvent arg0) {
- confirmationResult.set(true);
- parent.getScene().getRoot().setEffect(null);
- dialog.close();
- }
- });
-
- buttonAnn.setOnAction(new EventHandler<ActionEvent>() {
- @Override
- public void handle(ActionEvent arg0) {
- confirmationResult.set(false);
- parent.getScene().getRoot().setEffect(null);
- dialog.close();
- }
- });
-
- dragged(dialog);
-
-
- // style and show the dialog.
- dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/confirm_box.css").toExternalForm());
- parent.getScene().getRoot().setEffect(new BoxBlur());
- dialog.showAndWait();
-
- return confirmationResult.get();
- }
-
- // permet de déplacer le Stage entrer en paramètre.
- private void dragged(final Stage dialog){
- final Node root = dialog.getScene().getRoot();
- final Delta dragDelta = new Delta();
- root.setOnMousePressed(new EventHandler<MouseEvent>() {
- @Override public void handle(MouseEvent mouseEvent) {
- // record a delta distance for the drag and drop operation.
- dragDelta.x = dialog.getX() - mouseEvent.getScreenX();
- dragDelta.y = dialog.getY() - mouseEvent.getScreenY();
- }
- });
- root.setOnMouseDragged(new EventHandler<MouseEvent>() {
- @Override public void handle(MouseEvent mouseEvent) {
- dialog.setX(mouseEvent.getScreenX() + dragDelta.x);
- dialog.setY(mouseEvent.getScreenY() + dragDelta.y);
- }
- });
- }
-
- // records relative x and y co-ordinates.
- class Delta { double x, y; }
-
- public static void main(String[] args) {
- launch(args);
- }
-}
Deleted: jtimerhtml5/alertes.html
===================================================================
--- jtimerhtml5/alertes.html 2013-04-25 16:03:02 UTC (rev 27)
+++ jtimerhtml5/alertes.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
- <head>
- <meta charset="UTF-8"/>
- <title>jTimer - Alertes</title>
- <link rel="stylesheet" type="text/css" href="aspect/alertes.css"/>
- <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
- <script type="text/javascript" src="javascript/alertes.js"></script>
- </head>
- <body>
- <b>Listes des alertes :</b>
- <span id="cadreHaut">
- <input type="button" id="alerteAnn" value="Annuler" OnClick="javascript:window.close()">
- <input type="button" id="alerteSave" value="Sauver">
- </span>
- <br>
- <br>
- <div width=100% id="listeAlertes">Type & Durée<br><br>
- </div>
- <input type="button" id="alerteAj" value="Ajouter" onclick="ajout()">
- </body>
-</html>
Deleted: jtimerhtml5/apropos.html
===================================================================
--- jtimerhtml5/apropos.html 2013-04-25 16:03:02 UTC (rev 27)
+++ jtimerhtml5/apropos.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
- <head>
- <meta charset="UTF-8"/>
- <title>A propos de jTimer</title>
- <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
- <link rel="stylesheet" type="text/css" href="aspect/apropos.css"/>
- <script type="text/javascript">
- <!-- //choix entre les deux texte via les boutons
- function action(i){
- if(i == 1){
- document.getElementById('dataText').innerHTML='<b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2012, 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.';
- document.getElementById('bt1').style.backgroundColor = "#339999";
- document.getElementById('bt2').style.backgroundColor = "#ffffff";
- }
- if(i == 2){
- document.getElementById('dataText').innerHTML="Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec jTimer. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme.";
- document.getElementById('bt1').style.backgroundColor = "#ffffff";
- document.getElementById('bt2').style.backgroundColor = "#339999";
- }
- }
- //-->
- </script>
- </head>
- <body>
- <img src="aspect/images/jtimer-logo-orange.jpg" /><br>
- <span id="bt1" onclick="action(1)">A propos de jTimer</span>
- <span id="bt2" onclick="action(2)">Licence</span><br>
- <div id="cadre"><p id="dataText"><b>jTimer - 1.4.1</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>
- <input style="margin-left:300px;margin-top:5px;width:100px;height:25px" type="submit" value="Fermer" OnClick="javascript:window.close()">
- </body>
-</html>
Deleted: jtimerhtml5/editionTache.html
===================================================================
--- jtimerhtml5/editionTache.html 2013-04-25 16:03:02 UTC (rev 27)
+++ jtimerhtml5/editionTache.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
- <head>
- <meta charset="UTF-8"/>
- <title>Edition de la tâche</title>
- <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
- <link rel="stylesheet" type="text/css" href="aspect/editionT.css"/>
- </head>
- <body>
- <input type="text" id="nomTache" name="newNomTache" value="x">
- <!-- Calendrier à date selectionnable -->
- <footer width=100%>
- Temps:
- <input type="text" name="heures" value="00" size=2>:
- <input type="text" name="minutes" value="00" size=2>:
- <input type="text" name="secondes" value="00" size=2><br>
- Note:<textarea rows="4" type="text" value="" id="noteTache"></textarea><br>
- <input type="button" id="editionAppl" value="Ajouter">
- <input type="reset" id="editionAnnul" value="Annuler">
- <input type="button" id="editionQuit" value="Quitter" OnClick="javascript:window.close()">
- </footer>
- </body>
-</html>
Deleted: jtimerhtml5/index.html
===================================================================
--- jtimerhtml5/index.html 2013-04-25 16:03:02 UTC (rev 27)
+++ jtimerhtml5/index.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
- <head>
- <meta charset="UTF-8"/>
- <title>jTimer</title>
- <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
- <link rel="stylesheet" type="text/css" href="aspect/jtimer.css"/>
- <script type="text/javascript" src="javascript/menu.js"></script>
- <script type="text/javascript" src="javascript/actionsMenus.js"></script>
- </head>
- <body>
- <!-- Menu -->
- <div>
- <span class="menu" id="mn1" onclick="menu(1)" onmouseover="over2(1)" onmouseout="out2(1)">Fichier</span>
- <span class="menu" id="mn2" onclick="menu(2)" onmouseover="over2(2)" onmouseout="out2(2)">Projet</span>
- <span class="menu" id="mn3" onclick="menu(3)" onmouseover="over2(3)" onmouseout="out2(3)">Tâche</span>
- <span class="menu" id="mn4" onclick="menu(4)" onmouseover="over2(4)" onmouseout="out2(4)">Rapport</span>
- <span class="menu" id="mn5" onclick="menu(5)" onmouseover="over2(5)" onmouseout="out2(5)">Options</span>
- <span class="menu" id="mn6" onclick="menu(6)" onmouseover="over2(6)" onmouseout="out2(6)">Aide</span>
- </div>
- <div class="boutons">
- <!-- Les boutons d'actions
- Réflechir à la possibilité de n'avoire qu'un bouton pour démarré et stoper une tache. -->
- <span id="demarreTache" title="Démarre la tâche sélectionnée" onclick="demarTache()" onmouseover="over(this)" onmouseout="out(this)"></span>
- <span id="arretTache" title="Arrête la tâche sélectionnée" onclick="stopTache()" onmouseover="over(this)" onmouseout="out(this)"></span>
- <span id="nouveauProjet" title="Création d'un nouveau projet" onclick="newProjet()" onmouseover="over(this)" onmouseout="out(this)"></span>
- <span id="nouvelleTache" title="Création d'une nouvelle tâche" onclick="newTache()" onmouseover="over(this)" onmouseout="out(this)"></span>
-
- <span id="note" title="Ajouter une annotation" onclick="addAnnotation()" onmouseover="over(this)" onmouseout="out(this)"></span>
- <span id="alerte" title="Edition des alertes" onclick="edAlertes()" onmouseover="over(this)" onmouseout="out(this)"></span>
- </div>
- <div>
- <!-- Arborescence des taches -->
- <div width=100%>
- <div id="entete">
- <span class="colone1">Projet et tâches</span>
- <span class="colone2">Aujourd'hui</span>
- <span class="colone3">Total</span><br><br>
- </div>
- <div id="arboTaches">
- <span class="colone1" id="cel1ligne1" onclick="selecTache(this, 1)" ondblclick="go(1)"><img src="aspect/images/running.gif" style="display:none" id="go1"/> jTimer html5</span>
- <span class="colone2" id="cel2ligne1" onclick="selecTache(this, 1)" ondblclick="go(1)"> xx:xx:xx</span>
- <span class="colone3" id="cel3ligne1" onclick="selecTache(this, 1)" ondblclick="go(1)"> xx:xx:xx</span><br>
- <span class="colone1" id="cel1ligne2" onclick="selecTache(this, 2)" ondblclick="go(2)"><img src="aspect/images/running.gif" style="display:none" id="go2"/> jTimer test</span>
- <span class="colone2" id="cel2ligne2" onclick="selecTache(this, 2)" ondblclick="go(2)"> xx:xx:xx</span>
- <span class="colone3" id="cel3ligne2" onclick="selecTache(this, 2)" ondblclick="go(2)"> xx:xx:xx</span><br>
- </div>
- </div>
- </div>
- <footer class="piedpage">
- <!-- footer à garder tel quel -->
- <div id="cadreBas"><span id="statutTaches">Inactif</span><span id="recapAuj">Aujourd'hui : xx:xx:xx</span></div>
- </footer>
- <!-- Les sous menus sont placé à la fin pour qu'il passe devant les autres blocks de texte -->
- <div id="menu1">
- <span class="options" onclick="javascript:window.close()">Quitter</span>
- </div>
- <div id="menu2">
- <span class="options" onclick="newProjet()">Nouveau projet</span><br>
- <span class="options" onclick="edProjet()">Édition du projet</span><br>
- <span class="options" onclick="ofProjet()">Ouvrir/Fermer le projet</span><br>
- <span class="options" onclick="supprProjet()">Suppression du projet</span>
- </div>
- <div id="menu3">
- <span class="options" onclick="newTache()">Nouvelle tâche</span><br>
- <span class="options" onclick="edTache()">Édition de la tâche</span><br>
- <span class="options" onclick="ofTache()">Ouvrir/Fermer la tâche</span><br>
- <span class="options" onclick="supprTache()">Suppression de la tâche</span><br>
-
- <span style="padding-top:10px;" class="options" onclick="demarTache()">Démarrer</span><br>
- <span class="options" onclick="stopTache()">Arrêter</span><br>
-
- <span style="padding-top:10px;" class="options" onclick="addAnnotation()">Ajouter une annotation</span><br>
- <span class="options" onclick="edAlertes()">Édition des alertes</span><br>
- <span class="options" onclick="add(1)">Ajouter 1 minute</span><br>
- <span class="options" onclick="add(5)">Ajouter 5 minutes</span><br>
- <span class="options" onclick="add(30)">Ajouter 30 minutes</span><br>
- <span class="options" onclick="sou(1)">Enlever 1 minute</span><br>
- <span class="options" onclick="sou(5)">Enlever 5 minutes</span><br>
- <span class="options" onclick="sou(30)">Enlever 30 minutes</span><br>
- <span class="options" onclick="zero()">Remettre à Zero</span><br>
- <span class="options" onclick="fusion()">Fusionner</span>
- </div>
- <div id="menu4">
- <span class="options" onclick="rapport()">Rapport...</span>
- </div>
- <div id="menu5">
- <span class="options" onclick="affCachés()"><label><input type="checkbox">Afficher les cachés</label></span><br>
- <span class="options" onclick="systray()"><label><input type="checkbox">Fermer vers le systray</label></span><br>
- <span class="options" onclick="jSemaine()">Rapport - Premier jour de la semaine</span>
- </div>
- <div id="menu6">
- <span class="options" onclick="aPropos()">À propos...</span>
- </div>
- </body>
-</html>
Deleted: jtimerhtml5/rapport.html
===================================================================
--- jtimerhtml5/rapport.html 2013-04-25 16:03:02 UTC (rev 27)
+++ jtimerhtml5/rapport.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr" height=100%>
- <head>
- <meta charset="UTF-8"/>
- <title>Rapport - jTimer</title>
- <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
- <link rel="stylesheet" type="text/css" href="aspect/rapport.css"/>
- <script language=JavaScript>
- var check = false;
- function checkHeure(){
- if (check==false){
- check=true;
- (document.getElementById("avHeure")).style.display="";
- }
- else
- {
- check=false;
- (document.getElementById("avHeure")).style.display="none";
- }
- }
- </script>
- </head>
- <body height=100%>
- <div id="divGauche">
- <div id="optionsRapport">
- Options :<br><br>
- De : <input type="date" id="dateDeb">
- <input type="button" name="Semaine courante" id="selecSemAct"><br>
- A : <input type="date" id="dateFin">
- <input type="button" name="Semaine précédente" id="selecSemPre"><br>
- <form>
- <label><input type="radio" name="choixFormat" value="jour">Par jour</label>
- <label><input type="radio" name="choixFormat" value="mois" id="moisRapport">Par mois</label>
- <br>
- <label><input type="radio" name="choixFormat" value="semaine">Par semaine</label>
- <label><input type="radio" name="choixFormat" value="annee" id="anneeRapport">Par année</label>
- <br>
- <label><input type="radio" name="choixFormat" value="projet">Par projet</label>
- </form>
- <label><input type="checkbox" id="incAnno" onchange="checkHeure()">Inclure les annotations</label>
- <span id="avHeure" style="display:none;"><label><input type="checkbox">avec l'heure</label></span>
- </div><br>
- <div id="projetsRapport">
- Projets :<br><br>
- <label><input type="checkbox" id="affichCachésRapport">Afficher les cachés</label>
- <div id="arboRapport">
- </div>
- </div>
- </div>
-
- <div id="divDroite">
- Rapport :<br>
- <span id="zoneTexteRapport"><textarea id="texteRapport"></textarea></span>
- <footer>
- <span id="generRapport"><img src="aspect/images/applications-system.png">Générer</span>
- <span id="mailRapport"><img src="aspect/images/mail-forward.png">Envoyer par email</span>
- <input type="button" value="Fermer" id="fermerRapport" onclick="javascript:window.close()">
- </footer>
- </div>
- </body>
-</html>
Added: jtimerhtml5/src/JTimer.java
===================================================================
--- jtimerhtml5/src/JTimer.java (rev 0)
+++ jtimerhtml5/src/JTimer.java 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,329 @@
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
+
+import javafx.application.Application;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.effect.BoxBlur;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.HBoxBuilder;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.web.PopupFeatures;
+import javafx.scene.web.PromptData;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebEvent;
+import javafx.scene.web.WebView;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+import javafx.util.Callback;
+
+public class JTimer extends Application {
+
+ @Override
+ public void start(final Stage stage) {
+ stage.setTitle("jTimer");
+
+ Scene scene = new Scene(new Group(), 450, 500);
+
+ VBox root = new VBox();
+
+ final WebView browser = new WebView();
+ final WebEngine webEngine = browser.getEngine();
+
+ // les différentes initialisation nécéssaire aux boites de dialogue
+ final VBox confirmationResults = new VBox();
+ confirmationResults.getStyleClass().add("confirmation-results");
+ confirmationResults.setMinWidth(100);
+ HBox layout = new HBox();
+ layout.getChildren().addAll(confirmationResults, browser);
+ stage.setScene(new Scene(layout));
+ stage.show();
+ stage.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/alert_box.css").toExternalForm());
+
+ // permet d'ouvrir des popup.
+ webEngine.setCreatePopupHandler(new Callback<PopupFeatures, WebEngine>() {
+ public WebEngine call(PopupFeatures popupFeatures) {
+ final WebView popupWebView = new WebView();
+ final Scene popupScene = new Scene(popupWebView);
+ final Stage popupStage = new Stage();
+ popupStage.setScene(popupScene);
+ popupStage.setResizable(popupFeatures.isResizable());
+ popupStage.show();
+
+ WebEngine popupEngine = popupWebView.getEngine();
+
+ popupEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() {
+ public void handle(WebEvent<Boolean> we) {
+ if (!we.getData()){
+ popupStage.close();
+ }
+ }
+ });
+
+ return popupEngine;
+ }
+ });
+
+ // permet de fermer la fenêtre
+ webEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() {
+ public void handle(WebEvent<Boolean> we) {
+ if (!we.getData()){
+ stage.close();
+ }
+ }
+ });
+
+ webEngine.setOnAlert(new EventHandler<WebEvent<String>>(){
+ @Override
+ public void handle(WebEvent<String> we) {
+ alert(stage, we.getData());
+ }
+ });
+
+ webEngine.setConfirmHandler(new Callback<String, Boolean>(){
+ public Boolean call(String str){
+ Boolean confirmed = confirm(stage, str);
+ confirmationResults.getChildren().add(new Label("Confirmed? " + confirmed));
+ return confirmed;
+ }
+ });
+
+ webEngine.setPromptHandler(new Callback<PromptData, String>(){
+ public String call(PromptData pdata){
+ String result = prompt(stage, pdata.getMessage(), pdata.getDefaultValue());
+ return result;
+ }
+ });
+
+ URL maPage = getClass().getResource("html/index.html");
+ webEngine.load(maPage.toExternalForm());
+
+ root.getChildren().addAll(browser);
+ scene.setRoot(root);
+
+ stage.setScene(scene);
+ stage.show();
+ }
+
+ // JavaJX n'a pas d'outils prédéfini pour les boites de dialogue, on les construits donc "manuelement"
+ // On retrouve donc a la suite des boîtes de dialogue personalisable.
+
+ // boite de dialogue de question ouverte
+ private String prompt(final Stage parent, String msg, String dft) {
+
+ final StringProperty reponse = new SimpleStringProperty();
+ final Stage dialog = new Stage(StageStyle.TRANSPARENT);
+ dialog.initOwner(parent);
+ dialog.initModality(Modality.WINDOW_MODAL);
+
+ Label label = new Label(msg);
+ final TextField textField = new TextField(dft);
+ Button buttonOk = new Button("OK");
+ Button buttonCancel = new Button("Annuler");
+
+ Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,textField,buttonOk,buttonCancel).build(), Color.TRANSPARENT);
+ dialog.setScene(scn);
+
+ buttonOk.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ reponse.setValue(textField.getCharacters().toString());
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ buttonCancel.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ reponse.setValue(null);
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ dragged(dialog);
+
+ // style and show the dialog.
+ dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/prompt_box.css").toExternalForm());
+ parent.getScene().getRoot().setEffect(new BoxBlur());
+ dialog.showAndWait();
+
+ return reponse.get();
+ }
+
+ // boite de dialogue d'alerte
+ private void alert(final Stage parent, String msg) {
+ // initialize the alert dialog
+ final Stage dialog = new Stage(StageStyle.TRANSPARENT);
+ dialog.initOwner(parent);
+ dialog.initModality(Modality.WINDOW_MODAL);
+
+ Label label = new Label(msg);
+ Button buttonOk = new Button("OK");
+
+ Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk).build(), Color.TRANSPARENT);
+ dialog.setScene(scn);
+
+ buttonOk.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ dragged(dialog);
+
+ // style and show the dialog.
+ dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/alert_box.css").toExternalForm());
+ parent.getScene().getRoot().setEffect(new BoxBlur());
+ dialog.showAndWait();
+ }
+
+ // boite de dialogue de confirmation
+ private Boolean confirm(final Stage parent, String msg) {
+ final BooleanProperty confirmationResult = new SimpleBooleanProperty();
+ // initialize the confirmation dialog
+ final Stage dialog = new Stage(StageStyle.TRANSPARENT);
+ dialog.initOwner(parent);
+ dialog.initModality(Modality.WINDOW_MODAL);
+
+ Label label = new Label(msg);
+ Button buttonOk = new Button("OK");
+ Button buttonCancel = new Button("Annuler");
+
+ Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk,buttonCancel).build(), Color.TRANSPARENT);
+ dialog.setScene(scn);
+
+ buttonOk.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ confirmationResult.set(true);
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ buttonCancel.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ confirmationResult.set(false);
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ dragged(dialog);
+
+
+ // style and show the dialog.
+ dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/confirm_box.css").toExternalForm());
+ parent.getScene().getRoot().setEffect(new BoxBlur());
+ dialog.showAndWait();
+
+ return confirmationResult.get();
+ }
+
+ // permet de déplacer le Stage entrer en paramètre avec la sourie.
+ private void dragged(final Stage dialog){
+ final Node root = dialog.getScene().getRoot();
+ final Delta dragDelta = new Delta();
+ root.setOnMousePressed(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ // record a delta distance for the drag and drop operation.
+ dragDelta.x = dialog.getX() - mouseEvent.getScreenX();
+ dragDelta.y = dialog.getY() - mouseEvent.getScreenY();
+ }
+ });
+ root.setOnMouseDragged(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ dialog.setX(mouseEvent.getScreenX() + dragDelta.x);
+ dialog.setY(mouseEvent.getScreenY() + dragDelta.y);
+ }
+ });
+ }
+
+ // records relative x and y co-ordinates.
+ class Delta { double x, y; }
+
+ public static void main(String[] args) {
+
+ // outil de comunication javascript/java par URL
+ URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory() {
+ @Override
+ public URLStreamHandler createURLStreamHandler(String protocol) {
+
+ if ("http".equals(protocol)) {
+ // TODO try to fix restricted api
+ return new sun.net.www.protocol.http.Handler() {
+
+ public URLConnection openConnection(URL url) throws IOException {
+
+ final String query = url.getPath();
+ System.out.println(url);
+ if (query != null && query.startsWith("/jtimer/")) {
+ return new URLConnection(url) {
+ @Override
+ public void connect() throws IOException {
+ // heu
+ }
+
+ public InputStream getInputStream() throws IOException {
+ System.out.println(url.getQuery()); // permet de récupéré ce qui est passé en paramètre
+ InputStream is = null;
+ String content = new String();
+ if (query.endsWith("newProject")){
+ content = "Création d'un nouveau Projet";
+ }
+ else if (query.endsWith("edProject")){
+ content = "Edition du Projet";
+ }
+ else if (query.endsWith("ofProject")){
+ content = "Ouverture/Fermeture du projet";
+ }
+ else if (query.endsWith("supprProject")){
+ content = "Suppression du projet";
+ }
+ else if (query.endsWith("startTask")){
+ content = "Démarage de la tâche";
+ }
+ else if (query.endsWith("stopTask")){
+ content = "Arrêt de la tâche";
+ }
+ is = new ByteArrayInputStream(content.getBytes());
+ return is;
+ }
+ };
+ }
+ else {
+ return super.openConnection(url);
+ }
+ }
+ };
+ }
+ return null; // back to default handler
+ }
+ });
+
+ launch(args);
+ }
+}
\ No newline at end of file
Added: jtimerhtml5/src/cssJavaFX/alert_box.css
===================================================================
--- jtimerhtml5/src/cssJavaFX/alert_box.css (rev 0)
+++ jtimerhtml5/src/cssJavaFX/alert_box.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,37 @@
+/**
+* modal-dialog.css
+* place in same directory as WebViewConfirm.java
+* ensure your build system copies the file to your build output directory
+*/
+
+.root {
+-fx-glass-color: rgba(255, 102, 102, 0.9);
+}
+
+.modal-dialog {
+-fx-padding: 10;
+-fx-spacing: 5;
+-fx-alignment: center;
+-fx-font-size: 18;
+-fx-font-weight:bold;
+-fx-background-color: linear-gradient(to bottom, derive(-fx-glass-color, 20%), -fx-glass-color);
+-fx-border-color: derive(-fx-glass-color, -20%);
+-fx-border-width: 3;
+-fx-background-insets: 6;
+-fx-border-insets: 5;
+-fx-border-radius: 3;
+-fx-background-radius: 3;
+}
+
+.modal-dialog:pressed {
+-fx-cursor: move;
+}
+
+.modal-dialog .button:pressed {
+-fx-cursor: default;
+}
+
+.confirmation-results {
+-fx-background-color: cornsilk;
+-fx-padding: 3;
+}
Added: jtimerhtml5/src/cssJavaFX/confirm_box.css
===================================================================
--- jtimerhtml5/src/cssJavaFX/confirm_box.css (rev 0)
+++ jtimerhtml5/src/cssJavaFX/confirm_box.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,37 @@
+/**
+* modal-dialog.css
+* place in same directory as WebViewConfirm.java
+* ensure your build system copies the file to your build output directory
+*/
+
+.root {
+-fx-glass-color: rgba(95, 158, 160, 0.9);
+}
+
+.modal-dialog {
+-fx-padding: 10;
+-fx-spacing: 5;
+-fx-alignment: center;
+-fx-font-size: 15;
+-fx-font-weight:bold;
+-fx-background-color: linear-gradient(to bottom, derive(-fx-glass-color, 20%), -fx-glass-color);
+-fx-border-color: derive(-fx-glass-color, -20%);
+-fx-border-width: 3;
+-fx-background-insets: 6;
+-fx-border-insets: 5;
+-fx-border-radius: 3;
+-fx-background-radius: 3;
+}
+
+.modal-dialog:pressed {
+-fx-cursor: move;
+}
+
+.modal-dialog .button:pressed {
+-fx-cursor: default;
+}
+
+.confirmation-results {
+-fx-background-color: cornsilk;
+-fx-padding: 3;
+}
Added: jtimerhtml5/src/cssJavaFX/prompt_box.css
===================================================================
--- jtimerhtml5/src/cssJavaFX/prompt_box.css (rev 0)
+++ jtimerhtml5/src/cssJavaFX/prompt_box.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,37 @@
+/**
+* modal-dialog.css
+* place in same directory as WebViewConfirm.java
+* ensure your build system copies the file to your build output directory
+*/
+
+.root {
+-fx-glass-color: rgba(153, 255, 153, 0.9);
+}
+
+.modal-dialog {
+-fx-padding: 10;
+-fx-spacing: 5;
+-fx-alignment: center;
+-fx-font-size: 15;
+-fx-font-weight:bold;
+-fx-background-color: linear-gradient(to bottom, derive(-fx-glass-color, 20%), -fx-glass-color);
+-fx-border-color: derive(-fx-glass-color, -20%);
+-fx-border-width: 3;
+-fx-background-insets: 6;
+-fx-border-insets: 5;
+-fx-border-radius: 3;
+-fx-background-radius: 3;
+}
+
+.modal-dialog:pressed {
+-fx-cursor: move;
+}
+
+.modal-dialog .button:pressed {
+-fx-cursor: default;
+}
+
+.confirmation-results {
+-fx-background-color: cornsilk;
+-fx-padding: 3;
+}
Added: jtimerhtml5/src/html/about.html
===================================================================
--- jtimerhtml5/src/html/about.html (rev 0)
+++ jtimerhtml5/src/html/about.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>A propos de jTimer</title>
+ <link rel="stylesheet" type="text/css" href="resourcescss/style.css"/>
+ <link rel="stylesheet" type="text/css" href="resourcescss/about.css"/>
+ <script type="text/javascript">
+ <!-- //choix entre les deux texte via les boutons
+ function action(i){
+ if(i == 1){
+ document.getElementById('dataText').innerHTML='<b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2012, 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.';
+ document.getElementById('bt1').style.backgroundColor = "#339999";
+ document.getElementById('bt2').style.backgroundColor = "#ffffff";
+ }
+ if(i == 2){
+ document.getElementById('dataText').innerHTML="Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec jTimer. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme.";
+ document.getElementById('bt1').style.backgroundColor = "#ffffff";
+ document.getElementById('bt2').style.backgroundColor = "#339999";
+ }
+ }
+ //-->
+ </script>
+ </head>
+ <body>
+ <img src="resourcescss/resourcesjs/resourcesimg/jtimer-logo-orange.jpg" /><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 - 1.4.1</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>
+ <input id="close" type="submit" value="Fermer" OnClick="javascript:window.close()">
+ </body>
+</html>
Added: jtimerhtml5/src/html/alerts.html
===================================================================
--- jtimerhtml5/src/html/alerts.html (rev 0)
+++ jtimerhtml5/src/html/alerts.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>jTimer - Alertes</title>
+ <link rel="stylesheet" type="text/css" href="resourcescss/alerts.css"/>
+ <link rel="stylesheet" type="text/css" href="resourcescss/style.css"/>
+ <script type="text/javascript" src="resourcescss/resourcesjs/alerts.js"></script>
+ </head>
+ <body>
+ <b>Listes des alertes :</b>
+ <span id="head">
+ <input type="button" id="alertCancel" value="Annuler" OnClick="javascript:window.close()">
+ <input type="button" id="alertSave" value="Sauver">
+ </span>
+ <br>
+ <br>
+ <div width=100% id="listAlerts">Type & Durée<br><br>
+ </div>
+ <input type="button" id="alertAdd" value="Ajouter" onclick="add()">
+ </body>
+</html>
Added: jtimerhtml5/src/html/editionTask.html
===================================================================
--- jtimerhtml5/src/html/editionTask.html (rev 0)
+++ jtimerhtml5/src/html/editionTask.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>Edition de la tâche</title>
+ <link rel="stylesheet" type="text/css" href="resourcescss/style.css"/>
+ <link rel="stylesheet" type="text/css" href="resourcescss/editionT.css"/>
+ </head>
+ <body>
+ <input type="text" id="nameTask" name="newNameTask" value="x">
+ <!-- Calendrier à date selectionnable -->
+ <footer width=100%>
+ Temps:
+ <input type="text" name="hour" value="00" size=2>:
+ <input type="text" name="minutes" value="00" size=2>:
+ <input type="text" name="seconds" value="00" size=2><br>
+ Note:<textarea rows="4" type="text" value="" id="noteTache"></textarea><br>
+ <input type="button" id="editionApply" value="Ajouter">
+ <input type="reset" id="editionCancel" value="Annuler">
+ <input type="button" id="editionClose" value="Quitter" OnClick="javascript:window.close()">
+ </footer>
+ </body>
+</html>
Added: jtimerhtml5/src/html/index.html
===================================================================
--- jtimerhtml5/src/html/index.html (rev 0)
+++ jtimerhtml5/src/html/index.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>jTimer</title>
+ <link rel="stylesheet" type="text/css" href="resourcescss/style.css"/>
+ <link rel="stylesheet" type="text/css" href="resourcescss/jtimer.css"/>
+ <script type="text/javascript" src="resourcescss/resourcesjs/menu.js"></script>
+ <script type="text/javascript" src="resourcescss/resourcesjs/actionsMenus.js"></script>
+ </head>
+ <body>
+ <!-- Menu -->
+ <div>
+ <span class="menu" id="mn1" onclick="menu(1)" onmouseover="over2(1)" onmouseout="out2(1)">Fichier</span>
+ <span class="menu" id="mn2" onclick="menu(2)" onmouseover="over2(2)" onmouseout="out2(2)">Project</span>
+ <span class="menu" id="mn3" onclick="menu(3)" onmouseover="over2(3)" onmouseout="out2(3)">Tâche</span>
+ <span class="menu" id="mn4" onclick="menu(4)" onmouseover="over2(4)" onmouseout="out2(4)">Rapport</span>
+ <span class="menu" id="mn5" onclick="menu(5)" onmouseover="over2(5)" onmouseout="out2(5)">Options</span>
+ <span class="menu" id="mn6" onclick="menu(6)" onmouseover="over2(6)" onmouseout="out2(6)">Aide</span>
+ </div>
+ <div class="buttons">
+ <!-- Les boutons d'actions
+ Réflechir à la possibilité de n'avoire qu'un bouton pour démarré et stoper une Task. -->
+ <span id="startTask" title="Démarre la tâche sélectionnée" onclick="startTask()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="stopTask" title="Arrête la tâche sélectionnée" onclick="stopTask()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="newProject" title="Création d'un nouveau Projet" onclick="newProject()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="newTask" title="Création d'une nouvelle tâche" onclick="newTask()" onmouseover="over(this)" onmouseout="out(this)"></span>
+
+ <span id="note" title="Ajouter une annotation" onclick="addAnnotation()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="alert" title="Edition des Alerts" onclick="edAlerts()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ </div>
+ <div>
+ <!-- Arborescence des Tasks -->
+ <div width=100%>
+ <div id="head">
+ <span class="col1">Projet et tâches</span>
+ <span class="col2">Aujourd'hui</span>
+ <span class="col3">Total</span><br><br>
+ </div>
+ <div id="treeTasks">
+ <span class="col1" id="cel1row1" onclick="selecTask(this, 1)" ondblclick="go(1)"><img src="resourcescss/resourcesjs/resourcesimg/running.gif" style="display:none" id="go1"/> jTimer html5</span>
+ <span class="col2" id="cel2row1" onclick="selecTask(this, 1)" ondblclick="go(1)"> xx:xx:xx</span>
+ <span class="col3" id="cel3row1" onclick="selecTask(this, 1)" ondblclick="go(1)"> xx:xx:xx</span><br>
+ <span class="col1" id="cel1row2" onclick="selecTask(this, 2)" ondblclick="go(2)"><img src="resourcescss/resourcesjs/resourcesimg/running.gif" style="display:none" id="go2"/> jTimer test</span>
+ <span class="col2" id="cel2row2" onclick="selecTask(this, 2)" ondblclick="go(2)"> xx:xx:xx</span>
+ <span class="col3" id="cel3row2" onclick="selecTask(this, 2)" ondblclick="go(2)"> xx:xx:xx</span><br>
+ </div>
+ </div>
+ </div>
+ <footer class="footer">
+ <!-- footer à garder tel quel -->
+ <div id="frame"><span id="statutTasks">Inactif</span><span id="recapToday">Aujourd'hui : xx:xx:xx</span></div>
+ </footer>
+ <!-- Les sous menus sont placé à la fin pour qu'il passe devant les autres blocks de texte -->
+ <div id="menu1">
+ <span class="options" onclick="javascript:window.close()">Quitter</span>
+ </div>
+ <div id="menu2">
+ <span class="options" onclick="newProject()">Nouveau Projet</span><br>
+ <span class="options" onclick="edProject()">Édition du Projet</span><br>
+ <span class="options" onclick="ofProject()">Ouvrir/Fermer le Projet</span><br>
+ <span class="options" onclick="supprProject()">Suppression du Projet</span>
+ </div>
+ <div id="menu3">
+ <span class="options" onclick="newTask()">Nouvelle tâche</span><br>
+ <span class="options" onclick="edTask()">Édition de la tâche</span><br>
+ <span class="options" onclick="ofTask()">Ouvrir/Fermer la tâche</span><br>
+ <span class="options" onclick="supprTask()">Suppression de la tâche</span><br>
+
+ <span class="options" onclick="startTask()">Démarrer</span><br>
+ <span class="options" onclick="stopTask()">Arrêter</span><br>
+
+ <span class="options" onclick="addAnnotation()">Ajouter une annotation</span><br>
+ <span class="options" onclick="edAlerts()">Édition des Alertes</span><br>
+ <span class="options" onclick="add(1)">Ajouter 1 minute</span><br>
+ <span class="options" onclick="add(5)">Ajouter 5 minutes</span><br>
+ <span class="options" onclick="add(30)">Ajouter 30 minutes</span><br>
+ <span class="options" onclick="sou(1)">Enlever 1 minute</span><br>
+ <span class="options" onclick="sou(5)">Enlever 5 minutes</span><br>
+ <span class="options" onclick="sou(30)">Enlever 30 minutes</span><br>
+ <span class="options" onclick="zero()">Remettre à Zero</span><br>
+ <span class="options" onclick="fusion()">Fusionner</span>
+ </div>
+ <div id="menu4">
+ <span class="options" onclick="report()">Rapport...</span>
+ </div>
+ <div id="menu5">
+ <span class="options" onclick="displayHidden()"><label><input type="checkbox">Afficher les cachés</label></span><br>
+ <span class="options" onclick="systray()"><label><input type="checkbox">Fermer vers le systray</label></span><br>
+ <span class="options" onclick="dStartWeek()">Rapport - Premier jour de la semaine</span>
+ </div>
+ <div id="menu6">
+ <span class="options" onclick="about()">À propos...</span>
+ </div>
+ </body>
+</html>
Added: jtimerhtml5/src/html/report.html
===================================================================
--- jtimerhtml5/src/html/report.html (rev 0)
+++ jtimerhtml5/src/html/report.html 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="fr" height=100%>
+ <head>
+ <meta charset="UTF-8"/>
+ <title>Rapport - jTimer</title>
+ <link rel="stylesheet" type="text/css" href="resourcescss/style.css"/>
+ <link rel="stylesheet" type="text/css" href="resourcescss/report.css"/>
+ <script language=JavaScript>
+ var check = false;
+ function checkTimeMark(){
+ if (check==false){
+ check=true;
+ (document.getElementById("withTimeMark")).style.display="";
+ }
+ else
+ {
+ check=false;
+ (document.getElementById("withTimeMark")).style.display="none";
+ }
+ }
+ </script>
+ </head>
+ <body height=100%>
+ <div id="divLeft">
+ <div id="optionsReport">
+ Options :<br><br>
+ De : <input type="date" id="startDate">
+ <!-- transformer en span -->
+ <input type="button" name="Semaine courante" id="selectThisWeek"><br>
+ A : <input type="date" id="endDate">
+ <input type="button" name="Semaine précédente" id="selectLastWeek"><br>
+ <form>
+ <label><input type="radio" name="formatChoice" value="day">Par jour</label>
+ <label><input type="radio" name="formatChoice" value="month" id="monthReport">Par mois</label>
+ <br>
+ <label><input type="radio" name="formatChoice" value="week">Par semaine</label>
+ <label><input type="radio" name="formatChoice" value="year" id="yearReport">Par année</label>
+ <br>
+ <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">
+ Report :<br>
+ <span id="zoneTexteReport"><textarea id="textReport"></textarea></span>
+ <footer>
+ <span id="generReport"><img src="resourcescss/resourcesjs/resourcesimg/applications-system.png">Générer</span>
+ <span id="mailReport"><img src="resourcescss/resourcesjs/resourcesimg/mail-forward.png">Envoyer par email</span>
+ <input type="button" value="Fermer" id="closeReport" onclick="javascript:window.close()">
+ </footer>
+ </div>
+ </body>
+</html>
Added: jtimerhtml5/src/html/resourcescss/about.css
===================================================================
--- jtimerhtml5/src/html/resourcescss/about.css (rev 0)
+++ jtimerhtml5/src/html/resourcescss/about.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,36 @@
+#dataText {
+ margin-left:5px;
+}
+
+#frame {
+ width:400px;
+ 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;
+}
+
+#bt2{
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ border-radius: 4px;
+ cursor:pointer;
+}
+
+#close {
+ margin-left:300px;
+ margin-top:5px;
+ width:100px;
+ height:25px;
+}
Added: jtimerhtml5/src/html/resourcescss/alerts.css
===================================================================
--- jtimerhtml5/src/html/resourcescss/alerts.css (rev 0)
+++ jtimerhtml5/src/html/resourcescss/alerts.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,15 @@
+#alertCancel{
+ width:70px;
+ height:30px;
+}
+
+#alertSave {
+ width:70px;
+ height:30px;
+}
+
+#head{
+ right:0px;
+ position:fixed;
+ margin-right:5px
+}
Added: jtimerhtml5/src/html/resourcescss/editionT.css
===================================================================
--- jtimerhtml5/src/html/resourcescss/editionT.css (rev 0)
+++ jtimerhtml5/src/html/resourcescss/editionT.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,20 @@
+#editionApply {
+ width:32%;
+ height: 30px;
+}
+#editionCancel {
+ width:32%;
+ height: 30px;
+}
+#editionClose {
+ width:32%;
+ height: 30px;
+}
+
+#nameTask {
+ width:98%;
+}
+
+#noteTask {
+ width:96%;
+}
Added: jtimerhtml5/src/html/resourcescss/jtimer.css
===================================================================
--- jtimerhtml5/src/html/resourcescss/jtimer.css (rev 0)
+++ jtimerhtml5/src/html/resourcescss/jtimer.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,188 @@
+/* Menus */
+
+#menu1 {
+ display:none;
+ position:absolute;
+ margin-left:2px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu2 {
+ display:none;
+ position:absolute;
+ margin-left:75px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu3 {
+ display:none;
+ position:absolute;
+ margin-left:139px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu4 {
+ display:none;
+ position:absolute;
+ margin-left:201px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu5 {
+ display:none;
+ position:absolute;
+ margin-left:282px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu6 {
+ display:none;
+ position:absolute;
+ margin-left:360px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+.menu{
+ padding:3px 3px;
+ border-radius: 4px;
+ border:2px solid #339999;
+ cursor:pointer;
+}
+
+.options{
+ padding:3px 3px;
+ cursor:pointer;
+}
+
+/* Boutons */
+
+#startTask {
+ background: url(resourcesjs/resourcesimg/go-next.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
+}
+
+#stopTask {
+ background: url(resourcesjs/resourcesimg/process-stop.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
+}
+
+#newProject {
+ background: url(resourcesjs/resourcesimg/bookmark-new.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
+}
+
+#newTask {
+ background: url(resourcesjs/resourcesimg/document-new.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
+}
+
+#note {
+ background: url(resourcesjs/resourcesimg/notes.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
+}
+
+#alert {
+ background: url(resourcesjs/resourcesimg/bell.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
+}
+
+.buttons {
+ margin-top:10px;
+ margin-bottom:20px
+}
+
+/* Arboresence des tâches */
+
+.col1{
+ width:33%;
+ margin-left:0;
+ position:absolute;
+ cursor:pointer;
+}
+
+.col2{
+ width:33%;
+ margin-left:32%;
+ position:absolute;
+ cursor:pointer;
+}
+
+.col3{
+ width:33%;
+ margin-left:65%;
+ position:absolute;
+ cursor:pointer;
+}
+
+#head{
+ margin-top:30px;
+}
+
+#head span {
+ text-align:center;
+ border-bottom:2px solid #339999;
+ border-left:2px solid #339999;
+}
+
+
+#statutTasks{
+ width:50%;
+}
+
+#recapToday{
+ width:49%;
+ margin-left:45%;
+ text-align:center;
+}
+
+#frame{
+ border:2px solid #339999;
+}
Added: jtimerhtml5/src/html/resourcescss/report.css
===================================================================
--- jtimerhtml5/src/html/resourcescss/report.css (rev 0)
+++ jtimerhtml5/src/html/resourcescss/report.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,107 @@
+#divRight{
+ 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%;
+}
+
+#selectThisWeek{
+ background: url(resourcesjs/resourcesimg/date_current.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 22px;
+}
+
+#selectLastWeek{
+ background: url(resourcesjs/resourcesimg/date_previous.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 22px;
+}
+
+#endDate{
+ margin-left:7px;
+ width:70%;
+}
+
+#startDate{
+ width:70%;
+}
+
+#textReport{
+ width:97%;
+ height:700px;
+ margin-left:5px;
+ margin-top:10px;
+}
+
+#generReport{
+ width:15%;
+ height:30px;
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ border-radius: 4px;
+ cursor:pointer;
+ position:fixed;
+ text-align:center;
+ bottom:5px;
+}
+
+#mailReport{
+ width:16%;
+ height:30px;
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ border-radius: 4px;
+ cursor:pointer;
+ position:fixed;
+ margin-left:16%;
+ text-align:center;
+ bottom:5px;
+}
+
+#closeReport{
+ width:16%;
+ margin-left:33%;
+ position:fixed;
+ bottom:10px;
+}
+
+#optionsReport{
+ 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;
+}
+
+#monthReport{
+ margin-left:50px;
+}
+
+#yearReport{
+ margin-left:24px;
+}
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/actionsMenus.js
===================================================================
--- jtimerhtml5/src/html/resourcescss/resourcesjs/actionsMenus.js (rev 0)
+++ jtimerhtml5/src/html/resourcescss/resourcesjs/actionsMenus.js 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,174 @@
+/* Différente actions des menus et des boutons */
+
+function newProject(){
+ var nameNewProject = prompt("Nom du Projet à créer :", "" )
+ if (nameNewProject=="") {
+ alert("Erreur : Le nom est vide !")
+ }
+ else {
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "http://whatever/jtimer/newProject", true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+ alert(xhr.responseText);
+ }
+ };
+ xhr.send(null);
+ }
+ // vérifier si un autre Project n'a pas déjà ce name
+}
+
+function edProject(){
+ var newnameProject = prompt("Nouveau nom du Projet :","x")
+ if (nameNewProject=="") {
+ alert("Erreur : Le nom est vide !")
+ }
+ else {
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "http://whatever/jtimer/edProject", true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+ alert(xhr.responseText);
+ }
+ };
+ xhr.send(null);
+ }
+ // vérifier si un autre Project n'a pas déjà ce name
+}
+
+function ofProject(){
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "http://whatever/jtimer/ofProject", true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+ alert(xhr.responseText);
+ }
+ };
+ xhr.send(null);
+}
+
+function supprProject() {
+ var bool = confirm("Voulez-vous supprimer le Projet x ?")
+ if (bool){
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "http://whatever/jtimer/supprProject", true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+ alert(xhr.responseText);
+ }
+ };
+ xhr.send(null);
+ }
+}
+
+function newTask() {
+ var nameNewTask = prompt("Nom de la tâche à créer pour x :", "" )
+ if (nameNewTask=="") {
+ alert("Erreur : Le nom est vide !")
+ }
+ else {}
+ // vérifier si une autre Task n'a pas déjà ce name
+}
+
+function edTask(){
+ window.open('editionTask.html','','height=450, width=350, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no')
+}
+
+function ofTask(){
+
+}
+
+function supprTask(){
+ var bool = confirm("Voulez-vous supprimer la tâche x ?")
+ if (bool){}
+}
+
+function startTask(){
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "http://whatever/jtimer/startTask?voilavoila", true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+ alert(xhr.responseText);
+ }
+ };
+ xhr.send(null);
+}
+
+function stopTask(){
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "http://whatever/jtimer/stopTask", true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+ alert(xhr.responseText);
+ }
+ };
+ xhr.send(null);
+}
+
+function addAnnotation(){
+ var newAnnot = prompt("Annotation pour la tâche x :","")
+
+}
+
+function edAlerts(){
+ window.open('alerts.html','','height=400, width=600, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no')
+}
+
+function add(nb){
+
+}
+
+function sou(nb){
+
+}
+
+function zero(){
+
+}
+
+function fusion(){
+
+}
+
+function report(){
+ window.open('report.html','','height=800, width=1100, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no')
+}
+
+function displayHidden(){
+ // uniquement lié à l'interface ?
+}
+
+function systray(){
+
+}
+
+function dStartWeek(){
+
+}
+
+function about(){
+ window.open('about.html','','height=405, width=420, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no')
+}
+
+/* Autres */
+
+function selecTask(cel, numligne) {
+ // pour toute les lignes mettre en blanc
+ var nbLignes = 2;
+ for (var j=0; j<nbLignes; j++) {
+ for (var k=0; k<3; k++)
+ (document.getElementById('cel'+(k+1)+'row'+(j+1))).style.backgroundColor = "#ffffff";
+ }
+ for (var i=0; i<3; i++)
+ (document.getElementById('cel'+(i+1)+'row'+numligne)).style.backgroundColor = "#00ccff";
+
+}
+function go(nb){
+ (document.getElementById('go'+nb)).style.display = "";
+}
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/alerts.js
===================================================================
--- jtimerhtml5/src/html/resourcescss/resourcesjs/alerts.js (rev 0)
+++ jtimerhtml5/src/html/resourcescss/resourcesjs/alerts.js 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,17 @@
+// trouver un moyen de supprimer les rows.
+var rows = 0;
+
+function add(){
+ rows++;
+ var thisOne = document.getElementById('listAlerts').innerHTML;
+ var newOne = "<div id='num"+rows+"'><select><option value='rdt'>REACH_DAILY_TIME</option><option value='rtt'>REACH_TOTAL_TIME</option></select><input type='text' size='2'>h<input type='text' size='2'>m<input type='text' size='2'>s <input type='button' value='X' onclick='suppr("+rows+")'></div>";
+ document.getElementById('listAlerts').innerHTML = thisOne + newOne;
+}
+
+function suppr(n){
+ document.getElementById("num"+n).innerHTML = "";
+}
+
+function save(){
+
+}
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/menu.js
===================================================================
--- jtimerhtml5/src/html/resourcescss/resourcesjs/menu.js (rev 0)
+++ jtimerhtml5/src/html/resourcescss/resourcesjs/menu.js 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,43 @@
+var proceed = 0;
+
+function menu(i){
+ if (i==proceed){
+ for(var j=0; j<6; j++){
+ document.getElementById('menu'+(j+1)).style.display='none';
+ document.getElementById('mn'+(j+1)).style.backgroundColor='#ffffff';
+ }
+ proceed = 0;
+ }
+ else{
+ for(var j=0; j<6; j++){
+ document.getElementById('menu'+(j+1)).style.display='none';
+ document.getElementById('mn'+(j+1)).style.backgroundColor='#ffffff';
+ }
+ document.getElementById('menu'+i).style.display='block';
+ document.getElementById('menu'+i).style.backgroundColor='#00ccff';
+ document.getElementById('mn'+i).style.backgroundColor='#00ccff';
+ proceed = i;
+ }
+}
+
+/* Boutons */
+
+function over(elem){
+ elem.style.backgroundColor = "#339999";
+}
+
+function out(elem){
+ elem.style.backgroundColor = "#ffffff";
+}
+
+function out2(j){
+ if (j!=proceed){
+ document.getElementById('mn'+j).style.backgroundColor = "#ffffff";
+ }
+}
+
+function over2(k){
+ if (k!=proceed){
+ document.getElementById('mn'+k).style.backgroundColor = "#339999";
+ }
+}
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/applications-system.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/applications-system.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/bell.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/bell.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/bookmark-new.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/bookmark-new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/date_current.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/date_current.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/date_previous.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/date_previous.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/document-new.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/document-new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/go-next.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/go-next.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/jtimer-logo-orange.jpg
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/jtimer-logo-orange.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/mail-forward.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/mail-forward.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/notes.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/notes.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/process-stop.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/process-stop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/running.gif
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/src/html/resourcescss/resourcesjs/resourcesimg/running.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/src/html/resourcescss/style.css
===================================================================
--- jtimerhtml5/src/html/resourcescss/style.css (rev 0)
+++ jtimerhtml5/src/html/resourcescss/style.css 2013-04-26 15:26:52 UTC (rev 28)
@@ -0,0 +1,14 @@
+
+/* Global */
+
+/*body{
+ margin:0;
+ padding:0;
+}*/
+
+footer {
+ width:100%;
+ position:fixed;
+ bottom:0px;
+ margin:0
+}
1
0
April 25, 2013
Author: qmoriceau
Date: 2013-04-25 18:03:02 +0200 (Thu, 25 Apr 2013)
New Revision: 27
Url: http://chorem.org/projects/incubator/repository/revisions/27
Log:
version des sources jeudi semaine 17
Added:
jtimerhtml5/TestWebEngine.java
jtimerhtml5/cssJavaFX/
jtimerhtml5/cssJavaFX/alert_box.css
jtimerhtml5/cssJavaFX/confirm_box.css
jtimerhtml5/cssJavaFX/prompt_box.css
Modified:
jtimerhtml5/alertes.html
jtimerhtml5/apropos.html
jtimerhtml5/aspect/alertes.css
jtimerhtml5/aspect/apropos.css
jtimerhtml5/aspect/jtimer.css
jtimerhtml5/aspect/rapport.css
jtimerhtml5/index.html
jtimerhtml5/javascript/actionsMenus.js
jtimerhtml5/javascript/menu.js
jtimerhtml5/rapport.html
Added: jtimerhtml5/TestWebEngine.java
===================================================================
--- jtimerhtml5/TestWebEngine.java (rev 0)
+++ jtimerhtml5/TestWebEngine.java 2013-04-25 16:03:02 UTC (rev 27)
@@ -0,0 +1,294 @@
+import java.net.URL;
+
+import netscape.javascript.JSObject;
+
+import javafx.application.Application;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.concurrent.Worker.State;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.effect.BoxBlur;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.HBoxBuilder;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.web.PopupFeatures;
+import javafx.scene.web.PromptData;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebEvent;
+import javafx.scene.web.WebView;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+import javafx.util.Callback;
+
+public class TestWebEngine extends Application {
+
+ @Override
+ public void start(final Stage stage) {
+ stage.setTitle("jTimer");
+
+ Scene scene = new Scene(new Group(), 450, 500);
+
+ VBox root = new VBox();
+
+ final WebView browser = new WebView();
+ final WebEngine webEngine = browser.getEngine();
+
+ // les différentes initialisation nécéssaire aux boites de dialogue
+ final VBox confirmationResults = new VBox();
+ confirmationResults.getStyleClass().add("confirmation-results");
+ confirmationResults.setMinWidth(100);
+ HBox layout = new HBox();
+ layout.getChildren().addAll(confirmationResults, browser);
+ stage.setScene(new Scene(layout));
+ stage.show();
+ stage.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/alert_box.css").toExternalForm());
+
+ // processus au chargement de la page, on crée le pont de Javascript vers javaFX
+ // Mais ne répond pas entièrement au problème.
+ /*webEngine.getLoadWorker().stateProperty().addListener(
+ new ChangeListener<State>() {
+ @Override
+ public void changed(ObservableValue<? extends State> ov,
+ State oldState, State newState) {
+ JSObject jsobj = (JSObject) webEngine.executeScript("window");
+ jsobj.setMember("java", new Bridge());
+ }
+ }
+ );*/
+
+ // permet d'ouvrir des popup.
+ webEngine.setCreatePopupHandler(new Callback<PopupFeatures, WebEngine>() {
+ public WebEngine call(PopupFeatures popupFeatures) {
+ final WebView popupWebView = new WebView();
+ final Scene popupScene = new Scene(popupWebView);
+ final Stage popupStage = new Stage();
+ popupStage.setScene(popupScene);
+ popupStage.setResizable(popupFeatures.isResizable());
+ popupStage.show();
+
+ WebEngine popupEngine = popupWebView.getEngine();
+
+ popupEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() {
+ public void handle(WebEvent<Boolean> we) {
+ if (!we.getData()){
+ popupStage.close();
+ }
+ }
+ });
+
+ popupEngine.getLoadWorker().stateProperty().addListener(
+ new ChangeListener<State>() {
+ @Override
+ public void changed(ObservableValue<? extends State> ov,
+ State oldState, State newState) {
+ JSObject jsobj = (JSObject) webEngine.executeScript("window");
+ jsobj.setMember("java", new Bridge());
+ }
+ }
+ );
+
+ return popupEngine;
+ }
+ });
+
+ // permet de fermer la fenêtre
+ webEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() {
+ public void handle(WebEvent<Boolean> we) {
+ if (!we.getData()){
+ stage.close();
+ }
+ }
+ });
+
+ webEngine.setOnAlert(new EventHandler<WebEvent<String>>(){
+ @Override
+ public void handle(WebEvent<String> we) {
+ alert(stage, we.getData());
+ }
+ });
+
+ webEngine.setConfirmHandler(new Callback<String, Boolean>(){
+ public Boolean call(String str){
+ Boolean confirmed = confirm(stage, str);
+ confirmationResults.getChildren().add(new Label("Confirmed? " + confirmed));
+ return confirmed;
+ }
+ });
+
+ webEngine.setPromptHandler(new Callback<PromptData, String>(){
+ public String call(PromptData pdata){
+ String result = prompt(stage, pdata.getMessage(), pdata.getDefaultValue());
+ return result;
+ }
+ });
+
+ URL maPage = getClass().getResource("index.html");
+ webEngine.load(maPage.toExternalForm());
+
+ root.getChildren().addAll(browser);
+ scene.setRoot(root);
+
+ stage.setScene(scene);
+ stage.show();
+ }
+
+ // JavaJX n'a pas d'outils prédéfini pour les boites de dialogue, on les construits donc "manuelement"
+ // On retrouve donc a la suite des boîtes de dialogue personalisable.
+
+ // boite de dialogue de question ouverte
+ private String prompt(final Stage parent, String msg, String dft) {
+
+ final StringProperty reponse = new SimpleStringProperty();
+ final Stage dialog = new Stage(StageStyle.TRANSPARENT);
+ dialog.initOwner(parent);
+ dialog.initModality(Modality.WINDOW_MODAL);
+
+ Label label = new Label(msg);
+ final TextField textField = new TextField(dft);
+ Button buttonOk = new Button("OK");
+ Button buttonAnn = new Button("Annuler");
+
+ Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,textField,buttonOk,buttonAnn).build(), Color.TRANSPARENT);
+ dialog.setScene(scn);
+
+ buttonOk.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ reponse.setValue(textField.getCharacters().toString());
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ buttonAnn.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ reponse.setValue(null);
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ dragged(dialog);
+
+ // style and show the dialog.
+ dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/prompt_box.css").toExternalForm());
+ parent.getScene().getRoot().setEffect(new BoxBlur());
+ dialog.showAndWait();
+
+ return reponse.get();
+ }
+
+ // boite de dialogue d'alerte
+ private void alert(final Stage parent, String msg) {
+ // initialize the alert dialog
+ final Stage dialog = new Stage(StageStyle.TRANSPARENT);
+ dialog.initOwner(parent);
+ dialog.initModality(Modality.WINDOW_MODAL);
+
+ Label label = new Label(msg);
+ Button buttonOk = new Button("OK");
+
+ Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk).build(), Color.TRANSPARENT);
+ dialog.setScene(scn);
+
+ buttonOk.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ dragged(dialog);
+
+ // style and show the dialog.
+ dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/alert_box.css").toExternalForm());
+ parent.getScene().getRoot().setEffect(new BoxBlur());
+ dialog.showAndWait();
+ }
+
+ // boite de dialogue de confirmation
+ private Boolean confirm(final Stage parent, String msg) {
+ final BooleanProperty confirmationResult = new SimpleBooleanProperty();
+ // initialize the confirmation dialog
+ final Stage dialog = new Stage(StageStyle.TRANSPARENT);
+ dialog.initOwner(parent);
+ dialog.initModality(Modality.WINDOW_MODAL);
+
+ Label label = new Label(msg);
+ Button buttonOk = new Button("OK");
+ Button buttonAnn = new Button("Annuler");
+
+ Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk,buttonAnn).build(), Color.TRANSPARENT);
+ dialog.setScene(scn);
+
+ buttonOk.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ confirmationResult.set(true);
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ buttonAnn.setOnAction(new EventHandler<ActionEvent>() {
+ @Override
+ public void handle(ActionEvent arg0) {
+ confirmationResult.set(false);
+ parent.getScene().getRoot().setEffect(null);
+ dialog.close();
+ }
+ });
+
+ dragged(dialog);
+
+
+ // style and show the dialog.
+ dialog.getScene().getStylesheets().add(getClass().getResource("cssJavaFX/confirm_box.css").toExternalForm());
+ parent.getScene().getRoot().setEffect(new BoxBlur());
+ dialog.showAndWait();
+
+ return confirmationResult.get();
+ }
+
+ // permet de déplacer le Stage entrer en paramètre.
+ private void dragged(final Stage dialog){
+ final Node root = dialog.getScene().getRoot();
+ final Delta dragDelta = new Delta();
+ root.setOnMousePressed(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ // record a delta distance for the drag and drop operation.
+ dragDelta.x = dialog.getX() - mouseEvent.getScreenX();
+ dragDelta.y = dialog.getY() - mouseEvent.getScreenY();
+ }
+ });
+ root.setOnMouseDragged(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ dialog.setX(mouseEvent.getScreenX() + dragDelta.x);
+ dialog.setY(mouseEvent.getScreenY() + dragDelta.y);
+ }
+ });
+ }
+
+ // records relative x and y co-ordinates.
+ class Delta { double x, y; }
+
+ public static void main(String[] args) {
+ launch(args);
+ }
+}
Modified: jtimerhtml5/alertes.html
===================================================================
--- jtimerhtml5/alertes.html 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/alertes.html 2013-04-25 16:03:02 UTC (rev 27)
@@ -5,17 +5,18 @@
<title>jTimer - Alertes</title>
<link rel="stylesheet" type="text/css" href="aspect/alertes.css"/>
<link rel="stylesheet" type="text/css" href="aspect/style.css"/>
+ <script type="text/javascript" src="javascript/alertes.js"></script>
</head>
<body>
- <p><b>Listes des alertes :</b></p>
- <div width=100% id="tableAlertes"><span class="alerteG">Type</span><span class="alerteD">Durée</span>
- </div>
- <footer>
- <input type="button" id="alerteAj" value="Ajouter">
- <input type="button" id="alerteSupp" value="Supprimer">
- <br>
+ <b>Listes des alertes :</b>
+ <span id="cadreHaut">
<input type="button" id="alerteAnn" value="Annuler" OnClick="javascript:window.close()">
<input type="button" id="alerteSave" value="Sauver">
- </footer>
+ </span>
+ <br>
+ <br>
+ <div width=100% id="listeAlertes">Type & Durée<br><br>
+ </div>
+ <input type="button" id="alerteAj" value="Ajouter" onclick="ajout()">
</body>
</html>
Modified: jtimerhtml5/apropos.html
===================================================================
--- jtimerhtml5/apropos.html 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/apropos.html 2013-04-25 16:03:02 UTC (rev 27)
@@ -10,18 +10,22 @@
function action(i){
if(i == 1){
document.getElementById('dataText').innerHTML='<b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2012, 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.';
+ document.getElementById('bt1').style.backgroundColor = "#339999";
+ document.getElementById('bt2').style.backgroundColor = "#ffffff";
}
if(i == 2){
document.getElementById('dataText').innerHTML="Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec jTimer. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme.";
+ document.getElementById('bt1').style.backgroundColor = "#ffffff";
+ document.getElementById('bt2').style.backgroundColor = "#339999";
}
}
//-->
</script>
</head>
<body>
- <img src="style/images/jtimer-logo-orange.jpg" /><br>
- <input type="button" value="A propos de jTimer" onclick="action(1)">
- <input type="button" value="Licence" onclick="action(2)"><br>
+ <img src="aspect/images/jtimer-logo-orange.jpg" /><br>
+ <span id="bt1" onclick="action(1)">A propos de jTimer</span>
+ <span id="bt2" onclick="action(2)">Licence</span><br>
<div id="cadre"><p id="dataText"><b>jTimer - 1.4.1</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>
<input style="margin-left:300px;margin-top:5px;width:100px;height:25px" type="submit" value="Fermer" OnClick="javascript:window.close()">
</body>
Modified: jtimerhtml5/aspect/alertes.css
===================================================================
--- jtimerhtml5/aspect/alertes.css 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/aspect/alertes.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -1,33 +1,15 @@
-#alerteAj {
- width:49%;
- height: 35px;
-}
-
-#alerteSupp {
- width:49%;
- height: 35px;
-}
-
#alerteAnn {
- width:49%;
- height: 35px;
+ width:70px;
+ height:30px;
}
#alerteSave {
- width:49%;
- height: 35px;
+ width:70px;
+ height:30px;
}
-.alerteG{
- width:50%;
- margin-left:0;
- position:absolute;
- text-align:center;
+#cadreHaut{
+ right:0px;
+ position:fixed;
+ margin-right:5px
}
-
-.alerteD{
- width:49%;
- margin-left:49%;
- position:absolute;
- text-align:center;
-}
Modified: jtimerhtml5/aspect/apropos.css
===================================================================
--- jtimerhtml5/aspect/apropos.css 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/aspect/apropos.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -7,5 +7,23 @@
height:155px;
border-style:solid;
border-width:2px;
- border-color:#339999
+ border-color:#339999;
+ border-radius: 4px;
}
+
+#bt1{
+ 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;
+}
Modified: jtimerhtml5/aspect/jtimer.css
===================================================================
--- jtimerhtml5/aspect/jtimer.css 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/aspect/jtimer.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -1,59 +1,141 @@
/* Menus */
+#menu1 {
+ display:none;
+ position:absolute;
+ margin-left:2px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+#menu2 {
+ display:none;
+ position:absolute;
+ margin-left:75px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+#menu3 {
+ display:none;
+ position:absolute;
+ margin-left:139px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu4 {
+ display:none;
+ position:absolute;
+ margin-left:201px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu5 {
+ display:none;
+ position:absolute;
+ margin-left:282px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+#menu6 {
+ display:none;
+ position:absolute;
+ margin-left:360px;
+ top:30px;
+ border-radius: 4px;
+ border:2px solid #339999;
+}
+
+.menu{
+ padding:3px 3px;
+ border-radius: 4px;
+ border:2px solid #339999;
+ cursor:pointer;
+}
+
+.options{
+ padding:3px 3px;
+ cursor:pointer;
+}
+
/* Boutons */
#demarreTache {
background: url(images/go-next.png);
background-repeat:no-repeat;
background-position:center center;
- width: 40px;
- height: 40px;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
}
#arretTache {
background: url(images/process-stop.png);
background-repeat:no-repeat;
background-position:center center;
- width: 40px;
- height: 40px;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
}
#nouveauProjet {
background: url(images/bookmark-new.png);
background-repeat:no-repeat;
background-position:center center;
- width: 40px;
- height: 40px;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
}
#nouvelleTache {
background: url(images/document-new.png);
background-repeat:no-repeat;
background-position:center center;
- width: 40px;
- height: 40px;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
}
#note {
background: url(images/notes.png);
background-repeat:no-repeat;
background-position:center center;
- width: 40px;
- height: 40px;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
}
#alerte {
background: url(images/bell.png);
background-repeat:no-repeat;
background-position:center center;
- width: 40px;
- height: 40px;
+ padding-right: 40px;
+ padding-bottom: 20px;
+ border-radius: 4px;
+ border:2px solid black;
+ cursor:pointer;
}
.boutons {
- margin-top:32px;
+ margin-top:10px;
margin-bottom:20px
}
@@ -63,20 +145,27 @@
width:33%;
margin-left:0;
position:absolute;
+ cursor:pointer;
}
.colone2{
width:33%;
margin-left:32%;
position:absolute;
+ cursor:pointer;
}
.colone3{
width:33%;
margin-left:65%;
position:absolute;
+ cursor:pointer;
}
+#entete{
+ margin-top:30px;
+}
+
#entete span {
text-align:center;
border-bottom:2px solid #339999;
Modified: jtimerhtml5/aspect/rapport.css
===================================================================
--- jtimerhtml5/aspect/rapport.css 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/aspect/rapport.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -5,7 +5,8 @@
margin:0;
border-style:solid;
border-width:2px;
- border-color:#339999
+ border-color:#339999;
+ border-radius: 4px;
}
#divGauche{
@@ -48,23 +49,37 @@
}
#generRapport{
- background: url(images/applications-system.png);
- background-repeat:no-repeat;
- background-position:left center;
- width:16%;
+ width:15%;
height:30px;
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ border-radius: 4px;
+ cursor:pointer;
+ position:fixed;
+ text-align:center;
+ bottom:5px;
}
#mailRapport{
- background: url(images/mail-forward.png);
- background-repeat:no-repeat;
- background-position:left center;
width:16%;
height:30px;
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ border-radius: 4px;
+ cursor:pointer;
+ position:fixed;
+ margin-left:16%;
+ text-align:center;
+ bottom:5px;
}
#fermerRapport{
width:16%;
+ margin-left:33%;
+ position:fixed;
+ bottom:10px;
}
#optionsRapport{
@@ -72,6 +87,7 @@
border-width:2px;
border-color:#339999;
height:100%;
+ border-radius: 4px;
}
#projetsRapport{
@@ -79,6 +95,7 @@
border-width:2px;
border-color:#339999;
height:100%;
+ border-radius: 4px;
}
#moisRapport{
Added: jtimerhtml5/cssJavaFX/alert_box.css
===================================================================
--- jtimerhtml5/cssJavaFX/alert_box.css (rev 0)
+++ jtimerhtml5/cssJavaFX/alert_box.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -0,0 +1,37 @@
+/**
+* modal-dialog.css
+* place in same directory as WebViewConfirm.java
+* ensure your build system copies the file to your build output directory
+*/
+
+.root {
+-fx-glass-color: rgba(255, 102, 102, 0.9);
+}
+
+.modal-dialog {
+-fx-padding: 10;
+-fx-spacing: 5;
+-fx-alignment: center;
+-fx-font-size: 18;
+-fx-font-weight:bold;
+-fx-background-color: linear-gradient(to bottom, derive(-fx-glass-color, 20%), -fx-glass-color);
+-fx-border-color: derive(-fx-glass-color, -20%);
+-fx-border-width: 3;
+-fx-background-insets: 6;
+-fx-border-insets: 5;
+-fx-border-radius: 3;
+-fx-background-radius: 3;
+}
+
+.modal-dialog:pressed {
+-fx-cursor: move;
+}
+
+.modal-dialog .button:pressed {
+-fx-cursor: default;
+}
+
+.confirmation-results {
+-fx-background-color: cornsilk;
+-fx-padding: 3;
+}
Added: jtimerhtml5/cssJavaFX/confirm_box.css
===================================================================
--- jtimerhtml5/cssJavaFX/confirm_box.css (rev 0)
+++ jtimerhtml5/cssJavaFX/confirm_box.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -0,0 +1,37 @@
+/**
+* modal-dialog.css
+* place in same directory as WebViewConfirm.java
+* ensure your build system copies the file to your build output directory
+*/
+
+.root {
+-fx-glass-color: rgba(95, 158, 160, 0.9);
+}
+
+.modal-dialog {
+-fx-padding: 10;
+-fx-spacing: 5;
+-fx-alignment: center;
+-fx-font-size: 15;
+-fx-font-weight:bold;
+-fx-background-color: linear-gradient(to bottom, derive(-fx-glass-color, 20%), -fx-glass-color);
+-fx-border-color: derive(-fx-glass-color, -20%);
+-fx-border-width: 3;
+-fx-background-insets: 6;
+-fx-border-insets: 5;
+-fx-border-radius: 3;
+-fx-background-radius: 3;
+}
+
+.modal-dialog:pressed {
+-fx-cursor: move;
+}
+
+.modal-dialog .button:pressed {
+-fx-cursor: default;
+}
+
+.confirmation-results {
+-fx-background-color: cornsilk;
+-fx-padding: 3;
+}
Added: jtimerhtml5/cssJavaFX/prompt_box.css
===================================================================
--- jtimerhtml5/cssJavaFX/prompt_box.css (rev 0)
+++ jtimerhtml5/cssJavaFX/prompt_box.css 2013-04-25 16:03:02 UTC (rev 27)
@@ -0,0 +1,37 @@
+/**
+* modal-dialog.css
+* place in same directory as WebViewConfirm.java
+* ensure your build system copies the file to your build output directory
+*/
+
+.root {
+-fx-glass-color: rgba(153, 255, 153, 0.9);
+}
+
+.modal-dialog {
+-fx-padding: 10;
+-fx-spacing: 5;
+-fx-alignment: center;
+-fx-font-size: 15;
+-fx-font-weight:bold;
+-fx-background-color: linear-gradient(to bottom, derive(-fx-glass-color, 20%), -fx-glass-color);
+-fx-border-color: derive(-fx-glass-color, -20%);
+-fx-border-width: 3;
+-fx-background-insets: 6;
+-fx-border-insets: 5;
+-fx-border-radius: 3;
+-fx-background-radius: 3;
+}
+
+.modal-dialog:pressed {
+-fx-cursor: move;
+}
+
+.modal-dialog .button:pressed {
+-fx-cursor: default;
+}
+
+.confirmation-results {
+-fx-background-color: cornsilk;
+-fx-padding: 3;
+}
Modified: jtimerhtml5/index.html
===================================================================
--- jtimerhtml5/index.html 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/index.html 2013-04-25 16:03:02 UTC (rev 27)
@@ -1,29 +1,36 @@
-<!--<!DOCTYPE html>-->
+<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8"/>
<title>jTimer</title>
<link rel="stylesheet" type="text/css" href="aspect/style.css"/>
<link rel="stylesheet" type="text/css" href="aspect/jtimer.css"/>
- <script type="text/javascript" src="menu.js"></script>
+ <script type="text/javascript" src="javascript/menu.js"></script>
<script type="text/javascript" src="javascript/actionsMenus.js"></script>
</head>
<body>
<!-- Menu -->
-
+ <div>
+ <span class="menu" id="mn1" onclick="menu(1)" onmouseover="over2(1)" onmouseout="out2(1)">Fichier</span>
+ <span class="menu" id="mn2" onclick="menu(2)" onmouseover="over2(2)" onmouseout="out2(2)">Projet</span>
+ <span class="menu" id="mn3" onclick="menu(3)" onmouseover="over2(3)" onmouseout="out2(3)">Tâche</span>
+ <span class="menu" id="mn4" onclick="menu(4)" onmouseover="over2(4)" onmouseout="out2(4)">Rapport</span>
+ <span class="menu" id="mn5" onclick="menu(5)" onmouseover="over2(5)" onmouseout="out2(5)">Options</span>
+ <span class="menu" id="mn6" onclick="menu(6)" onmouseover="over2(6)" onmouseout="out2(6)">Aide</span>
+ </div>
<div class="boutons">
- <! Les boutons d'actions >
- <! Réflechir à la possibilité de n'avoire qu'un bouton pour démarré et stoper une tache. >
- <input type="button" id="demarreTache" value="" title="Démarre la tâche sélectionnée" onclick="demarTache()">
- <input type="button" id="arretTache" value="" title="Arrête la tâche sélectionnée" onclick="stopTache">
- <input type="button" id="nouveauProjet" value="" title="Création d'un nouveau projet" onclick="newProjet()">
- <input type="button" id="nouvelleTache" value="" title="Création d'une nouvelle tâche" onclick="newTache()">
+ <!-- Les boutons d'actions
+ Réflechir à la possibilité de n'avoire qu'un bouton pour démarré et stoper une tache. -->
+ <span id="demarreTache" title="Démarre la tâche sélectionnée" onclick="demarTache()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="arretTache" title="Arrête la tâche sélectionnée" onclick="stopTache()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="nouveauProjet" title="Création d'un nouveau projet" onclick="newProjet()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="nouvelleTache" title="Création d'une nouvelle tâche" onclick="newTache()" onmouseover="over(this)" onmouseout="out(this)"></span>
- <input type="button" id="note" value="" title="Ajouter une annotation" onclick="addAnnotation()">
- <input type="button" id="alerte" value="" title="Edition des alertes" onclick="edAlertes()">
+ <span id="note" title="Ajouter une annotation" onclick="addAnnotation()" onmouseover="over(this)" onmouseout="out(this)"></span>
+ <span id="alerte" title="Edition des alertes" onclick="edAlertes()" onmouseover="over(this)" onmouseout="out(this)"></span>
</div>
<div>
- <! Arborescence des taches >
+ <!-- Arborescence des taches -->
<div width=100%>
<div id="entete">
<span class="colone1">Projet et tâches</span>
@@ -41,8 +48,49 @@
</div>
</div>
<footer class="piedpage">
- <! footer à garder tel quel >
+ <!-- footer à garder tel quel -->
<div id="cadreBas"><span id="statutTaches">Inactif</span><span id="recapAuj">Aujourd'hui : xx:xx:xx</span></div>
</footer>
+ <!-- Les sous menus sont placé à la fin pour qu'il passe devant les autres blocks de texte -->
+ <div id="menu1">
+ <span class="options" onclick="javascript:window.close()">Quitter</span>
+ </div>
+ <div id="menu2">
+ <span class="options" onclick="newProjet()">Nouveau projet</span><br>
+ <span class="options" onclick="edProjet()">Édition du projet</span><br>
+ <span class="options" onclick="ofProjet()">Ouvrir/Fermer le projet</span><br>
+ <span class="options" onclick="supprProjet()">Suppression du projet</span>
+ </div>
+ <div id="menu3">
+ <span class="options" onclick="newTache()">Nouvelle tâche</span><br>
+ <span class="options" onclick="edTache()">Édition de la tâche</span><br>
+ <span class="options" onclick="ofTache()">Ouvrir/Fermer la tâche</span><br>
+ <span class="options" onclick="supprTache()">Suppression de la tâche</span><br>
+
+ <span style="padding-top:10px;" class="options" onclick="demarTache()">Démarrer</span><br>
+ <span class="options" onclick="stopTache()">Arrêter</span><br>
+
+ <span style="padding-top:10px;" class="options" onclick="addAnnotation()">Ajouter une annotation</span><br>
+ <span class="options" onclick="edAlertes()">Édition des alertes</span><br>
+ <span class="options" onclick="add(1)">Ajouter 1 minute</span><br>
+ <span class="options" onclick="add(5)">Ajouter 5 minutes</span><br>
+ <span class="options" onclick="add(30)">Ajouter 30 minutes</span><br>
+ <span class="options" onclick="sou(1)">Enlever 1 minute</span><br>
+ <span class="options" onclick="sou(5)">Enlever 5 minutes</span><br>
+ <span class="options" onclick="sou(30)">Enlever 30 minutes</span><br>
+ <span class="options" onclick="zero()">Remettre à Zero</span><br>
+ <span class="options" onclick="fusion()">Fusionner</span>
+ </div>
+ <div id="menu4">
+ <span class="options" onclick="rapport()">Rapport...</span>
+ </div>
+ <div id="menu5">
+ <span class="options" onclick="affCachés()"><label><input type="checkbox">Afficher les cachés</label></span><br>
+ <span class="options" onclick="systray()"><label><input type="checkbox">Fermer vers le systray</label></span><br>
+ <span class="options" onclick="jSemaine()">Rapport - Premier jour de la semaine</span>
+ </div>
+ <div id="menu6">
+ <span class="options" onclick="aPropos()">À propos...</span>
+ </div>
</body>
</html>
Modified: jtimerhtml5/javascript/actionsMenus.js
===================================================================
--- jtimerhtml5/javascript/actionsMenus.js 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/javascript/actionsMenus.js 2013-04-25 16:03:02 UTC (rev 27)
@@ -5,6 +5,9 @@
if (nomNewProjet=="") {
alert("Erreur : Le nom est vide !")
}
+ else {
+ java.newProjet();
+ }
// vérifier si un autre projet n'a pas déjà ce nom
}
@@ -13,23 +16,29 @@
if (nomNewProjet=="") {
alert("Erreur : Le nom est vide !")
}
+ else {
+ java.edProjet();
+ }
// vérifier si un autre projet n'a pas déjà ce nom
}
function ofProjet(){
-
+ java.ofProjet();
}
function supprProjet() {
var bool = confirm("Voulez-vous supprimer le projet x ?")
- // si bool alors action
+ if (bool){java.supprProjet();}
}
function newTache() {
var nomNewTache = prompt("Nom de la tâche à créer pour x :", "" )
- if (nomNewProjet=="") {
+ if (nomNewTache=="") {
alert("Erreur : Le nom est vide !")
}
+ else {
+ java.newTache();
+ }
// vérifier si une autre tache n'a pas déjà ce nom
}
@@ -38,24 +47,25 @@
}
function ofTache(){
-
+ java.ofTache();
}
function supprTache(){
var bool = confirm("Voulez-vous supprimer la tâche x ?")
- // si bool alors action
+ if (bool){java.supprTache();}
}
function demarTache(){
-
+ java.demarTache();
}
function stopTache(){
-
+ java.stopTache();
}
function addAnnotation(){
var newAnnot = prompt("Annotation pour la tâche x :","")
+ java.addAnnotation(newAnnot);
}
function edAlertes(){
@@ -63,19 +73,19 @@
}
function add(nb){
-
+ java.add(nb);
}
function sou(nb){
-
+ java.sou(nb);
}
function zero(){
-
+ java.zero();
}
function fusion(){
-
+ java.fusion();
}
function rapport(){
@@ -83,15 +93,15 @@
}
function affCachés(){
-
+ // uniquement lié à l'interface ?
}
function systray(){
-
+ java.systray();
}
function jSemaine(){
-
+ java.jSemaine();
}
function aPropos(){
@@ -102,17 +112,15 @@
function selecTache(cel, numligne) {
// pour toute les lignes mettre en blanc
- var nbLignes = 2
+ var nbLignes = 2;
for (var j=0; j<nbLignes; j++) {
for (var k=0; k<3; k++)
- (document.getElementById('cel'+(k+1)+'ligne'+(j+1))).style.backgroundColor = "#ffffff"
+ (document.getElementById('cel'+(k+1)+'ligne'+(j+1))).style.backgroundColor = "#ffffff";
}
for (var i=0; i<3; i++)
- (document.getElementById('cel'+(i+1)+'ligne'+numligne)).style.backgroundColor = "#00ccff"
-
- cel.style.backgroundColor = "#3399ff"
+ (document.getElementById('cel'+(i+1)+'ligne'+numligne)).style.backgroundColor = "#00ccff";
}
function go(nb){
- (document.getElementById('go'+nb)).style.display = ""
+ (document.getElementById('go'+nb)).style.display = "";
}
Modified: jtimerhtml5/javascript/menu.js
===================================================================
--- jtimerhtml5/javascript/menu.js 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/javascript/menu.js 2013-04-25 16:03:02 UTC (rev 27)
@@ -1,78 +1,43 @@
-function createMenu() {
- document.write("<div class='menus'><table cellspacing=0;><tr>")
- for (var i = 0; i < menu.length; i++)
- document.write("<td id=menu"+i+" onmouseover=menuOver(this,"+i+") onmouseout=menuOut(this,"+i+") onclick=menuClick(this,"+i+")> "+menu[i]+"</td>")
-
- document.write("</tr></table></div>")
- for (var i = 0; i < submenu.length; i++) {
- document.write("<span class='ssmenu'><table border=1 style=display:none;left:"+(i*50)+";top:25; id=submenu"+i+" cellspacing=0 onmouseover=revealSubMenu("+i+") >")
-
- for (var j = 0; j < submenu[i].length; j++)
- document.write("<tr><td onmouseover=styleOver(this) onmouseout=styleOut(this)> "+submenu[i][j]+"</td></tr>")
- document.write("</table></span>")
- }
-}
+var deroule = 0;
-function menuClick(element, numMenu){
- if (click==false) {
- click=true
- menuOver(element, numMenu)
+function menu(i){
+ if (i==deroule){
+ for(var j=0; j<6; j++){
+ document.getElementById('menu'+(j+1)).style.display='none';
+ document.getElementById('mn'+(j+1)).style.backgroundColor='#ffffff';
+ }
+ deroule = 0;
}
- else {
- click=false
- menuOut(element, numMenu)
- styleOut(element)
+ else{
+ for(var j=0; j<6; j++){
+ document.getElementById('menu'+(j+1)).style.display='none';
+ document.getElementById('mn'+(j+1)).style.backgroundColor='#ffffff';
+ }
+ document.getElementById('menu'+i).style.display='block';
+ document.getElementById('menu'+i).style.backgroundColor='#00ccff';
+ document.getElementById('mn'+i).style.backgroundColor='#00ccff';
+ deroule = i;
}
}
+/* Boutons */
-function menuOver(element, numMenu) {
- if (click==true){
- setDefaultStyle(element)
- styleOver(element)
- revealSubMenu(numMenu)
- }
+function over(elem){
+ elem.style.backgroundColor = "#339999";
}
-function menuOut(element, numMenu) {
- hideSubMenu(numMenu)
+function out(elem){
+ elem.style.backgroundColor = "#ffffff";
}
-function styleOver(element) {
- element.style.backgroundColor = "#33CC00"
+function out2(j){
+ if (j!=deroule){
+ document.getElementById('mn'+j).style.backgroundColor = "#ffffff";
+ }
}
-function styleOut(element) {
- element.style.backgroundColor = "#FFFF9E"
+function over2(k){
+ if (k!=deroule){
+ document.getElementById('mn'+k).style.backgroundColor = "#339999";
+ }
}
-
-function setDefaultStyle() {
- for (var i = 0; i < menu.length; i++)
- O("menu"+i).style.backgroundColor = "#FFFF9E"
-}
-
-function revealSubMenu(numMenu) {
- hideAll()
- show( O("submenu"+numMenu) )
-}
-
-function hideSubMenu(numMenu) {
- hide( O("submenu"+numMenu) )
-}
-
-function show(element) {
- element.style.display = ""
-}
-
-function hideAll() {
- for (var i = 0; i < submenu.length; i++)
- hideSubMenu(i)
-}
-
-function hide(element) {
- element.style.display = "none"
-}
-
-function O(id) {
- return document.getElementById(id)
-}
Modified: jtimerhtml5/rapport.html
===================================================================
--- jtimerhtml5/rapport.html 2013-04-19 15:38:31 UTC (rev 26)
+++ jtimerhtml5/rapport.html 2013-04-25 16:03:02 UTC (rev 27)
@@ -24,27 +24,25 @@
<div id="divGauche">
<div id="optionsRapport">
Options :<br><br>
- De : <input type="text" id="dateDeb">
- <input type="button" id="selecDateDeb">
+ De : <input type="date" id="dateDeb">
<input type="button" name="Semaine courante" id="selecSemAct"><br>
- A : <input type="text" id="dateFin">
- <input type="button" id="selecDateFin">
+ A : <input type="date" id="dateFin">
<input type="button" name="Semaine précédente" id="selecSemPre"><br>
<form>
- <input type="radio" name="choixFormat" value="jour">Par jour
- <input type="radio" name="choixFormat" value="mois" id="moisRapport">Par mois
+ <label><input type="radio" name="choixFormat" value="jour">Par jour</label>
+ <label><input type="radio" name="choixFormat" value="mois" id="moisRapport">Par mois</label>
<br>
- <input type="radio" name="choixFormat" value="semaine">Par semaine
- <input type="radio" name="choixFormat" value="annee" id="anneeRapport">Par année
+ <label><input type="radio" name="choixFormat" value="semaine">Par semaine</label>
+ <label><input type="radio" name="choixFormat" value="annee" id="anneeRapport">Par année</label>
<br>
- <input type="radio" name="choixFormat" value="projet">Par projet
+ <label><input type="radio" name="choixFormat" value="projet">Par projet</label>
</form>
- <input type="checkbox" id="incAnno" onchange="checkHeure()">Inclure les annotations
- <span id="avHeure" style="display:none;"><input type="checkbox">avec l'heure</span>
+ <label><input type="checkbox" id="incAnno" onchange="checkHeure()">Inclure les annotations</label>
+ <span id="avHeure" style="display:none;"><label><input type="checkbox">avec l'heure</label></span>
</div><br>
<div id="projetsRapport">
Projets :<br><br>
- <input type="checkbox" id="affichCachésRapport">Afficher les cachés
+ <label><input type="checkbox" id="affichCachésRapport">Afficher les cachés</label>
<div id="arboRapport">
</div>
</div>
@@ -54,8 +52,8 @@
Rapport :<br>
<span id="zoneTexteRapport"><textarea id="texteRapport"></textarea></span>
<footer>
- <input type="button" value="Générer" id="generRapport">
- <input type="button" value="Envoyer par email" id="mailRapport">
+ <span id="generRapport"><img src="aspect/images/applications-system.png">Générer</span>
+ <span id="mailRapport"><img src="aspect/images/mail-forward.png">Envoyer par email</span>
<input type="button" value="Fermer" id="fermerRapport" onclick="javascript:window.close()">
</footer>
</div>
1
0
Author: qmoriceau
Date: 2013-04-19 17:38:31 +0200 (Fri, 19 Apr 2013)
New Revision: 26
Url: http://chorem.org/projects/incubator/repository/revisions/26
Log:
Version des sources fin de semaine 16
Removed:
jtimerhtml5/images/
jtimerhtml5/menu.js
jtimerhtml5/style.css
Deleted: jtimerhtml5/menu.js
===================================================================
--- jtimerhtml5/menu.js 2013-04-19 15:32:10 UTC (rev 25)
+++ jtimerhtml5/menu.js 2013-04-19 15:38:31 UTC (rev 26)
@@ -1,67 +0,0 @@
-
-// -----------------------------------------------------...
-function createMenu() {
-document.write("<div class='menus'><table border=1 bordercolor="+menu_bordercolor+" style=cursor:default;position:absolute;top:"+y+";left:"+x+"; cellspacing=0; width="+elementW*3+"><tr>")
-for (var i = 0; i < menu.length; i++)
-document.write("<td bgcolor="+menu_bgcolor_normal+" id=menu"+i+" onmouseover=menuOver(this,"+i+") onmouseout=menuOut(this,"+i+") onclick=menuOver(this,"+i+") height="+elementH+" width="+elementW/2+" > "+menu[i]+"</td>")
-document.write("</tr></table></div>")
-for (var i = 0; i < submenu.length; i++) {
-document.write("<table border=1 bordercolor="+menu_bordercolor+" style=display:none;cursor:hand;position:absolute;left:"+(x+(i*elementW/2))+";top:"+(y + elementH)+"; id=submenu"+i+" cellspacing=0 onmouseover=revealSubMenu("+i+") onmouseout=hideSubMenu("+i+") width="+elementW+">")
-for (var j = 0; j < submenu[i].length; j++)
-document.write("<tr><td bgcolor="+menu_bgcolor_normal+" onmouseover=styleOver(this) onmouseout=styleOut(this) height="+elementH+"> "+submenu[i][j]+"</td></tr>")
-document.write("</table>")
-}
-}
-// -----------------------------------------------------...
-// -----------------------------------------------------
-function menuOver(element, numMenu) {
-setDefaultStyle(element)
-styleOver(element)
-revealSubMenu(numMenu)
-}
-// -----------------------------------------------------
-function menuOut(element, numMenu) {
-hideSubMenu(numMenu)
-}
-// -----------------------------------------------------
-function styleOver(element) {
-element.bgColor = menu_bgcolor_over
-}
-// -----------------------------------------------------
-function styleOut(element) {
-element.bgColor = menu_bgcolor_normal
-}
-// -----------------------------------------------------
-function setDefaultStyle() {
-for (var i = 0; i < menu.length; i++)
-O("menu"+i).bgColor = menu_bgcolor_normal
-}
-// -----------------------------------------------------
-// -----------------------------------------------------
-function revealSubMenu(numMenu) {
-hideAll()
-show( O("submenu"+numMenu) )
-}
-// -----------------------------------------------------
-function hideSubMenu(numMenu) {
-hide( O("submenu"+numMenu) )
-}
-// -----------------------------------------------------
-function show(element) {
-element.style.display = ""
-}
-// -----------------------------------------------------
-function hideAll() {
-for (var i = 0; i < submenu.length; i++)
-hideSubMenu(i)
-}
-// -----------------------------------------------------
-function hide(element) {
-element.style.display = "none"
-}
-// -----------------------------------------------------
-// -----------------------------------------------------
-function O(id) {
-return document.getElementById(id)
-}
-// -----------------------------------------------------
Deleted: jtimerhtml5/style.css
===================================================================
--- jtimerhtml5/style.css 2013-04-19 15:32:10 UTC (rev 25)
+++ jtimerhtml5/style.css 2013-04-19 15:38:31 UTC (rev 26)
@@ -1,41 +0,0 @@
-
-/* Boutons */
-
-.boutonAct {
- background-repeat:no-repeat;
- background-position:center center;
- width: 40px;
- height: 40px;
-}
-
-#demarreTache {
- background: url(images/go-next.png);
-}
-
-#arretTache {
- background: url(images/process-stop.png);
-}
-
-#nouveauProjet {
- background: url(images/bookmark-new.png);
-}
-
-#nouvelleTache {
- background: url(images/document-new.png);
-}
-
-#note {
- background: url(images/notes.png);
-}
-
-#alerte {
- background: url(images/bell.png);
-}
-
-
-
-.boutons {margin-top:32px; margin-bottom:20px}
-
-footer {width:100%;height:35px;position:fixed;bottom:0px;margin:0}
-
-th { border:thin solid}
1
0
r25 - in jtimerhtml5: . aspect aspect/images javascript
by qmoriceau＠users.chorem.org April 19, 2013
by qmoriceau＠users.chorem.org April 19, 2013
April 19, 2013
Author: qmoriceau
Date: 2013-04-19 17:32:10 +0200 (Fri, 19 Apr 2013)
New Revision: 25
Url: http://chorem.org/projects/incubator/repository/revisions/25
Log:
Version des sources fin de semaine 16
Added:
jtimerhtml5/alertes.html
jtimerhtml5/apropos.html
jtimerhtml5/aspect/
jtimerhtml5/aspect/alertes.css
jtimerhtml5/aspect/apropos.css
jtimerhtml5/aspect/editionT.css
jtimerhtml5/aspect/images/
jtimerhtml5/aspect/images/applications-system.png
jtimerhtml5/aspect/images/bell.png
jtimerhtml5/aspect/images/bookmark-new.png
jtimerhtml5/aspect/images/date_current.png
jtimerhtml5/aspect/images/date_previous.png
jtimerhtml5/aspect/images/document-new.png
jtimerhtml5/aspect/images/go-next.png
jtimerhtml5/aspect/images/jtimer-logo-orange.jpg
jtimerhtml5/aspect/images/mail-forward.png
jtimerhtml5/aspect/images/notes.png
jtimerhtml5/aspect/images/process-stop.png
jtimerhtml5/aspect/images/running.gif
jtimerhtml5/aspect/jtimer.css
jtimerhtml5/aspect/rapport.css
jtimerhtml5/aspect/style.css
jtimerhtml5/editionTache.html
jtimerhtml5/javascript/
jtimerhtml5/javascript/actionsMenus.js
jtimerhtml5/javascript/menu.js
jtimerhtml5/rapport.html
Modified:
jtimerhtml5/index.html
Added: jtimerhtml5/alertes.html
===================================================================
--- jtimerhtml5/alertes.html (rev 0)
+++ jtimerhtml5/alertes.html 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>jTimer - Alertes</title>
+ <link rel="stylesheet" type="text/css" href="aspect/alertes.css"/>
+ <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
+ </head>
+ <body>
+ <p><b>Listes des alertes :</b></p>
+ <div width=100% id="tableAlertes"><span class="alerteG">Type</span><span class="alerteD">Durée</span>
+ </div>
+ <footer>
+ <input type="button" id="alerteAj" value="Ajouter">
+ <input type="button" id="alerteSupp" value="Supprimer">
+ <br>
+ <input type="button" id="alerteAnn" value="Annuler" OnClick="javascript:window.close()">
+ <input type="button" id="alerteSave" value="Sauver">
+ </footer>
+ </body>
+</html>
Added: jtimerhtml5/apropos.html
===================================================================
--- jtimerhtml5/apropos.html (rev 0)
+++ jtimerhtml5/apropos.html 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>A propos de jTimer</title>
+ <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
+ <link rel="stylesheet" type="text/css" href="aspect/apropos.css"/>
+ <script type="text/javascript">
+ <!-- //choix entre les deux texte via les boutons
+ function action(i){
+ if(i == 1){
+ document.getElementById('dataText').innerHTML='<b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2012, 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.';
+ }
+ if(i == 2){
+ document.getElementById('dataText').innerHTML="Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec jTimer. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme.";
+ }
+ }
+ //-->
+ </script>
+ </head>
+ <body>
+ <img src="style/images/jtimer-logo-orange.jpg" /><br>
+ <input type="button" value="A propos de jTimer" onclick="action(1)">
+ <input type="button" value="Licence" onclick="action(2)"><br>
+ <div id="cadre"><p id="dataText"><b>jTimer - 1.4.1</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>
+ <input style="margin-left:300px;margin-top:5px;width:100px;height:25px" type="submit" value="Fermer" OnClick="javascript:window.close()">
+ </body>
+</html>
Added: jtimerhtml5/aspect/alertes.css
===================================================================
--- jtimerhtml5/aspect/alertes.css (rev 0)
+++ jtimerhtml5/aspect/alertes.css 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,33 @@
+#alerteAj {
+ width:49%;
+ height: 35px;
+}
+
+#alerteSupp {
+ width:49%;
+ height: 35px;
+}
+
+#alerteAnn {
+ width:49%;
+ height: 35px;
+}
+
+#alerteSave {
+ width:49%;
+ height: 35px;
+}
+
+.alerteG{
+ width:50%;
+ margin-left:0;
+ position:absolute;
+ text-align:center;
+}
+
+.alerteD{
+ width:49%;
+ margin-left:49%;
+ position:absolute;
+ text-align:center;
+}
Added: jtimerhtml5/aspect/apropos.css
===================================================================
--- jtimerhtml5/aspect/apropos.css (rev 0)
+++ jtimerhtml5/aspect/apropos.css 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,11 @@
+#dataText {
+ margin-left:5px;
+}
+
+#cadre {
+ width:400px;
+ height:155px;
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999
+}
Added: jtimerhtml5/aspect/editionT.css
===================================================================
--- jtimerhtml5/aspect/editionT.css (rev 0)
+++ jtimerhtml5/aspect/editionT.css 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,20 @@
+#editionAppl {
+ width:32%;
+ height: 30px;
+}
+#editionAnnul {
+ width:32%;
+ height: 30px;
+}
+#editionQuit {
+ width:32%;
+ height: 30px;
+}
+
+#nomTache {
+ width:98%;
+}
+
+#noteTache {
+ width:96%;
+}
Added: jtimerhtml5/aspect/images/applications-system.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/applications-system.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/bell.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/bell.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/bookmark-new.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/bookmark-new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/date_current.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/date_current.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/date_previous.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/date_previous.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/document-new.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/document-new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/go-next.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/go-next.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/jtimer-logo-orange.jpg
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/jtimer-logo-orange.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/mail-forward.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/mail-forward.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/notes.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/notes.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/process-stop.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/process-stop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/images/running.gif
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/aspect/images/running.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/aspect/jtimer.css
===================================================================
--- jtimerhtml5/aspect/jtimer.css (rev 0)
+++ jtimerhtml5/aspect/jtimer.css 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,99 @@
+/* Menus */
+
+
+
+/* Boutons */
+
+#demarreTache {
+ background: url(images/go-next.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+#arretTache {
+ background: url(images/process-stop.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+#nouveauProjet {
+ background: url(images/bookmark-new.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+#nouvelleTache {
+ background: url(images/document-new.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+#note {
+ background: url(images/notes.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+#alerte {
+ background: url(images/bell.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+.boutons {
+ margin-top:32px;
+ margin-bottom:20px
+}
+
+/* Arboresence des tâches */
+
+.colone1{
+ width:33%;
+ margin-left:0;
+ position:absolute;
+}
+
+.colone2{
+ width:33%;
+ margin-left:32%;
+ position:absolute;
+}
+
+.colone3{
+ width:33%;
+ margin-left:65%;
+ position:absolute;
+}
+
+#entete span {
+ text-align:center;
+ border-bottom:2px solid #339999;
+ border-left:2px solid #339999;
+}
+
+
+#statutTaches{
+ width:50%;
+}
+
+#recapAuj{
+ width:49%;
+ margin-left:45%;
+ text-align:center;
+}
+
+#cadreBas{
+ border:2px solid #339999;
+}
Added: jtimerhtml5/aspect/rapport.css
===================================================================
--- jtimerhtml5/aspect/rapport.css (rev 0)
+++ jtimerhtml5/aspect/rapport.css 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,90 @@
+#divDroite{
+ width:50%;
+ height:100%;
+ float:right;
+ margin:0;
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999
+}
+
+#divGauche{
+ width:49%;
+ float:left;
+ margin:0;
+ height:100%;
+}
+
+#selecSemAct{
+ background: url(images/date_current.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 22px;
+}
+
+#selecSemPre{
+ background: url(images/date_previous.png);
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 22px;
+}
+
+#dateFin{
+ margin-left:7px;
+ width:70%;
+}
+
+#dateDeb{
+ width:70%;
+}
+
+#texteRapport{
+ width:97%;
+ height:700px;
+ margin-left:5px;
+ margin-top:10px;
+}
+
+#generRapport{
+ background: url(images/applications-system.png);
+ background-repeat:no-repeat;
+ background-position:left center;
+ width:16%;
+ height:30px;
+}
+
+#mailRapport{
+ background: url(images/mail-forward.png);
+ background-repeat:no-repeat;
+ background-position:left center;
+ width:16%;
+ height:30px;
+}
+
+#fermerRapport{
+ width:16%;
+}
+
+#optionsRapport{
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ height:100%;
+}
+
+#projetsRapport{
+ border-style:solid;
+ border-width:2px;
+ border-color:#339999;
+ height:100%;
+}
+
+#moisRapport{
+ margin-left:50px;
+}
+
+#anneeRapport{
+ margin-left:24px;
+}
Added: jtimerhtml5/aspect/style.css
===================================================================
--- jtimerhtml5/aspect/style.css (rev 0)
+++ jtimerhtml5/aspect/style.css 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,14 @@
+
+/* Global */
+
+/*body{
+ margin:0;
+ padding:0;
+}*/
+
+footer {
+ width:100%;
+ position:fixed;
+ bottom:0px;
+ margin:0
+}
Added: jtimerhtml5/editionTache.html
===================================================================
--- jtimerhtml5/editionTache.html (rev 0)
+++ jtimerhtml5/editionTache.html 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="fr">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>Edition de la tâche</title>
+ <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
+ <link rel="stylesheet" type="text/css" href="aspect/editionT.css"/>
+ </head>
+ <body>
+ <input type="text" id="nomTache" name="newNomTache" value="x">
+ <!-- Calendrier à date selectionnable -->
+ <footer width=100%>
+ Temps:
+ <input type="text" name="heures" value="00" size=2>:
+ <input type="text" name="minutes" value="00" size=2>:
+ <input type="text" name="secondes" value="00" size=2><br>
+ Note:<textarea rows="4" type="text" value="" id="noteTache"></textarea><br>
+ <input type="button" id="editionAppl" value="Ajouter">
+ <input type="reset" id="editionAnnul" value="Annuler">
+ <input type="button" id="editionQuit" value="Quitter" OnClick="javascript:window.close()">
+ </footer>
+ </body>
+</html>
Modified: jtimerhtml5/index.html
===================================================================
--- jtimerhtml5/index.html 2013-04-17 12:46:18 UTC (rev 24)
+++ jtimerhtml5/index.html 2013-04-19 15:32:10 UTC (rev 25)
@@ -1,88 +1,48 @@
-<html>
+<!--<!DOCTYPE html>-->
+<html lang="fr">
<head>
<meta charset="UTF-8"/>
<title>jTimer</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
- <script type="text/javascript" src="menu.js"></script>
+ <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
+ <link rel="stylesheet" type="text/css" href="aspect/jtimer.css"/>
+ <script type="text/javascript" src="menu.js"></script>
+ <script type="text/javascript" src="javascript/actionsMenus.js"></script>
</head>
<body>
- <script language=JavaScript>
- <!-- //Menu dynamique
- var x = 0, y = 0
- var elementH = 25, elementW = 150
- var menu_bgcolor_normal = "#CCCCCC"
- var menu_bgcolor_over = "#33CC00"
- var menu_bordercolor = "#000000"
- var menu = [
- "<font size=3>Fichier</font>",
- "<font size=3>Projet</font>",
- "<font size=3>Tâche</font>",
- "<font size=3>Rapport</font>",
- "<font size=3>Options</font>",
- "<font size=3>Aide</font>"
- ]
- var submenu = [
- [
- "<font id='quitter' size=3 onclick=''>Quitter</font>"
- ],
- [
- "<font id='newP' size=3 onclick=''>Nouveau projet</font>",
- "<font id='edP' size=3 onclick=''>Edition du projet</font>",
- "<font id='ofP' size=3 onclick=''>Ouvrir/Fermer le projet</font>",
- "<font id='suppP' size=3 onclick=''>Suppression du projet</font>"
- ],
- [
- "<font id='newT' size=3 onclick=''>Nouvelle tâche</font>",
- "<font id='edT' size=3 onclick=''>Edition de la tâche</font>",
- "<font id='ofT' size=3 onclick=''>Ouvrir/Fermer la tâche</font>",
- "<font id='SuppT' size=3 onclick=''>Suppression de la tâhe</font>",
- "<font id='dem' size=3 onclick=''>Démarrer</font>",
- "<font id='stop' size=3 onclick=''>Arrêter</font>",
- "<font id='addA' size=3 onclick=''>Ajouter une annotation</font>",
- "<font id='edAlerte' size=3 onclick=''>Edition des alertes</font>",
- "<font id='add1' size=3 onclick=''>Ajouter 1 minute</font>",
- "<font id='add5' size=3 onclick=''>Ajouter 5 minutes</font>",
- "<font id='add30' size=3 onclick=''>Ajouter 30 minutes</font>",
- "<font id='sou1' size=3 onclick=''>Enlever 1 minute</font>",
- "<font id='sou5' size=3 onclick=''>Enlever 5 minutes</font>",
- "<font id='sou30' size=3 onclick=''>Enlever 30 minutes</font>",
- "<font id='zero' size=3 onclick=''>Remettre à Zero</font>",
- "<font id='fus' size=3 onclick=''>Fusionner</font>"
- ],
- [
- "<font id='rapport' size=3 onclick=''>Rapport...</font>"
- ],
- [
- "<font id='affCachés' size=3 onclick=''>Afficher les cachés</font>",
- "<font id='fermerSystray' size=3 onclick=''>Fermer vers le systray</font>",
- "<font id='jSemaine' size=3 onclick=''>Rapport-Premier jour de la semaine</font>"
- ],
- [
- "<font id='propos' size=3 onclick=''>A propos...</font>"
- ]
- ]
- createMenu()
- //-->
- </script>
+ <!-- Menu -->
+
<div class="boutons">
<! Les boutons d'actions >
- <input type="submit" class="boutonAct" id="demarreTache" value="" title="" onclick=''>
- <input type="submit" class="boutonAct" id="arretTache" value="" title="" onclick=''>
- <input type="submit" class="boutonAct" id="nouveauProjet" value="" title="" onclick=''>
- <input type="submit" class="boutonAct" id="nouvelleTache" value="" title="" onclick=''>
+ <! Réflechir à la possibilité de n'avoire qu'un bouton pour démarré et stoper une tache. >
+ <input type="button" id="demarreTache" value="" title="Démarre la tâche sélectionnée" onclick="demarTache()">
+ <input type="button" id="arretTache" value="" title="Arrête la tâche sélectionnée" onclick="stopTache">
+ <input type="button" id="nouveauProjet" value="" title="Création d'un nouveau projet" onclick="newProjet()">
+ <input type="button" id="nouvelleTache" value="" title="Création d'une nouvelle tâche" onclick="newTache()">
- <input type="submit" class="boutonAct" id="note" value="" title="">
- <input type="submit" class="boutonAct" id="alerte" value="" title="">
+ <input type="button" id="note" value="" title="Ajouter une annotation" onclick="addAnnotation()">
+ <input type="button" id="alerte" value="" title="Edition des alertes" onclick="edAlertes()">
</div>
- <div class="arboTaches">
+ <div>
<! Arborescence des taches >
- <table width=100%>
- <tr><th width=33%>Projet et tâches</th><th width=33%>Aujourd'hui</th><th width=33%>Total</th></tr>
- </table>
+ <div width=100%>
+ <div id="entete">
+ <span class="colone1">Projet et tâches</span>
+ <span class="colone2">Aujourd'hui</span>
+ <span class="colone3">Total</span><br><br>
+ </div>
+ <div id="arboTaches">
+ <span class="colone1" id="cel1ligne1" onclick="selecTache(this, 1)" ondblclick="go(1)"><img src="aspect/images/running.gif" style="display:none" id="go1"/> jTimer html5</span>
+ <span class="colone2" id="cel2ligne1" onclick="selecTache(this, 1)" ondblclick="go(1)"> xx:xx:xx</span>
+ <span class="colone3" id="cel3ligne1" onclick="selecTache(this, 1)" ondblclick="go(1)"> xx:xx:xx</span><br>
+ <span class="colone1" id="cel1ligne2" onclick="selecTache(this, 2)" ondblclick="go(2)"><img src="aspect/images/running.gif" style="display:none" id="go2"/> jTimer test</span>
+ <span class="colone2" id="cel2ligne2" onclick="selecTache(this, 2)" ondblclick="go(2)"> xx:xx:xx</span>
+ <span class="colone3" id="cel3ligne2" onclick="selecTache(this, 2)" ondblclick="go(2)"> xx:xx:xx</span><br>
+ </div>
+ </div>
</div>
<footer class="piedpage">
<! footer à garder tel quel >
- <table border=1 width=99%><tr><td width=50%>Inactif</td><td width=50% align="center">Aujourd'hui : 00:00:00</td></tr></table>
+ <div id="cadreBas"><span id="statutTaches">Inactif</span><span id="recapAuj">Aujourd'hui : xx:xx:xx</span></div>
</footer>
</body>
</html>
Added: jtimerhtml5/javascript/actionsMenus.js
===================================================================
--- jtimerhtml5/javascript/actionsMenus.js (rev 0)
+++ jtimerhtml5/javascript/actionsMenus.js 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,118 @@
+/* Différente actions des menus et des boutons */
+
+function newProjet(){
+ var nomNewProjet = prompt("Nom du projet à créer :", "" )
+ if (nomNewProjet=="") {
+ alert("Erreur : Le nom est vide !")
+ }
+ // vérifier si un autre projet n'a pas déjà ce nom
+}
+
+function edProjet(){
+ var newNomProjet = prompt("Nouveau nom du projet :","x")
+ if (nomNewProjet=="") {
+ alert("Erreur : Le nom est vide !")
+ }
+ // vérifier si un autre projet n'a pas déjà ce nom
+}
+
+function ofProjet(){
+
+}
+
+function supprProjet() {
+ var bool = confirm("Voulez-vous supprimer le projet x ?")
+ // si bool alors action
+}
+
+function newTache() {
+ var nomNewTache = prompt("Nom de la tâche à créer pour x :", "" )
+ if (nomNewProjet=="") {
+ alert("Erreur : Le nom est vide !")
+ }
+ // vérifier si une autre tache n'a pas déjà ce nom
+}
+
+function edTache(){
+ window.open('editionTache.html','','height=450, width=350, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no')
+}
+
+function ofTache(){
+
+}
+
+function supprTache(){
+ var bool = confirm("Voulez-vous supprimer la tâche x ?")
+ // si bool alors action
+}
+
+function demarTache(){
+
+}
+
+function stopTache(){
+
+}
+
+function addAnnotation(){
+ var newAnnot = prompt("Annotation pour la tâche x :","")
+}
+
+function edAlertes(){
+ window.open('alertes.html','','height=400, width=600, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no')
+}
+
+function add(nb){
+
+}
+
+function sou(nb){
+
+}
+
+function zero(){
+
+}
+
+function fusion(){
+
+}
+
+function rapport(){
+ window.open('rapport.html','','height=800, width=1100, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no')
+}
+
+function affCachés(){
+
+}
+
+function systray(){
+
+}
+
+function jSemaine(){
+
+}
+
+function aPropos(){
+ window.open('apropos.html','','height=405, width=420, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no')
+}
+
+/* Autres */
+
+function selecTache(cel, numligne) {
+ // pour toute les lignes mettre en blanc
+ var nbLignes = 2
+ for (var j=0; j<nbLignes; j++) {
+ for (var k=0; k<3; k++)
+ (document.getElementById('cel'+(k+1)+'ligne'+(j+1))).style.backgroundColor = "#ffffff"
+ }
+ for (var i=0; i<3; i++)
+ (document.getElementById('cel'+(i+1)+'ligne'+numligne)).style.backgroundColor = "#00ccff"
+
+ cel.style.backgroundColor = "#3399ff"
+
+}
+function go(nb){
+ (document.getElementById('go'+nb)).style.display = ""
+}
Added: jtimerhtml5/javascript/menu.js
===================================================================
--- jtimerhtml5/javascript/menu.js (rev 0)
+++ jtimerhtml5/javascript/menu.js 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,78 @@
+function createMenu() {
+ document.write("<div class='menus'><table cellspacing=0;><tr>")
+ for (var i = 0; i < menu.length; i++)
+ document.write("<td id=menu"+i+" onmouseover=menuOver(this,"+i+") onmouseout=menuOut(this,"+i+") onclick=menuClick(this,"+i+")> "+menu[i]+"</td>")
+
+ document.write("</tr></table></div>")
+ for (var i = 0; i < submenu.length; i++) {
+ document.write("<span class='ssmenu'><table border=1 style=display:none;left:"+(i*50)+";top:25; id=submenu"+i+" cellspacing=0 onmouseover=revealSubMenu("+i+") >")
+
+ for (var j = 0; j < submenu[i].length; j++)
+ document.write("<tr><td onmouseover=styleOver(this) onmouseout=styleOut(this)> "+submenu[i][j]+"</td></tr>")
+ document.write("</table></span>")
+ }
+}
+
+function menuClick(element, numMenu){
+ if (click==false) {
+ click=true
+ menuOver(element, numMenu)
+ }
+ else {
+ click=false
+ menuOut(element, numMenu)
+ styleOut(element)
+ }
+}
+
+
+function menuOver(element, numMenu) {
+ if (click==true){
+ setDefaultStyle(element)
+ styleOver(element)
+ revealSubMenu(numMenu)
+ }
+}
+
+function menuOut(element, numMenu) {
+ hideSubMenu(numMenu)
+}
+
+function styleOver(element) {
+ element.style.backgroundColor = "#33CC00"
+}
+
+function styleOut(element) {
+ element.style.backgroundColor = "#FFFF9E"
+}
+
+function setDefaultStyle() {
+ for (var i = 0; i < menu.length; i++)
+ O("menu"+i).style.backgroundColor = "#FFFF9E"
+}
+
+function revealSubMenu(numMenu) {
+ hideAll()
+ show( O("submenu"+numMenu) )
+}
+
+function hideSubMenu(numMenu) {
+ hide( O("submenu"+numMenu) )
+}
+
+function show(element) {
+ element.style.display = ""
+}
+
+function hideAll() {
+ for (var i = 0; i < submenu.length; i++)
+ hideSubMenu(i)
+}
+
+function hide(element) {
+ element.style.display = "none"
+}
+
+function O(id) {
+ return document.getElementById(id)
+}
Added: jtimerhtml5/rapport.html
===================================================================
--- jtimerhtml5/rapport.html (rev 0)
+++ jtimerhtml5/rapport.html 2013-04-19 15:32:10 UTC (rev 25)
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="fr" height=100%>
+ <head>
+ <meta charset="UTF-8"/>
+ <title>Rapport - jTimer</title>
+ <link rel="stylesheet" type="text/css" href="aspect/style.css"/>
+ <link rel="stylesheet" type="text/css" href="aspect/rapport.css"/>
+ <script language=JavaScript>
+ var check = false;
+ function checkHeure(){
+ if (check==false){
+ check=true;
+ (document.getElementById("avHeure")).style.display="";
+ }
+ else
+ {
+ check=false;
+ (document.getElementById("avHeure")).style.display="none";
+ }
+ }
+ </script>
+ </head>
+ <body height=100%>
+ <div id="divGauche">
+ <div id="optionsRapport">
+ Options :<br><br>
+ De : <input type="text" id="dateDeb">
+ <input type="button" id="selecDateDeb">
+ <input type="button" name="Semaine courante" id="selecSemAct"><br>
+ A : <input type="text" id="dateFin">
+ <input type="button" id="selecDateFin">
+ <input type="button" name="Semaine précédente" id="selecSemPre"><br>
+ <form>
+ <input type="radio" name="choixFormat" value="jour">Par jour
+ <input type="radio" name="choixFormat" value="mois" id="moisRapport">Par mois
+ <br>
+ <input type="radio" name="choixFormat" value="semaine">Par semaine
+ <input type="radio" name="choixFormat" value="annee" id="anneeRapport">Par année
+ <br>
+ <input type="radio" name="choixFormat" value="projet">Par projet
+ </form>
+ <input type="checkbox" id="incAnno" onchange="checkHeure()">Inclure les annotations
+ <span id="avHeure" style="display:none;"><input type="checkbox">avec l'heure</span>
+ </div><br>
+ <div id="projetsRapport">
+ Projets :<br><br>
+ <input type="checkbox" id="affichCachésRapport">Afficher les cachés
+ <div id="arboRapport">
+ </div>
+ </div>
+ </div>
+
+ <div id="divDroite">
+ Rapport :<br>
+ <span id="zoneTexteRapport"><textarea id="texteRapport"></textarea></span>
+ <footer>
+ <input type="button" value="Générer" id="generRapport">
+ <input type="button" value="Envoyer par email" id="mailRapport">
+ <input type="button" value="Fermer" id="fermerRapport" onclick="javascript:window.close()">
+ </footer>
+ </div>
+ </body>
+</html>
1
0
Author: qmoriceau
Date: 2013-04-17 14:46:18 +0200 (Wed, 17 Apr 2013)
New Revision: 24
Url: http://chorem.org/projects/incubator/repository/revisions/24
Log:
Premi?\195?\168re version des sources
Added:
jtimerhtml5/images/
jtimerhtml5/images/bell.png
jtimerhtml5/images/bookmark-new.png
jtimerhtml5/images/document-new.png
jtimerhtml5/images/go-next.png
jtimerhtml5/images/notes.png
jtimerhtml5/images/process-stop.png
jtimerhtml5/index.html
jtimerhtml5/menu.js
jtimerhtml5/style.css
Added: jtimerhtml5/images/bell.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/images/bell.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/images/bookmark-new.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/images/bookmark-new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/images/document-new.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/images/document-new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/images/go-next.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/images/go-next.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/images/notes.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/images/notes.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/images/process-stop.png
===================================================================
(Binary files differ)
Property changes on: jtimerhtml5/images/process-stop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jtimerhtml5/index.html
===================================================================
--- jtimerhtml5/index.html (rev 0)
+++ jtimerhtml5/index.html 2013-04-17 12:46:18 UTC (rev 24)
@@ -0,0 +1,88 @@
+<html>
+ <head>
+ <meta charset="UTF-8"/>
+ <title>jTimer</title>
+ <link rel="stylesheet" type="text/css" href="style.css"/>
+ <script type="text/javascript" src="menu.js"></script>
+ </head>
+ <body>
+ <script language=JavaScript>
+ <!-- //Menu dynamique
+ var x = 0, y = 0
+ var elementH = 25, elementW = 150
+ var menu_bgcolor_normal = "#CCCCCC"
+ var menu_bgcolor_over = "#33CC00"
+ var menu_bordercolor = "#000000"
+ var menu = [
+ "<font size=3>Fichier</font>",
+ "<font size=3>Projet</font>",
+ "<font size=3>Tâche</font>",
+ "<font size=3>Rapport</font>",
+ "<font size=3>Options</font>",
+ "<font size=3>Aide</font>"
+ ]
+ var submenu = [
+ [
+ "<font id='quitter' size=3 onclick=''>Quitter</font>"
+ ],
+ [
+ "<font id='newP' size=3 onclick=''>Nouveau projet</font>",
+ "<font id='edP' size=3 onclick=''>Edition du projet</font>",
+ "<font id='ofP' size=3 onclick=''>Ouvrir/Fermer le projet</font>",
+ "<font id='suppP' size=3 onclick=''>Suppression du projet</font>"
+ ],
+ [
+ "<font id='newT' size=3 onclick=''>Nouvelle tâche</font>",
+ "<font id='edT' size=3 onclick=''>Edition de la tâche</font>",
+ "<font id='ofT' size=3 onclick=''>Ouvrir/Fermer la tâche</font>",
+ "<font id='SuppT' size=3 onclick=''>Suppression de la tâhe</font>",
+ "<font id='dem' size=3 onclick=''>Démarrer</font>",
+ "<font id='stop' size=3 onclick=''>Arrêter</font>",
+ "<font id='addA' size=3 onclick=''>Ajouter une annotation</font>",
+ "<font id='edAlerte' size=3 onclick=''>Edition des alertes</font>",
+ "<font id='add1' size=3 onclick=''>Ajouter 1 minute</font>",
+ "<font id='add5' size=3 onclick=''>Ajouter 5 minutes</font>",
+ "<font id='add30' size=3 onclick=''>Ajouter 30 minutes</font>",
+ "<font id='sou1' size=3 onclick=''>Enlever 1 minute</font>",
+ "<font id='sou5' size=3 onclick=''>Enlever 5 minutes</font>",
+ "<font id='sou30' size=3 onclick=''>Enlever 30 minutes</font>",
+ "<font id='zero' size=3 onclick=''>Remettre à Zero</font>",
+ "<font id='fus' size=3 onclick=''>Fusionner</font>"
+ ],
+ [
+ "<font id='rapport' size=3 onclick=''>Rapport...</font>"
+ ],
+ [
+ "<font id='affCachés' size=3 onclick=''>Afficher les cachés</font>",
+ "<font id='fermerSystray' size=3 onclick=''>Fermer vers le systray</font>",
+ "<font id='jSemaine' size=3 onclick=''>Rapport-Premier jour de la semaine</font>"
+ ],
+ [
+ "<font id='propos' size=3 onclick=''>A propos...</font>"
+ ]
+ ]
+ createMenu()
+ //-->
+ </script>
+ <div class="boutons">
+ <! Les boutons d'actions >
+ <input type="submit" class="boutonAct" id="demarreTache" value="" title="" onclick=''>
+ <input type="submit" class="boutonAct" id="arretTache" value="" title="" onclick=''>
+ <input type="submit" class="boutonAct" id="nouveauProjet" value="" title="" onclick=''>
+ <input type="submit" class="boutonAct" id="nouvelleTache" value="" title="" onclick=''>
+
+ <input type="submit" class="boutonAct" id="note" value="" title="">
+ <input type="submit" class="boutonAct" id="alerte" value="" title="">
+ </div>
+ <div class="arboTaches">
+ <! Arborescence des taches >
+ <table width=100%>
+ <tr><th width=33%>Projet et tâches</th><th width=33%>Aujourd'hui</th><th width=33%>Total</th></tr>
+ </table>
+ </div>
+ <footer class="piedpage">
+ <! footer à garder tel quel >
+ <table border=1 width=99%><tr><td width=50%>Inactif</td><td width=50% align="center">Aujourd'hui : 00:00:00</td></tr></table>
+ </footer>
+ </body>
+</html>
Added: jtimerhtml5/menu.js
===================================================================
--- jtimerhtml5/menu.js (rev 0)
+++ jtimerhtml5/menu.js 2013-04-17 12:46:18 UTC (rev 24)
@@ -0,0 +1,67 @@
+
+// -----------------------------------------------------...
+function createMenu() {
+document.write("<div class='menus'><table border=1 bordercolor="+menu_bordercolor+" style=cursor:default;position:absolute;top:"+y+";left:"+x+"; cellspacing=0; width="+elementW*3+"><tr>")
+for (var i = 0; i < menu.length; i++)
+document.write("<td bgcolor="+menu_bgcolor_normal+" id=menu"+i+" onmouseover=menuOver(this,"+i+") onmouseout=menuOut(this,"+i+") onclick=menuOver(this,"+i+") height="+elementH+" width="+elementW/2+" > "+menu[i]+"</td>")
+document.write("</tr></table></div>")
+for (var i = 0; i < submenu.length; i++) {
+document.write("<table border=1 bordercolor="+menu_bordercolor+" style=display:none;cursor:hand;position:absolute;left:"+(x+(i*elementW/2))+";top:"+(y + elementH)+"; id=submenu"+i+" cellspacing=0 onmouseover=revealSubMenu("+i+") onmouseout=hideSubMenu("+i+") width="+elementW+">")
+for (var j = 0; j < submenu[i].length; j++)
+document.write("<tr><td bgcolor="+menu_bgcolor_normal+" onmouseover=styleOver(this) onmouseout=styleOut(this) height="+elementH+"> "+submenu[i][j]+"</td></tr>")
+document.write("</table>")
+}
+}
+// -----------------------------------------------------...
+// -----------------------------------------------------
+function menuOver(element, numMenu) {
+setDefaultStyle(element)
+styleOver(element)
+revealSubMenu(numMenu)
+}
+// -----------------------------------------------------
+function menuOut(element, numMenu) {
+hideSubMenu(numMenu)
+}
+// -----------------------------------------------------
+function styleOver(element) {
+element.bgColor = menu_bgcolor_over
+}
+// -----------------------------------------------------
+function styleOut(element) {
+element.bgColor = menu_bgcolor_normal
+}
+// -----------------------------------------------------
+function setDefaultStyle() {
+for (var i = 0; i < menu.length; i++)
+O("menu"+i).bgColor = menu_bgcolor_normal
+}
+// -----------------------------------------------------
+// -----------------------------------------------------
+function revealSubMenu(numMenu) {
+hideAll()
+show( O("submenu"+numMenu) )
+}
+// -----------------------------------------------------
+function hideSubMenu(numMenu) {
+hide( O("submenu"+numMenu) )
+}
+// -----------------------------------------------------
+function show(element) {
+element.style.display = ""
+}
+// -----------------------------------------------------
+function hideAll() {
+for (var i = 0; i < submenu.length; i++)
+hideSubMenu(i)
+}
+// -----------------------------------------------------
+function hide(element) {
+element.style.display = "none"
+}
+// -----------------------------------------------------
+// -----------------------------------------------------
+function O(id) {
+return document.getElementById(id)
+}
+// -----------------------------------------------------
Added: jtimerhtml5/style.css
===================================================================
--- jtimerhtml5/style.css (rev 0)
+++ jtimerhtml5/style.css 2013-04-17 12:46:18 UTC (rev 24)
@@ -0,0 +1,41 @@
+
+/* Boutons */
+
+.boutonAct {
+ background-repeat:no-repeat;
+ background-position:center center;
+ width: 40px;
+ height: 40px;
+}
+
+#demarreTache {
+ background: url(images/go-next.png);
+}
+
+#arretTache {
+ background: url(images/process-stop.png);
+}
+
+#nouveauProjet {
+ background: url(images/bookmark-new.png);
+}
+
+#nouvelleTache {
+ background: url(images/document-new.png);
+}
+
+#note {
+ background: url(images/notes.png);
+}
+
+#alerte {
+ background: url(images/bell.png);
+}
+
+
+
+.boutons {margin-top:32px; margin-bottom:20px}
+
+footer {width:100%;height:35px;position:fixed;bottom:0px;margin:0}
+
+th { border:thin solid}
1
0
Author: qmoriceau
Date: 2013-04-17 14:43:41 +0200 (Wed, 17 Apr 2013)
New Revision: 23
Url: http://chorem.org/projects/incubator/repository/revisions/23
Log:
Cr?\195?\169ation d'un nouveau prototype pour jTimer
Added:
jtimerhtml5/
1
0