'; diff --git a/choix_autre.php b/choix_autre.php index f854120..54b45b3 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -35,7 +35,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp echo '
-

' . _("You haven't filled the first section of the poll creation.") . ' !

+

' . _("You haven't filled the first section of the poll creation.") . ' !

' . _("Back to the homepage of ") . ' ' . NOMAPPLICATION . '

'."\n"; @@ -133,7 +133,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
-

'. _("List of your choices").'

+

'. _("List of your choices").'

'. $summary .'
diff --git a/choix_date.php b/choix_date.php index 9302de1..dcb9b1d 100644 --- a/choix_date.php +++ b/choix_date.php @@ -36,7 +36,7 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress echo '
-

' . _("You haven't filled the first section of the poll creation.") . ' !

+

' . _("You haven't filled the first section of the poll creation.") . ' !

' . _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.

'; @@ -144,9 +144,9 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
-

'. _("Confirm the creation of your poll") .'

+

'. _("Confirm the creation of your poll") .'

-

'. _("List of your choices").'

+

'. _("List of your choices").'

'. $summary .'
@@ -185,7 +185,7 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
-

'. _("Choose the dates of your poll") .'

+

'. _("Choose the dates of your poll") .'

'. _("To schedule an event you need to propose at least two choices (two hours for one day or two days).").'

'. _("You can add or remove additionnal days and hours with the buttons") .' '. _("Remove") .' '. _("Add") .'

@@ -218,8 +218,8 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress } echo '
- - + +
'; @@ -228,8 +228,8 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
- - + +
diff --git a/css/frama.css b/css/frama.css index 4c43753..c683d2c 100644 --- a/css/frama.css +++ b/css/frama.css @@ -3,7 +3,6 @@ .text-muted a, a.text-muted { color: #767676; - border-color: #767676; } .text-muted a:hover, @@ -11,78 +10,61 @@ a.text-muted { a.text-muted:hover, a.text-muted:focus { color: #5e5e5e; - border-color:#5e5e5e; - border-bottom-style:solid; } .text-primary, .text-primary a, a.text-primary { color: #6A5687; - border-color: #6A5687; } .text-primary a:hover, .text-primary a:focus, a.text-primary:hover, a.text-primary:focus { color: #583C66; - border-color: #583C66; - border-bottom-style:solid; } .text-success, .text-success a, a.text-success { color: #606E38; - border-color: #606E38; } .text-success a:hover, .text-success a:focus, a.text-success:hover, a.text-success:focus { color: #67753C; - border-color: #67753C; - border-bottom-style:solid; } .text-info, .text-info a, a.text-info { color: #31748F; - border-color: #31748F; } .text-info a:hover, .text-info a:focus, a.text-info:hover, a.text-info:focus { color: #245569; - border-color: #31748F; - border-bottom-style:solid; } .text-warning, .text-warning a, a.text-warning { color: #8A6E3B; - border-color: #8A6E3B; } .text-warning a:hover, .text-warning a:focus, a.text-warning:hover, a.text-warning:focus { color: #66522C; - border-color: #66522C; - border-bottom-style:solid; } .text-danger, .text-danger a, a.text-danger { color: #A94E42; - border-color: #A94E42; } .text-danger a:hover, .text-danger a:focus, a.text-danger:hover, a.text-danger:focus { color: #843D34; - border-color: #843D34; - border-bottom-style:solid; } /* Background */ @@ -92,7 +74,6 @@ a.bg-primary:focus, a.bg-primary:hover { color: #fff; background-color: #6A5687; - border-color:#fff; } .bg-success, a.bg-success:hover { background-color: #EAF0D8; @@ -448,3 +429,8 @@ fieldset[disabled] .btn-link:focus { background-color: #767676; } +/* Modal header title */ +.modal-header h1,.modal-header h2,.modal-header h3, +.modal-header h4,.modal-header h5,.modal-header h6 { + font-size: 24px; +} diff --git a/index.php b/index.php index 301b52e..337e890 100644 --- a/index.php +++ b/index.php @@ -53,7 +53,7 @@ echo '
-

'. _('What is that?') . '

+

'. _('What is that?') . '

'. _('Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.') .'

'. _('Here is how it works:') . '

@@ -66,7 +66,7 @@ echo '

'. _('Do you want to ') . ''. _("view an example?") .'

-

'. _('The software') .'

+

'. _('The software') .'

'. _('Framadate was initially based on '). 'Studs'. _(' a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft') .'.

'. _('This software needs javascript and cookies enabled. It is compatible with the following web browsers:') .'

@@ -80,7 +80,7 @@ echo '

'. _('It is governed by the ').''. _('CeCILL-B license').'.

-

'. _('Cultivate your garden') .'

+

'. _('Cultivate your garden') .'

'. _('To participate in the software development, suggest improvements or simply download it, please visit ') .''._('the development site').'.


diff --git a/infos_sondage.php b/infos_sondage.php index d1ddbf0..dc65d4d 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -190,13 +190,13 @@ if (!$_SESSION["adresse"] && Utils::issetAndNoEmpty("poursuivre")) { if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) { $input_name = ''.stripslashes($_SESSION["nom"]); } else { - $input_name = ''; + $input_name = ''; } if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) { $input_email = ''.$_SESSION["adresse"]; } else { - $input_email = ''; + $input_email = ''; } // Checkbox checked ? @@ -215,7 +215,7 @@ if ($_SESSION["mailsonde"]) { // Affichage du formulaire echo '
-
+
@@ -223,29 +223,29 @@ echo '
- -
- + +
+
'.$errors['title']['msg'].'
- -
+ +
'.$errors['description']['msg'].'
- -
+ +
'.$input_name.'
'.$errors['name']['msg'].'
- -
+ +
'.$input_email.'
diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo index 20cbded..5aa0f96 100644 Binary files a/locale/de_DE/LC_MESSAGES/Studs.mo and b/locale/de_DE/LC_MESSAGES/Studs.mo differ diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index 43a43a8..ed66bf3 100644 Binary files a/locale/en_GB/LC_MESSAGES/Studs.mo and b/locale/en_GB/LC_MESSAGES/Studs.mo differ diff --git a/locale/es_ES/LC_MESSAGES/Studs.mo b/locale/es_ES/LC_MESSAGES/Studs.mo index 6e907e6..54fc228 100644 Binary files a/locale/es_ES/LC_MESSAGES/Studs.mo and b/locale/es_ES/LC_MESSAGES/Studs.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index 9b41a38..95ecc91 100644 Binary files a/locale/fr_FR/LC_MESSAGES/Studs.mo and b/locale/fr_FR/LC_MESSAGES/Studs.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index c3879df..5de3587 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -28,7 +28,7 @@ msgid "Poll" msgstr "Sondage" msgid "Save" -msgstr "Enregister" +msgstr "Enregistrer" msgid "Cancel" msgstr "Annuler" diff --git a/studs.php b/studs.php index 4be6dc5..dcd5081 100644 --- a/studs.php +++ b/studs.php @@ -209,7 +209,7 @@ if($err != 0) { } else { Utils::print_header(_('Poll').' - '.$dsondage->titre); - bandeau_titre(_("Make your polls")); + bandeau_titre(_('Poll').' - '.$dsondage->titre); } $title=stripslashes(str_replace("\\","",$dsondage->titre)); @@ -217,7 +217,7 @@ echo '
-

'.$title.'

+

'.$title.'

@@ -229,7 +229,7 @@ echo '
-

'. _("Initiator of the poll") .'

+

'. _("Initiator of the poll") .'

'.stripslashes($dsondage->nom_admin).'

@@ -458,6 +458,7 @@ echo'
+

'._('Votes of the poll ').'