From bfb0c05e8389abea00bbfd9ff3427b8ab2dad700 Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Sun, 11 Sep 2022 00:20:05 +0800 Subject: [PATCH] Support subpath deployment - Make css font reference relative - Fix cover image loading error --- client/components/boards/boardsList.css | 2 +- client/components/cards/minicard.jade | 2 +- client/components/main/fonts.css | 10 +++++----- packages/wekan-accounts-cas/README.md | 22 +++++++++++++++------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/client/components/boards/boardsList.css b/client/components/boards/boardsList.css index d7b05bce6..86bc42ac7 100644 --- a/client/components/boards/boardsList.css +++ b/client/components/boards/boardsList.css @@ -1,4 +1,4 @@ -@import url("/css/reset.css") print, screen; +@import url("../../../css/reset.css") print, screen; .board-list { margin: 0 8px; diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 01cf711e7..42ff0a15f 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -10,7 +10,7 @@ template(name="minicard") else a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}") if cover - .minicard-cover(style="background-image: url('{{cover.link 'original' '/'}}?dummyReloadAfterSessionEstablished={{sess}}');") + .minicard-cover(style="background-image: url('{{cover.link 'original'}}?dummyReloadAfterSessionEstablished={{sess}}');") if labels .minicard-labels(class="{{#if hiddenMinicardLabelText}}minicard-labels-no-text{{/if}}") each labels diff --git a/client/components/main/fonts.css b/client/components/main/fonts.css index d379569fb..cc1af11ee 100644 --- a/client/components/main/fonts.css +++ b/client/components/main/fonts.css @@ -2,29 +2,29 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url("/fonts/roboto-regular.woff2") format('woff2'), url("/fonts/roboto-regular.woff") format('woff'); + src: local('Roboto'), local('Roboto-Regular'), url("../../../roboto-regular.woff2") format('woff2'), url("../../../roboto-regular.woff") format('woff'); } @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url("/fonts/roboto-bold.woff2") format('woff2'), url("/fonts/roboto-bold.woff") format('woff'); + src: local('Roboto Bold'), local('Roboto-Bold'), url("../../../roboto-bold.woff2") format('woff2'), url("../../../roboto-bold.woff") format('woff'); } @font-face { font-family: 'Poppins'; font-style: normal; font-weight: 400; - src: local('Poppins'), local('Poppins-Regular'), url("/fonts/poppins-regular.woff") format('woff'); + src: local('Poppins'), local('Poppins-Regular'), url("../../../poppins-regular.woff") format('woff'); } @font-face { font-family: 'Poppins'; font-style: normal; font-weight: 500; - src: local('Poppins Medium'), local('Poppins-Medium'), url("/fonts/poppins-medium.woff") format('woff'); + src: local('Poppins Medium'), local('Poppins-Medium'), url("../../../poppins-medium.woff") format('woff'); } @font-face { font-family: 'Poppins'; font-style: normal; font-weight: 700; - src: local('Poppins Bold'), local('Poppins-Bold'), url("/fonts/poppins-bold.woff") format('woff'); + src: local('Poppins Bold'), local('Poppins-Bold'), url("../../../poppins-bold.woff") format('woff'); } diff --git a/packages/wekan-accounts-cas/README.md b/packages/wekan-accounts-cas/README.md index 3e246c4f1..4e991ed64 100644 --- a/packages/wekan-accounts-cas/README.md +++ b/packages/wekan-accounts-cas/README.md @@ -23,9 +23,11 @@ meteor add wekan:accounts-cas ## Usage -Put CAS settings in Meteor.settings (for example using METEOR_SETTINGS env or --settings) like so: +Put CAS settings in Meteor.settings (for example using METEOR_SETTINGS env or +--settings) like so: -If casVersion is not defined, it will assume you use CAS 1.0. (note by xaionaro: option `casVersion` seems to be just ignored in the code, ATM). +If casVersion is not defined, it will assume you use CAS 1.0. (note by +xaionaro: option `casVersion` seems to be just ignored in the code, ATM). Server side settings: @@ -46,11 +48,17 @@ Meteor.settings = { CAS `attributes` settings : * `attributes`: by default `{}` : all default values below will apply -* * `debug` : by default `false` ; `true` will print to the server console the CAS attribute names to map, the CAS attributes values retrieved, if necessary the new user account created, and finally the user to use -* * `id` : by default, the CAS user is used for the user account, but you can specified another CAS attribute -* * `firstname` : by default `cas:givenName` ; but you can use your own CAS attribute -* * `lastname` : by default `cas:sn` (respectively) ; but you can use your own CAS attribute -* * `fullname` : by default unused, but if you specify your own CAS attribute, it will be used instead of the `firstname` + `lastname` +* * `debug` : by default `false` ; `true` will print to the server console the + CAS attribute names to map, the CAS attributes values retrieved, if necessary + the new user account created, and finally the user to use +* * `id` : by default, the CAS user is used for the user account, but you can + specified another CAS attribute +* * `firstname` : by default `cas:givenName` ; but you can use your own CAS + attribute +* * `lastname` : by default `cas:sn` (respectively) ; but you can use your own + CAS attribute +* * `fullname` : by default unused, but if you specify your own CAS attribute, + it will be used instead of the `firstname` + `lastname` * * `mail` : by default `cas:mail` Client side settings: