refs #1138 Fix stash pop from add translate and es-en files

ogWebconsole/src/app/components/calendar/calendar.component.html

@@ -1,9 +1,4 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminImagesTitle">Administrar calendarios</h2>
-  <div class="calendar-button-row">
-    <button mat-flat-button color="primary" (click)="addImage()">Añadir calendario</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
@@ -12,21 +7,14 @@
     <button joyrideStep="addButtonStep" text="{{ 'addButtonStepText' | translate }}" mat-flat-button color="primary" (click)="addImage()">
       {{ 'addCalendar' | translate }}
     </button>
->>>>>>> Stashed changes
   </div>
 </div>
 <mat-divider class="divider"></mat-divider>
 
 <div class="search-container">
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-string">
-    <mat-label i18n="@@searchLabel">Buscar nombre de calendario</mat-label>
-    <input matInput placeholder="Búsqueda" [(ngModel)]="filters['name']" (keyup.enter)="search()" i18n-placeholder="@@searchPlaceholder">
-=======
   <mat-form-field joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}" appearance="fill" class="search-string">
     <mat-label>{{ 'searchCalendarLabel' | translate }}</mat-label>
     <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
->>>>>>> Stashed changes
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
@@ -37,11 +25,7 @@
 </div>
 
 <div *ngIf="!loading">
-<<<<<<< Updated upstream
-  <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-=======
   <table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
->>>>>>> Stashed changes
     <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
       <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
       <td mat-cell *matCellDef="let image">
@@ -56,13 +40,8 @@
       </td>
     </ng-container>
 
-<<<<<<< Updated upstream
-    <ng-container matColumnDef="actions">
-      <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: center;">Acciones</th>
-=======
     <ng-container matColumnDef="actions" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
       <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
->>>>>>> Stashed changes
       <td mat-cell *matCellDef="let calendar" style="text-align: center;">
         <button mat-icon-button color="primary" (click)="editCalendar(calendar)">
           <mat-icon>edit</mat-icon>

ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.html

@@ -1,9 +1,4 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminCommandGroupsTitle">Administrar Grupos de Comandos</h2>
-  <div class="command-groups-button-row">
-    <button mat-flat-button color="primary" (click)="openCreateCommandGroupModal()">Añadir Grupo de Comandos</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
@@ -12,17 +7,12 @@
     <button mat-flat-button color="primary" (click)="openCreateCommandGroupModal()" joyrideStep="addCommandGroupStep" text="{{ 'addCommandGroupStepText' | translate }}">
       {{ 'addCommandGroup' | translate }}
     </button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
-<<<<<<< Updated upstream
-<div class="search-container">
-=======
 
 <div class="search-container" joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchGroupNameLabel' | translate }}</mat-label>
     <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
@@ -31,20 +21,12 @@
   </mat-form-field>
 </div>
 
-<<<<<<< Updated upstream
-<div *ngIf="loading" class="loading-container">
-=======
 <div *ngIf="loading" class="loading-container" joyrideStep="loadingStep" text="{{ 'loadingStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-spinner></mat-spinner>
 </div>
 
 <div *ngIf="!loading">
-<<<<<<< Updated upstream
-  <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-=======
   <table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
->>>>>>> Stashed changes
     <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
       <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
       <td mat-cell *matCellDef="let commandGroup">
@@ -52,13 +34,8 @@
           {{ column.cell(commandGroup) }}
         </ng-container>
 
-<<<<<<< Updated upstream
-        <ng-container *ngIf="column.columnDef === 'commands'">
-          <button mat-button [matMenuTriggerFor]="menu">Ver comandos</button>
-=======
         <ng-container *ngIf="column.columnDef === 'commands'" joyrideStep="viewCommandsStep" text="{{ 'viewCommandsStepText' | translate }}">
           <button mat-button [matMenuTriggerFor]="menu">{{ 'viewCommands' | translate }}</button>
->>>>>>> Stashed changes
           <mat-menu #menu="matMenu">
             <button mat-menu-item *ngFor="let command of commandGroup.commands">
               {{ command.name }}
@@ -69,12 +46,6 @@
     </ng-container>
 
     <ng-container matColumnDef="actions">
-<<<<<<< Updated upstream
-      <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: center;">Acciones</th>
-      <td mat-cell *matCellDef="let client" style="text-align: center;" joyrideStep="actionsStep" text="Usa estas opciones para ver, editar o eliminar un grupo de comandos.">
-        <button mat-icon-button color="info" (click)="viewGroupDetails(client)"><mat-icon i18n="@@deleteElementTooltip">visibility</mat-icon></button>
-        <button mat-icon-button color="primary" (click)="editCommandGroup(client)" i18n="@@editImage"> <mat-icon>edit</mat-icon></button>
-=======
       <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
       <td mat-cell *matCellDef="let client" style="text-align: center;" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
         <button mat-icon-button color="info" (click)="viewGroupDetails(client)">
@@ -83,7 +54,6 @@
         <button mat-icon-button color="primary" (click)="editCommandGroup(client)">
           <mat-icon>edit</mat-icon>
         </button>
->>>>>>> Stashed changes
         <button mat-icon-button color="warn" (click)="deleteCommandGroup(client)">
           <mat-icon>delete</mat-icon>
         </button>
@@ -95,11 +65,7 @@
   </table>
 </div>
 
-<<<<<<< Updated upstream
-<div class="paginator-container">
-=======
 <div class="paginator-container" joyrideStep="paginationStep" text="{{ 'paginationStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-paginator [length]="length"
                  [pageSize]="itemsPerPage"
                  [pageIndex]="page"

ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.html

@@ -38,13 +38,8 @@
       </div>
 
       <div class="selected-commands">
-<<<<<<< Updated upstream
-        <h3>Comandos Seleccionados</h3>
-        <div class="selected-commands-list">
-=======
         <h3>{{ 'selectedCommandsTitle' | translate }}</h3>
         <div class="selected-commands-list" cdkDropList (cdkDropListDropped)="drop($event)">
->>>>>>> Stashed changes
           <div class="commands-container">
             <div *ngFor="let command of selectedCommands" cdkDrag>
               <div class="command-item">

ogWebconsole/src/app/components/commands/commands-task/commands-task.component.html

@@ -1,9 +1,4 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title">Administrar Tareas</h2>
-  <div class="task-button-row">
-    <button mat-flat-button color="primary" (click)="openCreateTaskModal()">Añadir Tarea</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
@@ -12,17 +7,12 @@
     <button mat-flat-button color="primary" (click)="openCreateTaskModal()" joyrideStep="addTaskStep" text="{{ 'addTaskStepText' | translate }}">
       {{ 'addTask' | translate }}
     </button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
 
-<<<<<<< Updated upstream
-<div class="search-container">
-=======
 <div class="search-container" joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchTaskLabel' | translate }}</mat-label>
     <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()" />
@@ -32,11 +22,7 @@
 </div>
 
 <div *ngIf="!loading">
-<<<<<<< Updated upstream
-  <table mat-table [dataSource]="tasks" class="mat-elevation-z8">
-=======
   <table mat-table [dataSource]="tasks" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
->>>>>>> Stashed changes
     <ng-container matColumnDef="taskid">
       <th mat-header-cell *matHeaderCellDef> {{ 'idColumn' | translate }} </th>
       <td mat-cell *matCellDef="let task"> {{ task.id }} </td>
@@ -63,12 +49,6 @@
     </ng-container>
 
     <ng-container matColumnDef="actions">
-<<<<<<< Updated upstream
-      <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: center;">Acciones</th>
-      <td mat-cell *matCellDef="let task" style="text-align: center;" joyrideStep="actionsStep" text="Usa estas opciones para ver, editar o eliminar una tarea.">
-        <button mat-icon-button color="info" (click)="viewTaskDetails(task)"><mat-icon i18n="@@deleteElementTooltip">visibility</mat-icon></button>
-        <button mat-icon-button color="primary" (click)="editTask(task)" i18n="@@editImage"> <mat-icon>edit</mat-icon></button>
-=======
       <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
       <td mat-cell *matCellDef="let task" style="text-align: center;" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
         <button mat-icon-button color="info" (click)="viewTaskDetails(task)">
@@ -77,7 +57,6 @@
         <button mat-icon-button color="primary" (click)="editTask(task)">
           <mat-icon>edit</mat-icon>
         </button>
->>>>>>> Stashed changes
         <button mat-icon-button color="warn" (click)="deleteTask(task)">
           <mat-icon>delete</mat-icon>
         </button>
@@ -89,12 +68,8 @@
   </table>
 </div>
 
-<<<<<<< Updated upstream
-<mat-paginator [length]="length"
-=======
 <mat-paginator joyrideStep="paginationStep" text="{{ 'paginationStepText' | translate }}"
                [length]="length"
->>>>>>> Stashed changes
                [pageSize]="itemsPerPage"
                [pageSizeOptions]="pageSizeOptions"
                (page)="onPageChange($event)">

ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html

@@ -1,9 +1,4 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminCommandsTitle">Trazas de comandos y procedimientos</h2>
-  <div class="images-button-row">
-    <button mat-flat-button color="primary" (click)="resetFilters()">Reiniciar filtros</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
@@ -12,20 +7,14 @@
     <button mat-flat-button color="primary" (click)="resetFilters()" joyrideStep="resetFiltersStep" text="{{ 'resetFiltersStepText' | translate }}">
       {{ 'resetFilters' | translate }}
     </button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
 
 <div class="search-container">
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-select">
-    <input type="text" matInput [formControl]="clientControl" [matAutocomplete]="clientAuto" placeholder="Seleccione un cliente">
-=======
   <mat-form-field appearance="fill" class="search-select" joyrideStep="clientSelectStep" text="{{ 'clientSelectStepText' | translate }}">
     <input type="text" matInput [formControl]="clientControl" [matAutocomplete]="clientAuto" placeholder="{{ 'selectClientPlaceholder' | translate }}">
->>>>>>> Stashed changes
     <mat-autocomplete #clientAuto="matAutocomplete" [displayWith]="displayFnClient" (optionSelected)="onOptionClientSelected($event.option.value)">
       <mat-option *ngFor="let client of filteredClients | async" [value]="client">
         {{ client.name }}
@@ -33,13 +22,8 @@
     </mat-autocomplete>
   </mat-form-field>
 
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-select">
-    <input type="text" matInput [formControl]="commandControl" [matAutocomplete]="commandAuto" placeholder="Seleccione un comando">
-=======
   <mat-form-field appearance="fill" class="search-select" joyrideStep="commandSelectStep" text="{{ 'commandSelectStepText' | translate }}">
     <input type="text" matInput [formControl]="commandControl" [matAutocomplete]="commandAuto" placeholder="{{ 'selectCommandPlaceholder' | translate }}">
->>>>>>> Stashed changes
     <mat-autocomplete #commandAuto="matAutocomplete" [displayWith]="displayFnCommand" (optionSelected)="onOptionCommandSelected($event.option.value)">
       <mat-option *ngFor="let command of filteredCommands | async" [value]="command">
         {{ command.name }}
@@ -53,11 +37,7 @@
 </div>
 
 <div *ngIf="!loading">
-<<<<<<< Updated upstream
-  <table mat-table [dataSource]="traces" class="mat-elevation-z8">
-=======
   <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
->>>>>>> Stashed changes
     <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
       <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
       <td mat-cell *matCellDef="let trace">
@@ -70,11 +50,7 @@
   </table>
 </div>
 
-<<<<<<< Updated upstream
-<div class="paginator-container">
-=======
 <div class="paginator-container" joyrideStep="paginationStep" text="{{ 'paginationStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-paginator [length]="length"
                  [pageSize]="itemsPerPage"
                  [pageIndex]="page"

ogWebconsole/src/app/components/commands/main-commands/commands.component.html

@@ -1,26 +1,16 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminCommandsTitle">Administrar Comandos</h2>
-  <div class="command-button-row">
-    <button mat-flat-button color="primary" (click)="openCreateCommandModal()">Añadir Comando</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
   <h2 class="title" joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandsTitle' | translate }}</h2>
   <div class="command-button-row" joyrideStep="addCommandStep" text="{{ 'addCommandStepText' | translate }}">
     <button mat-flat-button color="primary" (click)="openCreateCommandModal()">{{ 'addCommand' | translate }}</button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
 
-<<<<<<< Updated upstream
-<div class="search-container">
-=======
 <div class="search-container" joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchCommandLabel' | translate }}</mat-label>
     <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()" />
@@ -29,20 +19,12 @@
   </mat-form-field>
 </div>
 
-<<<<<<< Updated upstream
-<div *ngIf="loading" class="loading-container">
-=======
 <div *ngIf="loading" class="loading-container" joyrideStep="loadingStep" text="{{ 'loadingStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-spinner></mat-spinner>
 </div>
 
 <div *ngIf="!loading">
-<<<<<<< Updated upstream
-  <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-=======
   <table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
->>>>>>> Stashed changes
     <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
       <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
       <td mat-cell *matCellDef="let command">
@@ -57,20 +39,12 @@
     </ng-container>
 
     <ng-container matColumnDef="actions">
-<<<<<<< Updated upstream
-      <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: center;">Acciones</th>
-      <td mat-cell *matCellDef="let client" style="text-align: center;">
-        <button mat-icon-button color="info" (click)="viewDetails($event, client)"><mat-icon i18n="@@deleteElementTooltip">visibility</mat-icon></button>
-        <button mat-icon-button color="primary" (click)="editCommand($event, client)" i18n="@@editImage"> <mat-icon>edit</mat-icon></button>
-        <button mat-icon-button color="warn" (click)="deleteCommand($event, client)"><mat-icon i18n="@@deleteElementTooltip">delete</mat-icon></button>
-=======
       <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
       <td mat-cell *matCellDef="let command" style="text-align: center;" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
         <button mat-icon-button color="info" (click)="executeCommand($event, command)"><mat-icon>play_arrow</mat-icon></button>
         <button mat-icon-button color="info" (click)="viewDetails($event, command)"><mat-icon>visibility</mat-icon></button>
         <button mat-icon-button color="primary" [disabled]="command.readOnly" (click)="editCommand($event, command)"><mat-icon>edit</mat-icon></button>
         <button mat-icon-button color="warn" [disabled]="command.readOnly" (click)="deleteCommand($event, command)"><mat-icon>delete</mat-icon></button>
->>>>>>> Stashed changes
       </td>
     </ng-container>
 
@@ -79,11 +53,7 @@
   </table>
 </div>
 
-<<<<<<< Updated upstream
-<div class="paginator-container">
-=======
 <div class="paginator-container" joyrideStep="paginationStep" text="{{ 'paginationStepText' | translate }}">
->>>>>>> Stashed changes
   <mat-paginator [length]="length"
                  [pageSize]="itemsPerPage"
                  [pageIndex]="page"

ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html

@@ -1,10 +1,4 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminImagesTitle">Administrar unidades organizativas</h2>
-  <div class="button-row">
-    <button mat-flat-button color="primary" (click)="resetFilters()">Reiniciar filtros</button>
-    <button mat-flat-button color="primary" (click)="addOrganizationalUnit($event)">Añadir OU</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
@@ -12,15 +6,10 @@
   <div class="button-row">
     <button mat-flat-button color="primary" (click)="resetFilters()">{{ 'resetFiltersButton' | translate }}</button>
     <button mat-flat-button color="primary" (click)="addOrganizationalUnit($event)">{{ 'addOUButton' | translate }}</button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 <div class="search-container">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchLabelOu' | translate }}</mat-label>
@@ -30,32 +19,6 @@
   </mat-form-field>
 
   <mat-form-field appearance="fill" class="search-boolean">
-<<<<<<< Updated upstream
-    <mat-label i18n="@@searchLabel">Tipo</mat-label>
-    <mat-select [(ngModel)]="filters['type']" (selectionChange)="search()" placeholder="Seleccionar opción">
-      <mat-option [value]="''">Todos</mat-option>
-      <mat-option [value]="'organizational-unit'">Centro</mat-option>
-      <mat-option [value]="'classrooms-group'">Grupos de aulas</mat-option>
-      <mat-option [value]="'classroom'">Aula</mat-option>
-      <mat-option [value]="'clients-group'">Grupos de PCs</mat-option>
-    </mat-select>
-  </mat-form-field>
-</div>
-
-<table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="Aquí se muestran las unidades organizativas según los filtros aplicados.">
-  <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
-    <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
-    <td mat-cell *matCellDef="let ou">
-      <ng-container *ngIf="column.columnDef !== 'available' && column.columnDef !== 'type'">
-        {{ column.cell(ou) }}
-      </ng-container>
-      <ng-container *ngIf="column.columnDef === 'available'">
-        <mat-chip *ngIf="ou.available" class="mat-chip-success"><mat-icon class="calendar-ico">event_available</mat-icon></mat-chip>
-        <mat-chip *ngIf="!ou.available" class="mat-chip-error"><mat-icon class="calendar-ico">event_busy</mat-icon></mat-chip>
-      </ng-container>
-      <ng-container *ngIf="column.columnDef === 'type'" >
-        <mat-chip> {{ ou.type }} </mat-chip>
-=======
     <mat-label>{{ 'typeLabel' | translate }}</mat-label>
     <mat-select [(ngModel)]="filters['type']" (selectionChange)="search()">
       <mat-option [value]="''">{{ 'allOption' | translate }}</mat-option>
@@ -84,7 +47,6 @@
       </ng-container>
       <ng-container *ngIf="column.columnDef === 'type'">
         <mat-chip>{{ ou.type | translate }}</mat-chip>
->>>>>>> Stashed changes
       </ng-container>
     </td>
   </ng-container>

ogWebconsole/src/app/components/groups/groups.component.html

@@ -1,13 +1,4 @@
 <mat-tab-group (selectedTabChange)="onTabChange($event)">
-<<<<<<< Updated upstream
-  <mat-tab label="General">
-    <div class="header-container">
-      <h2 class="title" i18n="@@adminGroupsTitle">Administrar grupos</h2>
-      <div class="groups-button-row">
-        <button mat-flat-button color="primary" (click)="addOU($event)" i18n="@@newOrganizationalUnitButton">Nueva Unidad Organizativa</button>
-        <button mat-flat-button color="primary" (click)="addClient($event)" i18n="@@newClientButton">Nuevo Cliente</button>
-        <button mat-raised-button (click)="openBottomSheet()" i18n="@@legendButton">Leyenda</button>
-=======
   <mat-tab label="{{ 'generalTabLabel' | translate }}">
     <div class="header-container" joyrideStep="tabsStep" text="{{ 'tabsStepText' | translate }}">
       <button mat-icon-button color="primary" (click)="iniciarTour()">
@@ -18,27 +9,16 @@
         <button mat-flat-button color="primary" (click)="addOU($event)" matTooltip="{{ 'newOrganizationalUnitTooltip' | translate }}" matTooltipShowDelay="1000">{{ 'newOrganizationalUnitButton' | translate }}</button>
         <button mat-flat-button color="primary" (click)="addClient($event)" matTooltipShowDelay="1000">{{ 'newClientButton' | translate }}</button>
         <button mat-raised-button (click)="openBottomSheet()" joyrideStep="keyStep" text="{{ 'keyStepText' | translate }}" matTooltipShowDelay="1000">{{ 'legendButton' | translate }}</button>
->>>>>>> Stashed changes
       </div>
     </div>
 
     <div class="groupLists-container">
-<<<<<<< Updated upstream
-      <mat-card class="card unidad-card">
-        <mat-card-title i18n="@@organizationalUnitTitle">Centros</mat-card-title>
-        <mat-card-content>
-          <mat-spinner *ngIf="loading"></mat-spinner>
-          <mat-list *ngIf="!loading">
-            <mat-list-item *ngFor="let unidad of organizationalUnits"
-                           [ngClass]="{'selected-item': unidad === selectedUnidad, 'clickable-item': true}" (click)="onSelectUnidad(unidad)">
-=======
       <mat-card class="card unidad-card" joyrideStep="unitStep" text="{{ 'unitStepText' | translate }}" matTooltipShowDelay="1000" matTooltipPosition="above">
         <mat-card-title>{{ 'organizationalUnitTitle' | translate }}</mat-card-title>
         <mat-card-content>
           <mat-spinner *ngIf="loading"></mat-spinner>
           <mat-list *ngIf="!loading">
             <mat-list-item *ngFor="let unidad of organizationalUnits" [ngClass]="{'selected-item': unidad === selectedUnidad, 'clickable-item': true}" (click)="onSelectUnidad(unidad)">
->>>>>>> Stashed changes
               <div class="item-content">
                 <mat-icon>apartment</mat-icon>
                 {{ unidad.name  }}
@@ -46,78 +26,28 @@
                   <mat-icon mat-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation()">more_vert</mat-icon>
                   <mat-menu #menu="matMenu">
                     <button mat-menu-item (click)="onTreeClick($event, unidad)">
-<<<<<<< Updated upstream
-                      <mat-icon
-                        #tooltip="matTooltip"
-                        matTooltip="Visualizar en forma de arbol"
-                        matTooltipHideDelay="0"
-                        i18n="@@viewTreeTooltip">account_tree
-                      </mat-icon>
-                      <span i18n="@@viewTreeMenu">Ver organigrama</span>
-=======
                       <mat-icon matTooltip="{{ 'viewTreeTooltip' | translate }}" matTooltipHideDelay="0">account_tree</mat-icon>
                       <span>{{ 'viewTreeMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button mat-menu-item (click)="onEditClick($event, unidad.type, unidad.uuid)">
-<<<<<<< Updated upstream
-                      <mat-icon
-                        #tooltip="matTooltip"
-                        matTooltip="Editar unidad organizativa"
-                        matTooltipHideDelay="0"
-                        i18n="@@editUnitTooltip">edit
-                      </mat-icon>
-                      <span i18n="@@editUnitMenu">Editar</span>
-=======
                       <mat-icon matTooltip="{{ 'editUnitTooltip' | translate }}" matTooltipHideDelay="0">edit</mat-icon>
                       <span>{{ 'editUnitMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button mat-menu-item (click)="onShowClick($event, unidad)">
-<<<<<<< Updated upstream
-                      <mat-icon
-                        #tooltip="matTooltip"
-                        matTooltip="Visualizar unidad organizativa"
-                        matTooltipHideDelay="0"
-                        i18n="@@viewUnitTool">visibility
-                      </mat-icon>
-                      <span i18n="@@viewUnitMenu">Visualizar datos</span>
-=======
                       <mat-icon matTooltip="{{ 'viewUnitTooltip' | translate }}" matTooltipHideDelay="0">visibility</mat-icon>
                       <span>{{ 'viewUnitMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button mat-menu-item (click)="addOU($event, unidad)">
-<<<<<<< Updated upstream
-                      <mat-icon
-                        #tooltip="matTooltip"
-                        matTooltip="Crear unidad organizativa interna"
-                        matTooltipHideDelay="0"
-                        i18n="@@addInternalUnitTool">add_home_work
-                      </mat-icon>
-                      <span i18n="@@addInternalUnitMenu">Añadir unidad organizativa</span>
-=======
                       <mat-icon matTooltip="{{ 'addInternalUnitTooltip' | translate }}" matTooltipHideDelay="0">add_home_work</mat-icon>
                       <span>{{ 'addInternalUnitMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button mat-menu-item (click)="addClient($event, unidad)">
-<<<<<<< Updated upstream
-                      <mat-icon
-                        #tooltip="matTooltip"
-                        matTooltip="Crear cliente en esta unidad organizativa"
-                        matTooltipHideDelay="0"
-                        i18n="@@addClientDevice">devices
-                      </mat-icon>
-                      <span i18n="@@addClientMenu">Crear cliente</span>
-=======
                       <mat-icon matTooltip="{{ 'addClientTooltip' | translate }}" matTooltipHideDelay="0">devices</mat-icon>
                       <span>{{ 'addClientMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
                   </mat-menu>
                 </span>
@@ -126,12 +56,8 @@
           </mat-list>
         </mat-card-content>
       </mat-card>
-<<<<<<< Updated upstream
-      <mat-card class="card elements-card">
-=======
 
       <mat-card class="card elements-card" joyrideStep="elementsStep" text="{{ 'elementsStepText' | translate }}" matTooltipShowDelay="1000" matTooltipPosition="above">
->>>>>>> Stashed changes
         <mat-card-title>
           <div class="title-with-breadcrumb">
             <span>{{ 'internalElementsTitle' | translate }}</span>
@@ -167,50 +93,26 @@
                   <mat-icon mat-button [matMenuTriggerFor]="menu" (click)="$event.stopPropagation()">more_vert</mat-icon>
                   <mat-menu #menu="matMenu">
                     <button mat-menu-item (click)="onEditClick($event, child.type, child.uuid)">
-<<<<<<< Updated upstream
-                      <mat-icon class="edit-icon" #tooltip="matTooltip" matTooltip="Editar elemento" matTooltipHideDelay="0" i18n="@@editElementTooltip">edit</mat-icon>
-                      <span i18n="@@editElementMenu">Editar</span>
-=======
                       <mat-icon matTooltip="{{ 'editElementTooltip' | translate }}" matTooltipHideDelay="0">edit</mat-icon>
                       <span>{{ 'editElementMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button *ngIf="child.type !== 'client'" mat-menu-item (click)="onShowClick($event, child)">
-<<<<<<< Updated upstream
-                      <mat-icon class="edit-icon" #tooltip="matTooltip" matTooltip="Visualizar unidad organizativa" matTooltipHideDelay="0" i18n="@@viewUnitTooltip">visibility</mat-icon>
-                      <span i18n="@@viewUnitMenu">Visualizar datos</span>
-=======
                       <mat-icon matTooltip="{{ 'viewUnitTooltip' | translate }}" matTooltipHideDelay="0">visibility</mat-icon>
                       <span>{{ 'viewUnitMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button *ngIf="child.type !== 'client'" mat-menu-item (click)="addOU($event, child)">
-<<<<<<< Updated upstream
-                      <mat-icon class="edit-icon" #tooltip="matTooltip" matTooltip="Crear unidad organizativa interna" matTooltipHideDelay="0" i18n="@@addInternalUnitTooltip">add_home_work</mat-icon>
-                      <span i18n="@@addInternalUnitMenu">Añadir unidad organizativa</span>
-=======
                       <mat-icon matTooltip="{{ 'addInternalUnitTooltip' | translate }}" matTooltipHideDelay="0">add_home_work</mat-icon>
                       <span>{{ 'addInternalUnitMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button *ngIf="child.type !== 'client'" mat-menu-item (click)="addClient($event, child)">
-<<<<<<< Updated upstream
-                      <mat-icon class="edit-icon" #tooltip="matTooltip" matTooltip="Crear cliente en esta unidad organizativa" matTooltipHideDelay="0" i18n="@@addClientTooltip">devices</mat-icon>
-                      <span i18n="@@addClientMenu">Crear cliente</span>
-=======
                       <mat-icon matTooltip="{{ 'addClientTooltip' | translate }}" matTooltipHideDelay="0">devices</mat-icon>
                       <span>{{ 'addClientMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
 
                     <button mat-menu-item (click)="onDeleteClick($event, child.uuid, child.name, child.type)">
-<<<<<<< Updated upstream
-                      <mat-icon class="delete-icon" #tooltip="matTooltip" matTooltip="Borrar elemento" matTooltipHideDelay="0" i18n="@@deleteElementTooltip">delete</mat-icon>
-                      <span i18n="@@deleteElementMenu">Borrar elemento</span>
-=======
                       <mat-icon matTooltip="{{ 'deleteElementTooltip' | translate }}" matTooltipHideDelay="0">delete</mat-icon>
                       <span>{{ 'deleteElementMenu' | translate }}</span>
                     </button>
@@ -218,7 +120,6 @@
                     <button mat-menu-item (click)="onExecuteCommand($event, child.uuid, child.name, child.type)">
                       <mat-icon matTooltip="{{ 'executeCommandTooltip' | translate }}" matTooltipHideDelay="0">play_arrow</mat-icon>
                       <span>{{ 'executeCommandMenu' | translate }}</span>
->>>>>>> Stashed changes
                     </button>
                   </mat-menu>
                 </div>
@@ -229,17 +130,6 @@
       </mat-card>
     </div>
   </mat-tab>
-<<<<<<< Updated upstream
-  <mat-tab i18n-label label="Búsqueda avanzada">
-    <app-advanced-search></app-advanced-search>
-  </mat-tab>
-
-  <mat-tab i18n-label label="Clientes">
-    <app-client-tab-view #clientTab></app-client-tab-view>
-  </mat-tab>
-
-  <mat-tab i18n-label label="Unidades organizativas">
-=======
 
   <mat-tab label="{{ 'advancedSearchTabLabel' | translate }}">
     <app-advanced-search></app-advanced-search>
@@ -250,7 +140,6 @@
   </mat-tab>
 
   <mat-tab label="{{ 'organizationalUnitsTabLabel' | translate }}">
->>>>>>> Stashed changes
     <app-organizational-unit-tab-view #organizationalUnitTab></app-organizational-unit-tab-view>
   </mat-tab>
 </mat-tab-group>

ogWebconsole/src/app/components/login/login.component.html

@@ -22,14 +22,6 @@
     </div>
   </form>
 </div>
-<<<<<<< Updated upstream
-<!-- BORRAR DESPUES DE LA DEMO -->
-<button mat-flat-button (click)="redirectToUrl1()">Español</button>
-
-<!-- Botón para redirigir a http://localhost:4200/auth/login -->
-<button mat-flat-button (click)="redirectToUrl2()">Inglés</button>
-=======
 
 <button mat-flat-button (click)="changeLanguage('es')">Español</button>
 <button mat-flat-button (click)="changeLanguage('en')">Inglés</button>
->>>>>>> Stashed changes

ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.html

@@ -1,64 +1,4 @@
 <div class="dashboard">
-<<<<<<< Updated upstream
-    <h2>OgBoot server Status</h2>
-
-    <div class="disk-usage-container">
-      <div class="disk-usage">
-        <h3>Uso de disco</h3>
-        <ngx-charts-pie-chart
-          [view]="view"
-          [scheme]="colorScheme"
-          [results]="diskUsageChartData"
-          [gradient]="gradient"
-          [doughnut]="isDoughnut"
-          [labels]="showLabels"
-          [legend]="showLegend">
-        </ngx-charts-pie-chart>
-        <div class="disk-usage-info">
-          <p>Total: {{ diskUsage.total }}</p>
-          <p>Ocupado: {{ diskUsage.used }}</p>
-          <p>Disponible: {{ diskUsage.available }}</p>
-          <p>Libre: {{ diskUsage.percentage }}</p>
-        </div>
-      </div>
-
-    <div class="services-status" joyrideStep="servicesStatusStep" text="Aquí puedes ver el estado de los servicios importantes del servidor.">
-      <h3>Servicios</h3>
-      <ul>
-        <li *ngFor="let service of getServices()">
-          <span
-            class="status-led"
-            [ngClass]="{ 'active': service.status === 'active', 'inactive': service.status !== 'active' }"
-          ></span>
-          {{ service.name }}: {{ service.status }}
-        </li>
-      </ul>
-    </div>
-  </div>
-
-    <div class="installed-oglives">
-      <h3>OGLives instalados</h3>
-      <table>
-        <thead>
-          <tr>
-            <th>ID</th>
-            <th>Kernel</th>
-            <th>Architecture</th>
-            <th>Revision</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let oglive of installedOglives">
-            <td>{{ oglive.id }}</td>
-            <td>{{ oglive.kernel }}</td>
-            <td>{{ oglive.architecture }}</td>
-            <td>{{ oglive.revision }}</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-=======
   <div class="header-container">
     <h2 joyrideStep="titleStep" text="Esta sección muestra el estado general del servidor OgBoot.">
       {{ 'ogBootServerStatus' | translate }}
@@ -127,4 +67,3 @@
     </table>
   </div>
 </div>
->>>>>>> Stashed changes

ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.html

@@ -1,12 +1,4 @@
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title">Netboot avanzado</h2>
-</div>
-
-<div [formGroup]="taskForm" class="search-container">
-  <mat-form-field appearance="fill" class="search-boolean" joyrideStep="selectUnitStep" text="Selecciona la Unidad Organizacional para listar las aulas disponibles.">
-    <mat-label>Selecciona Unidad Organizacional</mat-label>
-=======
   <h2 class="title" joyrideStep="titleStep" text="{{ 'advancedNetbootDescription' | translate }}">
     {{ 'advancedNetbootTitle' | translate }}
   </h2>
@@ -18,7 +10,6 @@
 <div [formGroup]="taskForm" class="search-container">
   <mat-form-field appearance="fill" class="search-boolean" joyrideStep="selectUnitStep" text="{{ 'selectUnitDescription' | translate }}">
     <mat-label>{{ 'selectUnitLabel' | translate }}</mat-label>
->>>>>>> Stashed changes
     <mat-select formControlName="organizationalUnit" (selectionChange)="onOrganizationalUnitChange()">
       <mat-option *ngIf="loadingUnits" disabled>{{ 'loadingUnitsOption' | translate }}</mat-option>
       <mat-option *ngFor="let unit of availableOrganizationalUnits" [value]="unit['@id']">
@@ -30,13 +21,8 @@
     </mat-error>
   </mat-form-field>
 
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-boolean">
-    <mat-label>Selecciona aula</mat-label>
-=======
   <mat-form-field appearance="fill" class="search-boolean" joyrideStep="selectClassStep" text="{{ 'selectClassDescription' | translate }}">
     <mat-label>{{ 'selectClassLabel' | translate }}</mat-label>
->>>>>>> Stashed changes
     <mat-select formControlName="selectedChild" (selectionChange)="onChildChange()">
       <mat-option *ngIf="selectedUnitChildren.length === 0" disabled>
         {{ 'noClassesOption' | translate }}
@@ -51,19 +37,6 @@
 <mat-divider class="divider"></mat-divider>
 
 <div class="global-selectors">
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="selected-global">
-    <mat-label>Seleccione plantilla para aplicar a todos los clientes</mat-label>
-    <mat-select [(value)]="globalOgLive" (selectionChange)="applyToAll()">
-      <mat-option *ngFor="let option of ogLiveOptions" [value]="option['@id']">{{ option.name }}</mat-option>
-    </mat-select>
-  </mat-form-field>
-
-  <button mat-flat-button color="primary" [disabled]="selectedUnitChildren.length === 0" (click)="saveOgLiveTemplates()" joyrideStep="saveButtonStep" text="Haz clic para guardar la configuración actual de plantillas.">Guardar</button>
-</div>
-
-<mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-=======
   <mat-form-field appearance="fill" class="selected-global" joyrideStep="applyToAllStep" text="{{ 'applyToAllDescription' | translate }}">
     <mat-label>{{ 'applyToAllLabel' | translate }}</mat-label>
     <mat-select [(value)]="globalOgLive" (selectionChange)="applyToAll()">
@@ -85,7 +58,6 @@
 </div>
 
 <mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableDescription' | translate }}">
->>>>>>> Stashed changes
   <ng-container matColumnDef="id">
     <mat-header-cell *matHeaderCellDef>{{ 'idColumnHeader' | translate }}</mat-header-cell>
     <mat-cell *matCellDef="let element"> {{ element.id }} </mat-cell>
@@ -99,13 +71,8 @@
   <ng-container matColumnDef="ogLive">
     <mat-header-cell *matHeaderCellDef>{{ 'templateColumnHeader' | translate }}</mat-header-cell>
     <mat-cell *matCellDef="let client">
-<<<<<<< Updated upstream
-      <mat-form-field appearance="fill">
-        <mat-label>Seleccione una plantilla</mat-label>
-=======
       <mat-form-field appearance="fill" joyrideStep="selectTemplateStep" text="{{ 'selectTemplateDescription' | translate }}">
         <mat-label>{{ 'selectTemplateLabel' | translate }}</mat-label>
->>>>>>> Stashed changes
         <mat-select [(ngModel)]="client.ogLive" [name]="'ogLive' + client.id">
           <mat-option [value]="null">{{ 'noTemplateOption' | translate }}</mat-option>
           <mat-option *ngFor="let template of ogLiveOptions" [value]="template['@id']">

ogWebconsole/src/app/components/ogboot/pxe-images/pxe-images.component.html

@@ -1,35 +1,18 @@
 <mat-accordion class="example-headers-align">
   <mat-expansion-panel hideToggle>
-<<<<<<< Updated upstream
-    <mat-expansion-panel-header>
-      <mat-panel-title> Información en servidor ogBoot </mat-panel-title>
-=======
     <mat-expansion-panel-header joyrideStep="serverInfoStep" [text]="'serverInfoDescription' | translate">
       <mat-panel-title>{{ 'serverInfoTitle' | translate }}</mat-panel-title>
->>>>>>> Stashed changes
     </mat-expansion-panel-header>
     <div class="button-row">
-<<<<<<< Updated upstream
-      <button mat-flat-button color="primary" (click)="syncOgBoot()"> Sincronizar base de datos</button>
-    </div>
-    <div class="button-row">
-      <button mat-flat-button color="accent" (click)="openSubnetInfoDialog()">Ver Información</button>
-=======
       <button mat-flat-button color="primary" (click)="syncOgBoot()">{{ 'syncDatabaseButton' | translate }}</button>
     </div>
     <div class="button-row">
       <button mat-flat-button color="accent" (click)="openSubnetInfoDialog()">{{ 'viewInfoButton' | translate }}</button>
->>>>>>> Stashed changes
     </div>
   </mat-expansion-panel>
 </mat-accordion>
 
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminImagesTitle">Administrar imágenes</h2>
-  <div class="images-button-row">
-    <button mat-flat-button color="primary" (click)="addImage()">Añadir imagen</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
@@ -40,51 +23,18 @@
     <button mat-flat-button color="primary" (click)="addImage()" joyrideStep="addImageStep" [text]="'addImageButtonDescription' | translate">
       {{ 'addImageButton' | translate }}
     </button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
 
 <div class="search-container">
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-string">
-    <mat-label i18n="@@searchLabel">Buscar nombre de imagen</mat-label>
-    <input matInput placeholder="Búsqueda" [(ngModel)]="filters['name']" (keyup.enter)="search()" i18n-placeholder="@@searchPlaceholder">
-=======
   <mat-form-field appearance="fill" class="search-string" joyrideStep="searchNameStep" [text]="'searchNameDescription' | translate">
     <mat-label>{{ 'searchLabel' | translate }}</mat-label>
     <input matInput [placeholder]="'searchPlaceholder' | translate" [(ngModel)]="filters['name']" (keyup.enter)="search()">
->>>>>>> Stashed changes
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-boolean">
-    <mat-label i18n="@@searchLabel">Imagen por defecto</mat-label>
-    <mat-select [(ngModel)]="filters['isDefault']" (selectionChange)="search()" placeholder="Seleccionar opción">
-      <mat-option [value]="''">Todos</mat-option>
-      <mat-option [value]="true">Sí</mat-option>
-      <mat-option [value]="false">No</mat-option>
-    </mat-select>
-  </mat-form-field>
-
-  <mat-form-field appearance="fill" class="search-boolean" joyrideStep="searchInstalledStep" text="Filtra las imágenes para mostrar solo las instaladas en el servidor OgBoot.">
-    <mat-label i18n="@@searchLabel">Instalado servidor ogBoot</mat-label>
-    <mat-select [(ngModel)]="filters['installed']" (selectionChange)="search()" placeholder="Seleccionar opción">
-      <mat-option [value]="''">Todos</mat-option>
-      <mat-option [value]="true">Sí</mat-option>
-      <mat-option [value]="false">No</mat-option>
-    </mat-select>
-  </mat-form-field>
-</div>
-
-<table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="Aquí se muestra la lista de imágenes disponibles para administrar.">
-  <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
-    <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
-    <td mat-cell *matCellDef="let image" >
-
-=======
   
   <mat-form-field appearance="fill" class="search-boolean" joyrideStep="searchDefaultImageStep" [text]="'searchDefaultDescription' | translate">
     <mat-label>{{ 'searchDefaultLabel' | translate }}</mat-label>
@@ -109,7 +59,6 @@
   <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
     <th mat-header-cell *matHeaderCellDef>{{ column.header }}</th>
     <td mat-cell *matCellDef="let image">
->>>>>>> Stashed changes
       <ng-container *ngIf="column.columnDef === 'isDefault' || column.columnDef === 'installed'">
         <mat-icon [color]="image[column.columnDef] ? 'primary' : 'warn'">
           <ng-container *ngIf="image[column.columnDef]; else cancelIcon">
@@ -146,13 +95,6 @@
   </ng-container>
 
   <ng-container matColumnDef="actions">
-<<<<<<< Updated upstream
-    <th mat-header-cell *matHeaderCellDef i18n="@@columnActions">Acciones</th>
-    <td mat-cell *matCellDef="let image" joyrideStep="actionsStep" text="Administra cada imagen con opciones para ver, editar, eliminar y más.">
-      <button mat-icon-button color="info" (click)="showOgLive($event, image)"><mat-icon i18n="@@deleteElementTooltip">visibility</mat-icon></button>
-      <button mat-icon-button color="primary" (click)="editImage(image)" i18n="@@editImage"><mat-icon>edit</mat-icon></button>
-      <button mat-icon-button color="warn" (click)="deleteImage(image)" i18n="@@buttonDelete"><mat-icon>delete</mat-icon></button>
-=======
     <th mat-header-cell *matHeaderCellDef>{{ 'actionsColumnHeader' | translate }}</th>
     <td mat-cell *matCellDef="let image" joyrideStep="actionsStep" [text]="'actionsDescription' | translate">
       <button mat-icon-button color="info" (click)="showOgLive($event, image)">
@@ -164,7 +106,6 @@
       <button mat-icon-button color="warn" (click)="deleteImage(image)">
         <mat-icon>{{ 'deleteIcon' | translate }}</mat-icon>
       </button>
->>>>>>> Stashed changes
       <button mat-icon-button [matMenuTriggerFor]="menu">
         <mat-icon>menu</mat-icon>
       </button>
@@ -183,12 +124,8 @@
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 </table>
-<<<<<<< Updated upstream
-<div class="paginator-container">
-=======
 
 <div class="paginator-container" joyrideStep="paginationStep" [text]="'paginationDescription' | translate">
->>>>>>> Stashed changes
   <mat-paginator [length]="length"
                  [pageSize]="itemsPerPage"
                  [pageIndex]="page"

ogWebconsole/src/app/components/ogboot/pxe/pxe.component.html

@@ -1,18 +1,10 @@
 <mat-accordion class="example-headers-align">
   <mat-expansion-panel hideToggle>
-<<<<<<< Updated upstream
-    <mat-expansion-panel-header>
-      <mat-panel-title> Información en servidor ogBoot </mat-panel-title>
-    </mat-expansion-panel-header>
-    <div class="example-button-row">
-      <button mat-flat-button color="primary" (click)="syncTemplates()"> Sincronizar base de datos</button>
-=======
     <mat-expansion-panel-header joyrideStep="serverInfoStep" text="{{ 'serverInfoDescription' | translate }}">
       <mat-panel-title>{{ 'serverInfoTitle' | translate }}</mat-panel-title>
     </mat-expansion-panel-header>
     <div class="example-button-row">
       <button mat-flat-button color="primary" (click)="syncTemplates()">{{ 'syncDatabaseButton' | translate }}</button>
->>>>>>> Stashed changes
     </div>
     <div class="example-button-row">
       <button mat-flat-button color="accent" (click)="openSubnetInfoDialog()">{{ 'viewInfoButton' | translate }}</button>
@@ -21,52 +13,24 @@
 </mat-accordion>
 
 <div class="header-container">
-<<<<<<< Updated upstream
-  <h2 class="title" i18n="@@adminPXETitle">Administrar plantillas PXE</h2>
-  <div class="pxe-button-row">
-    <button mat-flat-button color="primary" (click)="addPxeTemplate()">Añadir plantilla PXE</button>
-=======
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
   <h2 class="title" joyrideStep="titleStep" text="{{ 'adminPxeDescription' | translate }}">{{ 'adminPxeTitle' | translate }}</h2>
   <div class="pxe-button-row">
     <button mat-flat-button color="primary" (click)="addPxeTemplate()" joyrideStep="addTemplateStep" text="{{ 'addTemplateButtonDescription' | translate }}">{{ 'addTemplateButton' | translate }}</button>
->>>>>>> Stashed changes
   </div>
 </div>
 
 <mat-divider class="divider"></mat-divider>
 
 <div class="search-container">
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-string">
-    <mat-label i18n="@@searchLabel">Buscar nombre de plantilla</mat-label>
-    <input matInput placeholder="Búsqueda" [(ngModel)]="filters['name']" (keyup.enter)="search()" i18n-placeholder="@@searchPlaceholder">
-=======
   <mat-form-field appearance="fill" class="search-string" joyrideStep="searchNameStep" text="{{ 'searchNameDescription' | translate }}">
     <mat-label>{{ 'searchLabel' | translate }}</mat-label>
     <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
->>>>>>> Stashed changes
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
-<<<<<<< Updated upstream
-  <mat-form-field appearance="fill" class="search-boolean">
-    <mat-label i18n="@@searchLabel">Creada en ogBoot</mat-label>
-    <mat-select [(ngModel)]="filters['synchronized']" (selectionChange)="search()" placeholder="Seleccionar opción">
-      <mat-option [value]="''">Todos</mat-option>
-      <mat-option [value]="true">Sí</mat-option>
-      <mat-option [value]="false">No</mat-option>
-    </mat-select>
-  </mat-form-field>
-</div>
-
-<table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="Aquí se muestra la lista de plantillas PXE disponibles para administrar.">
-  <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
-    <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
-    <td mat-cell *matCellDef="let image" >
-=======
   <mat-form-field appearance="fill" class="search-boolean" joyrideStep="searchSyncStep" text="{{ 'searchSyncDescription' | translate }}">
     <mat-label>{{ 'createdInOgbootLabel' | translate }}</mat-label>
     <mat-select [(ngModel)]="filters['synchronized']" (selectionChange)="search()" placeholder="{{ 'selectOptionPlaceholder' | translate }}">
@@ -81,7 +45,6 @@
   <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
     <th mat-header-cell *matHeaderCellDef>{{ column.header }}</th>
     <td mat-cell *matCellDef="let image">
->>>>>>> Stashed changes
       <ng-container *ngIf="column.columnDef === 'synchronized'">
         <mat-icon [color]="image[column.columnDef] ? 'primary' : 'warn'">
           {{ image[column.columnDef] ? 'check_circle' : 'cancel' }}
@@ -93,14 +56,6 @@
     </td>
   </ng-container>
 
-<<<<<<< Updated upstream
-  <ng-container matColumnDef="actions" >
-    <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: center;">Acciones</th>
-    <td mat-cell *matCellDef="let template" style="text-align: center;" joyrideStep="actionsStep" text="Gestiona cada plantilla PXE con opciones para ver, editar, eliminar y más.">
-      <button mat-icon-button color="info" (click)="showTemplate($event, template)"><mat-icon i18n="@@deleteElementTooltip">visibility</mat-icon></button>
-      <button mat-icon-button color="info" [disabled]="template.clientsLength === 0"  (click)="editClients($event, template)"><mat-icon i18n="@@deleteElementTooltip">computer</mat-icon></button>
-      <button mat-icon-button color="primary" (click)="editPxeTemplate(template)" i18n="@@editImage"> <mat-icon>edit</mat-icon></button>
-=======
   <ng-container matColumnDef="actions">
     <th mat-header-cell *matHeaderCellDef>{{ 'actionsColumn' | translate }}</th>
     <td mat-cell *matCellDef="let template">
@@ -113,22 +68,14 @@
       <button mat-icon-button color="primary" (click)="editPxeTemplate(template)">
         <mat-icon>edit</mat-icon>
       </button>
->>>>>>> Stashed changes
       <button mat-icon-button [matMenuTriggerFor]="menu">
         <mat-icon>menu</mat-icon>
       </button>
       <mat-menu #menu="matMenu">
-<<<<<<< Updated upstream
-        <button mat-menu-item (click)="toggleAction(template, 'create')">Crear en servidor ogBoot</button>
-        <button mat-menu-item (click)="addClientsToPxe(template)">Añadir cliente</button>
-        <button mat-menu-item (click)="toggleAction(template, 'sync')">Sincronizar base de datos</button>
-        <button mat-menu-item (click)="toggleAction(template, 'delete')">Eliminar</button>
-=======
         <button mat-menu-item (click)="toggleAction(template, 'create')">{{ 'createServerButton' | translate }}</button>
         <button mat-menu-item (click)="addClientsToPxe(template)">{{ 'addClientButton' | translate }}</button>
         <button mat-menu-item (click)="toggleAction(template, 'sync')">{{ 'syncDatabaseButton' | translate }}</button>
         <button mat-menu-item (click)="toggleAction(template, 'delete')">{{ 'deleteButton' | translate }}</button>
->>>>>>> Stashed changes
       </mat-menu>
     </td>
   </ng-container>
@@ -136,12 +83,8 @@
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 </table>
-<<<<<<< Updated upstream
-<div class="paginator-container">
-=======
 
 <div class="paginator-container" joyrideStep="paginationStep" text="{{ 'paginationDescription' | translate }}">
->>>>>>> Stashed changes
   <mat-paginator [length]="length"
                  [pageSize]="itemsPerPage"
                  [pageIndex]="page"