From 350711f80a5059810eb7a260022fc108e85da985 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 11 Jul 2015 16:43:57 +0000
Subject: [PATCH] Use standard img directory and fix app-icon

---
 appinfo/app.php                  |   2 +-
 {images => img}/CREDITS.md       |   0
 {images => img}/app-icon.png     | Bin
 {images => img}/clouds.png       | Bin
 {images => img}/mist.png         | Bin
 {images => img}/rain.jpg         | Bin
 {images => img}/snow.png         | Bin
 {images => img}/sun.png          | Bin
 {images => img}/thunderstorm.png | Bin
 templates/main.php               |   2 +-
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename {images => img}/CREDITS.md (100%)
 rename {images => img}/app-icon.png (100%)
 rename {images => img}/clouds.png (100%)
 rename {images => img}/mist.png (100%)
 rename {images => img}/rain.jpg (100%)
 rename {images => img}/snow.png (100%)
 rename {images => img}/sun.png (100%)
 rename {images => img}/thunderstorm.png (100%)

diff --git a/appinfo/app.php b/appinfo/app.php
index aaf3d3c..e85b61f 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -25,7 +25,7 @@ if (class_exists('\OCP\AppFramework\App')) {
 
 	    // the icon that will be shown in the navigation
 	    // this file needs to exist in img/
-	    'icon' => \OCP\Util::imagePath('weather', 'images/app-icon.png'),
+	    'icon' => \OCP\Util::imagePath('weather', 'app-icon.png'),
 
 	    // the title of your application. This will be used in the
 	    // navigation or on the settings page of your app
diff --git a/images/CREDITS.md b/img/CREDITS.md
similarity index 100%
rename from images/CREDITS.md
rename to img/CREDITS.md
diff --git a/images/app-icon.png b/img/app-icon.png
similarity index 100%
rename from images/app-icon.png
rename to img/app-icon.png
diff --git a/images/clouds.png b/img/clouds.png
similarity index 100%
rename from images/clouds.png
rename to img/clouds.png
diff --git a/images/mist.png b/img/mist.png
similarity index 100%
rename from images/mist.png
rename to img/mist.png
diff --git a/images/rain.jpg b/img/rain.jpg
similarity index 100%
rename from images/rain.jpg
rename to img/rain.jpg
diff --git a/images/snow.png b/img/snow.png
similarity index 100%
rename from images/snow.png
rename to img/snow.png
diff --git a/images/sun.png b/img/sun.png
similarity index 100%
rename from images/sun.png
rename to img/sun.png
diff --git a/images/thunderstorm.png b/img/thunderstorm.png
similarity index 100%
rename from images/thunderstorm.png
rename to img/thunderstorm.png
diff --git a/templates/main.php b/templates/main.php
index 655d3e2..715b150 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -30,7 +30,7 @@
 	<div id="city-right" ng-show="cityLoadError != ''">
 		<span class="city-load-error">{{ cityLoadError }}</span>
 	</div>
-	<div id="city-right" ng-show="currentCity != null" style="background-image: url('/apps/weather/images/{{ currentCity.image }}');">
+	<div id="city-right" ng-show="currentCity != null" style="background-image: url('/apps/weather/img/{{ currentCity.image }}');">
 		<div id="city-weather-panel">
 			<div class="city-name">{{ currentCity.name }}, {{ currentCity.sys.country }}</div>
 			<div class="city-current-temp">{{ currentCity.main.temp }}°C</div>