RPJosh
/
nc-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from butonic/fixurlwhenusingdifferentappsfolder 

fix url when using different apps folder
master
Ner'zhul 2016-12-29 09:04:04 +01:00 committed by GitHub
parent 16c09a619e bbffcebb6c
commit cf66554c9c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/public/app.js
View File

@ -58,7 +58,7 @@ app.controller('WeatherController', ['$scope', '$interval', '$timeout', '$compil
// timeout functions internal calls cannot be serialized // timeout functions internal calls cannot be serialized
$timeout(function () { $timeout(function () {
var imgPath = OC.generateUrl('/apps/weather').replace('index.php/',''); var imgPath = OC.filePath('weather','img','').replace('index.php/','');
$scope.owncloudAppImgPath = imgPath; $scope.owncloudAppImgPath = imgPath;
$scope.loadCities(); $scope.loadCities();
}); });

6
templates/main.php
View File

@ -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> <a href="http://home.openweathermap.org/users/sign_in" ng-show="cityLoadNeedsAPIKey == true">Click here to get an API key</a>
</span> </span>
</div> </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 id="city-weather-panel">
<div class="city-name"> <div class="city-name">
{{ currentCity.name }}, {{ currentCity.sys.country }} {{ currentCity.name }}, {{ currentCity.sys.country }}
<img ng-show="selectedCityId == homeCity" src="{{ owncloudAppImgPath }}/img/home-pick.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 }}/img/home-nopick.png" /> <img class="home-icon" ng-click="setHome(selectedCityId);" ng-show="selectedCityId != homeCity" src="{{ owncloudAppImgPath }}home-nopick.png" />
</div> </div>
<div class="city-current-temp">{{ currentCity.main.temp }}{{ metricRepresentation }}</div> <div class="city-current-temp">{{ currentCity.main.temp }}{{ metricRepresentation }}</div>
<div class="city-current-pressure">Pressure: {{ currentCity.main.pressure }} hpa</div> <div class="city-current-pressure">Pressure: {{ currentCity.main.pressure }} hpa</div>