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

Cleanup some invalid HTML 

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-12-17 14:05:19 +01:00
parent 3b9dcd8085
commit 9c969f8896
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
18 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/check.php
View File

@ -182,7 +182,7 @@ usort($messages, 'compareCheckMessage');
<body> <body>
<div class="container ombre"> <div class="container ombre">
<div class="row"> <div class="row">
<form method="get" action="" class="hidden-print"> <form method="get" class="hidden-print">
<div class="input-group input-group-sm pull-right col-xs-12 col-sm-2"> <div class="input-group input-group-sm pull-right col-xs-12 col-sm-2">
<select name="lang" class="form-control" title="<?=__('Language selector', 'Select the language')?>" > <select name="lang" class="form-control" title="<?=__('Language selector', 'Select the language')?>" >
<?php foreach ($ALLOWED_LANGUAGES as $lang_key => $language) { ?> <?php foreach ($ALLOWED_LANGUAGES as $lang_key => $language) { ?>

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

@ -60,17 +60,17 @@ class Utils {
<link rel="stylesheet" href="' . self::get_server_name() . 'css/style.css" /> <link rel="stylesheet" href="' . self::get_server_name() . 'css/style.css" />
<link rel="stylesheet" href="' . self::get_server_name() . 'css/frama.css" /> <link rel="stylesheet" href="' . self::get_server_name() . 'css/frama.css" />
<link rel="stylesheet" href="' . self::get_server_name() . 'css/print.css" media="print" /> <link rel="stylesheet" href="' . self::get_server_name() . 'css/print.css" media="print" />
<script type="text/javascript" src="' . self::get_server_name() . 'js/jquery-1.12.4.min.js"></script> <script src="' . self::get_server_name() . 'js/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap.min.js"></script> <script src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>'; <script src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>';
if ('en' !== $locale) { if ('en' !== $locale) {
echo ' echo '
<script type="text/javascript" src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>'; <script src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>';
} }
echo ' echo '
<script type="text/javascript" src="' . self::get_server_name() . 'js/core.js"></script>'; <script src="' . self::get_server_name() . 'js/core.js"></script>';
if (is_file($_SERVER['DOCUMENT_ROOT'] . "/nav/nav.js")) { if (is_file($_SERVER['DOCUMENT_ROOT'] . "/nav/nav.js")) {
echo '<script src="/nav/nav.js" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->'; echo '<script src="/nav/nav.js" id="nav_js" charset="utf-8"></script><!-- /Framanav -->';
} }
echo ' echo '

2
bandeaux.php
View File

@ -28,7 +28,7 @@ function bandeau_titre($titre)
echo ' echo '
<header role="banner">'; <header role="banner">';
if(count($ALLOWED_LANGUAGES) > 1){ if(count($ALLOWED_LANGUAGES) > 1){
echo '<form method="post" action="" class="hidden-print"> echo '<form method="post" class="hidden-print">
<div class="input-group input-group-sm pull-right col-md-2 col-xs-4"> <div class="input-group input-group-sm pull-right col-md-2 col-xs-4">
<select name="lang" class="form-control" title="' . __('Language selector', 'Select the language') . '" >' . liste_lang() . '</select> <select name="lang" class="form-control" title="' . __('Language selector', 'Select the language') . '" >' . liste_lang() . '</select>
<span class="input-group-btn"> <span class="input-group-btn">

6
create_classic_poll.php
View File

@ -181,7 +181,7 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ?
bandeau_titre(__('Step 2 classic', 'Poll subjects (2 on 3)')); bandeau_titre(__('Step 2 classic', 'Poll subjects (2 on 3)'));
echo ' echo '
<form name="formulaire" action="' . Utils::get_server_name() . 'create_classic_poll.php" method="POST" class="form-horizontal" role="form"> <form name="formulaire" action="' . Utils::get_server_name() . 'create_classic_poll.php" method="POST" class="form-horizontal">
<div class="row"> <div class="row">
<div class="col-md-8 col-md-offset-2">'; <div class="col-md-8 col-md-offset-2">';
echo ' echo '
@ -255,8 +255,8 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ?
</div> </div>
</form> </form>
<script type="text/javascript" src="js/app/framadatepicker.js"></script> <script src="js/app/framadatepicker.js"></script>
<script type="text/javascript" src="js/app/classic_poll.js"></script> <script src="js/app/classic_poll.js"></script>
' . "\n"; ' . "\n";
bandeau_pied(); bandeau_pied();

6
tpl/add_column.tpl
View File

@ -1,13 +1,13 @@
{extends file='page.tpl'} {extends file='page.tpl'}
{block name="header"} {block name="header"}
<script type="text/javascript"> <script>
window.date_formats = { window.date_formats = {
DATE: '{__('Date', 'DATE')}', DATE: '{__('Date', 'DATE')}',
DATEPICKER: '{__('Date', 'datepicker')}' DATEPICKER: '{__('Date', 'datepicker')}'
}; };
</script> </script>
<script type="text/javascript" src="{'js/app/framadatepicker.js'|resource}"></script> <script src="{'js/app/framadatepicker.js'|resource}"></script>
{/block} {/block}
{block name=main} {block name=main}
@ -50,4 +50,4 @@
</div> </div>
</div> </div>
</form> </form>
{/block} {/block}

2
tpl/admin/install.tpl
View File

@ -3,7 +3,7 @@
{block 'main'} {block 'main'}
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<form action="" method="POST"> <form method="POST">
{if $error} {if $error}
<div id="result" class="alert alert-danger"> <div id="result" class="alert alert-danger">

6
tpl/admin/polls.tpl
View File

@ -1,14 +1,14 @@
{extends 'admin/admin_page.tpl'} {extends 'admin/admin_page.tpl'}
{block name="header"} {block name="header"}
<script src="{"js/app/admin/polls.js"|resource}" type="text/javascript"></script> <script src="{"js/app/admin/polls.js"|resource}"></script>
{/block} {/block}
{block 'admin_main'} {block 'admin_main'}
<div class="panel panel-default" id="poll_search"> <div class="panel panel-default" id="poll_search">
<div class="panel-heading">{__('Generic', 'Search')}</div> <div class="panel-heading">{__('Generic', 'Search')}</div>
<div class="panel-body" style="display: none;"> <div class="panel-body" style="display: none;">
<form action="" method="GET"> <form method="GET">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
@ -44,7 +44,7 @@
</div> </div>
</div> </div>
<form action="" method="POST"> <form method="POST">
<input type="hidden" name="csrf" value="{$crsf}"/> <input type="hidden" name="csrf" value="{$crsf}"/>
{if $poll_to_delete} {if $poll_to_delete}
<div class="alert alert-warning text-center"> <div class="alert alert-warning text-center">

2
tpl/admin/purge.tpl
View File

@ -4,7 +4,7 @@
{if $message} {if $message}
<div class="alert alert-dismissible alert-info" role="alert">{$message|html}<button type="button" class="close" data-dismiss="alert" aria-label="{__('Generic', 'Close')}"><span aria-hidden="true">&times;</span></button></div> <div class="alert alert-dismissible alert-info" role="alert">{$message|html}<button type="button" class="close" data-dismiss="alert" aria-label="{__('Generic', 'Close')}"><span aria-hidden="true">&times;</span></button></div>
{/if} {/if}
<form action="" method="POST"> <form method="POST">
<input type="hidden" name="csrf" value="{$crsf}"/> <input type="hidden" name="csrf" value="{$crsf}"/>
<div class="text-center"> <div class="text-center">
<button type="submit" name="action" value="purge" class="btn btn-danger">{__('Admin', 'Purge the polls')} <span class="glyphicon glyphicon-trash"></span></button> <button type="submit" name="action" value="purge" class="btn btn-danger">{__('Admin', 'Purge the polls')} <span class="glyphicon glyphicon-trash"></span></button>

8
tpl/create_classic_poll_step3.tpl
View File

@ -1,17 +1,17 @@
{extends file='page.tpl'} {extends file='page.tpl'}
{block name="header"} {block name="header"}
<script type="text/javascript"> <script>
window.date_formats = { window.date_formats = {
DATE: '{__('Date', 'DATE')}', DATE: '{__('Date', 'DATE')}',
DATEPICKER: '{__('Date', 'datepicker')}' DATEPICKER: '{__('Date', 'datepicker')}'
}; };
</script> </script>
<script type="text/javascript" src="{'js/app/framadatepicker.js'|resource}"></script> <script src="{'js/app/framadatepicker.js'|resource}"></script>
{/block} {/block}
{block name="main"} {block name="main"}
<form name="formulaire" method="POST" class="form-horizontal" role="form"> <form name="formulaire" method="POST" class="form-horizontal">
<div class="row"> <div class="row">
<div class="col-md-8 col-md-offset-2"> <div class="col-md-8 col-md-offset-2">
<div class="well summary"> <div class="well summary">
@ -45,4 +45,4 @@
</div> </div>
</div> </div>
</form> </form>
{/block} {/block}

8
tpl/create_date_poll_step_2.tpl
View File

@ -1,18 +1,18 @@
{extends file='page.tpl'} {extends file='page.tpl'}
{block name="header"} {block name="header"}
<script type="text/javascript"> <script>
window.date_formats = { window.date_formats = {
DATE: '{__('Date', 'DATE')}', DATE: '{__('Date', 'DATE')}',
DATEPICKER: '{__('Date', 'datepicker')}' DATEPICKER: '{__('Date', 'datepicker')}'
}; };
</script> </script>
<script type="text/javascript" src="{'js/app/framadatepicker.js'|resource}"></script> <script src="{'js/app/framadatepicker.js'|resource}"></script>
<script type="text/javascript" src="{'js/app/date_poll.js'|resource}"></script> <script src="{'js/app/date_poll.js'|resource}"></script>
{/block} {/block}
{block name=main} {block name=main}
<form name="formulaire" action="" method="POST" class="form-horizontal" role="form"> <form name="formulaire" method="POST" class="form-horizontal">
<div class="row" id="selected-days"> <div class="row" id="selected-days">
<div class="col-md-10 col-md-offset-1"> <div class="col-md-10 col-md-offset-1">
<h3>{__('Step 2 date', 'Choose the dates of your poll')}</h3> <h3>{__('Step 2 date', 'Choose the dates of your poll')}</h3>

14
tpl/create_poll.tpl
View File

@ -1,19 +1,19 @@
{extends file='page.tpl'} {extends file='page.tpl'}
{block name="header"} {block name="header"}
<script src="{"js/simplemde.min.js"|resource}" type="text/javascript"></script> <script src="{"js/easymde.min.js"|resource}"></script>
<script src="{"js/dompurify.js"|resource}" type="text/javascript"></script> <script src="{"js/dompurify.js"|resource}"></script>
<script src="{"js/mde-wrapper.js"|resource}" type="text/javascript"></script> <script src="{"js/mde-wrapper.js"|resource}"></script>
<script src="{"js/app/create_poll.js"|resource}" type="text/javascript"></script> <script src="{"js/app/create_poll.js"|resource}"></script>
<link rel="stylesheet" href="{"css/app/create_poll.css"|resource}"> <link rel="stylesheet" href="{"css/app/create_poll.css"|resource}">
<link rel="stylesheet" href="{"css/simplemde.min.css"|resource}"> <link rel="stylesheet" href="{"css/easymde.min.css"|resource}">
{/block} {/block}
{block name=main} {block name=main}
<div class="row" style="display:none" id="form-block"> <div class="row" style="display:none" id="form-block">
<div class="col-md-8 col-md-offset-2"> <div class="col-md-8 col-md-offset-2">
<form name="formulaire" id="formulaire" action="" method="POST" class="form-horizontal" role="form"> <form name="formulaire" id="formulaire" method="POST" class="form-horizontal">
<div class="alert alert-info"> <div class="alert alert-info">
<p> <p>
@ -335,7 +335,7 @@
class="btn btn-success">{__('Step 1', 'Go to step 2')}</button> class="btn btn-success">{__('Step 1', 'Go to step 2')}</button>
</p> </p>
<script type="text/javascript">document.formulaire.title.focus();</script> <script>document.formulaire.title.focus();</script>
</form> </form>
</div> </div>

2
tpl/find_polls.tpl
View File

@ -4,7 +4,7 @@
{if !empty($message)} {if !empty($message)}
<div class="alert alert-dismissible alert-{$message->type|html}" role="alert">{$message->message|html}{if $message->link != null}<br/><a href="{$message->link}">{$message->link}</a>{/if}<button type="button" class="close" data-dismiss="alert" aria-label="{__('Generic', 'Close')}"><span aria-hidden="true">&times;</span></button></div> <div class="alert alert-dismissible alert-{$message->type|html}" role="alert">{$message->message|html}{if $message->link != null}<br/><a href="{$message->link}">{$message->link}</a>{/if}<button type="button" class="close" data-dismiss="alert" aria-label="{__('Generic', 'Close')}"><span aria-hidden="true">&times;</span></button></div>
{/if} {/if}
<form action="" method="post"> <form method="post">
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-3 text-center"> <div class="col-md-6 col-md-offset-3 text-center">
<div class="form-group"> <div class="form-group">

6
tpl/header.tpl
View File

@ -1,6 +1,6 @@
<header role="banner" class="clearfix"> <header class="clearfix">
{if count($langs)>1} {if count($langs)>1}
<form method="post" action="" class="hidden-print"> <form method="post" class="hidden-print">
<div class="input-group input-group-sm pull-right col-xs-12 col-sm-2"> <div class="input-group input-group-sm pull-right col-xs-12 col-sm-2">
<select name="lang" class="form-control" title="{__('Language selector', 'Select the language')}" > <select name="lang" class="form-control" title="{__('Language selector', 'Select the language')}" >
{foreach $langs as $lang_key=>$lang_value} {foreach $langs as $lang_key=>$lang_value}
@ -22,4 +22,4 @@
{if !empty($title)}<h2 class="lead col-xs-12"><i>{$title|html}</i></h2>{/if} {if !empty($title)}<h2 class="lead col-xs-12"><i>{$title|html}</i></h2>{/if}
<div class="trait col-xs-12" role="presentation"></div> <div class="trait col-xs-12" role="presentation"></div>
</header> </header>
<main role="main"> <main>

12
tpl/page.tpl
View File

@ -23,20 +23,20 @@
{if $provide_fork_awesome} {if $provide_fork_awesome}
<link rel="stylesheet" href="{'css/fork-awesome.min.css'|resource}"> <link rel="stylesheet" href="{'css/fork-awesome.min.css'|resource}">
{/if} {/if}
<script type="text/javascript" src="{'js/jquery-1.12.4.min.js'|resource}"></script> <script src="{'js/jquery-1.12.4.min.js'|resource}"></script>
<script type="text/javascript" src="{'js/bootstrap.min.js'|resource}"></script> <script src="{'js/bootstrap.min.js'|resource}"></script>
<script type="text/javascript" src="{'js/bootstrap-datepicker.js'|resource}"></script> <script src="{'js/bootstrap-datepicker.js'|resource}"></script>
{if 'en' != $locale} {if 'en' != $locale}
<script type="text/javascript" src="{$locale|datepicker_path|resource}"></script> <script src="{$locale|datepicker_path|resource}"></script>
{/if} {/if}
<script type="text/javascript" src="{'js/core.js'|resource}"></script> <script src="{'js/core.js'|resource}"></script>
{block name="header"}{/block} {block name="header"}{/block}
</head> </head>
<body> <body>
{if $use_nav_js} {if $use_nav_js}
<script src="https://framasoft.org/nav/nav.js" type="text/javascript"></script> <script src="https://framasoft.org/nav/nav.js"></script>
{/if} {/if}
<div class="container ombre"> <div class="container ombre">

2
tpl/part/password_request.tpl
View File

@ -3,7 +3,7 @@
<div class="panel panel-danger password_request alert-danger"> <div class="panel panel-danger password_request alert-danger">
<div class="col-md-6 col-md-offset-3"> <div class="col-md-6 col-md-offset-3">
<form action="" method="POST" class="form-inline"> <form method="POST" class="form-inline">
<input type="hidden" name="poll" value="{$poll_id}"/> <input type="hidden" name="poll" value="{$poll_id}"/>
<div class="form-group"> <div class="form-group">
<label for="password" class="control-label">{__('Password', 'Password')}</label> <label for="password" class="control-label">{__('Password', 'Password')}</label>

2
tpl/part/vote_table_classic.tpl
View File

@ -255,7 +255,7 @@
</p> </p>
</div> </div>
</div> </div>
<script type="text/javascript"> <script>
$(document).ready(function () { $(document).ready(function () {
$('#showChart').on('click', function() { $('#showChart').on('click', function() {
$('#showChart') $('#showChart')

2
tpl/part/vote_table_date.tpl
View File

@ -319,7 +319,7 @@
</p> </p>
</div> </div>
</div> </div>
<script type="text/javascript"> <script>
$(document).ready(function () { $(document).ready(function () {
$('#showChart').on('click', function() { $('#showChart').on('click', function() {
$('#showChart') $('#showChart')

16
tpl/studs.tpl
View File

@ -1,17 +1,17 @@
{extends file='page.tpl'} {extends file='page.tpl'}
{block name="header"} {block name="header"}
<script src="{"js/Chart.min.js"|resource}" type="text/javascript"></script> <script src="{"js/Chart.min.js"|resource}"></script>
<script src="{"js/Chart.StackedBar.js"|resource}" type="text/javascript"></script> <script src="{"js/Chart.StackedBar.js"|resource}"></script>
<script src="{"js/app/studs.js"|resource}" type="text/javascript"></script> <script src="{"js/app/studs.js"|resource}"></script>
<link rel="stylesheet" href="{'css/jquery-ui.min.css'|resource}"> <link rel="stylesheet" href="{'css/jquery-ui.min.css'|resource}">
{if $admin} {if $admin}
<script src="{"js/simplemde.min.js"|resource}" type="text/javascript"></script> <script src="{"js/easymde.min.js"|resource}"></script>
<script src="{"js/dompurify.js"|resource}" type="text/javascript"></script> <script src="{"js/dompurify.js"|resource}"></script>
<script src="{"js/mde-wrapper.js"|resource}" type="text/javascript"></script> <script src="{"js/mde-wrapper.js"|resource}"></script>
<script src="{"js/app/adminstuds.js"|resource}" type="text/javascript"></script> <script src="{"js/app/adminstuds.js"|resource}"></script>
<link rel="stylesheet" href="{'css/simplemde.min.css'|resource}"> <link rel="stylesheet" href="{'css/easymde.min.css'|resource}">
{/if} {/if}
{/block} {/block}