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

reintegrate InlineStyle; fix processing of stati images #13

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

bwl21
Copy link

@bwl21 bwl21 commented Dec 9, 2015

I have updated my development branch to your recent refactoring:

  • reintegrated InlineStyle
  • reintegrated the fix for the static images
  • follow the proposed layout in Some refactorings #11,
    • moved the upload folder out of the installation folder
    • keep uploads, thumbnails and static strictly separated
  • fixed the base path in editor.html
  • added index.html again such that we can have a working environment (not sure if it is better to keep it or to leave it out)

I have trouble with the .htaccess. It did not work if the thing is installed in a subfolder.
I did not commit my .htaccess though:

  • need to set the Options - otherwise Apache claims that RewriteRule is not allowed
  • need to set a RewriteBase - otherwise rewrite adds my system path to the rewritten url

my development server uses an alias such that the url is http:localhost:8080/mosaico, this alias refers to a subdirectory of the server root.

<IfModule mod_rewrite.c>
Options +SymLinksIfOwnerMatch +FollowSymLinks
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteBase /mosaico/backend-php/
RewriteRule ^(.*)$ index.php [QSA,L]
</IfModule>

bwl21 added 11 commits November 26, 2015 10:33
Updated readme.md accordingly.
Ignore generated files in this repository.
* absolute paths
* cleanup computation of urls and server internal paths
* feature/Integrate_Inlinestyle:
  Added <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> see voidlabs/mosaico#56
  Integrate https://github.com/christiaan/InlineStyle Updated readme.md accordingly. Ignore generated files in this repository.
* feature/fix_image_handling:
  fix image handling * absolute paths * cleanup computation of urls and server internal paths
* feature/fix_image_handling:
  cherry picked some changes to make this branch work

Conflicts: resolved
	.gitignore
* commit 'ea2e126298fabbb86b69079e4207bde1110719c6':
  Update README.md
  Refactor code and improve url and file system pathing

Conflicts:
	README.md
	config.php
	dl/index.php
	upload/index.php
Integrated InlineStyle
Followed the layout in uSked#11

needs installation specific adaption of .htaccess
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant