Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore

1 files changed, 25 insertions, 0 deletions

diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/izmeni-laptop/izmeni-laptop.component.html b/sandbox/TestIvanLjubisavljevic/frontend/src/app/izmeni-laptop/izmeni-laptop.component.html
new file mode 100755
index 00000000..c49a700d
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/izmeni-laptop/izmeni-laptop.component.html
@@ -0,0 +1,25 @@
+<div *ngIf="laptop" id="forma">
+    <label>Brand:</label>
+    <input type="text" [(ngModel)]="laptop.brand" ><br>
+    <label>Model:</label> 
+    <input type="text"  [(ngModel)]="laptop.model"><br>
+    <label>Ram:</label> 
+    <input type="number"  [(ngModel)]="laptop.ram"> <br>
+    <label>Memorija:</label> 
+    <input type="number"  [(ngModel)]="laptop.hdd"> <br>
+    <label>Grafika:</label> 
+    <input type="text"  [(ngModel)]="laptop.graphics"> <br>
+    <label>Ekran:</label>
+    <input type="text"  [(ngModel)]="laptop.display"> <br>
+    <label>Procesor:</label>
+    <input type="text"  [(ngModel)]="laptop.processor"><br>
+    <label>Cena:</label> 
+    <input type="number"  [(ngModel)]="laptop.price"><br>
+
+    <button (click)="izmeni(laptop)">Sačuvaj izmene</button><br>
+    <button (click)="back()">Nazad na početnu</button> 
+</div>
+
+<div *ngIf="izmenio" id="forma">
+    <p style="color:green">Uspešno izmenjeni podaci!</p>
+</div>
\ No newline at end of file