publish: Merge pull request #22 from umpirsky/restaurant/la-strega

generated from commit 6dfa910
umpirsky · May 9, 2015 · 0c29e9d · 0c29e9d
1 parent a0c6b3f
commit 0c29e9d
Show file tree

Hide file tree

Showing 76 changed files with 63 additions and 3 deletions.
diff --git a/data/la-strega.json b/data/la-strega.json
@@ -0,0 +1,16 @@
+{
+    "name": "La Strega",
+    "logo": "images/restaurant/la-strega.png",
+    "phone": "065 290 22 22, 018 29 22 22",
+    "delivery": true,
+    "address": "Nikole Pašića 1, Niš",
+    "url": "http://www.picerijalastrega.rs",
+    "images": [
+        "images/menu/la-strega/1.jpg",
+        "images/menu/la-strega/2.jpg",
+        "images/menu/la-strega/3.jpg",
+        "images/menu/la-strega/4.jpg",
+        "images/menu/la-strega/5.jpg",
+        "images/menu/la-strega/6.jpg"
+    ]
+}
diff --git a/data/novopazarski-cevap-deset-sa-lukom.json b/data/novopazarski-cevap-deset-sa-lukom.json
@@ -0,0 +1,12 @@
+{
+    "name": "Novopazarski ćevap deset sa lukom",
+    "logo": "images/restaurant/novopazarski-cevap-deset-sa-lukom.png",
+    "phone": "063 70 77 901",
+    "delivery": true,
+    "address": "Nikole Pašića 2, Niš",
+    "url": "https://www.facebook.com/pages/Novopazarski-%C4%87evap-Deset-ucelo/1496451907287776",
+    "images": [
+        "images/menu/novopazarski-cevap-deset-sa-lukom/1.jpg",
+        "images/menu/novopazarski-cevap-deset-sa-lukom/2.jpg"
+    ]
+}
diff --git a/data/pizza-boss.json b/data/pizza-boss.json
@@ -11,6 +11,8 @@
         "images/menu/pizza-boss/3.jpg",
         "images/menu/pizza-boss/4.jpg",
         "images/menu/pizza-boss/5.jpg",
-        "images/menu/pizza-boss/6.jpg"
+        "images/menu/pizza-boss/6.jpg",
+        "images/menu/pizza-boss/7.jpg",
+        "images/menu/pizza-boss/8.jpg"
     ]
 }
diff --git a/data/rapido.json b/data/rapido.json
@@ -0,0 +1,12 @@
+{
+    "name": "Rapido",
+    "logo": "images/restaurant/rapido.jpg",
+    "phone": "060 529 11 10, 018  29 11 11",
+    "delivery": true,
+    "address": "Nikole Pašića 1, Niš",
+    "url": "http://www.picerijalastrega.rs",
+    "images": [
+        "images/menu/rapido/1.jpg",
+        "images/menu/rapido/2.jpg"
+    ]
+}
diff --git a/data/restaurants.json b/data/restaurants.json
@@ -53,6 +53,18 @@
         "logo": "images/restaurant/geppetto.jpg",
         "tags": "pica, sendvič,palačinka"
     },
+    {
+        "name": "Rapido",
+        "slug": "rapido",
+        "logo": "images/restaurant/rapido.jpg",
+        "tags": "salata, sendvič, palačinka"
+    },
+    {
+        "name": "La Strega",
+        "slug": "la-strega",
+        "logo": "images/restaurant/la-strega.png",
+        "tags": "pasta, pica, palačinka"
+    },
     {
         "name": "Cezar",
         "slug": "cezar",
@@ -77,6 +89,12 @@
         "logo": "images/restaurant/kabak.jpg",
         "tags": "burek, pica, pecivo, sendvič, kroasan"
     },
+    {
+        "name": "Novopazarski ćevap deset sa lukom",
+        "slug": "novopazarski-cevap-deset-sa-lukom",
+        "logo": "images/restaurant/novopazarski-cevap-deset-sa-lukom.png",
+        "tags": "ćevap, pljeskavica, sudžuk"
+    },
     {
         "name": "Pizza Boss",
         "slug": "pizza-boss",

diff --git a/images/menu/la-strega/1.jpg b/images/menu/la-strega/1.jpg
diff --git a/images/menu/la-strega/2.jpg b/images/menu/la-strega/2.jpg
diff --git a/images/menu/la-strega/3.jpg b/images/menu/la-strega/3.jpg
diff --git a/images/menu/la-strega/4.jpg b/images/menu/la-strega/4.jpg
diff --git a/images/menu/la-strega/5.jpg b/images/menu/la-strega/5.jpg
diff --git a/images/menu/la-strega/6.jpg b/images/menu/la-strega/6.jpg
diff --git a/images/menu/novopazarski-cevap-deset-sa-lukom/1.jpg b/images/menu/novopazarski-cevap-deset-sa-lukom/1.jpg
diff --git a/images/menu/novopazarski-cevap-deset-sa-lukom/2.jpg b/images/menu/novopazarski-cevap-deset-sa-lukom/2.jpg
diff --git a/images/menu/pizza-boss/7.jpg b/images/menu/pizza-boss/7.jpg
diff --git a/images/menu/pizza-boss/8.jpg b/images/menu/pizza-boss/8.jpg
diff --git a/images/menu/rapido/1.jpg b/images/menu/rapido/1.jpg
diff --git a/images/menu/rapido/2.jpg b/images/menu/rapido/2.jpg
diff --git a/images/restaurant/la-strega.png b/images/restaurant/la-strega.png
diff --git a/images/restaurant/novopazarski-cevap-deset-sa-lukom.png b/images/restaurant/novopazarski-cevap-deset-sa-lukom.png
diff --git a/images/restaurant/pizza-boss.jpg b/images/restaurant/pizza-boss.jpg
diff --git a/images/restaurant/rapido.jpg b/images/restaurant/rapido.jpg
diff --git a/images/thumbnails-200/menu/la-strega/01.jpg b/images/thumbnails-200/menu/la-strega/01.jpg
diff --git a/images/thumbnails-200/menu/la-strega/02.jpg b/images/thumbnails-200/menu/la-strega/02.jpg
diff --git a/images/thumbnails-200/menu/la-strega/03.jpg b/images/thumbnails-200/menu/la-strega/03.jpg
diff --git a/images/thumbnails-200/menu/la-strega/04.jpg b/images/thumbnails-200/menu/la-strega/04.jpg
diff --git a/images/thumbnails-200/menu/la-strega/05.jpg b/images/thumbnails-200/menu/la-strega/05.jpg
diff --git a/images/thumbnails-200/menu/la-strega/06.jpg b/images/thumbnails-200/menu/la-strega/06.jpg
diff --git a/images/thumbnails-200/menu/la-strega/1.jpg b/images/thumbnails-200/menu/la-strega/1.jpg
diff --git a/images/thumbnails-200/menu/la-strega/2.jpg b/images/thumbnails-200/menu/la-strega/2.jpg
diff --git a/images/thumbnails-200/menu/la-strega/3.jpg b/images/thumbnails-200/menu/la-strega/3.jpg
diff --git a/images/thumbnails-200/menu/la-strega/4.jpg b/images/thumbnails-200/menu/la-strega/4.jpg
diff --git a/images/thumbnails-200/menu/la-strega/5.jpg b/images/thumbnails-200/menu/la-strega/5.jpg
diff --git a/images/thumbnails-200/menu/la-strega/6.jpg b/images/thumbnails-200/menu/la-strega/6.jpg
diff --git a/images/thumbnails-200/menu/la-strega/Scan04052015112842_001.jpg b/images/thumbnails-200/menu/la-strega/Scan04052015112842_001.jpg
diff --git a/images/thumbnails-200/menu/la-strega/Scan04052015113018_001.jpg b/images/thumbnails-200/menu/la-strega/Scan04052015113018_001.jpg
diff --git a/images/thumbnails-200/menu/la-strega/Scan05052015090413_001.jpg b/images/thumbnails-200/menu/la-strega/Scan05052015090413_001.jpg
diff --git a/images/thumbnails-200/menu/la-strega/Scan05052015090513_001.jpg b/images/thumbnails-200/menu/la-strega/Scan05052015090513_001.jpg
diff --git a/images/thumbnails-200/menu/la-strega/Scan05052015090625_001.jpg b/images/thumbnails-200/menu/la-strega/Scan05052015090625_001.jpg
diff --git a/images/thumbnails-200/menu/la-strega/Scan05052015090721_001.jpg b/images/thumbnails-200/menu/la-strega/Scan05052015090721_001.jpg
diff --git a/images/thumbnails-200/menu/novopazarski-cevap-deset-sa-lukom/1.jpg b/images/thumbnails-200/menu/novopazarski-cevap-deset-sa-lukom/1.jpg
diff --git a/images/thumbnails-200/menu/novopazarski-cevap-deset-sa-lukom/2.jpg b/images/thumbnails-200/menu/novopazarski-cevap-deset-sa-lukom/2.jpg
diff --git a/images/thumbnails-200/menu/pizza-boss/7.jpg b/images/thumbnails-200/menu/pizza-boss/7.jpg
diff --git a/images/thumbnails-200/menu/pizza-boss/8.jpg b/images/thumbnails-200/menu/pizza-boss/8.jpg
diff --git a/images/thumbnails-200/menu/pizza-boss/Scan08052015173834_001.jpg b/images/thumbnails-200/menu/pizza-boss/Scan08052015173834_001.jpg
diff --git a/images/thumbnails-200/menu/pizza-boss/Scan08052015173950_001.jpg b/images/thumbnails-200/menu/pizza-boss/Scan08052015173950_001.jpg
diff --git a/images/thumbnails-200/menu/rapido/1.jpg b/images/thumbnails-200/menu/rapido/1.jpg
diff --git a/images/thumbnails-200/menu/rapido/2.jpg b/images/thumbnails-200/menu/rapido/2.jpg
diff --git a/images/thumbnails-600/menu/la-strega/01.jpg b/images/thumbnails-600/menu/la-strega/01.jpg
diff --git a/images/thumbnails-600/menu/la-strega/02.jpg b/images/thumbnails-600/menu/la-strega/02.jpg
diff --git a/images/thumbnails-600/menu/la-strega/03.jpg b/images/thumbnails-600/menu/la-strega/03.jpg
diff --git a/images/thumbnails-600/menu/la-strega/04.jpg b/images/thumbnails-600/menu/la-strega/04.jpg
diff --git a/images/thumbnails-600/menu/la-strega/05.jpg b/images/thumbnails-600/menu/la-strega/05.jpg
diff --git a/images/thumbnails-600/menu/la-strega/06.jpg b/images/thumbnails-600/menu/la-strega/06.jpg
diff --git a/images/thumbnails-600/menu/la-strega/1.jpg b/images/thumbnails-600/menu/la-strega/1.jpg
diff --git a/images/thumbnails-600/menu/la-strega/2.jpg b/images/thumbnails-600/menu/la-strega/2.jpg
diff --git a/images/thumbnails-600/menu/la-strega/3.jpg b/images/thumbnails-600/menu/la-strega/3.jpg
diff --git a/images/thumbnails-600/menu/la-strega/4.jpg b/images/thumbnails-600/menu/la-strega/4.jpg
diff --git a/images/thumbnails-600/menu/la-strega/5.jpg b/images/thumbnails-600/menu/la-strega/5.jpg
diff --git a/images/thumbnails-600/menu/la-strega/6.jpg b/images/thumbnails-600/menu/la-strega/6.jpg
diff --git a/images/thumbnails-600/menu/la-strega/Scan04052015112842_001.jpg b/images/thumbnails-600/menu/la-strega/Scan04052015112842_001.jpg
diff --git a/images/thumbnails-600/menu/la-strega/Scan04052015113018_001.jpg b/images/thumbnails-600/menu/la-strega/Scan04052015113018_001.jpg
diff --git a/images/thumbnails-600/menu/la-strega/Scan05052015090413_001.jpg b/images/thumbnails-600/menu/la-strega/Scan05052015090413_001.jpg
diff --git a/images/thumbnails-600/menu/la-strega/Scan05052015090513_001.jpg b/images/thumbnails-600/menu/la-strega/Scan05052015090513_001.jpg
diff --git a/images/thumbnails-600/menu/la-strega/Scan05052015090625_001.jpg b/images/thumbnails-600/menu/la-strega/Scan05052015090625_001.jpg
diff --git a/images/thumbnails-600/menu/la-strega/Scan05052015090721_001.jpg b/images/thumbnails-600/menu/la-strega/Scan05052015090721_001.jpg
diff --git a/images/thumbnails-600/menu/novopazarski-cevap-deset-sa-lukom/1.jpg b/images/thumbnails-600/menu/novopazarski-cevap-deset-sa-lukom/1.jpg
diff --git a/images/thumbnails-600/menu/novopazarski-cevap-deset-sa-lukom/2.jpg b/images/thumbnails-600/menu/novopazarski-cevap-deset-sa-lukom/2.jpg
diff --git a/images/thumbnails-600/menu/pizza-boss/7.jpg b/images/thumbnails-600/menu/pizza-boss/7.jpg
diff --git a/images/thumbnails-600/menu/pizza-boss/8.jpg b/images/thumbnails-600/menu/pizza-boss/8.jpg
diff --git a/images/thumbnails-600/menu/pizza-boss/Scan08052015173834_001.jpg b/images/thumbnails-600/menu/pizza-boss/Scan08052015173834_001.jpg
diff --git a/images/thumbnails-600/menu/pizza-boss/Scan08052015173950_001.jpg b/images/thumbnails-600/menu/pizza-boss/Scan08052015173950_001.jpg
diff --git a/images/thumbnails-600/menu/rapido/1.jpg b/images/thumbnails-600/menu/rapido/1.jpg
diff --git a/images/thumbnails-600/menu/rapido/2.jpg b/images/thumbnails-600/menu/rapido/2.jpg
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!doctype html><!--[if lt IE 7]><html lang="sr" class="no-js ie6"><![endif]--><!--[if IE 7]><html lang="sr" class="no-js ie7"><![endif]--><!--[if IE 8]><html lang="sr" class="no-js ie8"><![endif]--><!--[if gt IE 8]><!--> <html lang="sr" class="no-js"> <!--<![endif]--> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Šta jesti?</title> <link rel="shortcut icon" href="favicon.png"> <link rel="stylesheet" href="styles/vendor.9cff5df9.css"> <link rel="stylesheet" href="styles/main.7627935c.css"> <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script> <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->  <body ng-app="restaurantsApp"> <div class="wrapper"> <section id="main"> <div class="container"> <div ng-view=""></div> </div> </section> <footer> <div class="container"> <div class="social"> <a href="https://www.facebook.com/stajesti" target="_blank"><i class="fa fa-facebook fa-lg"></i></a> <a href="https://twitter.com/stajesti" target="_blank"><i class="fa fa-twitter fa-lg"></i></a> <a href="mailto:info@stajesti.rs"><i class="fa fa-envelope fa-lg"></i></a> </div> <div class="rights"> <p><a href="https://github.com/umpirsky/stajesti.rs/wiki/%C5%A0ta-jesti%3F" target="_blank">O projektu</a></p> <p>Dizajn baziran na <a href="http://www.scoopthemes.com" target="_blank">Scoop</a> temi</p> </div> </div> </footer> </div> <script src="scripts/vendor.6fa7b5e4.js"></script> <script src="scripts/scripts.2bfd0d77.js"></script> <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    <![endif]-->  <body ng-app="restaurantsApp"> <div class="wrapper"> <section id="main"> <div class="container"> <div ng-view=""></div> </div> </section> <footer> <div class="container"> <div class="social"> <a href="https://www.facebook.com/stajesti" target="_blank"><i class="fa fa-facebook fa-lg"></i></a> <a href="https://twitter.com/stajesti" target="_blank"><i class="fa fa-twitter fa-lg"></i></a> <a href="mailto:info@stajesti.rs"><i class="fa fa-envelope fa-lg"></i></a> </div> <div class="rights"> <p><a href="https://github.com/umpirsky/stajesti.rs/wiki/%C5%A0ta-jesti%3F" target="_blank">O projektu</a></p> <p>Dizajn baziran na <a href="http://www.scoopthemes.com" target="_blank">Scoop</a> temi</p> </div> </div> </footer> </div> <script src="scripts/vendor.6fa7b5e4.js"></script> <script src="scripts/scripts.74369142.js"></script> <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');

diff --git a/scripts/scripts.2bfd0d77.js b/scripts/scripts.2bfd0d77.js
diff --git a/scripts/scripts.74369142.js b/scripts/scripts.74369142.js