Resolution du conflit
This commit is contained in:
MarguoNana
commit
985be95b0d
|
|
@ -1,25 +1,25 @@
|
|||
<header style="text-align:center">
|
||||
<a [routerLink]="'home'" class="home_link" aria-roledescription="home">
|
||||
<h1>
|
||||
<span class="logo_first">Frama</span>
|
||||
<span class="logo_second">date</span>
|
||||
</h1>
|
||||
<a [routerLink]="'home'" class="home_link" aria-roledescription="home">
|
||||
<h1>
|
||||
<span class="logo_first">Frama</span>
|
||||
<span class="logo_second">date</span>
|
||||
</h1>
|
||||
|
||||
</a>
|
||||
<div id="translate_example">
|
||||
<div class="lang-choices">
|
||||
<button class="btn btn-info" (click)="switchLanguage('en')">en</button>
|
||||
<button class="btn btn-info" (click)="switchLanguage('fr')">fr</button>
|
||||
</div>
|
||||
</a>
|
||||
<div id="translate_example">
|
||||
<div class="lang-choices">
|
||||
<button class="btn btn-info" (click)="switchLanguage('en')">en</button>
|
||||
<button class="btn btn-info" (click)="switchLanguage('fr')">fr</button>
|
||||
</div>
|
||||
<h1 i18n>{{"Title"|translate}}</h1>
|
||||
<div>
|
||||
{{"Intro"|translate:user}}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{{"Intro"|translate:user}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</header>
|
||||
<framadate-navigation></framadate-navigation>
|
||||
<main>
|
||||
<router-outlet></router-outlet>
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
<framadate-debugger></framadate-debugger>
|
||||
|
|
|
|||
|
|
@ -1,36 +1,35 @@
|
|||
<div class="well debug">
|
||||
|
||||
<strong>
|
||||
<h2 i18n>
|
||||
infos de debug
|
||||
</h2>
|
||||
<span class="demo">
|
||||
{{"config.demo"|translate}}
|
||||
</span>
|
||||
</strong>
|
||||
<ul>
|
||||
<li>
|
||||
étape actuelle {{config.step}} / {{config.stepMax}}
|
||||
</li>
|
||||
<li>
|
||||
formulaire valide : {{formIsValid}}
|
||||
</li>
|
||||
<li>
|
||||
type de formulaire: {{config.pollType}}
|
||||
</li>
|
||||
<li>
|
||||
config:
|
||||
<pre>
|
||||
{{config|json}}
|
||||
</pre>
|
||||
</li>
|
||||
</ul>
|
||||
<strong>
|
||||
<h2 i18n>
|
||||
infos de debug
|
||||
</h2>
|
||||
<span class="demo">
|
||||
{{"config.demo"|translate}}
|
||||
</span>
|
||||
</strong>
|
||||
<ul>
|
||||
<li>
|
||||
étape actuelle {{config.step}} / {{config.stepMax}}
|
||||
</li>
|
||||
<li>
|
||||
formulaire valide : {{formIsValid}}
|
||||
</li>
|
||||
<li>
|
||||
type de formulaire: {{config.pollType}}
|
||||
</li>
|
||||
<li>
|
||||
config:
|
||||
<pre>
|
||||
{{config|json}}
|
||||
</pre>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<button
|
||||
class="btn"
|
||||
i18n
|
||||
(click)="config.sendForm()"
|
||||
class="btn"
|
||||
i18n
|
||||
(click)="config.sendForm()"
|
||||
>
|
||||
Envoyer le formulaire
|
||||
Envoyer le formulaire
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
<div class="answers">
|
||||
<h1 i18n>
|
||||
Choisir les propositions
|
||||
</h1>
|
||||
<h1 i18n>
|
||||
Choisir les propositions
|
||||
</h1>
|
||||
|
||||
<p class="subtitle" i18n>
|
||||
vous pouvez utiliser la syntaxe markdown
|
||||
</p>
|
||||
<p class="subtitle" i18n>
|
||||
vous pouvez utiliser la syntaxe markdown
|
||||
</p>
|
||||
|
||||
<ol>
|
||||
<li #answers *ngFor="let answer of config.answers; index as i;trackBy trackFunction"
|
||||
class="answer-item">
|
||||
<input
|
||||
[(ngModel)]="answer.text"
|
||||
class="answer"
|
||||
placeholder="réponse"
|
||||
type="text"
|
||||
>
|
||||
<button (click)="config.answers.splice(i,1)">X</button>
|
||||
</li>
|
||||
</ol>
|
||||
<ol>
|
||||
<li #answers *ngFor="let answer of config.answers; index as i;trackBy trackFunction"
|
||||
class="answer-item">
|
||||
<input
|
||||
[(ngModel)]="answer.text"
|
||||
class="answer"
|
||||
placeholder="réponse"
|
||||
type="text"
|
||||
>
|
||||
<button (click)="config.answers.splice(i,1)">X</button>
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<button
|
||||
(click)="addAnswer()"
|
||||
class="btn-outline btn-block"
|
||||
i18n>
|
||||
Ajouter
|
||||
</button>
|
||||
<button
|
||||
(click)="addAnswer()"
|
||||
class="btn-outline btn-block"
|
||||
i18n>
|
||||
Ajouter
|
||||
</button>
|
||||
|
||||
<a [routerLink]="'/step/resume'" class="btn btn-block" i18n>Voyons ce que ça donne</a>
|
||||
<a [routerLink]="'/step/resume'" class="btn btn-block" i18n>Voyons ce que ça donne</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<h1>Ce composant est celui de base pour les pages</h1>
|
||||
<a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">
|
||||
{{"config.perfect"|translate}}
|
||||
{{"config.perfect"|translate}}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1,54 +1,54 @@
|
|||
<section class="creation">
|
||||
<h1>
|
||||
{{"creation.title"|translate}}
|
||||
</h1>
|
||||
<p
|
||||
class="description"
|
||||
i18n
|
||||
>
|
||||
{{"config.title"|translate}}
|
||||
</p>
|
||||
<div class="btn-next">
|
||||
<a
|
||||
[routerLink]="'/home'"
|
||||
>
|
||||
<h1>
|
||||
{{"creation.title"|translate}}
|
||||
</h1>
|
||||
<p
|
||||
class="description"
|
||||
i18n
|
||||
>
|
||||
{{"config.title"|translate}}
|
||||
</p>
|
||||
<div class="btn-next">
|
||||
<a
|
||||
[routerLink]="'/home'"
|
||||
>
|
||||
<span
|
||||
class="text"
|
||||
i18n
|
||||
>
|
||||
class="text"
|
||||
i18n
|
||||
>
|
||||
{{"config.letsgo"|translate}}
|
||||
</span>
|
||||
<span class="icon right">
|
||||
<span class="icon right">
|
||||
>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</section>
|
||||
<section class="recuperation">
|
||||
<h1>
|
||||
{{"config.find_my_polls"|translate}}
|
||||
</h1>
|
||||
<form
|
||||
action="https://framadate.org/find_polls.php"
|
||||
method="post"
|
||||
>
|
||||
<label
|
||||
class="description"
|
||||
for="email"
|
||||
i18n
|
||||
>
|
||||
{{"config.find_helper"|translate}} :
|
||||
</label>
|
||||
<input
|
||||
type="email"
|
||||
name="mail"
|
||||
id="email"
|
||||
autofocus="autofocus"
|
||||
/>
|
||||
<input
|
||||
type="submit"
|
||||
class="btn btn-block"
|
||||
i18n-value="'config.find_button'|translate"
|
||||
/>
|
||||
</form>
|
||||
<h1>
|
||||
{{"config.find_my_polls"|translate}}
|
||||
</h1>
|
||||
<form
|
||||
action="https://framadate.org/find_polls.php"
|
||||
method="post"
|
||||
>
|
||||
<label
|
||||
class="description"
|
||||
for="email"
|
||||
i18n
|
||||
>
|
||||
{{"config.find_helper"|translate}} :
|
||||
</label>
|
||||
<input
|
||||
type="email"
|
||||
name="mail"
|
||||
id="email"
|
||||
autofocus="autofocus"
|
||||
/>
|
||||
<input
|
||||
type="submit"
|
||||
class="btn btn-block"
|
||||
i18n-value="'config.find_button'|translate"
|
||||
/>
|
||||
</form>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<div i18n>
|
||||
{{"dates.title"|translate}}
|
||||
{{"dates.title"|translate}}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="multi_hours">
|
||||
<label for="multi_hours">
|
||||
<span i18n>
|
||||
Je souhaite mettre des créneaux horaires
|
||||
</span>
|
||||
|
|
@ -18,39 +18,39 @@
|
|||
<span i18n>
|
||||
pour chaque journée
|
||||
</span>
|
||||
</label>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<button
|
||||
class="btn btn-primary"
|
||||
(click)="addDate()"
|
||||
i18n
|
||||
class="btn btn-primary"
|
||||
(click)="addDate()"
|
||||
i18n
|
||||
>
|
||||
{{"dates.add"|translate}}
|
||||
{{"dates.add"|translate}}
|
||||
</button>
|
||||
<div class="dates-list">
|
||||
{{config.dateList.length}}
|
||||
<span i18n>
|
||||
{{"dates.count_dates"|translate}}
|
||||
</span>
|
||||
{{config.dateList.length}}
|
||||
<span i18n>
|
||||
{{"dates.count_dates"|translate}}
|
||||
</span>
|
||||
|
||||
<div
|
||||
*ngFor="let choice of config.dateList; index as id"
|
||||
class="date-choice"
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
name="dateChoices[]"
|
||||
[(ngModel)]="choice.literal"
|
||||
>
|
||||
<div
|
||||
*ngFor="let choice of config.dateList; index as id"
|
||||
class="date-choice"
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
name="dateChoices[]"
|
||||
[(ngModel)]="choice.literal"
|
||||
>
|
||||
|
||||
<button (click)="config.dateList.splice(id, 1)">X</button>
|
||||
</div>
|
||||
<button (click)="config.dateList.splice(id, 1)">X</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a
|
||||
[routerLink]="'/step/end'"
|
||||
class="btn btn-block"
|
||||
[routerLink]="'/step/end'"
|
||||
class="btn btn-block"
|
||||
>
|
||||
C'est parfait!
|
||||
C'est parfait!
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<h1 i18n>
|
||||
{{"resume.title"|translate}}
|
||||
{{"resume.title"|translate}}
|
||||
</h1>
|
||||
<h2 i18n>{{"resume.admins"|translate}}</h2>
|
||||
<h2 i18n>{{"resume.users"|translate}}</h2>
|
||||
|
|
|
|||
|
|
@ -1,85 +1,86 @@
|
|||
<div class="description">
|
||||
<router-outlet></router-outlet>
|
||||
<h1 i18n>
|
||||
{{"creation.title"|translate}}
|
||||
</h1>
|
||||
<span
|
||||
class="pre-selector"
|
||||
i18n
|
||||
>
|
||||
{{"creation.want"|translate}}
|
||||
</span>
|
||||
<select
|
||||
id="selector"
|
||||
name="selector"
|
||||
autofocus="autofocus"
|
||||
[(ngModel)]="config.pollType"
|
||||
>
|
||||
<option value="dates">
|
||||
{{"creation.kind.date"|translate}}
|
||||
</option>
|
||||
<option value="classic">
|
||||
{{"creation.kind.classic"|translate}}
|
||||
</option>
|
||||
</select>
|
||||
|
||||
<router-outlet></router-outlet>
|
||||
<h1 i18n>
|
||||
{{"creation.title"|translate}}
|
||||
</h1>
|
||||
<span
|
||||
class="pre-selector"
|
||||
i18n
|
||||
>
|
||||
{{"creation.want"|translate}}
|
||||
</span>
|
||||
<select
|
||||
id="selector"
|
||||
name="selector"
|
||||
autofocus="autofocus"
|
||||
[(ngModel)]="config.pollType"
|
||||
>
|
||||
<option value="dates">
|
||||
{{"creation.kind.date"|translate}}
|
||||
</option>
|
||||
<option value="classic">
|
||||
{{"creation.kind.classic"|translate}}
|
||||
</option>
|
||||
</select>
|
||||
<span class="post-selector">
|
||||
</span>
|
||||
<div>
|
||||
<span class="post-selector">
|
||||
</span>
|
||||
|
||||
<label
|
||||
for="poll_title"
|
||||
class="title-label"
|
||||
i18n
|
||||
>
|
||||
{{"creation.choose_title"|translate}}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
id="poll_title"
|
||||
name="poll_title"
|
||||
placeholder="titre"
|
||||
[(ngModel)]="config.title"
|
||||
>
|
||||
<div>
|
||||
|
||||
</div>
|
||||
<div>
|
||||
<label for="my_name">
|
||||
{{"creation.name"|translate}} :
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
name="my_name"
|
||||
id="my_name"
|
||||
placeholder="mon nom"
|
||||
[(ngModel)]="config.myName"
|
||||
>
|
||||
</div>
|
||||
<div>
|
||||
<label
|
||||
for="poll_description"
|
||||
class="title-label"
|
||||
i18n
|
||||
>
|
||||
{{"creation.description"|translate}}
|
||||
</label>
|
||||
<textarea
|
||||
id="poll_description"
|
||||
name="poll_description"
|
||||
[(ngModel)]="config.description"
|
||||
placeholder="description"
|
||||
cols="50"
|
||||
lines="5"
|
||||
></textarea>
|
||||
<label
|
||||
for="poll_title"
|
||||
class="title-label"
|
||||
i18n
|
||||
>
|
||||
{{"creation.choose_title"|translate}}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
id="poll_title"
|
||||
name="poll_title"
|
||||
placeholder="titre"
|
||||
[(ngModel)]="config.title"
|
||||
>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div>
|
||||
<label for="my_name">
|
||||
{{"creation.name"|translate}} :
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
name="my_name"
|
||||
id="my_name"
|
||||
placeholder="mon nom"
|
||||
[(ngModel)]="config.myName"
|
||||
>
|
||||
</div>
|
||||
|
||||
<a
|
||||
[routerLink]="'/step/answers'"
|
||||
class="btn btn-block"
|
||||
i18n
|
||||
>
|
||||
Continuer
|
||||
</a>
|
||||
<hr>
|
||||
<div>
|
||||
<label
|
||||
for="poll_description"
|
||||
class="title-label"
|
||||
i18n
|
||||
>
|
||||
{{"creation.description"|translate}}
|
||||
</label>
|
||||
<textarea
|
||||
id="poll_description"
|
||||
name="poll_description"
|
||||
[(ngModel)]="config.description"
|
||||
placeholder="description"
|
||||
cols="50"
|
||||
lines="5"
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
<a
|
||||
[routerLink]="'/step/answers'"
|
||||
class="btn btn-block"
|
||||
i18n
|
||||
>
|
||||
Continuer
|
||||
</a>
|
||||
<hr>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<!--ceci est la popup pour ajouter une image-->
|
||||
<h1 i18n>
|
||||
Images
|
||||
Images
|
||||
</h1>
|
||||
<a [routerLink]="'/step/visibility'" class="btn btn-block">ok</a>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<h1 i18n>
|
||||
Résumé avant validation
|
||||
Résumé avant validation
|
||||
</h1>
|
||||
<section>
|
||||
<div markdown *ngFor="let questions of config.answers">
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
<h1 i18n>
|
||||
{{"visibility.title"|translate}}
|
||||
{{"visibility.title"|translate}}
|
||||
</h1>
|
||||
<h1 i18n>
|
||||
{{"visibility.votes"|translate}}
|
||||
{{"visibility.votes"|translate}}
|
||||
</h1>
|
||||
<h1 i18n>
|
||||
{{"visibility.archiving"|translate}}
|
||||
{{"visibility.archiving"|translate}}
|
||||
</h1>
|
||||
|
||||
<h1 i18n>
|
||||
{{"visibility.access"|translate}}
|
||||
{{"visibility.access"|translate}}
|
||||
</h1>
|
||||
<a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">C'est parfait!</a>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Framadate</title>
|
||||
<base href="/">
|
||||
<meta charset="utf-8">
|
||||
<title>Framadate</title>
|
||||
<base href="/">
|
||||
|
||||
<meta content="width=device-width, initial-scale=1" name="viewport">
|
||||
<link href="favicon.ico" rel="icon" type="image/x-icon">
|
||||
<meta content="width=device-width, initial-scale=1" name="viewport">
|
||||
<link href="favicon.ico" rel="icon" type="image/x-icon">
|
||||
|
||||
<link rel="stylesheet" href="assets/css/bootstrap-reboot-4.3.1.css">
|
||||
<link rel="stylesheet" href="assets/css/bootstrap-reboot-4.3.1.css">
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
<app-root></app-root>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in New Issue