Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Retouches après série de merges

Browse Source 
(cherry picked from commit 6751a8a9cf)

Conflicts:
	adminstuds.php
	app/classes/Framadate/Utils.php
	creation_sondage.php
This commit is contained in:
FramaJosephK 2014-12-03 14:30:25 +01:00 committed by Olivier PEREZ
parent 381c4444e3
commit 35ba152199
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/classes/Framadate/Utils.php
View File

@ -19,9 +19,9 @@
namespace Framadate;
class Utils {
/**
* @return string Server name
*/
/**
* @return string Server name
*/
public static function get_server_name() {
$scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
$port = in_array($_SERVER['SERVER_PORT'], [80, 443]) ? '' : ':' . $_SERVER['SERVER_PORT'];

4
install/error.html
View File

@ -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>

4
install/install.html
View File

@ -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>