Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LQDN Adminsys
don
Commits
275b5108
Commit
275b5108
authored
Nov 08, 2018
by
Okhin
Browse files
Old conflict artifacts, bad
@okhin
, bad.
parent
61c6866e
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/view/user/perso.html
View file @
275b5108
...
...
@@ -386,7 +386,6 @@
<div
class=
"modal-body"
>
<h3>
{{ _("Envoyer à l'adresse
:") }}
</h3>
<p
class=
"addressmodal"
>
<
<<<<<<
HEAD
{{ @adresse.nom }}
<br>
{{ @adresse.adresse }}
<br>
<check
if=
"{{ @@adresse.adresse2 }}"
>
...
...
@@ -398,13 +397,6 @@
{{ @adresse.state }}
</check>
{{ @adresse.pays }}
=======
{{ @adresses[@GET['adresse_id']].nom }}
<br>
{{ @adresses[@GET['adresse_id']].adresse }}
<br>
{{ @adresses[@GET['adresse_id']].adresse2 }}
<br>
{{ @adresses[@GET['adresse_id']].codepostal }}
{{ @adresses[@GET['adresse_id']].ville }}
>>>>>>> 79b1a677cd3183f3c04a575e24f8c3957afe708c
</p>
<h3>
{{ _("Récapitulatif
:") }}
</h3>
<ul
class=
"list-unstyled"
>
...
...
@@ -432,7 +424,6 @@
<li
class=
"media"
>
<div
class=
"media-left"
>
<img
class=
"media-object"
src=
"/static/img/pishirt2.svg"
alt=
""
>
<
<<<<<<
HEAD
</div>
<div
class=
"media-body"
>
{{ _("Un pi-shirt") }} ({{@atailles[@GET['taille']]}})
...
...
@@ -446,45 +437,6 @@
</div>
<div
class=
"media-body"
>
{{ _("Un hoopie") }} ({{@atailles[@GET['taille_h']]}})
=======
</div>
<div
class=
"media-body"
>
{{ _("Un pi-shirt") }}
>>>>>>> 79b1a677cd3183f3c04a575e24f8c3957afe708c
</div>
</li>
</check>
<check
if=
"{{ in_array(@GET['quoi'], array('hoopie')) }}"
>
<li
class=
"media"
>
<div
class=
"media-left"
>
<img
class=
"media-object"
src=
"/static/img/hoopie2.svg"
alt=
""
>
</div>
<div
class=
"media-body"
>
{{ _("Un hoopie") }}
<
<<<<<<
HEAD
</
div
>
</li>
</check>
</ul>
</div>
<div
class=
"form-group text-left"
>
<label
for=
"commentaire"
><h3>
{{ _("Un commentaire
? Si il y a un objet du pack que vous ne voulez pas indiquez-le nous :)") }}
</h3></label>
<textarea
class=
"form-control"
id=
"commentaire"
name=
"commentaire"
placeholder=
""
row=
"3"
></textarea>
<div
class=
"modal-footer"
>
<input
type=
"hidden"
name=
"csrf"
value=
"{{ @CSRF }}"
>
<repeat
group=
"{{@GET}}"
key=
"{{ @key }}"
value=
"{{ @value }}"
>
<input
type=
"hidden"
name=
"{{ @key }}"
value=
"{{ @value }}"
>
</repeat>
<a
href=
"{{ 'perso' | alias }}"
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
Close
</a>
<input
type=
"submit"
class=
"btn btn-primary"
value=
"{{ _('Valider') }}"
>
</div>
</div>
</div>
</form>
</div>
</check>
=======
>>>>>>> 79b1a677cd3183f3c04a575e24f8c3957afe708c
</div>
</li>
</check>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment