Retouches après série de merges
(cherry picked from commit 6751a8a9cf
)
Conflicts:
adminstuds.php
app/classes/Framadate/Utils.php
creation_sondage.php
This commit is contained in:
parent
381c4444e3
commit
35ba152199
@ -12,13 +12,13 @@
|
||||
<div class="container ombre">
|
||||
<header role="banner">
|
||||
<h1>
|
||||
<img src="../images/logo-framadate.png" width="360" height="50" alt="OpenSondage" />
|
||||
<img src="../images/logo-framadate.png" width="360" height="50" alt="Framadate" />
|
||||
</h1>
|
||||
<h2>Make your polls</h2>
|
||||
<hr class="trait" role="presentation">
|
||||
</header>
|
||||
<main role="main">
|
||||
<h3>OpenSondage Installation</h3>
|
||||
<h3>Framadate Installation</h3>
|
||||
<div class="alert alert-danger" role="alert">
|
||||
<?php echo htmlspecialchars($e->getMessage(), ENT_COMPAT | ENT_HTML401, 'UTF-8') ?>
|
||||
</div>
|
||||
|
@ -12,13 +12,13 @@
|
||||
<div class="container ombre">
|
||||
<header role="banner">
|
||||
<h1>
|
||||
<img src="../images/logo-framadate.png" width="360" height="50" alt="OpenSondage" />
|
||||
<img src="../images/logo-framadate.png" width="360" height="50" alt="Framadate" />
|
||||
</h1>
|
||||
<h2>Make your polls</h2>
|
||||
<hr class="trait" role="presentation">
|
||||
</header>
|
||||
<main role="main">
|
||||
<h3>OpenSondage Installation</h3>
|
||||
<h3>Framadate Installation</h3>
|
||||
<form action="" method="post" role="form">
|
||||
<fieldset>
|
||||
<legend>General</legend>
|
||||
|
Loading…
Reference in New Issue
Block a user