Skip to content
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

Integrate templates into bindata optionally #314

Merged
merged 14 commits into from
Dec 6, 2016
Merged

Integrate templates into bindata optionally #314

merged 14 commits into from
Dec 6, 2016

Conversation

tboerger
Copy link
Member

@tboerger tboerger commented Nov 30, 2016

I have created this pull request to get early feedback. To finish this PR I still need to figure out how we can use the embedded templates for the mailer. Looks like the used macaron.TemplateSet doesn't like bindata.

Partially obsoletes #74.

@tboerger tboerger added type/enhancement An improvement of existing functionality pr/wip This PR is not ready for review labels Nov 30, 2016
@tboerger tboerger added this to the 1.0.0 milestone Nov 30, 2016
@lunny
Copy link
Member

lunny commented Nov 30, 2016

Why not just use template but templates, two directories named template are strange.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 30, 2016
@tboerger
Copy link
Member Author

@lunny as said, it's work in progress. If we want to add the func map into the same package I can do that in the end

@tboerger tboerger removed the pr/wip This PR is not ready for review label Dec 6, 2016
@strk
Copy link
Member

strk commented Dec 6, 2016

It looks like custom templates are not used when building with bindata tag.

Tried with custom/templates/home.tmpl (used by gitea only when built with no bindata tag)

@tboerger
Copy link
Member Author

tboerger commented Dec 6, 2016

It looks like custom templates are not used when building with bindata tag

Looks like that, but nothing we can fix within Gitea as it seems to be an issue of https://github.com/go-macaron/bindata

@tboerger
Copy link
Member Author

tboerger commented Dec 6, 2016

The mail templates are always overwritable as we do it manually to read the templates.

@strk
Copy link
Member

strk commented Dec 6, 2016 via email

@metalmatze
Copy link
Contributor

Not tested but the code:
LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 6, 2016
@bkcsoft
Copy link
Member

bkcsoft commented Dec 6, 2016

code LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 6, 2016
@tboerger tboerger merged commit 83ed234 into go-gitea:master Dec 6, 2016
@tboerger tboerger deleted the templates-bindata branch December 7, 2016 08:14
@strk strk mentioned this pull request Dec 29, 2016
6 tasks
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants