Skip to content

Commit f0fb47d

Browse files
laurentabballaurentabbal
committed
v3
1 parent a1773cb commit f0fb47d

12 files changed

+149
-625
lines changed

‎resources/views/classe-console.blade.php

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,34 +64,21 @@
6464

6565
<div class="row pt-3">
6666

67-
<div class="col-md-2">
68-
69-
<div class="text-right mb-3">
67+
<div class="col-md-1 text-right">
68+
<div class=" mb-3">
7069
@if(Auth::check())
7170
<a class="btn btn-light btn-sm" href="/console/classes" role="button"><i class="fas fa-arrow-left"></i></a>
7271
@else
7372
<a class="btn btn-light btn-sm" href="/" role="button"><i class="fas fa-arrow-left"></i></a>
7473
@endif
7574
</div>
7675

77-
<a class="btn btn-success btn-sm pl-3 pr-3 text-monospace" style="width:100%" href="{{route('classe-creer-get')}}" role="button">{{__('nouvelle classe')}}</a>
78-
79-
<a href="https://github.com/codepuzzle-io/www.codepuzzle.io/discussions" target="_blank" role="button" class="mt-2 btn btn-light btn-sm text-left text-muted" style="width:100%;opacity:0.8;">
80-
<span style="font-size:80%"><i class="fas fa-comment-alt" style="float:left;margin:4px 8px 5px 0px;"></i> {{__('discussions')}} <span style="opacity:0.6;font-size:90%;">&</span> {{__('annonces')}}</span>
81-
</a>
82-
83-
<a href="https://github.com/codepuzzle-io/www.codepuzzle.io/issues/new/choose" target="_blank" role="button" class="mt-1 btn btn-light text-left btn-sm text-muted" style="width:100%;opacity:0.8;">
84-
<span style="font-size:80%"><i class="fas fa-bug" style="float:left;margin:4px 8px 5px 0px;"></i> {{__('signalement de bogue')}} <span style="opacity:0.6;font-size:90%;">&</span> {{__('questions techniques')}}</span>
85-
</a>
86-
87-
<div class="mt-3 text-muted text-monospace pl-1 mb-3" style="font-size:70%;opacity:0.8;">
88-
<span><i class="fa fa-envelope"></i> contact@codepuzzle.io</span>
89-
</div>
76+
<div class="mt-2 mb-4"><a class="btn btn-dark btn-sm" href="/classe-modifier/{{$jeton_secret}}" role="button" data-toggle="tooltip" data-placement="right" title="{{__('modifier')}}"><i class="fa-solid fa-pen"></i></a></div>
9077

9178
</div>
9279

9380
@if($classe->user_id == 0 OR !Auth::check())
94-
<div class="col-md-8">
81+
<div class="col-md-10">
9582
<div id="frame" class="frame">
9683
<div class="row">
9784
<div class="col-md-6 offset-md-3 text-monospace pt-3 pb-3">
@@ -116,13 +103,12 @@
116103
<li>{{ count($liste_activites_classe)}} activités</li>
117104
</ul>
118105
</div>
119-
<div class="mt-2 mb-4"><a class="btn btn-dark btn-sm" href="/classe-modifier/{{$jeton_secret}}" role="button" data-toggle="tooltip" data-placement="right" title="{{__('modifier')}}"><i class="fa-solid fa-pen"></i></a></div>
120106
</div>
121107

122108
</div><!-- /row -->
123109

124110
<div class="row pt-2">
125-
<div class="col-md-8 offset-md-2">
111+
<div class="col-md-10 offset-md-1">
126112
<div class="text-monospace">{{strtoupper(__('SUIVI DES ACTIVITÉS'))}}</div>
127113
@if (!empty($liste_activites_classe) OR !empty($liste_activites_autres))
128114
@if (!empty($liste_activites_classe))
@@ -214,7 +200,7 @@
214200

215201
<div class="container">
216202
<div class="row">
217-
<div class="col-md-8 offset-md-2">
203+
<div class="col-md-10 offset-md-1">
218204

219205
@if (empty($liste_activites_classe) AND empty($liste_activites_autres))
220206
<div class='text-muted small text-monospace'>Aucune activité n'a été enregistrée pour le moment.</div>

‎resources/views/console-classes.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161

6262
<a class='btn btn-dark btn-sm' href='/classe-console/{{ $classe->jeton_secret }}' role='button' data-toggle="tooltip" data-placement="top" title="{{__('voir')}}"><i class="fas fa-eye"></i></a>
6363

64-
<a class='btn btn-light btn-sm' href='/classe-modifier/{{ $classe->jeton_secret }}' role='button' data-toggle="tooltip" data-placement="top" title="{{__('modifier')}}"><i class="fas fa-pen"></i></a>
65-
6664
<!-- supprimer -->
6765
<span id="supprimer_button_{{$loop->iteration}}">
6866
<div onclick="showConfirm('supprimer_button_{{$loop->iteration}}', 'supprimer_confirm_{{$loop->iteration}}')" class="d-inline-block" type="button">

‎resources/views/console-sujets.blade.php

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -59,49 +59,35 @@
5959
<!-- options -->
6060
<div style="float:right;">
6161

62-
<a class='btn btn-dark btn-sm' href='/sujet-console/{{ $sujet->jeton_secret }}' role='button' data-toggle="tooltip" data-placement="top" title="{{__('voir / corriger')}}"><i class="fas fa-check"></i></a>
62+
<a class='btn btn-dark btn-sm' href='/sujet-console/{{ $sujet->jeton_secret }}' role='button' data-toggle="tooltip" data-placement="top" title="{{__('voir / corriger')}}"><i class="fas fa-eye"></i></a>
6363

64-
<a class='btn btn-light btn-sm' data-toggle="collapse" href="#collapse-{{$loop->iteration}}" role='button' aria-expanded="false" aria-controls="collapse-{{$loop->iteration}}"><i class="fas fa-bars" style="margin-top:0px;" data-toggle="tooltip" data-offset="0, 9" data-placement="top" title="{{__('déplier plier')}}"></i></a>
65-
66-
<a class='btn btn-light btn-sm' href='/sujet-creer/{{ $sujet->jeton_secret }}' role='button' data-toggle="tooltip" data-placement="top" title="{{__('modifier')}}"><i class="fas fa-pen"></i></a>
67-
68-
<a tabindex='0' id='/console/sujet-supprimer/{{ Crypt::encryptString($sujet->id) }}' class='btn btn-danger btn-sm text-light' role='button' style="cursor:pointer;outline:none;" data-toggle="popover" data-trigger="focus" data-placement="left" data-html="true" data-content="<a href='/console/sujet-supprimer/{{ Crypt::encryptString($sujet->id) }}' class='btn btn-danger btn-sm text-light' role='button'>{{__('confirmer')}}</a><a class='btn btn-light btn-sm ml-2' href='#' role='button'>{{__('annuler')}}</a>"><i class='fas fa-trash fa-sm' data-toggle="tooltip" data-placement="top" data-offset="0, 15" title="{{__('supprimer')}}"></i></a>
64+
<!-- supprimer -->
65+
<span id="supprimer_button_{{$loop->iteration}}">
66+
<div onclick="showConfirm('supprimer_button_{{$loop->iteration}}', 'supprimer_confirm_{{$loop->iteration}}')" class="d-inline-block" type="button">
67+
<a tabindex='0' class='btn btn-light btn-sm' role='button' style="cursor:pointer;outline:none;"><i class='fa-solid fa-xmark'></i></a>
68+
</div>
69+
</span>
70+
<span id="supprimer_confirm_{{$loop->iteration}}" style="display:none">
71+
<div id="supprimer_{{$loop->iteration}}" class="d-inline-block">
72+
<a href='/console/sujet-supprimer/{{ Crypt::encryptString($sujet->id) }}' class='btn btn-danger btn-sm text-light ml-3' role='button' style="cursor:pointer;outline:none;" data-toggle="tooltip" data-placement="top" title="{{__('supprimer')}}"><i class='fas fa-trash fa-sm'></i></a>
73+
</div>
74+
<div id="supprimer_cancel_{{$loop->iteration}}" onclick="hideConfirm('supprimer_button_{{$loop->iteration}}', 'supprimer_confirm_{{$loop->iteration}}')" class="d-inline-block" type="button">
75+
<a tabindex='0' class='btn btn-light btn-sm' role='button' style="cursor:pointer;outline:none;" data-toggle="tooltip" data-placement="top" title="{{__('annuler')}}"><i class="fa-solid fa-chevron-right" ></i></a>
76+
</div>
77+
</span>
78+
<!-- /supprimer -->
6979

7080
</div>
7181
<!-- /options -->
7282

73-
<h2 class="p-0 m-0">
74-
@if ($sujet->titre_enseignant == NULL)
75-
Devoir {{$sujet->jeton_secret}}
76-
@else
77-
{{$sujet->titre_enseignant}}
78-
@endif
79-
</h2>
80-
<div class="text-monospace small" style="color:silver;">{{ $sujet->sous_titre_enseignant }}</div>
81-
82-
</div>
83-
</div>
83+
<h2 class="p-0 m-0">{{$sujet->titre}}</h2>
8484

85-
<div class="row">
86-
<div class="col-md-12 text-monospace small text-muted">
87-
<i class="fas fa-share-alt ml-1 mr-2"></i>lien élèves: <a href="/{{ strtoupper('E'.$sujet->jeton) }}" target="_blank">www.codepuzzle.io/E{{ strtoupper($sujet->jeton) }}</a>
88-
</div>
89-
</div>
85+
<div class="row mt-1" style="clear:both;">
86+
<div class="col-md-12 text-monospace text-muted">
87+
<span class="small"><i class="fas fa-share-alt ml-1 mr-2"></i>lien public: </span><a id="lien_{{$loop->iteration}}" href="/{{ strtoupper('S'.$sujet->jeton) }}" target="_blank">www.codepuzzle.io/S{{ strtoupper($sujet->jeton) }}</a><span class="pl-2" onclick="copier('lien_{{$loop->iteration}}')" style="cursor:pointer;"><i class="fa-regular fa-copy"></i></span><span id="lien_{{$loop->iteration}}_copie_confirmation" class="pl-3 text-right small text-monospace text muted">&nbsp;</span>
88+
</div>
89+
</div>
9090

91-
<div class="collapse" id="collapse-{{$loop->iteration}}">
92-
<div class="row mt-3">
93-
<div class="col-md-12">
94-
@if ($sujet->titre_eleve !== NULL OR $sujet->consignes_eleve !== NULL)
95-
<div class="pt-3 pl-3 pr-3 pb-1" style="background-color:#f3f5f7;border-radius:5px;">
96-
@if ($sujet->titre_eleve !== NULL)
97-
<div class="text-monospace mb-1 font-weight-bold">{{ $sujet->titre_eleve }}</div>
98-
@endif
99-
@if ($sujet->consignes_eleve !== NULL)
100-
<div class="markdown_content border rounded bg-light text-monospace p-3">{{ $sujet->consignes_eleve }}</div>
101-
@endif
102-
</div>
103-
@endif
104-
</div>
10591
</div>
10692
</div>
10793

‎resources/views/console.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
<div class="mb-1 text-center"><a class="btn btn-light btn-sm d-block" href="{{route('console-programmes')}}" role="button">{{__('PROGRAMMES')}}</a></div>
2727
<div class="mb-3 text-center"><a class="btn btn-light btn-sm d-block" href="{{route('console-classes')}}" role="button">{{__('CLASSES')}}</a></div>
2828

29-
<div class="mt-5 text-muted text-monospace" style="font-size:70%;opacity:0.7;">
29+
<div class="mt-5 text-muted text-monospace small" style="text-align:justify">
3030
<i class="fas fa-comment-alt" style="float:left;margin:3px 8px 5px 0px;"></i>
3131
<a href="https://github.com/codepuzzle-io/www.codepuzzle.io/discussions" target="_blank"> {{__('discussions')}} & {{__('annonces')}}</a>
3232
</div>
3333

34-
<div class="mt-1 text-muted text-monospace" style="font-size:70%;opacity:0.7;">
34+
<div class="mt-1 text-muted text-monospace small" style="text-align:justify">
3535
<i class="fas fa-bug" style="float:left;margin:3px 8px 5px 0px;"></i>
36-
<a href="https://github.com/codepuzzle-io/www.codepuzzle.io/issues/new/choose" target="_blank">{{__('signalement de bogue')}} & {{__('questions techniques')}}</a>
36+
<a href="https://github.com/codepuzzle-io/www.codepuzzle.io/issues/new/choose" target="_blank">{{__('signalement de bogues')}} & {{__('questions techniques')}}</a>
3737
</div>
3838

39-
<div class="mt-1 text-muted text-monospace" style="font-size:70%;opacity:0.7;">
39+
<div class="mt-1 text-muted text-monospace small">
4040
<i class="fa fa-envelope" style="float:left;margin:3px 8px 5px 0px;"></i>
4141
contact@codepuzzle.io
4242
</div>

‎resources/views/defi-creer.blade.php

Lines changed: 3 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<html lang="fr">
33
<head>
44
@include('inc-meta')
5+
@include('markdown/inc-markdown-css')
56
<title>{{ config('app.name') }} | {{ ucfirst(__('nouveau défi')) }}</title>
67
</head>
78
<body>
@@ -12,82 +13,6 @@
1213
@include('inc-nav')
1314
@endif
1415

15-
<!-- MODAL MARKDOWN HELP -->
16-
<div class="modal fade" id="markdown_help" tabindex="-1" aria-labelledby="markdown_helpLabel" aria-hidden="true">
17-
<div class="modal-dialog modal-lg">
18-
<div class="modal-content">
19-
<div class="modal-header">
20-
<b class="modal-title" id="exampleModalLabel">Formatage du texte</b>
21-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
22-
<span aria-hidden="true">&times;</span>
23-
</button>
24-
</div>
25-
<div class="modal-body">
26-
<table class="table table-bordered table-hover small">
27-
<tr>
28-
<td></td>
29-
<td class="p-2 text-center">SYNTAXE</td>
30-
<td class="p-2 text-center">RENDU</td>
31-
</tr>
32-
<tr>
33-
<td class="p-2">PARAGRAPHES</td>
34-
<td class="p-2 text-monospace text-muted">paragraphe<br /><br />paragraphe<p class="mt-2 mb-0" style="color:silver">Laisser une ligne vide pour marquer un nouveau paragraphe.</p></td>
35-
<td class="p-2" style="vertical-align:top"><p class="mb-1">paragraphe</p>paragraphe</td>
36-
</tr>
37-
<tr>
38-
<td class="p-2">RETOUR À LA LIGNE</td>
39-
<td class="p-2 text-monospace text-muted">ligne \<br />ligne<p class="mt-2 mb-0" style="color:silver">Ajouter un \ en bout de ligne pour forcer le retour à la ligne.</p></td>
40-
<td class="p-2" style="vertical-align:top">ligne<br />ligne</td>
41-
</tr>
42-
<tr>
43-
<td class="p-2">LISTES</td>
44-
<td class="p-2 text-monospace text-muted">* point 1<br />* point 2<br /></td>
45-
<td class="p-2" style="vertical-align:top"><ul style="padding-left:20px;margin-left:0;margin-bottom:0"><li>point 1</li><li>point 2</li></ul></td>
46-
</tr>
47-
<tr>
48-
<td class="p-2">ITALIQUE</td>
49-
<td class="p-2 text-monospace text-muted">*italique*</td>
50-
<td class="p-2"><em>italique</em></td>
51-
</tr>
52-
<tr>
53-
<td class="p-2">GRAS</td>
54-
<td class="p-2 text-monospace text-muted">**gras**</td>
55-
<td class="p-2"><b>gras</b></td>
56-
</tr>
57-
<tr>
58-
<td class="p-2">SOULIGNÉ</td>
59-
<td class="p-2 text-monospace text-muted">__souligné__</td>
60-
<td class="p-2"><u>souligné</u></td>
61-
</tr>
62-
<tr>
63-
<td class="p-2">IMAGE</td>
64-
<td class="p-2 text-monospace text-muted">
65-
<p>![](url-image)</p>
66-
<p class="mb-0"><i>Exemple : ![](https://www.codepuzzle.io/img/codepuzzle.png)<i></p>
67-
</td>
68-
<td class="p-2"><img src="https://www.codepuzzle.io/img/codepuzzle.png" width="160"/></td>
69-
</tr>
70-
<tr>
71-
<td class="p-2">LIEN</td>
72-
<td class="p-2 text-monospace text-muted">
73-
<p>[texte-cliquable](url-site)</p>
74-
<p class="mb-1"><i>Exemple 1 : Un [lien](https://eduscol.education.fr) vers Eduscol.</i></p>
75-
<p class="mb-0"><i>Exemple 2 : Un lien vers [Eduscol](https://eduscol.education.fr).</i></p>
76-
</td>
77-
<td class="p-2">
78-
<p><br /></p>
79-
<p class="mb-1">Un <a href="http://pep8online.com/" target="_blank">lien</a> vers PEP8 online.</p>
80-
<p class="mb-0">Un lien vers <a href="http://pep8online.com/" target="_blank">PEP8 online</a>.</p>
81-
</td>
82-
</tr>
83-
</table>
84-
</div>
85-
</div>
86-
</div>
87-
</div>
88-
<!-- MODAL MARKDOWN HELP -->
89-
90-
9116
<div class="container mt-4 mb-5">
9217

9318
<div class="row">
@@ -146,7 +71,7 @@
14671
@if(Auth::check())
14772
<div class="text-monospace text-muted small text-justify mb-1">{{__('Consignes pour l élève')}}</div>
14873
@endif
149-
<textarea class="form-control @error('consignes_eleve') is-invalid @enderror" name="consignes_eleve" id="consignes_eleve" rows="20">{{ old('consignes_eleve') }}</textarea>
74+
<textarea id="markdown_content" class="form-control @error('consignes_eleve') is-invalid @enderror" name="consignes_eleve" id="consignes_eleve" rows="20">{{ old('consignes_eleve') }}</textarea>
15075
@error('consignes_eleve')
15176
<span class="invalid-feedback" role="alert">
15277
<strong>{{ $message }}</strong>
@@ -251,6 +176,7 @@
251176
</div><!-- container -->
252177

253178
@include('inc-bottom-js')
179+
@include('markdown/inc-markdown-editeur-js')
254180

255181
<script src="{{ asset('js/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
256182
<script>

0 commit comments

Comments
 (0)