Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Groups/users labels text #10663

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Groups/users labels text #10663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ea2ea
groups-users-label-text Update text labels for entries on groups and …
dogboat Jul 31, 2024
2eb9bb7
retrigger actions
dogboat Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions dojo/templates/dojo/view_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% load authorization_tags %}

{% block content %}
<h3 id="id_heading"> Group {{ group.name }}</h3>
<h3 id="id_heading"> Group: {{ group.name }}</h3>
<div class="row">
<div id="tests" class="col-md-8">
<div class="panel panel-default">
Expand Down Expand Up @@ -43,7 +43,7 @@ <h3 class="pull-left">Description</h3>
<div class="panel panel-default">
<div class="panel-heading">
<div class="clearfix">
<h4 class="pull-left">Members</h4>
<h4 class="pull-left">Members of this Group</h4>
&nbsp;
<a href="https://documentation.defectdojo.com/usage/permissions/#groups" target="_blank">
<i class="fa-solid fa-circle-question"></i></a>
Expand Down Expand Up @@ -72,7 +72,7 @@ <h4 class="pull-left">Members</h4>
<tr>
<th label="Actions"></th>
<th>User</th>
<th>Group role</th>
<th>Role in this Group</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -108,15 +108,15 @@ <h4 class="pull-left">Members</h4>
</div>
{% else %}
<div class="panel-body">
<small class="text-muted"><em>No members found.</em></small>
<small class="text-muted"><em>This Group has no members.</em></small>
</div>
{% endif %}
</div>

<div class="panel panel-default">
<div class="panel-heading">
<div class="clearfix">
<h4 class="pull-left">Product Type Groups</h4>
<h4 class="pull-left">Product Types this Group can access</h4>
&nbsp;
<a href="https://documentation.defectdojo.com/usage/permissions/" target="_blank">
<i class="fa-solid fa-circle-question"></i></a>
Expand Down Expand Up @@ -182,15 +182,15 @@ <h4 class="pull-left">Product Type Groups</h4>
</div>
{% else %}
<div class="panel-body">
<small class="text-muted"><em>No product type groups found.</em></small>
<small class="text-muted"><em>This Group cannot access any Product Types.</em></small>
</div>
{% endif %}
</div>

<div class="panel panel-default">
<div class="panel-heading">
<div class="clearfix">
<h4 class="pull-left">Product Groups</h4>
<h4 class="pull-left">Products this Group can access</h4>
&nbsp;
<a href="https://documentation.defectdojo.com/usage/permissions/" target="_blank">
<i class="fa-solid fa-circle-question"></i></a>
Expand Down Expand Up @@ -256,7 +256,7 @@ <h4 class="pull-left">Product Groups</h4>
</div>
{% else %}
<div class="panel-body">
<small class="text-muted"><em>No product groups found.</em></small>
<small class="text-muted"><em>This Group cannot access any Products.</em></small>
</div>
{% endif %}
</div>
Expand Down
16 changes: 8 additions & 8 deletions dojo/templates/dojo/view_user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% block content %}
{{ block.super }}
<h3 id="id_heading">{% blocktrans with full_name=user.get_full_name %}User {{ full_name }}{% endblocktrans %}</h3>
<h3 id="id_heading">{% blocktrans with full_name=user.get_full_name %}User: {{ full_name }}{% endblocktrans %}</h3>
<div class="row">
<div id="tests" class="col-md-8">
<div class="panel panel-default">
Expand Down Expand Up @@ -104,7 +104,7 @@ <h4 class="pull-left">{% trans "Contact Information" %}</h4>
<div class="panel panel-default">
<div class="panel-heading">
<div class="clearfix">
<h4 class="pull-left">{% trans "Product Type Membership" %}</h4>
<h4 class="pull-left">{% trans "Product Types this User can access" %}</h4>
&nbsp;
<a href="https://documentation.defectdojo.com/usage/permissions/" target="_blank">
<i class="fa-solid fa-circle-question"></i></a>
Expand Down Expand Up @@ -170,14 +170,14 @@ <h4 class="pull-left">{% trans "Product Type Membership" %}</h4>
</div>
{% else %}
<div class="panel-body">
<small class="text-muted"><em>{% trans "No product type members found." %}</em></small>
<small class="text-muted"><em>{% trans "This User is not assigned to any Product Types." %}</em></small>
</div>
{% endif %}
</div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="clearfix">
<h4 class="pull-left">{% trans "Product Membership" %}</h4>
<h4 class="pull-left">{% trans "Products this User can access" %}</h4>
&nbsp;
<a href="https://documentation.defectdojo.com/usage/permissions/" target="_blank">
<i class="fa-solid fa-circle-question"></i></a>
Expand Down Expand Up @@ -243,15 +243,15 @@ <h4 class="pull-left">{% trans "Product Membership" %}</h4>
</div>
{% else %}
<div class="panel-body">
<small class="text-muted"><em>{% trans "No product members found." %}</em></small>
<small class="text-muted"><em>{% trans "This User is not assigned to any Products." %}</em></small>
</div>
{% endif %}
</div>

<div class="panel panel-default">
<div class="panel-heading">
<div class="clearfix">
<h4 class="pull-left">{% trans "Group Membership" %}</h4>
<h4 class="pull-left">{% trans "Groups this User is a member of" %}</h4>
&nbsp;
<a href="https://documentation.defectdojo.com/usage/permissions/#groups" target="_blank">
<i class="fa-solid fa-circle-question"></i></a>
Expand Down Expand Up @@ -280,7 +280,7 @@ <h4 class="pull-left">{% trans "Group Membership" %}</h4>
<tr>
<th></th>
<th>{% trans "Group" %}</th>
<th>{% trans "Group role" %}</th>
<th>{% trans "Role in this Group" %}</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -317,7 +317,7 @@ <h4 class="pull-left">{% trans "Group Membership" %}</h4>
</div>
{% else %}
<div class="panel-body">
<small class="text-muted"><em>{% trans "No group members found." %}</em></small>
<small class="text-muted"><em>{% trans "This User is not a member of any Groups." %}</em></small>
</div>
{% endif %}
</div>
Expand Down
Loading