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.

Sign up for GitHub

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

Jump to bottom

Remove layout engine #31

Merged
merged 19 commits into from
Nov 16, 2017
Merged

Remove layout engine #31

merged 19 commits into from
Nov 16, 2017

Conversation

sigee
Copy link
Collaborator

@sigee sigee commented Jun 29, 2017

Based on #30

sigee added 18 commits June 21, 2017 11:19
@sigee
FIX base when dirname ends with directory separator
15eeb42
@sigee
FIX css issues
6d3e854
@sigee
Move header layout settings / printing from init() to the header.html…
0e87f82 
… template
@sigee
Move footer layout printing from shutdown.php to the footer.html temp…
7de664c 
…late
@sigee
Replace LayoutEngine to Fat-Free Template inside Home controller
a656117
@sigee
Inline displaySitemapEdit() function into SiteMap->parse()
11ead9e
@sigee
Replace LayoutEngine to Fat-Free Template inside SiteMap->parse() action
360b2bc
@sigee
Replace LayoutEngine to Fat-Free Template inside Update controller
b97cdb6
@sigee
Replace LayoutEngine to Fat-Free Template inside SiteMap->submitPageT…
c5c244f 
…oGoogle() action
@sigee
Inline writeSitemapUserinput() function into SiteMap->writeSiteMapUse…
2f2e5cd 
…rInput()
@sigee
Add view printing to the SiteMap->writeSiteMapUserInput() action
d103ae0
@sigee
Replace edit_files.php to Fat-Free Template
f2f6a81
@sigee
Replace setup_expert.php to Fat-Free Template
af85ebe
@sigee
Add a new dependency
18da51d
@sigee
Add a logger implementation
e21d7c5
@sigee
Change LayoutEngine info, warning, debug, error, etc. to Logger
0ff04e1
@sigee
Remove fclose, because it is not needed in case of filehandler is fal…
1331d20 
…se (boolean)
@sigee
Add phpDoc and remove unneeded php closing tags
4c04a3e
@sigee sigee added this to the 1.6.0 milestone Jun 29, 2017
@sigee sigee requested a review from lewismc June 29, 2017 08:05
@lewismc
Copy link
Contributor

lewismc commented Jul 4, 2017

@sigee I merged #29 so this PR is now out of date... can you please update?

@sigee
Merge remote-tracking branch 'origin/master' into remove-layout-engine
c3f6bd5 
# Conflicts:
#	inc/functions/functions.inc.php
#	src/Sitepod/Controller/Home.php
#	src/Sitepod/Controller/SiteMap.php
#	src/Sitepod/Controller/Update.php
@sigee
Copy link
Collaborator Author

sigee commented Jul 4, 2017

@lewismc,
I've resolved the conflicts.

@lewismc lewismc merged commit f2e721f into master Nov 16, 2017
@lewismc lewismc deleted the remove-layout-engine branch November 16, 2017 06:55
@lewismc
Copy link
Contributor

lewismc commented Nov 16, 2017

@sigee this is much cleaner thank you for the contribution and apologies it took me so long to review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lewismc lewismc Awaiting requested review from lewismc

Assignees

@lewismc lewismc

Labels
None yet
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.
2 participants
@sigee @lewismc