Merge branch 'nztqa-fix-adminPanel-subfolder' into devel

Fix admin panel route for subfolder. Thanks to nztqa ! Related: #973

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+* [Fix admin panel route for subfolder](https://github.com/wekan/wekan/pull/1084);
+
+Thanks to GitHub user nztqa for contributions.
+
 # v0.25 2017-06-24 Wekan release
 
 This release adds the following new features:

client/components/users/userHeader.jade

@@ -18,7 +18,7 @@ template(name="memberMenuPopup")
       li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
       li: a.js-edit-notification {{_ 'editNotificationPopup-title'}}
     if currentUser.isAdmin
-      li: a.js-go-setting(href='/setting') {{_ 'admin-panel'}}
+      li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
   hr
   ul.pop-over-list
     li: a.js-logout {{_ 'log-out'}}