Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
d913b8b6
Commit
d913b8b6
authored
May 10, 2017
by
Skia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some more pimp in Trombi + translations
parent
35f98313
Pipeline
#969
passed with stage
in 4 minutes and 24 seconds
Changes
7
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
379 additions
and
183 deletions
+379
-183
core/templates/core/user_preferences.jinja
core/templates/core/user_preferences.jinja
+3
-1
core/templates/core/user_tools.jinja
core/templates/core/user_tools.jinja
+6
-2
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+351
-168
trombi/models.py
trombi/models.py
+6
-2
trombi/templates/trombi/detail.jinja
trombi/templates/trombi/detail.jinja
+4
-4
trombi/templates/trombi/user_tools.jinja
trombi/templates/trombi/user_tools.jinja
+4
-4
trombi/views.py
trombi/views.py
+5
-2
No files found.
core/templates/core/user_preferences.jinja
View file @
d913b8b6
...
...
@@ -11,6 +11,7 @@
{{
form.as_p
()
}}
<p><input
type=
"submit"
value=
"
{%
trans
%}
Save
{%
endtrans
%}
"
/></p>
</form>
<h4>
{%
trans
%}
Trombi
{%
endtrans
%}
</h4>
{%
if
trombi_form
%}
<form
action=
"
{{
url
(
'trombi:user_tools'
)
}}
"
method=
"post"
enctype=
"multipart/form-data"
>
{%
csrf_token
%}
...
...
@@ -18,7 +19,8 @@
<p><input
type=
"submit"
value=
"
{%
trans
%}
Save
{%
endtrans
%}
"
/></p>
</form>
{%
else
%}
<p><a
href=
"
{{
url
(
'trombi:user_tools'
)
}}
"
>
Trombi tools
</a></p>
<p>
{%
trans
trombi
=
user.trombi_user.trombi
%}
You already choose to be in that Trombi:
{{
trombi
}}
.
{%
endtrans
%}
<a
href=
"
{{
url
(
'trombi:user_tools'
)
}}
"
>
{%
trans
%}
Go to my Trombi tools
{%
endtrans
%}
</a></p>
{%
endif
%}
{%
endblock
%}
...
...
core/templates/core/user_tools.jinja
View file @
d913b8b6
...
...
@@ -34,13 +34,13 @@
{%
endif
%}
{%
for
b
in
settings.SITH_COUNTER_BARS
%}
{%
if
user.is_in_group
(
b
[
1
]
+
" admin"
)
%}
<li>
<li>
<a
href=
"
{{
url
(
'counter:details'
,
counter_id
=
b
[
0
])
}}
"
>
{{
b
[
1
]
}}
</a>
-
<a
href=
"
{{
url
(
'counter:admin'
,
counter_id
=
b
[
0
])
}}
"
>
{%
trans
%}
Edit
{%
endtrans
%}
</a>
-
<a
href=
"
{{
url
(
'counter:stats'
,
counter_id
=
b
[
0
])
}}
"
>
{%
trans
%}
Stats
{%
endtrans
%}
</a>
-
{%
set
c
=
Counter.objects.
filter
(
id
=
b
[
0
])
.
first
()
%}
{%
if
c.stock
%}
<a
href=
"
{{
url
(
'stock:items_list'
,
stock_id
=
c.stock.id
)
}}
"
>
Stock
</a>
-
<a
href=
"
{{
url
(
'stock:items_list'
,
stock_id
=
c.stock.id
)
}}
"
>
Stock
</a>
-
<a
href=
"
{{
url
(
'stock:shoppinglist_list'
,
stock_id
=
c.stock.id
)
}}
"
>
{%
trans
%}
Shopping lists
{%
endtrans
%}
</a>
{%
else
%}
<a
href=
"
{{
url
(
'stock:new'
,
counter_id
=
c.id
)
}}
"
>
{%
trans
%}
Create new stock
{%
endtrans
%}
</a>
...
...
@@ -106,6 +106,10 @@
<li><a
href=
"
{{
url
(
'election:create'
)
}}
"
>
{%
trans
%}
Create a new election
{%
endtrans
%}
</a></li>
{%
-
endif
-
%}
</ul>
<h4>
{%
trans
%}
Other tools
{%
endtrans
%}
</h4>
<ul>
<li><a
href=
"
{{
url
(
'trombi:user_tools'
)
}}
"
>
{%
trans
%}
Trombi tools
{%
endtrans
%}
</a></li>
</ul>
{%
endblock
%}
...
...
locale/fr/LC_MESSAGES/django.po
View file @
d913b8b6
This diff is collapsed.
Click to expand it.
trombi/models.py
View file @
d913b8b6
...
...
@@ -55,9 +55,9 @@ class Trombi(models.Model):
"After this date, users subscribed will be allowed to comment on each other."
))
comments_deadline
=
models
.
DateField
(
_
(
'comments deadline'
),
default
=
timezone
.
now
,
help_text
=
_
(
"After this date, users won't be "
"able to make comments anymore"
))
"able to make comments anymore
.
"
))
max_chars
=
models
.
IntegerField
(
_
(
'maximum characters'
),
default
=
400
,
help_text
=
_
(
'
m
aximum number of characters allowed in a comment'
))
help_text
=
_
(
'
M
aximum number of characters allowed in a comment
.
'
))
club
=
models
.
OneToOneField
(
Club
,
related_name
=
'trombi'
)
objects
=
TrombiManager
()
...
...
@@ -98,6 +98,9 @@ class TrombiUser(models.Model):
scrub_pict
=
models
.
ImageField
(
upload_to
=
'trombi'
,
verbose_name
=
_
(
"scrub pict"
),
null
=
True
,
blank
=
True
,
help_text
=
_
(
"The scrub picture you want in the trombi (warning: this picture may be published)"
))
def
__str__
(
self
):
return
str
(
self
.
user
)
class
TrombiComment
(
models
.
Model
):
"""
This represent a comment given by someone to someone else in the same Trombi
...
...
@@ -111,3 +114,4 @@ class TrombiComment(models.Model):
if
user
.
id
==
self
.
target
.
user
.
id
:
return
False
return
user
.
id
==
self
.
author
.
user
.
id
or
user
.
can_edit
(
self
.
author
.
trombi
)
trombi/templates/trombi/detail.jinja
View file @
d913b8b6
...
...
@@ -6,9 +6,9 @@
{%
block
content
%}
<h2>
{%
trans
club
=
object.club
%}{{
club
}}
's Trombi
{%
endtrans
%}
</h2>
<a
href=
"
{{
url
(
'trombi:edit'
,
trombi_id
=
object.id
)
}}
"
>
Edit
</a>
<p>
Subscription deadline:
{{
object.subscription_deadline
|
date
(
DATETIME_FORMAT
)
}}
</p>
<p>
Comment deadline:
{{
object.comments_deadline
|
date
(
DATETIME_FORMAT
)
}}
</p>
<a
href=
"
{{
url
(
'trombi:edit'
,
trombi_id
=
object.id
)
}}
"
>
{%
trans
%}
Edit
{%
endtrans
%}
</a>
<p>
{%
trans
%}
Subscription deadline:
{%
endtrans
%}
{{
object.subscription_deadline
|
date
(
DATETIME_FORMAT
)
}}
</p>
<p>
{%
trans
%}
Comment deadline:
{%
endtrans
%}
{{
object.comments_deadline
|
date
(
DATETIME_FORMAT
)
}}
</p>
<a
href=
"#"
>
Export
</a>
<hr>
<div>
...
...
@@ -24,7 +24,7 @@
<img
src=
"
{{
file
}}
"
alt=
""
style=
"max-width: 100px"
>
</div>
<div>
{{
u.user.get_display_name
()
}}
</div>
<div><a
href=
"
{{
url
(
'trombi:delete_user'
,
trombi_id
=
object.id
,
user_id
=
u.id
)
}}
"
>
Delete
</a></div>
<div><a
href=
"
{{
url
(
'trombi:delete_user'
,
trombi_id
=
object.id
,
user_id
=
u.id
)
}}
"
>
{%
trans
%}
Delete
{%
endtrans
%}
</a></div>
</div>
{%
endfor
%}
</div>
...
...
trombi/templates/trombi/user_tools.jinja
View file @
d913b8b6
...
...
@@ -14,8 +14,8 @@
</form>
{%
else
%}
<p>
{%
trans
trombi
=
user.trombi_user.trombi
%}
You are subscribed to the Trombi
{{
trombi
}}{%
endtrans
%}
</p>
<p><a
href=
"
{{
url
(
"trombi:profile"
)
}}
"
>
Edit my profile
</a></p>
<p><a
href=
"
{{
url
(
"trombi:pictures"
)
}}
"
>
Edit my pictures
</a></p>
<p><a
href=
"
{{
url
(
"trombi:profile"
)
}}
"
>
{%
trans
%}
Edit my profile
{%
endtrans
%}
</a></p>
<p><a
href=
"
{{
url
(
"trombi:pictures"
)
}}
"
>
{%
trans
%}
Edit my pictures
{%
endtrans
%}
</a></p>
<hr>
<div>
{%
for
u
in
user.trombi_user.trombi.users.exclude
(
id
=
user.trombi_user.id
)
%}
...
...
@@ -32,9 +32,9 @@
<div>
{{
u.user.get_display_name
()
}}
</div>
{%
set
comment
=
u.received_comments.
filter
(
author__id
=
user.trombi_user.id
)
.
first
()
%}
{%
if
comment
%}
<a
href=
"
{{
url
(
"trombi:edit_comment"
,
comment_id
=
comment.id
)
}}
"
>
Edit comment
</a>
<a
href=
"
{{
url
(
"trombi:edit_comment"
,
comment_id
=
comment.id
)
}}
"
>
{%
trans
%}
Edit comment
{%
endtrans
%}
</a>
{%
else
%}
<a
href=
"
{{
url
(
"trombi:new_comment"
,
user_id
=
u.id
)
}}
"
>
Comment
</a>
<a
href=
"
{{
url
(
"trombi:new_comment"
,
user_id
=
u.id
)
}}
"
>
{%
trans
%}
Comment
{%
endtrans
%}
</a>
{%
endif
%}
</div>
{%
endfor
%}
...
...
trombi/views.py
View file @
d913b8b6
...
...
@@ -72,7 +72,10 @@ class TrombiEditView(CanEditPropMixin, UpdateView):
template_name
=
'core/edit.jinja'
pk_url_kwarg
=
'trombi_id'
class
TrombiDetailView
(
CanEditMixin
,
DetailView
):
def
get_success_url
(
self
):
return
super
(
TrombiEditView
,
self
).
get_success_url
()
+
"?qn_success"
class
TrombiDetailView
(
CanEditMixin
,
QuickNotifMixin
,
DetailView
):
model
=
Trombi
template_name
=
'trombi/detail.jinja'
pk_url_kwarg
=
'trombi_id'
...
...
@@ -87,7 +90,7 @@ class TrombiDeleteUserView(CanEditPropMixin, SingleObjectMixin, RedirectView):
user
=
get_object_or_404
(
TrombiUser
,
id
=
self
.
kwargs
[
'user_id'
])
user
.
delete
()
# See if we need to also delete the comments on the user, or if we keep them
return
redirect
(
self
.
object
.
get_absolute_url
())
return
redirect
(
self
.
object
.
get_absolute_url
()
+
"?qn_success"
)
# User side
class
UserTrombiForm
(
forms
.
Form
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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