Commit 5f9b6fd5 authored by Josue Martinez Villacorta's avatar Josue Martinez Villacorta
Browse files

Merge branch 'master' of

# Conflicts:
#	build.gradle
parents 35ef91f9 2f49201a
......@@ -33,7 +33,6 @@ ext.envAngularBuildScriptMap = [
'prod' : 'buildProd',
'default': 'build'
<form (ngSubmit)="login()">
<div fxLayout="row" fxLayoutAlign="center center" class="login-card-container">
<mat-card class="login-card">
......@@ -7,15 +8,15 @@
<input matInput placeholder="Webin submission account" required [(ngModel)]="username">
<input matInput placeholder="Webin submission account" required [(ngModel)]="username" name="username">
<input type="password" matInput placeholder="Password" required [(ngModel)]="password">
<input type="password" matInput placeholder="Password" required [(ngModel)]="password" name="password">
<button mat-raised-button color="accent" type="submit" name="action" (click)="login()">Login</button>
<button mat-raised-button color="accent" type="submit" name="action" >Login</button>
<p class="app-error" *ngIf="error">
<i class="material-icons">error</i>
......@@ -24,3 +25,4 @@
......@@ -77,7 +77,6 @@ export class WebinRestService implements WebinRestServiceInterface {
' </ACTIONS>' +
this.appendXml(formData, 'SUBMISSION', submissionXml);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment