Use standard img directory and fix app-icon

2015-07-11 16:43:57 +00:00 · 2015-07-11 16:43:57 +00:00 · 350711f80a
parent a7454c6394
commit 350711f80a
10 changed files with 2 additions and 2 deletions
--- 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
--- a/images/CREDITS.md
+++ b/images/CREDITS.md
--- a/images/app-icon.png
+++ b/images/app-icon.png
--- a/images/clouds.png
+++ b/images/clouds.png
--- a/images/mist.png
+++ b/images/mist.png
--- a/images/rain.jpg
+++ b/images/rain.jpg
--- a/images/snow.png
+++ b/images/snow.png
--- a/images/sun.png
+++ b/images/sun.png
--- a/images/thunderstorm.png
+++ b/images/thunderstorm.png
--- 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>