diff --git a/.gitattributes b/.gitattributes index 6b04d0efe371d42c0e73a1afd86ad17de68f7d45..1cfdfaa53fc360b0b1cc0ec0258ff6e0d3102ec7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,6 +7,7 @@ dist/feed.png -text dist/fond/ajax.html -text dist/fond/ajax_fonctions.php -text dist/fond/ajax_stat.html -text +dist/formfx.css -text dist/formulaires/choix_mots.html -text dist/formulaires/editer_article.html -text dist/formulaires/editer_article.php -text diff --git a/dist/formfx.css b/dist/formfx.css new file mode 100644 index 0000000000000000000000000000000000000000..7af9be3049bf3cd5fe37f3a18191c7fda78735b7 --- /dev/null +++ b/dist/formfx.css @@ -0,0 +1,51 @@ +/* + * + * Style des formulaires .formfx + * Inspire de http://www.alistapart.com/articles/prettyaccessibleforms + * "Prettier Accessible Forms", by Nick Rigby + * + */ +.formfx form fieldset { + margin-bottom: 10px; +} +.formfx form legend { + padding: 0 2px; + font-weight: bold; +} +.formfx form label { + display: inline-block; + line-height: 1.8; + vertical-align: top; +} +.formfx form fieldset ol { + margin: 0; + padding: 0; +} +.formfx form fieldset li { + list-style: none; + padding: 5px; + margin: 0; +} +.formfx form fieldset fieldset { + border: none; + margin: 3px 0 0; +} +.formfx form fieldset fieldset legend { + padding: 0 0 5px; + font-weight: normal; +} +.formfx form fieldset fieldset label { + display: block; + width: auto; +} +.formfx form em { + font-weight: bold; + font-style: normal; + color: #f00; +} +.formfx form label { + width: 120px; /* Width of labels */ +} +.formfx form fieldset fieldset label { + margin-left: 123px; /* Width plus 3 (html space) */ +} \ No newline at end of file diff --git a/dist/inc-head.html b/dist/inc-head.html index 81dffbb9d1d6c957108aeea20fdc23daf47e7f7d..e4dba80a1afd554312b574332c268bf2f930b846 100644 --- a/dist/inc-head.html +++ b/dist/inc-head.html @@ -23,6 +23,9 @@ [(#REM) Feuille de style CSS pour l'impression ] [<link rel="stylesheet" href="(#CHEMIN{impression.css}|direction_css)" type="text/css" media="print" />] +[(#REM) Feuille de style CSS pour les formulaires ] +[<link rel="stylesheet" href="(#CHEMIN{formfx.css}|direction_css)" type="text/css" media="all" />] + [(#REM) Feuille de style personnalisee pour surcharger les precedentes A noter par defaut cette css n'existe pas ] diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php index d91db25e2cc74ae03ea94139db9522b4ad3e6a88..073843ee819bacb510d3d7266e62bd28ee0a2d46 100644 --- a/ecrire/inc/filtres.php +++ b/ecrire/inc/filtres.php @@ -2313,7 +2313,7 @@ function filtre_cache_static($scripts,$type='js'){ $dir = sous_repertoire(_DIR_VAR,'cache-'.$type); $nom = $dir . md5(serialize($scripts)) . ".$type"; if ( - $GLOBALS['var_mode']=='recalcul' + _request('var_mode') OR !file_exists($nom)){ $fichier = ""; $comms = array();