Closed ghost closed 6 years ago
Could you please follow conventional changelog convention for your commit messages? It allows to generate an automatic changelog file.
Please use angular convention.
I can see that you're using specific css. I think it would be better to reuse existing css (you can complete it if you want).
You also created a new directory for error
while these pages are part of the theme: they should be inside the teme directory.
And finally, if they reuse the existing css, there's no nedd for a specific directory, just put the error files into the theme
directory.
Last suggestion: could it be possible to reuse header.html
and footer.html
?
Reusing css, header and footer will make error pages easier to maintain.
Ok. Are you saying you want the error message to be displayed within the header and footer?
[header]
[error message]
[footer]
I will move the files into the /theme
directory and also use the existing style.css
in the /theme
directory, I'll just add some stuff to it.
Having a deeper look, I don't think any more that you should include header and footer.
Do not hesitate to amend your previous commit in order to follow conventional changelog. It'll facilitate the changelog generation.
Ok. Sounds good. I'll take a look at the conventional changelog thing.
@oupala I moved the error pages to the theme
folder, and merged the required CSS into theme/style.css
. The error pages also reference this now. I still have to test it though. I don't have access to my apache server at the moment
@oupala I believe I have now completed this pull request. I have tested all my changes on my server, and they are fully functional. I will wait for your review.
Great.
Is it possible for you to rewite history of your commits? To squash similar commits together, to rewrite some of the first commit's message?
You'll have to use interactive rebase (git rebase -i
And by the way, empty parenthesis can be omitted, it make messages clearer:
fix: Error page styling issues.
I don't think my git rebase
worked because I had already pushed the previous commits to Github. What should I do?
Force push with adding --force
flag to your git push
command.
Well, now git
on my desktop only registers that I made 2 commits after performing the rebase
, but as we can see, all 8 of my commits show on Github. I think I messed it up.
Have you pushed to GitHub ?
git push --force
(--force
is because rebasing does rewrite the history)
Yes I did.
> git push --force
Everything is up-to-date
Should I just start over? I didn't make a whole lot of changes, It wouldn't be that hard. I'll keep in mind all the things I learned from this disaster of a pull request...
I added custom error pages that follow the style of Apaxy. Please note that when setting up, the references to the stylesheets and images will have to be updated, because they are set to
/{FOLDERNAME}/errors/
by default. These error pages are fully functional, as Apache will automatically redirect to them upon each error code. These are the common ones, I can add more if we want. See #98Here is an example (404 page):![example](https://user-images.githubusercontent.com/27834353/36564606-dbac592c-17eb-11e8-9fe0-8b7884bfbe07.PNG)
The message will also fade down on load, just like the Apaxy website.