-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
allow css/js asset directory to be relocated ('assetdirectory') #13063
Conversation
@DeepDiver1975 what do you think? |
Thanks a lot for your contribution! Contributions to the core repo require a signed contributors agreement http://owncloud.org/contribute/agreement/ Alternatively you can add a comment here stating that this contribution is MIT licensed. Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/ |
5f11913
to
99dd660
Compare
OK, so the problem I was hitting before was to do with the way I made So I'm pretty sure this will work if we're fine with the constraints - whatever directory you pick, you'll get an I can look at making the asset path configurable later, but I'm a bit frazzled now... |
8c30ca7
to
1f883b3
Compare
Thanks a lot @AdamWill - I'll review and test this asap. |
@owncloud-bot This is okay to test |
Works 👍 awesome |
Refer to this link for build results (access rights to CI server needed): |
* Where css and js assets are stored; this defaults to ``assets/`` in the | ||
* ownCloud directory. The assets will be stored in a subdirectory of this | ||
* directory named 'assets'. The server *must* be configured to serve that | ||
* directory as $WEBROOT/assets. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@carlaschroder this has to be respected in the documentation as well - can you take care of this? Thanks a lot!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also the current text kind of stinks (I wrote it for the first version of the code where you specified the asset directory directly rather than its parent, then just did a very small change when I changed the code approach, I think it's way too confusing ATM). I'll try and find a minute to fix that, but if I don't, don't just copy this for the docs, make it better...:)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DeepDiver1975 My autogeneration tool of the documentation for config.sample.php will update the documentation just after the merge ;)
@DeepDiver1975 , the manual page is auto-generated from config.sample.php, so as long it's correct there it will be spiffy in the manual. Thanks @AdamWill ! |
This allows the directory where CSS/JS asset collections are written to be changed, in case SERVERROOT is not writeable. Note it does *not* allow the expected URL to be changed: whatever directory is used, the server must be configured to serve it at WEBROOT/assets. It may be possible to add another config parameter to allow the admin to specify a custom asset URL, but I thought I'd keep the first implementation simple.
1f883b3
to
bb79aac
Compare
The inspection completed: No new issues |
ok - let's 👍 THX @AdamWill |
allow css/js asset directory to be relocated ('assetdirectory')
This allows the directory where CSS/JS asset collections are written to be changed, in case SERVERROOT is not writeable. Note it does not allow the expected URL to be changed: whatever directory is used, the server must be configured to serve it at WEBROOT/assets. It would be possible to add another config parameter to allow the admin to specify a custom asset URL, but I thought I'd keep the first implementation simple.