s407562/System_konkursow_edukacyjnych
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

layout changes

Browse Source
This commit is contained in:
Przemysław Stawujak 2019-01-23 21:05:52 +01:00
parent 29caf98af5
commit 13bfb0a45f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SystemKonkursow/4.2.1/angular/src/account/register/register.component.ts
View File

@ -49,7 +49,7 @@ export class RegisterComponent extends AppComponentBase implements OnInit, After
ngOnInit(): void { ngOnInit(): void {
this.model.role = 'Participant'; this.model.role = 'Participant';
this.model.participantClass = 1; this.model.participantClass = null;
} }
back(): void { back(): void {

4
SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.css
View File

@ -8,7 +8,7 @@
} }
.element-size { .element-size {
width: 500px; width: calc(100% - 20px);
} }
.field { .field {
@ -17,7 +17,7 @@
border-left: 10px #739CB9 solid; border-left: 10px #739CB9 solid;
border-radius: 10px; border-radius: 10px;
padding: 5px; padding: 5px;
width: 520px; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
} }

2
SystemKonkursow/4.2.1/angular/src/app/competition-create/competition-create.component.html
View File

@ -1,5 +1,5 @@
<div id="create-competition-area"> <div id="create-competition-area">
<div class="container"> <div>
<h2 class="title">Tworzenie konkursu</h2> <h2 class="title">Tworzenie konkursu</h2>

12
SystemKonkursow/4.2.1/angular/src/app/competition-detail/competition-detail.component.html
View File

@ -54,10 +54,10 @@
<hr /> <hr />
<div class="text-center"> <div class="text-center">
<button class="btn btn-default" (click)="goTo(0);">Pierwsza</button> <button *ngIf="pager.index!==0" class="btn btn-default" (click)="goTo(0);">Pierwsza</button>
<button class="btn btn-default" (click)="goTo(pager.index - 1);">Poprzednia</button> <button *ngIf="pager.index!==0" class="btn btn-default" (click)="goTo(pager.index - 1);">Poprzednia</button>
<button class="btn btn-primary" (click)="goTo(pager.index + 1);">Następna</button> <button *ngIf="pager.index!==pager.count-1" class="btn btn-primary" (click)="goTo(pager.index + 1);">Następna</button>
<button class="btn btn-default" (click)="goTo(pager.count - 1);">Ostatnia</button> <button *ngIf="pager.index!==pager.count-1" class="btn btn-default" (click)="goTo(pager.count - 1);">Ostatnia</button>
</div> </div>
<div> <div>
@ -70,8 +70,8 @@
<div *ngFor="let question of competition.questions; let index = index"> <div *ngFor="let question of competition.questions; let index = index">
<div class="result-question"> <div class="result-question">
<h5>{{index + 1}}. {{question.name}}</h5> <h5>{{index + 1}}. {{question.name}}</h5>
<div class="row"> <div>
<div *ngFor="let option of question.questionOptions"> <div [ngClass]="{'alert alert-success': option.isAnswer}" *ngFor="let option of question.questionOptions">
<input type="checkbox" [(ngModel)]="option.selected" id="{{option.id}}" disabled="true"> <input type="checkbox" [(ngModel)]="option.selected" id="{{option.id}}" disabled="true">
<label class="option-size" for="{{option.id}}">{{option.name}}</label> <label class="option-size" for="{{option.id}}">{{option.name}}</label>
</div> </div>

2
SystemKonkursow/4.2.1/angular/src/app/layout/sidebar-nav.component.ts
View File

@ -11,7 +11,7 @@ export class SideBarNavComponent extends AppComponentBase {
menuItems: MenuItem[] = [ menuItems: MenuItem[] = [
new MenuItem(this.l("Strona domowa"), "", "home", "/app/home"), new MenuItem(this.l("Strona domowa"), "", "home", "/app/home"),
new MenuItem(this.l("Profil"), "", "person", "/app/profile"), new MenuItem(this.l("Edycja profilu"), "", "person", "/app/profile"),
new MenuItem(this.l("Konkursy"), "", "list", "/app/categories-list"), new MenuItem(this.l("Konkursy"), "", "list", "/app/categories-list"),
new MenuItem(this.l("Dodaj konkurs"), "Pages.Create.Competition", "add", "/app/competition-create"), new MenuItem(this.l("Dodaj konkurs"), "Pages.Create.Competition", "add", "/app/competition-create"),

2
SystemKonkursow/4.2.1/angular/src/app/layout/topbar.component.html
View File

@ -18,7 +18,7 @@
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse"> <div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="javascript:void(0);" class="js-search" data-close="true"><i class="material-icons">search</i></a></li> <!-- <li><a href="javascript:void(0);" class="js-search" data-close="true"><i class="material-icons">search</i></a></li> -->
<!-- <topbar-languageswitch></topbar-languageswitch> --> <!-- <topbar-languageswitch></topbar-languageswitch> -->
<li><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li> <li><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li>
<li><a (click)="logout()"><i class="material-icons">input</i></a></li> <li><a (click)="logout()"><i class="material-icons">input</i></a></li>