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
033c22bf
Commit
033c22bf
authored
Sep 19, 2018
by
erdnaxe
🎇
Committed by
erdnaxe
Sep 22, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix other font-awesome icons
parent
2702bee9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
templates/base.html
templates/base.html
+1
-1
templates/buttons/edit.html
templates/buttons/edit.html
+1
-1
users/templates/users/profil.html
users/templates/users/profil.html
+7
-7
No files found.
templates/base.html
View file @
033c22bf
...
...
@@ -81,7 +81,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<li><a
href=
"{% url 'machines:index' %}"
><i
class=
"fa fa-desktop"
></i>
{% trans "Manage the machines" %}
</a></li>
{% acl_end %}
{% can_view_app cotisations %}
<li><a
href=
"{% url 'cotisations:index' %}"
><i
class=
"fa fa-
usd
"
></i>
{% trans "Manage the subscriptions" %}
</a></li>
<li><a
href=
"{% url 'cotisations:index' %}"
><i
class=
"fa fa-
eur
"
></i>
{% trans "Manage the subscriptions" %}
</a></li>
{% acl_end %}
</ul>
</li>
...
...
templates/buttons/edit.html
View file @
033c22bf
...
...
@@ -26,6 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Edit" as tr_edit %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
title=
"{{ desc|default:tr_edit }}"
href=
"{% url href id %}"
>
<i
class=
"fa fa-pencil
-alt
"
></i>
<i
class=
"fa fa-pencil"
></i>
</a>
users/templates/users/profil.html
View file @
033c22bf
...
...
@@ -79,11 +79,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"col-sm-6 col-md-4"
>
<div
class=
"panel panel-info"
>
<div
class=
"panel-heading dashboard"
data-parent=
"#accordion"
data-toggle=
"collapse"
data-target=
"#collapse4"
>
{{ users.solde }}
<i
class=
"fa fa-eur
o-sign
"
></i>
{{ users.solde }}
<i
class=
"fa fa-eur"
></i>
</div>
<div
class=
"panel-body dashboard"
>
<a
class=
"btn btn-primary btn-sm"
role=
"button"
href=
"{% url 'cotisations:credit-solde' users.id %}"
>
<i
class=
"fa fa-eur
o-sign
"
></i>
{% trans "Refill the balance" %}
<i
class=
"fa fa-eur"
></i>
{% trans "Refill the balance" %}
</a>
</div>
</div>
...
...
@@ -240,7 +240,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>
{{ users.solde }} €
{% if user_solde %}
<a
class=
"btn btn-primary btn-sm"
style=
'float:right'
role=
"button"
href=
"{% url 'cotisations:credit-solde' users.pk%}"
>
<i
class=
"fa fa-eur
o-sign
"
></i>
<i
class=
"fa fa-eur"
></i>
{% trans "Refill" %}
</a>
{% endif %}
...
...
@@ -345,7 +345,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading clearfix profil"
data-parent=
"#accordion"
data-toggle=
"collapse"
data-target=
"#collapse4"
>
<h3
class=
"panel-title pull-left"
>
<i
class=
"fa fa-eur
o-sign
"
></i>
<i
class=
"fa fa-eur"
></i>
{% trans "Subscriptions" %}
</h3>
</div>
...
...
@@ -353,12 +353,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"panel-body"
>
{% can_create Facture %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
href=
"{% url 'cotisations:new-facture' users.id %}"
>
<i
class=
"fa fa-eur
o-sign
"
></i>
<i
class=
"fa fa-eur"
></i>
{% trans "Add as subscription" %}
</a>
{% if user_solde %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
href=
"{% url 'cotisations:credit-solde' users.id %}"
>
<i
class=
"fa fa-eur
o-sign
"
></i>
<i
class=
"fa fa-eur"
></i>
{% trans "Edit the balance" %}
</a>
{% endif%}
...
...
@@ -433,7 +433,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"panel-body"
>
{% can_edit users %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
href=
"{% url 'users:edit-email-settings' users.id %}"
>
<i
class=
"fa fa-pencil
-alt
"
></i>
{% trans " Edit email settings" %}
<i
class=
"fa fa-pencil"
></i>
{% trans " Edit email settings" %}
</a>
{% acl_end %}
</div>
...
...
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