Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
55ebc4c1
Commit
55ebc4c1
authored
Jul 24, 2018
by
chirac
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Fix_mr_190' into 'master'
Fix ticks See merge request federez/re2o!202
parents
41cd115f
a8541749
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
39 deletions
+4
-39
cotisations/templates/cotisations/aff_article.html
cotisations/templates/cotisations/aff_article.html
+3
-19
cotisations/templates/cotisations/aff_paiement.html
cotisations/templates/cotisations/aff_paiement.html
+1
-16
machines/templates/machines/aff_extension.html
machines/templates/machines/aff_extension.html
+0
-1
machines/templates/machines/aff_iptype.html
machines/templates/machines/aff_iptype.html
+0
-1
machines/templates/machines/aff_nas.html
machines/templates/machines/aff_nas.html
+0
-1
machines/templates/machines/aff_service.html
machines/templates/machines/aff_service.html
+0
-1
No files found.
cotisations/templates/cotisations/aff_article.html
View file @
55ebc4c1
...
...
@@ -30,26 +30,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<td>
{{ article.name }}
</td>
<td>
{{ article.prix }}
</td>
<td>
{{ article.type_cotisation }}
</td>
<td>
{{ article.duration }}
</td>
<td>
{{ article.type_user }}
</td>
<td>
{{ article.available_for_everyone }}
</td>
<td
class=
"text-right"
>
{% can_edit article %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
title=
"{% trans "
Edit
"
%}"
href=
"{% url 'cotisations:edit-article' article.id %}"
>
<i
class=
"fa fa-edit"
></i>
</a>
{% acl_end %}
{% history_button article %}
</td>
<th>
{% trans "Article" %}
</th>
<th>
{% trans "Price" %}
</th>
<th>
{% trans "Cotisation type" %}
</th>
<th>
{% trans "Duration (month)" %}
</th>
<th>
{% trans "Concerned users" %}
</th>
<th>
{% trans "Available for everyone" %}
</th>
<th>
{% trans "Available for everyone"
| tick
%}
</th>
<th></th>
</tr>
</thead>
...
...
@@ -60,16 +46,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>
{{ article.type_cotisation }}
</td>
<td>
{{ article.duration }}
</td>
<td>
{{ article.type_user }}
</td>
<td>
{{ article.available_for_everyone
|tick
}}
</td>
<td>
{{ article.available_for_everyone }}
</td>
<td
class=
"text-right"
>
{% can_edit article %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
title=
"{% trans "
Edit
"
%}"
href=
"{% url 'cotisations:edit-article' article.id %}"
>
<i
class=
"fa fa-edit"
></i>
</a>
{% acl_end %}
<a
class=
"btn btn-info btn-sm"
role=
"button"
title=
"{% trans "
Historique
"
%}"
href=
"{% url 'cotisations:history' 'article' article.id %}"
>
<i
class=
"fa fa-history"
></i>
</a>
{% history_button article %}
</td>
</tr>
{% endfor %}
...
...
cotisations/templates/cotisations/aff_paiement.html
View file @
55ebc4c1
...
...
@@ -30,19 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<table
class=
"table table-striped"
>
<thead>
<tr>
<td>
{{ paiement.moyen }}
</td>
<td>
{{ paiement.available_for_everyone }}
</td>
<td>
{{paiement.get_payment_method_name}}
</td>
<td
class=
"text-right"
>
{% can_edit paiement %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
title=
"{% trans "
Edit
"
%}"
href=
"{% url 'cotisations:edit-paiement' paiement.id %}"
>
<i
class=
"fa fa-edit"
></i>
</a>
{% acl_end %}
{% history_button paiement %}
</td>
<th>
{% trans "Payment type" %}
</th>
<th>
{% trans "Is available for everyone" %}
</th>
<th>
{% trans "Custom payment method" %}
</th>
...
...
@@ -62,9 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<i
class=
"fa fa-edit"
></i>
</a>
{% acl_end %}
<a
class=
"btn btn-info btn-sm"
role=
"button"
title=
"{% trans "
Historique
"
%}"
href=
"{% url 'cotisations:history' 'paiement' paiement.id %}"
>
<i
class=
"fa fa-history"
></i>
</a>
{% history_button paiement %}
</td>
</tr>
{% endfor %}
...
...
machines/templates/machines/aff_extension.html
View file @
55ebc4c1
...
...
@@ -54,7 +54,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
{% acl_end %}
{% history_button extension %}
{% include 'buttons/history.html' with href='machines:history' name='extension' id=extension.id %}
</td>
</tr>
{% endfor %}
...
...
machines/templates/machines/aff_iptype.html
View file @
55ebc4c1
...
...
@@ -55,7 +55,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
{% acl_end %}
{% history_button type %}
{% include 'buttons/history.html' with href='machines:history' name='iptype' id=type.id %}
</td>
</tr>
{% endfor %}
...
...
machines/templates/machines/aff_nas.html
View file @
55ebc4c1
...
...
@@ -49,7 +49,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
{% acl_end %}
{% history_button nas %}
{% include 'buttons/history.html' with href='machines:history' name='nas' id=nas.id %}
</td>
</tr>
{% endfor %}
...
...
machines/templates/machines/aff_service.html
View file @
55ebc4c1
...
...
@@ -47,7 +47,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
{% acl_end %}
{% history_button service %}
{% include 'buttons/history.html' with href='machines:history' name='service' id=service.id %}
</td>
</tr>
{% endfor %}
...
...
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