diff --git a/Images/miniature_festivalgo.png b/Images/miniature_festivalgo.png deleted file mode 100644 index e1c562a..0000000 Binary files a/Images/miniature_festivalgo.png and /dev/null differ diff --git a/Images/publier.png b/Images/publier.png deleted file mode 100644 index 8bd6e68..0000000 Binary files a/Images/publier.png and /dev/null differ diff --git a/a_propos.php b/a_propos.php index 7d0ec91..ef1dda0 100644 --- a/a_propos.php +++ b/a_propos.php @@ -5,11 +5,11 @@ require_once('includes/config.php'); - - + + - + Festiv'Algo - A propos diff --git a/aide.php b/aide.php index ee09915..9d6f6c3 100644 --- a/aide.php +++ b/aide.php @@ -5,14 +5,14 @@ require_once('includes/config.php'); - - + + - + Festiv'Algo - Aide pour la programmation d'algorithmes. Tutoriel d'algorithmique, TI Basic et Basic Casio. @@ -25,7 +25,7 @@ require_once('includes/config.php');

• Qu'est-ce qu'un algorithme ?

- Schéma d'un algorithme + Schéma d'un algorithme
Le mot "algorithme" vient du nom du mathématicien Persan Al-Khuwarizmi, qui inventa une méthode, au début du IXème siècle, pour résoudre des équations pas à pas.
Un algorithme est une suite d'opérations appliquées dans un ordre donné. @@ -68,7 +68,7 @@ require_once('includes/config.php');

• Les conditions

- Schéma d'une condition + Schéma d'une condition
La résolution de certains problèmes conduit parfois à une situation dans laquelle la décision prise est soumise à condition.
Si la condition est vérifiée, on effectue une première tâche, sinon on effectue une seconde tâche. @@ -107,7 +107,6 @@ require_once('includes/config.php');
-
diff --git a/aide.css b/assets/css/aide.css similarity index 100% rename from aide.css rename to assets/css/aide.css diff --git a/exemples.css b/assets/css/exemples.css similarity index 100% rename from exemples.css rename to assets/css/exemples.css diff --git a/ie.css b/assets/css/ie.css similarity index 100% rename from ie.css rename to assets/css/ie.css diff --git a/jquery.cleditor.css b/assets/css/jquery/jquery.cleditor.css similarity index 88% rename from jquery.cleditor.css rename to assets/css/jquery/jquery.cleditor.css index ffb1fb1..8ee89ab 100644 --- a/jquery.cleditor.css +++ b/assets/css/jquery/jquery.cleditor.css @@ -1,8 +1,8 @@ .cleditorMain iframe {border:none; margin:0; padding:0} .cleditorMain textarea {border:none; margin:0; padding:0; overflow-y:scroll; font:10pt Arial,Verdana; resize:none; outline:none /* webkit grip focus */} -.cleditorToolbar {background: url('Images/toolbar.gif') repeat} +.cleditorToolbar {background: url('../../img/programm/editor/toolbar.gif') repeat} .cleditorGroup {float:left; height:26px} -.cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('Images/buttons.gif')} +.cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('../../img/programm/editor/buttons.gif')} .cleditorDisabled {opacity:0.3; filter:alpha(opacity=30)} .cleditorDivider {float:left; width:1px; height:23px; margin:1px 0 1px 0; background:#CCC} .cleditorPopup {border:solid 1px #999; background-color:white; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000} diff --git a/menu.css b/assets/css/menu.css similarity index 64% rename from menu.css rename to assets/css/menu.css index 2fbc09f..c23f82e 100644 --- a/menu.css +++ b/assets/css/menu.css @@ -1,10 +1,10 @@ @font-face { font-family: 'Navig'; - src: url('assets/fonts/Action_Man/Action_Man-webfont.eot'); - src: url('assets/fonts/Action_Man/Action_Man-webfont.eot?#iefix') format('embedded-opentype'), - url('assets/fonts/Action_Man/Action_Man-webfont.woff') format('woff'), - url('assets/fonts/Action_Man/Action_Man-webfont.ttf') format('truetype'), - url('assets/fonts/Action_Man/Action_Man-webfont.svg#ActionManRegular') format('svg'); + src: url('../fonts/Action_Man/Action_Man-webfont.eot'); + src: url('../fonts/Action_Man/Action_Man-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/Action_Man/Action_Man-webfont.woff') format('woff'), + url('../fonts/Action_Man/Action_Man-webfont.ttf') format('truetype'), + url('../fonts/Action_Man/Action_Man-webfont.svg#ActionManRegular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/stylesheet.css b/assets/css/stylesheet.css similarity index 89% rename from stylesheet.css rename to assets/css/stylesheet.css index f0365f1..8a1f1a7 100644 --- a/stylesheet.css +++ b/assets/css/stylesheet.css @@ -2,11 +2,11 @@ @font-face { font-family: 'Crete Round'; - src: url('assets/fonts/Crete_Round/CreteRound-Regular-webfont.eot'); - src: url('assets/fonts/Crete_Round/CreteRound-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('assets/fonts/Crete_Round/CreteRound-Regular-webfont.woff') format('woff'), - url('assets/fonts/Crete_Round/CreteRound-Regular-webfont.ttf') format('truetype'), - url('assets/fonts/Crete_Round/CreteRound-Regular-webfont.svg#CreteRoundRegular') format('svg'); + src: url('../fonts/Crete_Round/CreteRound-Regular-webfont.eot'); + src: url('../fonts/Crete_Round/CreteRound-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/Crete_Round/CreteRound-Regular-webfont.woff') format('woff'), + url('../fonts/Crete_Round/CreteRound-Regular-webfont.ttf') format('truetype'), + url('../fonts/Crete_Round/CreteRound-Regular-webfont.svg#CreteRoundRegular') format('svg'); font-weight: normal; font-style: normal; @@ -14,11 +14,11 @@ @font-face { font-family: 'Crete Round'; - src: url('assets/fonts/Crete_Round/CreteRound-Italic-webfont.eot'); - src: url('assets/fonts/Crete_Round/CreteRound-Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('assets/fonts/Crete_Round/CreteRound-Italic-webfont.woff') format('woff'), - url('assets/fonts/Crete_Round/CreteRound-Italic-webfont.ttf') format('truetype'), - url('assets/fonts/Crete_Round/CreteRound-Italic-webfont.svg#CreteRoundItalic') format('svg'); + src: url('../fonts/Crete_Round/CreteRound-Italic-webfont.eot'); + src: url('../fonts/Crete_Round/CreteRound-Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/Crete_Round/CreteRound-Italic-webfont.woff') format('woff'), + url('../fonts/Crete_Round/CreteRound-Italic-webfont.ttf') format('truetype'), + url('../fonts/Crete_Round/CreteRound-Italic-webfont.svg#CreteRoundItalic') format('svg'); font-weight: normal; font-style: italic; diff --git a/Images/tester.png b/assets/img/examples/tester.png similarity index 100% rename from Images/tester.png rename to assets/img/examples/tester.png diff --git a/Images/schema_algo.png b/assets/img/help/schema_algo.png similarity index 100% rename from Images/schema_algo.png rename to assets/img/help/schema_algo.png diff --git a/Images/schema_condition.png b/assets/img/help/schema_condition.png similarity index 100% rename from Images/schema_condition.png rename to assets/img/help/schema_condition.png diff --git a/Images/Planete-Casio.png b/assets/img/partners/Planete-Casio.png similarity index 100% rename from Images/Planete-Casio.png rename to assets/img/partners/Planete-Casio.png diff --git a/Images/TI-Planet.png b/assets/img/partners/TI-Planet.png similarity index 100% rename from Images/TI-Planet.png rename to assets/img/partners/TI-Planet.png diff --git a/Images/mathematiques_magiques.png b/assets/img/partners/mathematiques_magiques.png similarity index 100% rename from Images/mathematiques_magiques.png rename to assets/img/partners/mathematiques_magiques.png diff --git a/Images/ampoule.png b/assets/img/programm/ampoule.png similarity index 100% rename from Images/ampoule.png rename to assets/img/programm/ampoule.png diff --git a/Images/attention.png b/assets/img/programm/attention.png similarity index 100% rename from Images/attention.png rename to assets/img/programm/attention.png diff --git a/Images/conversion_algo.png b/assets/img/programm/conversion_algo.png similarity index 100% rename from Images/conversion_algo.png rename to assets/img/programm/conversion_algo.png diff --git a/Images/conversion_casio.png b/assets/img/programm/conversion_casio.png similarity index 100% rename from Images/conversion_casio.png rename to assets/img/programm/conversion_casio.png diff --git a/Images/conversion_ti.png b/assets/img/programm/conversion_ti.png similarity index 100% rename from Images/conversion_ti.png rename to assets/img/programm/conversion_ti.png diff --git a/Images/autres.png b/assets/img/programm/editor/autres.png similarity index 100% rename from Images/autres.png rename to assets/img/programm/editor/autres.png diff --git a/Images/boucles.png b/assets/img/programm/editor/boucles.png similarity index 100% rename from Images/boucles.png rename to assets/img/programm/editor/boucles.png diff --git a/Images/buttons.gif b/assets/img/programm/editor/buttons.gif similarity index 100% rename from Images/buttons.gif rename to assets/img/programm/editor/buttons.gif diff --git a/Images/conditions.png b/assets/img/programm/editor/conditions.png similarity index 100% rename from Images/conditions.png rename to assets/img/programm/editor/conditions.png diff --git a/Images/disable.png b/assets/img/programm/editor/disable.png similarity index 100% rename from Images/disable.png rename to assets/img/programm/editor/disable.png diff --git a/Images/entrees-sorties.png b/assets/img/programm/editor/entrees-sorties.png similarity index 100% rename from Images/entrees-sorties.png rename to assets/img/programm/editor/entrees-sorties.png diff --git a/Images/onglet_deroulant.png b/assets/img/programm/editor/onglet_deroulant.png similarity index 100% rename from Images/onglet_deroulant.png rename to assets/img/programm/editor/onglet_deroulant.png diff --git a/Images/onglet_deroulant_selection.png b/assets/img/programm/editor/onglet_deroulant_selection.png similarity index 100% rename from Images/onglet_deroulant_selection.png rename to assets/img/programm/editor/onglet_deroulant_selection.png diff --git a/Images/signes.png b/assets/img/programm/editor/signes.png similarity index 100% rename from Images/signes.png rename to assets/img/programm/editor/signes.png diff --git a/Images/support_menus.png b/assets/img/programm/editor/support_menus.png similarity index 100% rename from Images/support_menus.png rename to assets/img/programm/editor/support_menus.png diff --git a/Images/toolbar.gif b/assets/img/programm/editor/toolbar.gif similarity index 100% rename from Images/toolbar.gif rename to assets/img/programm/editor/toolbar.gif diff --git a/Images/executer.png b/assets/img/programm/executer.png similarity index 100% rename from Images/executer.png rename to assets/img/programm/executer.png diff --git a/Images/pause.png b/assets/img/programm/pause.png similarity index 100% rename from Images/pause.png rename to assets/img/programm/pause.png diff --git a/Images/reset.png b/assets/img/programm/reset.png similarity index 100% rename from Images/reset.png rename to assets/img/programm/reset.png diff --git a/Images/Banniere.png b/assets/img/theme/banniere.png similarity index 100% rename from Images/Banniere.png rename to assets/img/theme/banniere.png diff --git a/Images/favicon_ie.ico b/assets/img/theme/favicon_ie.ico similarity index 100% rename from Images/favicon_ie.ico rename to assets/img/theme/favicon_ie.ico diff --git a/Images/Navigation.png b/assets/img/theme/navigation.png similarity index 100% rename from Images/Navigation.png rename to assets/img/theme/navigation.png diff --git a/Images/Onglet.png b/assets/img/theme/onglet.png similarity index 100% rename from Images/Onglet.png rename to assets/img/theme/onglet.png diff --git a/assets/js/compil1.js b/assets/js/compil1.js index 76a46a6..219ccb2 100644 --- a/assets/js/compil1.js +++ b/assets/js/compil1.js @@ -1139,12 +1139,12 @@ function affiche_erreurs(code) { switch(erreur_syntaxe[4 * a + 2]) { case "non_reconnu": - $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : expression \"" + erreur_syntaxe[4 * a + 1] + "\" non reconnue.
Suggestion : vérifiez la syntaxe du mot.

"); + $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : expression \"" + erreur_syntaxe[4 * a + 1] + "\" non reconnue.
Suggestion : vérifiez la syntaxe du mot.

"); expression = erreur_syntaxe[4 * a + 1]; break; case "manquant": - $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : élément de syntaxe manquant.
Suggestion : ajoutez " + erreur_syntaxe[4 * a] + ".

"); + $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : élément de syntaxe manquant.
Suggestion : ajoutez " + erreur_syntaxe[4 * a] + ".

"); break; case "tout": @@ -1152,24 +1152,24 @@ function affiche_erreurs(code) { break; case "instruction_illegale": - $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : instruction \"" + erreur_syntaxe[4 * a + 1] + "\" inadaptée au contexte.
Suggestion : vérifiez vos " + erreur_syntaxe[4 * a + 4] + ".

"); + $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : instruction \"" + erreur_syntaxe[4 * a + 1] + "\" inadaptée au contexte.
Suggestion : vérifiez vos " + erreur_syntaxe[4 * a + 4] + ".

"); expression = erreur_syntaxe[4 * a + 1]; break; case "erreur_conditions": - $("#debug_titre").after("

• Erreur de conditions
Suggestion : vérifiez vos conditions.

"); + $("#debug_titre").after("

• Erreur de conditions
Suggestion : vérifiez vos conditions.

"); break; case "erreur_boucles": - $("#debug_titre").after("

• Erreur de boucles
Suggestion : vérifiez vos boucles.

"); + $("#debug_titre").after("

• Erreur de boucles
Suggestion : vérifiez vos boucles.

"); break; case "erreur_ti": - $("#debug_titre").after("

• Erreur de structure
Suggestion : vérifiez vos conditions et vos boucles.

"); + $("#debug_titre").after("

• Erreur de structure
Suggestion : vérifiez vos conditions et vos boucles.

"); break; default: - $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : " + erreur_syntaxe[4 * a + 2] + " au contexte.
Suggestion : remplacer \"" + erreur_syntaxe[4 * a + 1] + "\" par " + erreur_syntaxe[4 * a] + ".

"); + $("#debug_titre").after("

• ligne " + erreur_syntaxe[4 * a + 3] + " : " + erreur_syntaxe[4 * a + 2] + " au contexte.
Suggestion : remplacer \"" + erreur_syntaxe[4 * a + 1] + "\" par " + erreur_syntaxe[4 * a] + ".

"); expression = erreur_syntaxe[4 * a + 1]; break; } diff --git a/assets/js/menus.js b/assets/js/menus.js index 443aeb0..d846863 100644 --- a/assets/js/menus.js +++ b/assets/js/menus.js @@ -1,6 +1,6 @@ $(document).ready(function() { function hide_onglet() { - $('nav').append(""); + $('nav').append(""); $('#onglet1').hide(); $('#onglet2').hide(); diff --git a/design_forum/images/black_40p.png b/design_forum/images/black_40p.png deleted file mode 100644 index 84feff1..0000000 Binary files a/design_forum/images/black_40p.png and /dev/null differ diff --git a/design_forum/images/bluec_30p.png b/design_forum/images/bluec_30p.png deleted file mode 100644 index 976e3d1..0000000 Binary files a/design_forum/images/bluec_30p.png and /dev/null differ diff --git a/design_forum/images/button.png b/design_forum/images/button.png deleted file mode 100644 index 19cb97b..0000000 Binary files a/design_forum/images/button.png and /dev/null differ diff --git a/design_forum/images/delete.png b/design_forum/images/delete.png deleted file mode 100644 index b42198f..0000000 Binary files a/design_forum/images/delete.png and /dev/null differ diff --git a/design_forum/images/down.png b/design_forum/images/down.png deleted file mode 100644 index 0c82616..0000000 Binary files a/design_forum/images/down.png and /dev/null differ diff --git a/design_forum/images/edit.png b/design_forum/images/edit.png deleted file mode 100644 index 1f825ea..0000000 Binary files a/design_forum/images/edit.png and /dev/null differ diff --git a/design_forum/images/up.png b/design_forum/images/up.png deleted file mode 100644 index 931e0aa..0000000 Binary files a/design_forum/images/up.png and /dev/null differ diff --git a/design_forum/style.css b/design_forum/style.css deleted file mode 100644 index e9aa341..0000000 --- a/design_forum/style.css +++ /dev/null @@ -1,268 +0,0 @@ -/*****************************************************/ -/****General****/ -/** -{ - margin:0px; - padding:0px; -}*/ - -a -{ - text-decoration:none; - color:#333333; -} -a:hover -{ - color:#000000; -} -img, table, tr, td -{ - border:0px; -} -h1 -{ - text-align:center; - margin:0px; - padding:0px; -} -.clean -{ - clear:both; -} -.left -{ - text-align:left; -} -.center -{ - text-align:center; -} -input[type=text], input[type=submit], input[type=button], input[type=password] -{ - width:150px; -} -input[type=submit] -{ - margin-top: 10px; -} -label -{ - width: 200px; - display: inline-block; - vertical-align: top; - text-align: left; - margin-bottom: 8px; -} -#se_souvenir -{ - width: 351px; -} -.message_buttons input -{ - width:auto; - padding:0px 5px; -} -.button -{ - padding:5px 15px; - vertical-align:middle; - border:1px solid #aaaaaa; - font-weight:bold; - background:url('Images/button.png') repeat-x; - -moz-border-radius:6px; - -webkit-border-radius:6px; - border-radius:6px; - display:inline-block; -} - -#content table -{ - border-spacing:0px; - background:#ffffff; - padding:0px; - width:95%; - margin:5px auto 18px auto; - background-color: rgb(241, 189, 23); - border: solid; - border-width: 4px; - border-radius: 10px; - border-color: rgb(233, 153, 10); -} -tr -{ - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - margin:0px; -} -td, th -{ - margin:0px; - border:0px; - padding:3px; - text-align:center; -} -/*****************************************************/ -/****Blocks****/ -.header -{ - margin:auto; - margin-top:10px; - padding:15px; - background:url('Images/bluec_30p.png'); - width:60%; - -moz-border-radius:20px; - -webkit-border-radius:20px; - border-radius:20px; - text-align:center; -} -.foot -{ - text-align:center; - background:url('Images/bluec_30p.png'); - width:60%; - -moz-border-radius:15px; - -webkit-border-radius:15px; - border-radius:15px; - padding:10px; - margin:20px auto; -} -.content -{ - background-color: #FFD745; - border: solid; - border-width: 4px; - border-color: #FAC801; - font-family: 'Crete Round', serif; - margin-left: 45px; - margin-right: 45px; - border-radius:20px; - padding:20px; - margin-top:10px; -} -.box_left -{ - float:left; -} -.box_right -{ - float:right; -} -.box -{ - border: solid; - border-width: 4px; - border-radius: 10px; - border-color: #FAC801; - margin:5px auto 30px auto; - padding: 5px 10px 5px 10px; -} -.login -{ - width:355px; - margin:auto; - text-align:left; -} -.box_login -{ - background-color: rgb(250, 184, 43); - border: solid; - border-width: 4px; - border-color: rgb(247, 154, 14); - width:360px; - -moz-border-radius:10px; - -webkit-border-radius:10px; - border-radius:10px; - margin:auto; - padding:20px; - margin-top:20px; - margin-bottom: 38px; - color:#ffffff; -} -/*****************************************************/ -/****Content****/ - -.champs -{ - margin-bottom: 8px; -} - -#memorize -{ - position: absolute; - top: 419px; - left: 510px; -} - -.big -{ - font-size:1.2em; -} -.small -{ - font-size:0.7em; -} -.message -{ - -moz-border-radius:20px; - -webkit-border-radius:20px; - border-radius:20px; - padding:20px; - margin:auto; - width:500px; - background:url('Images/black_40p.png'); - color:#ffffff; - text-align:center; - font-weight:bold; - margin-top:20px; -} -.messages_table td -{ - border-top:1px solid #cccccc; - vertical-align:top; -} -.author -{ - width:150px; - border-right:1px solid #cccccc; -} -.title_cell -{ - width:45%; -} -.date -{ - font-style:italic; - text-align:right; - font-size:0.9em; - margin-right:10px; -} -.edit -{ - float:left; -} -.forum_ntop, .forum_nrep, .forum_act, .forum_auth -{ - width:100px; -} -td.forum_cat, td.forum_tops -{ - padding-left:15px; - text-align:left; -} -.categories_table td, .categories_table th, .topics_table td, .topics_table th, .list_pm td, .list_pm th -{ - border-bottom:1px solid #cccccc; -} -.categories_table tr:last-child td, .topics_table tr:last-child td, .list_pm tr:last-child td -{ - border-bottom:0px; -} -td.forum_cat .title -{ - font-weight:bold; -} -td.forum_cat .description -{ - padding-left:5px; -} diff --git a/exemples.php b/exemples.php index 2903266..35a626f 100644 --- a/exemples.php +++ b/exemples.php @@ -128,11 +128,11 @@ L\'aire du quart de disque est Pi/4 et la fréquence d\'apparition du point dans - - + + - + Festiv'Algo - Exemples d'algorithmes @@ -153,7 +153,7 @@ L\'aire du quart de disque est Pi/4 et la fréquence d\'apparition du point dans

Description :


- +
diff --git a/includes/bas_de_page.php b/includes/bas_de_page.php index 053e0fd..7ab91d9 100644 --- a/includes/bas_de_page.php +++ b/includes/bas_de_page.php @@ -1,11 +1,11 @@