diff --git a/index.html b/admin/index.html
similarity index 66%
rename from index.html
rename to admin/index.html
index 6c9fe41..83ce3a7 100644
--- a/index.html
+++ b/admin/index.html
@@ -2,11 +2,14 @@
 <html>
 <body>
 
+<h1> Dodavanje slike novog artikla </h1>
+<p>
 <form action="upload.php" method="post" enctype="multipart/form-data">
   Izaberi sliku:
   <input type="file" name="fileToUpload" id="fileToUpload">
-  <input type="submit" value="Upload Image" name="submit">
+  <input type="submit" value="Uploaduj" name="submit">
 </form>
+</p>
 
 </body>
 </html>
diff --git a/admin/prikazi.php b/admin/prikazi.php
new file mode 100644
index 0000000..c63bd1b
--- /dev/null
+++ b/admin/prikazi.php
@@ -0,0 +1,27 @@
+<?php 
+
+require __DIR__ . '/../okvirovi.php';
+
+if(!$_GET['slika']) { 
+  die("Slika nije specificirana!"); 
+}
+
+$hash_slike = $_GET['slika'];
+$broj_okvirova = sizeof($okvirovi);
+?>
+<!DOCTYPE html>
+<html>
+<body>
+
+<h1> Uokvirena slika </h1>
+
+<p>Tag za artikal: </p>
+<p><input type="text" value="<?php echo $hash_slike ?>" /></p>
+
+
+<?php 
+
+for($i = 0; $i<$broj_okvirova; $i++) {
+  echo "<h2>Okvir $i</h2>";
+  echo "<img src='../image.php?slika=$hash_slike&okvir=$i' />";
+}
diff --git a/admin/upload.php b/admin/upload.php
new file mode 100644
index 0000000..5f35d9c
--- /dev/null
+++ b/admin/upload.php
@@ -0,0 +1,57 @@
+<?php
+
+function hashedName(){
+  $now = time();
+  $somenumber = rand();
+  return sha1("ojhaa $now $somenumber ojhaaa");
+}
+
+$target_dir = __DIR__ . "/../slike/";
+$target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
+$imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
+$target_file = $target_dir . hashedName() . ".$imageFileType";
+
+$uploadOk = 1;
+
+// Check if image file is a actual image or fake image
+if(isset($_POST["submit"])) {
+  $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
+  if($check !== false) {
+    echo "File is an image - " . $check["mime"] . ".";
+    $uploadOk = 1;
+  } else {
+    echo "File is not an image.";
+    $uploadOk = 0;
+  }
+}
+
+// Check if file already exists
+if (file_exists($target_file)) {
+  echo "Sorry, file already exists.";
+  $uploadOk = 0;
+}
+
+// Check file size
+if ($_FILES["fileToUpload"]["size"] > 500000) {
+  echo "Sorry, your file is too large.";
+  $uploadOk = 0;
+}
+
+// Allow certain file formats
+if($imageFileType != "jpg") {
+  echo "Sorry, only JPG files are allowed.";
+  $uploadOk = 0;
+}
+
+// Check if $uploadOk is set to 0 by an error
+if ($uploadOk == 0) {
+  echo "Sorry, your file was not uploaded.";
+// if everything is ok, try to upload file
+} else {
+  if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
+    header('Location: B.php');
+    exit();
+  } else {
+    echo "Sorry, there was an error uploading your file.";
+  }
+}
diff --git a/image.php b/image.php
index 102215e..0975f6e 100644
--- a/image.php
+++ b/image.php
@@ -62,7 +62,7 @@ $gotova_slika = $imagine->create($okvir_size, $color);
 $gotova_slika->paste($okvir_image, new Imagine\Image\Point(0,0));
 
 // snimi i prikazi
-$gotova_slika->save(__DIR__ . "/cache/tip" . $okvir_id . "slika" . $slika . ".jpg");
+//$gotova_slika->save(__DIR__ . "/cache/tip" . $okvir_id . "slika" . $slika . ".jpg");
 $gotova_slika->show("jpg");
 // koristiti CDN za kes
 
diff --git a/index.php b/index.php
deleted file mode 100644
index 50cce95..0000000
--- a/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-
