Merge branch 'tabs-in-html' into 'dev'

Format html templates with tabs

See merge request framasoft/framadate/funky-framadate-front!7
This commit is contained in:
ty kayn 2019-10-24 16:08:58 +02:00
commit fb67e99c76
12 changed files with 235 additions and 236 deletions

View File

@ -1,25 +1,25 @@
<header style="text-align:center"> <header style="text-align:center">
<a [routerLink]="'home'" class="home_link" aria-roledescription="home"> <a [routerLink]="'home'" class="home_link" aria-roledescription="home">
<h1> <h1>
<span class="logo_first">Frama</span> <span class="logo_first">Frama</span>
<span class="logo_second">date</span> <span class="logo_second">date</span>
</h1> </h1>
</a> </a>
<div id="translate_example"> <div id="translate_example">
<div class="lang-choices"> <div class="lang-choices">
<button class="btn btn-info" (click)="switchLanguage('en')">en</button> <button class="btn btn-info" (click)="switchLanguage('en')">en</button>
<button class="btn btn-info" (click)="switchLanguage('fr')">fr</button> <button class="btn btn-info" (click)="switchLanguage('fr')">fr</button>
</div> </div>
<h1 i18n>{{"Title"|translate}}</h1> <h1 i18n>{{"Title"|translate}}</h1>
<div> <div>
{{"Intro"|translate:user}} {{"Intro"|translate:user}}
</div> </div>
</div> </div>
</header> </header>
<framadate-navigation></framadate-navigation> <framadate-navigation></framadate-navigation>
<main> <main>
<router-outlet></router-outlet> <router-outlet></router-outlet>
</main> </main>
<framadate-debugger></framadate-debugger> <framadate-debugger></framadate-debugger>

View File

@ -1,36 +1,35 @@
<div class="well debug"> <div class="well debug">
<strong>
<strong> <h2 i18n>
<h2 i18n> infos de debug
infos de debug </h2>
</h2> <span class="demo">
<span class="demo"> {{"config.demo"|translate}}
{{"config.demo"|translate}} </span>
</span> </strong>
</strong> <ul>
<ul> <li>
<li> étape actuelle {{config.step}} / {{config.stepMax}}
étape actuelle {{config.step}} / {{config.stepMax}} </li>
</li> <li>
<li> formulaire valide : {{formIsValid}}
formulaire valide : {{formIsValid}} </li>
</li> <li>
<li> type de formulaire: {{config.pollType}}
type de formulaire: {{config.pollType}} </li>
</li> <li>
<li> config:
config: <pre>
<pre> {{config|json}}
{{config|json}} </pre>
</pre> </li>
</li> </ul>
</ul>
</div> </div>
<button <button
class="btn" class="btn"
i18n i18n
(click)="config.sendForm()" (click)="config.sendForm()"
> >
Envoyer le formulaire Envoyer le formulaire
</button> </button>

View File

@ -1,31 +1,31 @@
<div class="answers"> <div class="answers">
<h1 i18n> <h1 i18n>
Choisir les propositions Choisir les propositions
</h1> </h1>
<p class="subtitle" i18n> <p class="subtitle" i18n>
vous pouvez utiliser la syntaxe markdown vous pouvez utiliser la syntaxe markdown
</p> </p>
<ol> <ol>
<li #answers *ngFor="let answer of config.answers; index as i;trackBy trackFunction" <li #answers *ngFor="let answer of config.answers; index as i;trackBy trackFunction"
class="answer-item"> class="answer-item">
<input <input
[(ngModel)]="answer.text" [(ngModel)]="answer.text"
class="answer" class="answer"
placeholder="réponse" placeholder="réponse"
type="text" type="text"
> >
<button (click)="config.answers.splice(i,1)">X</button> <button (click)="config.answers.splice(i,1)">X</button>
</li> </li>
</ol> </ol>
<button <button
(click)="addAnswer()" (click)="addAnswer()"
class="btn-outline btn-block" class="btn-outline btn-block"
i18n> i18n>
Ajouter Ajouter
</button> </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> </div>

View File

@ -1,4 +1,4 @@
<h1>Ce composant est celui de base pour les pages</h1> <h1>Ce composant est celui de base pour les pages</h1>
<a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm"> <a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">
{{"config.perfect"|translate}} {{"config.perfect"|translate}}
</a> </a>

View File

@ -1,54 +1,54 @@
<section class="creation"> <section class="creation">
<h1> <h1>
{{"creation.title"|translate}} {{"creation.title"|translate}}
</h1> </h1>
<p <p
class="description" class="description"
i18n i18n
> >
{{"config.title"|translate}} {{"config.title"|translate}}
</p> </p>
<div class="btn-next"> <div class="btn-next">
<a <a
[routerLink]="'/home'" [routerLink]="'/home'"
> >
<span <span
class="text" class="text"
i18n i18n
> >
{{"config.letsgo"|translate}} {{"config.letsgo"|translate}}
</span> </span>
<span class="icon right"> <span class="icon right">
> >
</span> </span>
</a> </a>
</div> </div>
</section> </section>
<section class="recuperation"> <section class="recuperation">
<h1> <h1>
{{"config.find_my_polls"|translate}} {{"config.find_my_polls"|translate}}
</h1> </h1>
<form <form
action="https://framadate.org/find_polls.php" action="https://framadate.org/find_polls.php"
method="post" method="post"
> >
<label <label
class="description" class="description"
for="email" for="email"
i18n i18n
> >
{{"config.find_helper"|translate}} : {{"config.find_helper"|translate}} :
</label> </label>
<input <input
type="email" type="email"
name="mail" name="mail"
id="email" id="email"
autofocus="autofocus" autofocus="autofocus"
/> />
<input <input
type="submit" type="submit"
class="btn btn-block" class="btn btn-block"
i18n-value="'config.find_button'|translate" i18n-value="'config.find_button'|translate"
/> />
</form> </form>
</section> </section>

View File

@ -1,9 +1,9 @@
<div i18n> <div i18n>
{{"dates.title"|translate}} {{"dates.title"|translate}}
</div> </div>
<div> <div>
<label for="multi_hours"> <label for="multi_hours">
<span i18n> <span i18n>
Je souhaite mettre des créneaux horaires Je souhaite mettre des créneaux horaires
</span> </span>
@ -18,39 +18,39 @@
<span i18n> <span i18n>
pour chaque journée pour chaque journée
</span> </span>
</label> </label>
</div> </div>
<button <button
class="btn btn-primary" class="btn btn-primary"
(click)="addDate()" (click)="addDate()"
i18n i18n
> >
{{"dates.add"|translate}} {{"dates.add"|translate}}
</button> </button>
<div class="dates-list"> <div class="dates-list">
{{config.dateList.length}} {{config.dateList.length}}
<span i18n> <span i18n>
{{"dates.count_dates"|translate}} {{"dates.count_dates"|translate}}
</span> </span>
<div <div
*ngFor="let choice of config.dateList; index as id" *ngFor="let choice of config.dateList; index as id"
class="date-choice" class="date-choice"
> >
<input <input
type="text" type="text"
name="dateChoices[]" name="dateChoices[]"
[(ngModel)]="choice.literal" [(ngModel)]="choice.literal"
> >
<button (click)="config.dateList.splice(id, 1)">X</button> <button (click)="config.dateList.splice(id, 1)">X</button>
</div> </div>
</div> </div>
<a <a
[routerLink]="'/step/end'" [routerLink]="'/step/end'"
class="btn btn-block" class="btn btn-block"
> >
C'est parfait! C'est parfait!
</a> </a>

View File

@ -1,5 +1,5 @@
<h1 i18n> <h1 i18n>
{{"resume.title"|translate}} {{"resume.title"|translate}}
</h1> </h1>
<h2 i18n>{{"resume.admins"|translate}}</h2> <h2 i18n>{{"resume.admins"|translate}}</h2>
<h2 i18n>{{"resume.users"|translate}}</h2> <h2 i18n>{{"resume.users"|translate}}</h2>

View File

@ -1,86 +1,86 @@
<div class="description"> <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> <span class="post-selector">
<h1 i18n> </span>
{{"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>
<label <div>
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> <label
<div> for="poll_title"
<label for="my_name"> class="title-label"
{{"creation.name"|translate}} : i18n
</label> >
<input {{"creation.choose_title"|translate}}
type="text" </label>
name="my_name" <input
id="my_name" type="text"
placeholder="mon nom" id="poll_title"
[(ngModel)]="config.myName" name="poll_title"
> placeholder="titre"
</div> [(ngModel)]="config.title"
<div> >
</div>
<label <div>
for="poll_description" <label for="my_name">
class="title-label" {{"creation.name"|translate}} :
i18n </label>
> <input
{{"creation.description"|translate}} type="text"
</label> name="my_name"
<textarea id="my_name"
id="poll_description" placeholder="mon nom"
name="poll_description" [(ngModel)]="config.myName"
[(ngModel)]="config.description" >
placeholder="description" </div>
cols="50"
lines="5"
></textarea>
</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>
</div>
<a <a
[routerLink]="'/step/answers'" [routerLink]="'/step/answers'"
class="btn btn-block" class="btn btn-block"
i18n i18n
> >
Continuer Continuer
</a> </a>
<hr> <hr>
</div> </div>

View File

@ -1,6 +1,6 @@
<!--ceci est la popup pour ajouter une image--> <!--ceci est la popup pour ajouter une image-->
<h1 i18n> <h1 i18n>
Images Images
</h1> </h1>
<a [routerLink]="'/step/visibility'" class="btn btn-block">ok</a> <a [routerLink]="'/step/visibility'" class="btn btn-block">ok</a>

View File

@ -1,9 +1,9 @@
<h1 i18n> <h1 i18n>
Résumé avant validation Résumé avant validation
</h1> </h1>
<section> <section>
TODO TODO
<pre> <pre>
{{config |json}} {{config |json}}
</pre> </pre>
</section> </section>

View File

@ -1,14 +1,14 @@
<h1 i18n> <h1 i18n>
{{"visibility.title"|translate}} {{"visibility.title"|translate}}
</h1> </h1>
<h1 i18n> <h1 i18n>
{{"visibility.votes"|translate}} {{"visibility.votes"|translate}}
</h1> </h1>
<h1 i18n> <h1 i18n>
{{"visibility.archiving"|translate}} {{"visibility.archiving"|translate}}
</h1> </h1>
<h1 i18n> <h1 i18n>
{{"visibility.access"|translate}} {{"visibility.access"|translate}}
</h1> </h1>
<a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">C'est parfait!</a> <a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">C'est parfait!</a>

View File

@ -1,16 +1,16 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Framadate</title> <title>Framadate</title>
<base href="/"> <base href="/">
<meta content="width=device-width, initial-scale=1" name="viewport"> <meta content="width=device-width, initial-scale=1" name="viewport">
<link href="favicon.ico" rel="icon" type="image/x-icon"> <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> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
</body> </body>
</html> </html>