Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
site-kwei
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aeltheos
site-kwei
Commits
8f8e4f21
Commit
8f8e4f21
authored
3 years ago
by
Dorian Lesbre
Browse files
Options
Downloads
Patches
Plain Diff
Removed rooms
parent
09844dbf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
accounts/templates/profile.html
+4
-4
4 additions, 4 deletions
accounts/templates/profile.html
home/templates/activites.html
+1
-1
1 addition, 1 deletion
home/templates/activites.html
home/templates/email/user.html
+1
-1
1 addition, 1 deletion
home/templates/email/user.html
with
6 additions
and
6 deletions
accounts/templates/profile.html
+
4
−
4
View file @
8f8e4f21
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
<ul>
<ul>
{% for activity in my_activities %}
{% for activity in my_activities %}
<li><a
href=
"{% url 'activites' %}#{{ activity.activity.slug }}"
>
{{ activity.activity.title }}
</a>
<li><a
href=
"{% url 'activites' %}#{{ activity.activity.slug }}"
>
{{ activity.activity.title }}
</a>
{% if activity.activity.
start and activity.activity.room
%}
{% if activity.activity.
on_planning
%}
(le {{ activity.activity.start|date:"l à H:i" }} en {{ activity.activity.room }})
(le {{ activity.activity.start|date:"l à H:i" }}
<!--
en {{ activity.activity.room }}
-->
)
{% endif %}
{% endif %}
</li>
</li>
{% endfor %}
{% endfor %}
...
@@ -44,8 +44,8 @@
...
@@ -44,8 +44,8 @@
<ol>
<ol>
{% for activity in my_activities %}
{% for activity in my_activities %}
<li><a
href=
"{% url 'activites' %}#{{ activity.activity.slug }}"
>
{{ activity.activity.title }}
</a>
<li><a
href=
"{% url 'activites' %}#{{ activity.activity.slug }}"
>
{{ activity.activity.title }}
</a>
{% if activity.activity.
start and activity.activity.room
%}
{% if activity.activity.
on_planning
%}
(le {{ activity.activity.start|date:"l à H:i" }} en {{ activity.activity.room }})
(le {{ activity.activity.start|date:"l à H:i" }}
<!--
en {{ activity.activity.room }}
-->
)
{% endif %}
{% endif %}
</li>
</li>
{% endfor %}
{% endfor %}
...
...
This diff is collapsed.
Click to expand it.
home/templates/activites.html
+
1
−
1
View file @
8f8e4f21
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<dt>
Places :
</dt><dd>
{{ activity.nb_participants }}
</dd>
<dt>
Places :
</dt><dd>
{{ activity.nb_participants }}
</dd>
{% if activity.times_and_places %}
{% if activity.times_and_places %}
<dt>
Heure/Lieu :
</dt><dd>
{% for act in activity.times_and_places %}
<dt>
Heure/Lieu :
</dt><dd>
{% for act in activity.times_and_places %}
{{ act.start|date:"l H:i" }} {{ act.room }}{% if not forloop.last %},
<br>
{% endif %}
{{ act.start|date:"l H:i" }}
<!--
{{ act.room }}
-->
{% if not forloop.last %},
<br>
{% endif %}
{% endfor %}
{% endfor %}
</dd>
</dd>
{% endif %}
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
home/templates/email/user.html
+
1
−
1
View file @
8f8e4f21
...
@@ -5,7 +5,7 @@ Les inscriptions aux Interludes sont fermées et la répartition des activités
...
@@ -5,7 +5,7 @@ Les inscriptions aux Interludes sont fermées et la répartition des activités
{% if requested_activities_nb %}
{% if requested_activities_nb %}
Vous avez obtenu {{ activities|length }} activité(s) (sur {{ requested_activities_nb }} souhaitée(s)).
Vous avez obtenu {{ activities|length }} activité(s) (sur {{ requested_activities_nb }} souhaitée(s)).
{% for act in activities %}
{% for act in activities %}
- {{ act.activity.title }}{% if act.activity.
start and act.activity.room
%} (le {{ act.activity.start|date:"l à H:i"
}} en {{ act.activity.room
}}){% endif %}{% endfor %}{% if activities %}
- {{ act.activity.title }}{% if act.activity.
on_planning
%} (le {{ act.activity.start|date:"l à H:i" }}){% endif %}{% endfor %}{% if activities %}
Cette liste est également disponible sur la page "Mon compte" du site: {% url "accounts:profile" %}.
Cette liste est également disponible sur la page "Mon compte" du site: {% url "accounts:profile" %}.
Votre adresse email sera communiquée aux orgas pour les activités nécessitant préparation avant l'événement.{% endif %}
Votre adresse email sera communiquée aux orgas pour les activités nécessitant préparation avant l'événement.{% endif %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment