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

Ajoute plus d'espace entre les éléments de la page utilisateurs classique. #596

Merged
merged 1 commit into from
Apr 14, 2020
Merged

Ajoute plus d'espace entre les éléments de la page utilisateurs classique. #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 25 additions & 23 deletions app/views/allUsersByGroup.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
@import models._
@(currentUser: User, currentUserRights: Authorization.UserRights)(userGroups: List[UserGroup], allUsers: List[User], applications: List[Application], selectedArea: Area)(implicit webJarsUtil: org.webjars.play.WebJarsUtil, flash: Flash, request: RequestHeader)

@display(users: Seq[User], id: Option[String] = None)(header: Html)(footer: Html) = {
<table class="mdl-cell mdl-cell--12-col mdl-data-table mdl-js-data-table pem-table mdl-shadow--2dp mdl-color--white" style="white-space: normal;" @if(id.isDefined){ id="@id.get" } >
<thead>
<th class="mdl-data-table__cell--non-numeric" colspan="6" style="font-size: 20px; text-align: left; color: black; font-weight: normal" >
@header
</th>
</thead>
<tfoot>
<tr>
<td class="mdl-data-table__cell--non-numeric" colspan="5">
@footer
</td>
</tr>
<tr class="invisible">
<td class="mdl-data-table__cell--non-numeric" colspan="5" style="text-align: center"><button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored" onclick="clearSearch()">Supprimer le filtre et afficher toutes les demandes</button></td>
</tr>
</tfoot>
<tbody>
@display(users: Seq[User], id: Option[String] = None)(header: Html)(footer: Html) = {
<div class="mdl-cell mdl-cell--12-col mdl-shadow--2dp mdl-color--white" style="padding: 24px;" @if(id.isDefined){ id="@id.get" } >
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

il y a du stule embed

<div>
<div style="font-size: 20px; color: black;" >
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style embed

@header
</div>
</div>
<table class="mdl-data-table mdl-js-data-table" style="border: none; border-spacing: 0px; border-collapse: unset; white-space: normal;">
@for(user <- users) {
<tr class="searchable-row td--clear-border">
@if(currentUser.admin) {
Expand Down Expand Up @@ -61,10 +51,22 @@
</td>
<td class="mdl-data-table__cell--non-numeric search-cell mdl-data-table__cell--content-size"></td>
</tr>
}
</tbody>
</table>
}
}
</table>
<div style="margin-top: 24px; margin-bottom: -24px;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style embed -> dans un fichier normalement

<div>
@footer
</div>
<div class="invisible">
<div style="text-align: center;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style embed -> dans un fichier normalement

<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored" onclick="clearSearch()">Supprimer le filtre et afficher toutes les demandes</button>
</div>
</div>
</div>
</div>
}


@main(currentUser, currentUserRights)(s"Gestion des groupes utilisateurs - ${selectedArea.name}") {
<link rel="stylesheet" media="screen,print" href='@routes.Assets.versioned("stylesheets/newForm.css")'>

Expand Down Expand Up @@ -125,7 +127,7 @@
@if(Authorization.canEditGroups(currentUserRights)) {
@helper.form(routes.UserController.add(userGroup.id), "method" -> "get") {
@helper.CSRF.formField
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" style="width: unset; margin-right: 24px;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style embed -> dans un fichier normalement

<input class="mdl-textfield__input" type="text" pattern="-?[0-9]*(\.[0-9]+)?" id="rows" name="rows" value="1">
<label class="mdl-textfield__label" for="rows">Nombre d'utilisateur à ajouter</label>
<span class="mdl-textfield__error">Ce n'est pas un nombre</span>
Expand Down
2 changes: 0 additions & 2 deletions app/views/editGroup.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import models._
@import views.html.helper.CSRF
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah bah comme quoi, tous les unused import dans les templates ne sont pas des faux positifs

@(currentUser: User, currentUserRights: Authorization.UserRights)(userGroup: UserGroup, groupUsers: List[User], isEmpty: Boolean)(implicit webJarsUtil: org.webjars.play.WebJarsUtil, flash: Flash, request: RequestHeader)


Expand Down