From bbffcebb6c0491ad15c9c57fe1bcbf8f54ed1c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 27 Dec 2016 23:41:14 +0100
Subject: [PATCH] fix url when using different apps folder

---
 js/public/app.js   | 2 +-
 templates/main.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/public/app.js b/js/public/app.js
index e4d4177..6f56435 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -58,7 +58,7 @@ app.controller('WeatherController', ['$scope', '$interval', '$timeout', '$compil
 
 		// timeout functions internal calls cannot be serialized
 		$timeout(function () {
-			var imgPath = OC.generateUrl('/apps/weather').replace('index.php/','');
+			var imgPath = OC.filePath('weather','img','').replace('index.php/','');
 			$scope.owncloudAppImgPath = imgPath;
 			$scope.loadCities();
 		});
diff --git a/templates/main.php b/templates/main.php
index d497495..3ba713c 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -48,12 +48,12 @@
 			<a href="http://home.openweathermap.org/users/sign_in" ng-show="cityLoadNeedsAPIKey == true">Click here to get an API key</a>
 		</span>
 	</div>
-	<div id="city-right" ng-show="cityLoadError == '' && currentCity != null" style="background-image: url('{{ owncloudAppImgPath }}/img/{{ currentCity.image }}');">
+	<div id="city-right" ng-show="cityLoadError == '' && currentCity != null" style="background-image: url('{{ owncloudAppImgPath }}{{ currentCity.image }}');">
 		<div id="city-weather-panel">
 			<div class="city-name">
 				{{ currentCity.name }}, {{ currentCity.sys.country }}
-				<img ng-show="selectedCityId == homeCity" src="{{ owncloudAppImgPath }}/img/home-pick.png" />
-				<img class="home-icon" ng-click="setHome(selectedCityId);" ng-show="selectedCityId != homeCity" src="{{ owncloudAppImgPath }}/img/home-nopick.png" />
+				<img ng-show="selectedCityId == homeCity" src="{{ owncloudAppImgPath }}home-pick.png" />
+				<img class="home-icon" ng-click="setHome(selectedCityId);" ng-show="selectedCityId != homeCity" src="{{ owncloudAppImgPath }}home-nopick.png" />
 			</div>
 			<div class="city-current-temp">{{ currentCity.main.temp }}{{ metricRepresentation }}</div>
 			<div class="city-current-pressure">Pressure: {{ currentCity.main.pressure }} hpa</div>