Merge pull request #74 from Quantum-P3/fix/design-dialog-table

src/main/resources/templates/mail/activationEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/creationEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/encuestaPrivadaEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/encuestaPublicaEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/passwordResetEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/passwordRestoredEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/reactivatedAccountEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/resources/templates/mail/suspendedAccountEmail.html

@@ -244,7 +244,7 @@
               <img
                 src="https://res.cloudinary.com/marielascloud/image/upload/v1626333882/email_v7pjtv.png"
                 alt=""
-                style="width: 300px; max-width: 600px; height: auto; margin: auto; display: block"
+                style="width: 250px; max-width: 600px; height: auto; margin: auto; display: block"
               />
             </td>
           </tr>

src/main/webapp/app/account/settings/settings.component.html

@@ -1,172 +1,3 @@
-<!-- <div>
-  <div class="row justify-content-center">
-    <div class="col-md-8">
-      <h2 jhiTranslate="settings.title" [translateValues]="{ username: account.login }" *ngIf="account">
-        User settings for [<strong>{{ account.login }}</strong
-        >]
-      </h2>
-
-      <div class="alert alert-success" *ngIf="success" jhiTranslate="settings.messages.success">
-        <strong>Settings saved!</strong>
-      </div>
-
-      <jhi-alert-error></jhi-alert-error>
-
-      <form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" *ngIf="account" novalidate>
-        <div class="form-group">
-          <label class="form-control-label" for="firstName" jhiTranslate="settings.form.firstname">First Name</label>
-          <input
-            type="text"
-            class="form-control"
-            id="firstName"
-            name="firstName"
-            placeholder="{{ 'settings.form.firstname.placeholder' | translate }}"
-            formControlName="firstName"
-            data-cy="firstname"
-          />
-
-          <div
-            *ngIf="
-              settingsForm.get('firstName')!.invalid && (settingsForm.get('firstName')!.dirty || settingsForm.get('firstName')!.touched)
-            "
-          >
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('firstName')?.errors?.required"
-              jhiTranslate="settings.messages.validate.firstname.required"
-            >
-              Your first name is required.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('firstName')?.errors?.minlength"
-              jhiTranslate="settings.messages.validate.firstname.minlength"
-            >
-              Your first name is required to be at least 1 character.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('firstName')?.errors?.maxlength"
-              jhiTranslate="settings.messages.validate.firstname.maxlength"
-            >
-              Your first name cannot be longer than 50 characters.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" for="lastName" jhiTranslate="settings.form.lastname">Last Name</label>
-          <input
-            type="text"
-            class="form-control"
-            id="lastName"
-            name="lastName"
-            placeholder="{{ 'settings.form.lastname.placeholder' | translate }}"
-            formControlName="lastName"
-            data-cy="lastname"
-          />
-
-          <div
-            *ngIf="settingsForm.get('lastName')!.invalid && (settingsForm.get('lastName')!.dirty || settingsForm.get('lastName')!.touched)"
-          >
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('lastName')?.errors?.required"
-              jhiTranslate="settings.messages.validate.lastname.required"
-            >
-              Your last name is required.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('lastName')?.errors?.minlength"
-              jhiTranslate="settings.messages.validate.lastname.minlength"
-            >
-              Your last name is required to be at least 1 character.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('lastName')?.errors?.maxlength"
-              jhiTranslate="settings.messages.validate.lastname.maxlength"
-            >
-              Your last name cannot be longer than 50 characters.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" for="email" jhiTranslate="global.form.email.label">Email</label>
-          <input
-            type="email"
-            class="form-control"
-            id="email"
-            name="email"
-            placeholder="{{ 'global.form.email.placeholder' | translate }}"
-            formControlName="email"
-            data-cy="email"
-          />
-
-          <div *ngIf="settingsForm.get('email')!.invalid && (settingsForm.get('email')!.dirty || settingsForm.get('email')!.touched)">
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('email')?.errors?.required"
-              jhiTranslate="global.messages.validate.email.required"
-            >
-              Your email is required.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('email')?.errors?.email"
-              jhiTranslate="global.messages.validate.email.invalid"
-            >
-              Your email is invalid.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('email')?.errors?.minlength"
-              jhiTranslate="global.messages.validate.email.minlength"
-            >
-              Your email is required to be at least 5 characters.
-            </small>
-
-            <small
-              class="form-text text-danger"
-              *ngIf="settingsForm.get('email')?.errors?.maxlength"
-              jhiTranslate="global.messages.validate.email.maxlength"
-            >
-              Your email cannot be longer than 100 characters.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group" *ngIf="languages && languages.length > 0">
-          <label for="langKey" jhiTranslate="settings.form.language">Language</label>
-          <select class="form-control" id="langKey" name="langKey" formControlName="langKey" data-cy="langKey">
-            <option *ngFor="let language of languages" [value]="language">{{ language | findLanguageFromKey }}</option>
-          </select>
-        </div>
-
-        <button
-          type="submit"
-          [disabled]="settingsForm.invalid"
-          class="btn btn-primary"
-          jhiTranslate="settings.form.button"
-          data-cy="submit"
-        >
-          Save
-        </button>
-      </form>
-    </div>
-  </div>
-</div>
--------------------------------------------------------------------------------
--->
-
 <div class="row justify-content-center">
   <div class="row w-75 pb-lg-5 pr-lg-5 mb-5" style="border-bottom: 1px solid #e7ebf3">
     <div class="col-lg-4 mr-lg-5">

src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html

@@ -2,24 +2,25 @@
   <div class="modal-header"></div>
 
   <div class="modal-body">
-    <jhi-alert-error></jhi-alert-error>
+    <!-- <jhi-alert-error></jhi-alert-error> -->
-
+    <p class="ds-title--small">Cambiar estado</p>
     <p
+      class="ds-subtitle"
       id="jhi-delete-categoria-heading"
       jhiTranslate="dataSurveyApp.categoria.delete.question"
       [translateValues]="{ nombre: categoria.nombre }"
-      style="text-align: center"
     >
       Are you sure you want to toggle this category's status?
     </p>
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary ds-btn ds-btn-secondary" data-dismiss="modal" (click)="cancel()">
+    <button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
-      &nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
+      <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-categoria" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger ds-btn ds-btn-danger">
+    <button id="jhi-confirm-delete-categoria" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
+      <fa-icon [icon]="faExchangeAlt"></fa-icon>
       <span jhiTranslate="entity.action.toggleStatus">Toggle Status</span>
     </button>
   </div>

src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.ts

@@ -10,10 +10,13 @@ import { finalize, map } from 'rxjs/operators';
 import { Categoria, ICategoria } from '../categoria.model';
 import { CategoriaService } from '../service/categoria.service';
 
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
 @Component({
   templateUrl: './categoria-delete-dialog.component.html',
 })
 export class CategoriaDeleteDialogComponent {
+  faExchangeAlt = faExchangeAlt;
+
   categoria?: ICategoria;
   encuestas?: IEncuesta[];
   encuestasFiltradas?: IEncuesta[];

src/main/webapp/app/entities/categoria/list/categoria.component.html

@@ -64,7 +64,8 @@
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
               </button>
 
-              <button type="submit" (click)="toggleStatus(categoria)" class="btn-sm ds-btn ds-btn--toggle" data-cy="entityDeleteButton">
+              <button type="submit" (click)="toggleStatus(categoria)" class="ds-btn ds-btn--danger" data-cy="entityDeleteButton">
+                <fa-icon [icon]="faExchangeAlt"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.toggleStatus">Toggle Status</span>
               </button>
             </div>

src/main/webapp/app/entities/categoria/list/categoria.component.ts

@@ -6,11 +6,15 @@ import { ICategoria } from '../categoria.model';
 import { CategoriaService } from '../service/categoria.service';
 import { CategoriaDeleteDialogComponent } from '../delete/categoria-delete-dialog.component';
 
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
+
 @Component({
   selector: 'jhi-categoria',
   templateUrl: './categoria.component.html',
 })
 export class CategoriaComponent implements OnInit {
+  faExchangeAlt = faExchangeAlt;
+
   categorias?: ICategoria[];
   isLoading = false;
   public searchString: string;

src/main/webapp/app/entities/categoria/update/categoria-update.component.html

@@ -46,10 +46,10 @@
           type="button"
           id="cancel-save"
           data-cy="entityCreateCancelButton"
-          class="btn btn-secondary ds-btn ds-btn-secondary"
+          class="ds-btn ds-btn--secondary"
           (click)="previousState()"
         >
-          &nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
+          <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
         </button>
 
         <button
@@ -58,7 +58,7 @@
           id="save-entity"
           data-cy="entityCreateSaveButton"
           [disabled]="editForm.invalid || isSaving"
-          class="btn btn-primary ds-btn ds-btn-primary"
+          class="ds-btn ds-btn--primary"
         >
           &nbsp;<span jhiTranslate="entity.action.save">Save</span>
         </button>

src/main/webapp/app/entities/encuesta/delete/encuesta-delete-dialog.component.html

@@ -6,9 +6,13 @@
   </div>
 
   <div class="modal-body">
-    <jhi-alert-error></jhi-alert-error>
+    <p class="ds-title--small">Eliminar encuesta</p>
-
+    <p
-    <p id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.question" [translateValues]="{ id: encuesta.id }">
+      class="ds-subtitle"
+      id="jhi-delete-encuesta-heading"
+      jhiTranslate="dataSurveyApp.encuesta.delete.question"
+      [translateValues]="{ id: encuesta.id }"
+    >
       Are you sure you want to delete this survey?
     </p>
   </div>

src/main/webapp/app/entities/encuesta/encuesta-delete-option-dialog/encuesta-delete-option-dialog.component.html

@@ -1,24 +1,23 @@
-<form name="deleteForm" (ngSubmit)="confirmDelete()">
+<form class="ds-form" name="deleteForm" (ngSubmit)="confirmDelete()">
   <div class="modal-header">
-    <h4 class="modal-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h4>
+    <!-- <h2 class="ds-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h2>
 
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>-->
   </div>
 
   <div class="modal-body">
-    <jhi-alert-error></jhi-alert-error>
+    <p class="ds-title--small">Eliminar opción</p>
-
+    <p class="ds-subtitle" id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.deleteoption">
-    <p id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.deleteoption">
       Are you sure you want to delete this option?
     </p>
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
+    <button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
-      <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
+      <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-encuesta" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
+    <button id="jhi-confirm-delete-option" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
       <fa-icon icon="times"></fa-icon>&nbsp;<span jhiTranslate="entity.action.delete">Delete</span>
     </button>
   </div>

src/main/webapp/app/entities/encuesta/encuesta-delete-question-dialog/encuesta-delete-question-dialog.component.html

@@ -1,24 +1,23 @@
-<form name="deleteForm" (ngSubmit)="confirmDelete()">
+<form class="ds-form" name="deleteForm" (ngSubmit)="confirmDelete()">
   <div class="modal-header">
-    <h4 class="modal-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h4>
+    <!-- <h2 class="ds-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h2>
 
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>-->
   </div>
 
   <div class="modal-body">
-    <jhi-alert-error></jhi-alert-error>
+    <p class="ds-title--small">Eliminar pregunta</p>
-
+    <p class="ds-subtitle" id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.deletequestion">
-    <p id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.deletequestion">
       Are you sure you want to delete this question?
     </p>
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
+    <button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
-      <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
+      <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-encuesta" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
+    <button id="jhi-confirm-delete-question" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
       <fa-icon icon="times"></fa-icon>&nbsp;<span jhiTranslate="entity.action.delete">Delete</span>
     </button>
   </div>

src/main/webapp/app/entities/encuesta/encuesta-publish-dialog/encuesta-publish-dialog.component.html

@@ -4,14 +4,16 @@
   </div>
 
   <div class="modal-body">
-    <jhi-alert-error></jhi-alert-error>
+    <!-- <jhi-alert-error></jhi-alert-error> -->
-
+    <p class="ds-title--small">Publicar encuesta</p>
-    <p id="jhi-delete-encuesta-heading" jhiTranslate="entity.publish.detail">Are you sure you want to delete this Encuesta?</p>
+    <p class="ds-subtitle" id="jhi-delete-encuesta-heading" jhiTranslate="entity.publish.detail">
+      Are you sure you want to delete this Encuesta?
+    </p>
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
+    <button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
-      <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
+      <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
     <button id="jhi-confirm-delete-encuesta" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--primary">

src/main/webapp/app/entities/encuesta/list/encuesta.component.html

@@ -1,7 +1,11 @@
 <div>
   <h2 id="page-heading" data-cy="EncuestaHeading">
     <div class="d-flex flex-sm-row flex-column justify-content-between align-items-center">
-      <div>
+      <div *ngIf="isAdmin() && isAuthenticated()">
+        <span class="ds-title" jhiTranslate="dataSurveyApp.encuesta.home.title">Encuestas</span>
+        <p class="ds-subtitle">Administre las encuestas de todos los usuarios</p>
+      </div>
+      <div *ngIf="!isAdmin() && isAuthenticated()">
         <span class="ds-title" jhiTranslate="dataSurveyApp.encuesta.home.title">Encuestas</span>
         <p class="ds-subtitle">Cree encuestas y publiquelas mundialmente</p>
       </div>
@@ -202,92 +206,6 @@
           ><fa-icon *ngFor="let i of [].constructor(5 - encuesta.calificacion!)" class="entity-icon--star--off" [icon]="faStar"></fa-icon>
         </div>
       </div>
-
-      <!-- <p>
-          <a [routerLink]="['/encuesta', encuesta.id, 'view']">{{ encuesta.id }}</a>
-        </p>
-        <p>{{ encuesta.nombre }}</p>
-        <p>{{ encuesta.descripcion }}</p>
-        <p>{{ encuesta.fechaCreacion | formatMediumDatetime }}</p>
-        <p>{{ encuesta.fechaPublicacion | formatMediumDatetime }}</p>
-        <p>{{ encuesta.fechaFinalizar | formatMediumDatetime }}</p>
-        <p>{{ encuesta.fechaFinalizada | formatMediumDatetime }}</p>
-        <p>{{ encuesta.calificacion }}</p>
-        <p jhiTranslate="{{ 'dataSurveyApp.AccesoEncuesta.' + encuesta.acceso }}">{{ encuesta.acceso }}</p>
-        <p>{{ encuesta.contrasenna }}</p>
-        <p jhiTranslate="{{ 'dataSurveyApp.EstadoEncuesta.' + encuesta.estado }}">{{ encuesta.estado }}</p>
-        <div>
-          <div *ngIf="encuesta.categoria">
-            <a [routerLink]="['/categoria', encuesta.categoria?.id, 'view']">{{ encuesta.categoria?.nombre }}</a>
-          </div>
-        </div>
-        <div>
-          <div *ngIf="encuesta.usuarioExtra">
-            <a [routerLink]="['/usuario-extra', encuesta.usuarioExtra?.id, 'view']">{{ encuesta.usuarioExtra?.id }}</a>
-          </div>
-        </div>
-        <div class="text-right">
-          <div class="btn-group">
-            <button
-              type="submit"
-              [routerLink]="['/encuesta', encuesta.id, 'view']"
-              class="btn btn-info btn-sm"
-              data-cy="entityDetailsButton"
-            >
-              <fa-icon icon="eye"></fa-icon>
-              <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
-            </button>
-
-            <button
-              type="submit"
-              [routerLink]="['/encuesta', encuesta.id, 'edit']"
-              class="btn btn-primary btn-sm"
-              data-cy="entityEditButton"
-            >
-              <fa-icon icon="pencil-alt"></fa-icon>
-              <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
-            </button>
-
-            <button type="submit" (click)="delete(encuesta)" class="btn btn-danger btn-sm" data-cy="entityDeleteButton">
-              <fa-icon icon="times"></fa-icon>
-              <span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div *ngIf="encuesta.usuarioExtra">
-          <a [routerLink]="['/usuario-extra', encuesta.usuarioExtra?.id, 'view']">{{ encuesta.usuarioExtra?.id }}</a>
-        </div>
-      </div>
-      <div class="text-right">
-        <div class="btn-group">
-          <button
-            type="submit"
-            [routerLink]="['/encuesta', encuesta.id, 'view']"
-            class="btn btn-info btn-sm"
-            data-cy="entityDetailsButton"
-          >
-            <fa-icon icon="eye"></fa-icon>
-            <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
-          </button>
-
-          <button
-            type="submit"
-            [routerLink]="['/encuesta', encuesta.id, 'edit']"
-            class="btn btn-primary btn-sm"
-            data-cy="entityEditButton"
-          >
-            <fa-icon icon="pencil-alt"></fa-icon>
-            <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
-          </button>
-
-          <button type="submit" (click)="delete(encuesta)" class="btn btn-danger btn-sm" data-cy="entityDeleteButton">
-            <fa-icon icon="times"></fa-icon>
-            <span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span>
-          </button>
-        </div>
-      </div> -->
     </div>
   </div>
 </div>
@@ -318,7 +236,8 @@
         <td jhiTranslate="{{ 'dataSurveyApp.EstadoEncuesta.' + encuesta.estado }}">{{ encuesta.estado }}</td>
         <td>
           <div *ngIf="encuesta.categoria">
-            <a [routerLink]="['/categoria', encuesta.categoria?.id, 'view']">{{ encuesta.categoria?.nombre }}</a>
+            <!-- <a [routerLink]="['/categoria', encuesta.categoria?.id, 'view']">{{ encuesta.categoria?.nombre }}</a> -->
+            {{ encuesta.categoria?.nombre }}
           </div>
         </td>
         <td>
@@ -328,7 +247,7 @@
         </td>
         <td class="text-right">
           <div class="btn-group">
-            <button
+            <!-- <button
               type="submit"
               [routerLink]="['/encuesta', encuesta.id, 'view']"
               class="ds-btn btn-info btn-sm"
@@ -336,9 +255,9 @@
             >
               <fa-icon icon="eye"></fa-icon>
               <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
-            </button>
+            </button> -->
 
-            <button
+            <!-- <button
               type="submit"
               [routerLink]="['/encuesta', encuesta.id, 'edit']"
               class="ds-btn ds-btn--primary btn-sm"
@@ -346,7 +265,7 @@
             >
               <fa-icon icon="pencil-alt"></fa-icon>
               <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
-            </button>
+            </button> -->
 
             <button type="submit" (click)="delete(encuesta)" class="ds-btn ds-btn--danger btn-sm" data-cy="entityDeleteButton">
               <fa-icon icon="times"></fa-icon>
@@ -488,268 +407,3 @@
     </div>
   </div>
 </div>
-
-<!-- ------------------------------------------------------------------------------------------------- -->
-
-<!-- <div ngIf class="row justify-content-center">
-  <div class="col-8">
-    <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
-      <h2 id="jhi-encuesta-heading" data-cy="EncuestaCreateUpdateHeading" jhiTranslate="dataSurveyApp.encuesta.home.createOrEditLabel">
-        Create or edit a Encuesta
-      </h2>
-
-      <div>
-        <jhi-alert-error></jhi-alert-error>
-
-        <div class="form-group" [hidden]="editForm.get('id')!.value == null">
-          <label class="form-control-label" jhiTranslate="global.field.id" for="field_id">ID</label>
-          <input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.nombre" for="field_nombre">Nombre</label>
-          <input type="text" class="form-control" name="nombre" id="field_nombre" data-cy="nombre" formControlName="nombre" />
-          <div *ngIf="editForm.get('nombre')!.invalid && (editForm.get('nombre')!.dirty || editForm.get('nombre')!.touched)">
-            <small class="form-text text-danger" *ngIf="editForm.get('nombre')?.errors?.required" jhiTranslate="entity.validation.required">
-              This field is required.
-            </small>
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('nombre')?.errors?.minlength"
-              jhiTranslate="entity.validation.minlength"
-              [translateValues]="{ min: 1 }"
-            >
-              This field is required to be at least 1 characters.
-            </small>
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('nombre')?.errors?.maxlength"
-              jhiTranslate="entity.validation.maxlength"
-              [translateValues]="{ max: 50 }"
-            >
-              This field cannot be longer than 50 characters.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.descripcion" for="field_descripcion">Descripcion</label>
-          <input
-            type="text"
-            class="form-control"
-            name="descripcion"
-            id="field_descripcion"
-            data-cy="descripcion"
-            formControlName="descripcion"
-          />
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.fechaCreacion" for="field_fechaCreacion"
-            >Fecha Creacion</label
-          >
-          <div class="d-flex">
-            <input
-              id="field_fechaCreacion"
-              data-cy="fechaCreacion"
-              type="datetime-local"
-              class="form-control"
-              name="fechaCreacion"
-              formControlName="fechaCreacion"
-              placeholder="YYYY-MM-DD HH:mm"
-            />
-          </div>
-          <div
-            *ngIf="
-              editForm.get('fechaCreacion')!.invalid && (editForm.get('fechaCreacion')!.dirty || editForm.get('fechaCreacion')!.touched)
-            "
-          >
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('fechaCreacion')?.errors?.required"
-              jhiTranslate="entity.validation.required"
-            >
-              This field is required.
-            </small>
-            <small
-              class="form-text text-danger"
-              [hidden]="!editForm.get('fechaCreacion')?.errors?.ZonedDateTimelocal"
-              jhiTranslate="entity.validation.ZonedDateTimelocal"
-            >
-              This field should be a date and time.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.fechaPublicacion" for="field_fechaPublicacion"
-            >Fecha Publicacion</label
-          >
-          <div class="d-flex">
-            <input
-              id="field_fechaPublicacion"
-              data-cy="fechaPublicacion"
-              type="datetime-local"
-              class="form-control"
-              name="fechaPublicacion"
-              formControlName="fechaPublicacion"
-              placeholder="YYYY-MM-DD HH:mm"
-            />
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.fechaFinalizar" for="field_fechaFinalizar"
-            >Fecha Finalizar</label
-          >
-          <div class="d-flex">
-            <input
-              id="field_fechaFinalizar"
-              data-cy="fechaFinalizar"
-              type="datetime-local"
-              class="form-control"
-              name="fechaFinalizar"
-              formControlName="fechaFinalizar"
-              placeholder="YYYY-MM-DD HH:mm"
-            />
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.fechaFinalizada" for="field_fechaFinalizada"
-            >Fecha Finalizada</label
-          >
-          <div class="d-flex">
-            <input
-              id="field_fechaFinalizada"
-              data-cy="fechaFinalizada"
-              type="datetime-local"
-              class="form-control"
-              name="fechaFinalizada"
-              formControlName="fechaFinalizada"
-              placeholder="YYYY-MM-DD HH:mm"
-            />
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.calificacion" for="field_calificacion">Calificacion</label>
-          <input
-            type="number"
-            class="form-control"
-            name="calificacion"
-            id="field_calificacion"
-            data-cy="calificacion"
-            formControlName="calificacion"
-          />
-          <div
-            *ngIf="editForm.get('calificacion')!.invalid && (editForm.get('calificacion')!.dirty || editForm.get('calificacion')!.touched)"
-          >
-            <small
-              class="form-text text-danger"
-              *ngIf="editForm.get('calificacion')?.errors?.required"
-              jhiTranslate="entity.validation.required"
-            >
-              This field is required.
-            </small>
-            <small
-              class="form-text text-danger"
-              [hidden]="!editForm.get('calificacion')?.errors?.number"
-              jhiTranslate="entity.validation.number"
-            >
-              This field should be a number.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.acceso" for="field_acceso">Acceso</label>
-          <select class="form-control" name="acceso" formControlName="acceso" id="field_acceso" data-cy="acceso">
-            <option [ngValue]="null">{{ 'dataSurveyApp.AccesoEncuesta.null' | translate }}</option>
-            <option value="PUBLIC">{{ 'dataSurveyApp.AccesoEncuesta.PUBLIC' | translate }}</option>
-            <option value="PRIVATE">{{ 'dataSurveyApp.AccesoEncuesta.PRIVATE' | translate }}</option>
-          </select>
-          <div *ngIf="editForm.get('acceso')!.invalid && (editForm.get('acceso')!.dirty || editForm.get('acceso')!.touched)">
-            <small class="form-text text-danger" *ngIf="editForm.get('acceso')?.errors?.required" jhiTranslate="entity.validation.required">
-              This field is required.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.contrasenna" for="field_contrasenna">Contrasenna</label>
-          <input
-            type="text"
-            class="form-control"
-            name="contrasenna"
-            id="field_contrasenna"
-            data-cy="contrasenna"
-            formControlName="contrasenna"
-          />
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.estado" for="field_estado">Estado</label>
-          <select class="form-control" name="estado" formControlName="estado" id="field_estado" data-cy="estado">
-            <option [ngValue]="null">{{ 'dataSurveyApp.EstadoEncuesta.null' | translate }}</option>
-            <option value="DRAFT">{{ 'dataSurveyApp.EstadoEncuesta.DRAFT' | translate }}</option>
-            <option value="ACTIVE">{{ 'dataSurveyApp.EstadoEncuesta.ACTIVE' | translate }}</option>
-            <option value="FINISHED">{{ 'dataSurveyApp.EstadoEncuesta.FINISHED' | translate }}</option>
-            <option value="DELETED">{{ 'dataSurveyApp.EstadoEncuesta.DELETED' | translate }}</option>
-          </select>
-          <div *ngIf="editForm.get('estado')!.invalid && (editForm.get('estado')!.dirty || editForm.get('estado')!.touched)">
-            <small class="form-text text-danger" *ngIf="editForm.get('estado')?.errors?.required" jhiTranslate="entity.validation.required">
-              This field is required.
-            </small>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.categoria" for="field_categoria">Categoria</label>
-          <select class="form-control" id="field_categoria" data-cy="categoria" name="categoria" formControlName="categoria">
-            <option [ngValue]="null"></option>
-            <option
-              [ngValue]="categoriaOption.id === editForm.get('categoria')!.value?.id ? editForm.get('categoria')!.value : categoriaOption"
-              *ngFor="let categoriaOption of categoriasSharedCollection; trackBy: trackCategoriaById"
-            >
-              {{ categoriaOption.nombre }}
-            </option>
-          </select>
-        </div>
-
-        <div class="form-group">
-          <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.usuarioExtra" for="field_usuarioExtra"
-            >Usuario Extra</label
-          >
-          <select class="form-control" id="field_usuarioExtra" data-cy="usuarioExtra" name="usuarioExtra" formControlName="usuarioExtra">
-            <option [ngValue]="null"></option>
-            <option
-              [ngValue]="
-                usuarioExtraOption.id === editForm.get('usuarioExtra')!.value?.id ? editForm.get('usuarioExtra')!.value : usuarioExtraOption
-              "
-              *ngFor="let usuarioExtraOption of usuarioExtrasSharedCollection; trackBy: trackUsuarioExtraById"
-            >
-              {{ usuarioExtraOption.id }}
-            </option>
-          </select>
-        </div>
-      </div>
-
-      <div>
-        <button type="button" id="cancel-save" data-cy="entityCreateCancelButton" class="btn btn-secondary" (click)="previousState()">
-          <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
-        </button>
-
-        <button
-          type="submit"
-          id="save-entity"
-          data-cy="entityCreateSaveButton"
-          [disabled]="editForm.invalid || isSaving"
-          class="btn btn-primary"
-        >
-          <fa-icon icon="save"></fa-icon>&nbsp;<span jhiTranslate="entity.action.save">Save</span>
-        </button>
-      </div>
-    </form>
-  </div>
-</div> -->

src/main/webapp/app/entities/parametro-aplicacion/update/parametro-aplicacion-update.component.html

@@ -1,17 +1,14 @@
 <div class="row justify-content-center ds-form">
-  <div class="row w-75 mb-4" style="border-bottom: 1px solid #e7ebf3">
-    <div class="col-lg-10 mr-lg-5">
-      <div class="row">
-        <div class="w-100">
-          <p class="ds-title">Configuración</p>
-        </div>
-        <div>
-          <p class="ds-subtitle">Configuración de parámetros de DataSurvey.</p>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class="row w-75">
+    <!-- <h2 id="page-heading" data-cy="EncuestaHeading">
+      <div class="d-flex flex-sm-row flex-column justify-content-between align-items-center">
+        <div>
+          <span class="ds-title">Configuración</span>
+          <p class="ds-subtitle">Configure los parámetros de encuestas de DataSurvey</p>
+        </div>
+      </div>
+    </h2> -->
+
     <div class="w-100 alert alert-danger" *ngIf="minDiasIncorrect">
       La cantidad mínima de los días, debe ser inferior a la cantidad máxima
     </div>

src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.html

@@ -1,20 +1,22 @@
-<form *ngIf="usuarioExtra" name="deleteForm" (ngSubmit)="confirmDelete(usuarioExtra)">
+<form class="ds-form" *ngIf="usuarioExtra" name="deleteForm" (ngSubmit)="confirmDelete(usuarioExtra)">
   <div class="modal-header">
     <!--<h4 class="modal-title" data-cy="usuarioExtraDeleteDialogHeading" jhiTranslate="entity.delete.status">Confirm delete operation</h4>-->
   </div>
 
   <div class="modal-body">
-    <jhi-alert-error></jhi-alert-error>
+    <p class="ds-title--small">Cambiar estado</p>
-
+    <p class="ds-subtitle" id="jhi-delete-usuarioExtra-heading" jhiTranslate="dataSurveyApp.usuarioExtra.delete.question">
-    <p id="jhi-delete-usuarioExtra-heading" jhiTranslate="dataSurveyApp.usuarioExtra.delete.question"></p>
+      Are you sure you want to toggle this user's status?
+    </p>
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
+    <button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
-      <fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
+      <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button id="jhi-confirm-delete-usuarioExtra" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-warning">
+    <button id="jhi-confirm-delete-usuarioExtra" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
+      <fa-icon [icon]="faExchangeAlt"></fa-icon>
       <span jhiTranslate="entity.action.toggleStatus">Cambiar estado</span>
     </button>
   </div>

src/main/webapp/app/entities/usuario-extra/delete/usuario-extra-delete-dialog.component.ts

@@ -5,10 +5,14 @@ import { IUsuarioExtra } from '../usuario-extra.model';
 import { UsuarioExtraService } from '../service/usuario-extra.service';
 import { EstadoUsuario } from '../../enumerations/estado-usuario.model';
 
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
+
 @Component({
   templateUrl: './usuario-extra-delete-dialog.component.html',
 })
 export class UsuarioExtraDeleteDialogComponent {
+  faExchangeAlt = faExchangeAlt;
+
   usuarioExtra?: IUsuarioExtra;
 
   constructor(protected usuarioExtraService: UsuarioExtraService, protected activeModal: NgbActiveModal) {}

src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html

@@ -24,11 +24,11 @@
   </div>
   <form class="ds-form d-inline">
     <div class="input-group">
-      <div class="col-3">
+      <div class="ds-filter">
         <div class="input-group-addon"><i class="glyphicon glyphicon-search"></i></div>
         <input type="text" name="searchNombreUsuario" placeholder="Buscar por nombre..." [(ngModel)]="searchNombreUsuario" />
       </div>
-      <div class="col-3">
+      <div class="ds-filter">
         <div class="input-group-addon"><i class="glyphicon glyphicon-search"></i></div>
         <select name="searchEstadoUsuario" id="searchEstadoUsuario" [(ngModel)]="searchEstadoUsuario" style="width: 200px">
           <option value="" selected="selected" disabled="disabled">Filtrar por estado</option>
@@ -79,7 +79,7 @@
               >{{ last ? '' : ', ' }}
             </span>
           </td>-->
-          <td class="text-center">
+          <td class="text-right">
             <div class="btn-group">
               <button
                 type="submit"
@@ -87,12 +87,12 @@
                 class="ds-btn ds-btn--primary btn-sm"
                 data-cy="entityDetailsButton"
               >
-                <fa-icon icon="eye"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
               </button>
-              &nbsp;&nbsp;
+
-              <button type="submit" (click)="delete(usuarioExtra)" class="btn-sm ds-btn ds-btn--toggle" data-cy="entityDeleteButton">
+              <button type="submit" (click)="delete(usuarioExtra)" class="ds-btn ds-btn--danger" data-cy="entityDeleteButton">
-                <span class="d-none d-md-inline" jhiTranslate="entity.action.toggleStatus"></span>
+                <fa-icon [icon]="faExchangeAlt"></fa-icon>
+                <span class="d-none d-md-inline" jhiTranslate="entity.action.toggleStatus">Toggle Status</span>
               </button>
             </div>
           </td>

src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts

@@ -8,12 +8,16 @@ import { UsuarioExtraDeleteDialogComponent } from '../delete/usuario-extra-delet
 import { IUser } from '../../user/user.model';
 import { finalize } from 'rxjs/operators';
 
+import { faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
+
 @Component({
   selector: 'jhi-usuario-extra',
   templateUrl: './usuario-extra.component.html',
   styleUrls: ['./usuario-extra.component.scss'],
 })
 export class UsuarioExtraComponent implements OnInit {
+  faExchangeAlt = faExchangeAlt;
+
   usuarioExtras?: IUsuarioExtra[];
   publicUsers?: IUser[];
   isLoading = false;

src/main/webapp/app/login/login.component.html

@@ -62,7 +62,7 @@
       <div class="col-xxl-4 col-lg-5">
         <div class="card mt-5">
           <!-- Logo -->
-          <div class="pl-4 pt-4 pr-4 pb-1 text-center">
+          <div role="button" routerLink="/" class="pl-4 pt-4 pr-4 pb-1 text-center">
             <img src="../../content/img_datasurvey/datasurvey-logo-text-black.svg" alt="" />
           </div>
 

src/main/webapp/content/scss/paper-dashboard/_datasurvey-global.scss

@@ -11,6 +11,14 @@
   font-size: 1.2rem;
 }
 
+.ds-title--small {
+  color: #313747;
+  font-weight: 900;
+  letter-spacing: 0.025rem;
+  text-transform: uppercase;
+  font-size: 1.1rem;
+}
+
 .ds-subtitle {
   color: #757d94;
   font-size: 0.9rem;

src/main/webapp/content/scss/paper-dashboard/_datasurvey-modal.scss

@@ -12,7 +12,7 @@
   .modal-header,
   .modal-footer {
     border: none;
-    padding: 2rem;
+    padding: 2rem !important;
     display: flex;
     align-items: center;
 

src/main/webapp/content/scss/paper-dashboard/_modals.scss

@@ -1,5 +1,6 @@
 .modal-header {
-  border-bottom: 1px solid $medium-gray;
+  // border-bottom: 1px solid $medium-gray;
+  border: none !important;
   padding: 20px;
   text-align: center;
   display: block !important;
@@ -41,9 +42,9 @@
 }
 
 .modal-content {
-  border: 0 none;
+  border: none !important;
-  border-radius: 10px;
+  border-radius: 3px !important;
-  box-shadow: 0 0 15px rgba(0, 0, 0, 0.15), 0 0 1px 1px rgba(0, 0, 0, 0.1);
+  box-shadow: none !important;
   .modal-header {
     h6 {
       margin-top: 10px;
@@ -59,8 +60,9 @@
   color: #000;
 }
 .modal-footer {
-  border-top: 1px solid $medium-gray;
+  // border-top: 1px solid $medium-gray;
-  padding: 0px;
+  border: none !important;
+  // padding: 0px;
 
   &.no-border-footer {
     border-top: 0 none;

src/main/webapp/i18n/es/usuarioExtra.json

@@ -12,7 +12,7 @@
       "updated": "El usuario con el identificador {{ param }} ha sido actualizado",
       "deleted": "El usuario con el identificador {{ param }} ha sido eliminado",
       "delete": {
-        "question": "¿Seguro que quiere modificar el estado del usuario ?"
+        "question": "¿Seguro que quiere cambiar el estado del usuario?"
       },
       "detail": {
         "title": "Usuario"