move public and templates directories to avoid conflicts with older v…

…ersions
mojolicious · Oct 20, 2015 · 0141cc9 · 0141cc9
1 parent dcfb9f2
commit 0141cc9
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 2 deletions.
diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -25,7 +25,7 @@ has paths   => sub { [] };
 
 # Bundled templates
 my $TEMPLATES = Mojo::Home->new(Mojo::Home->new->mojo_lib_dir)
-  ->rel_dir('Mojolicious/templates');
+  ->rel_dir('Mojolicious/resources/templates');
 
 sub DESTROY { Mojo::Util::_teardown($_) for @{shift->{namespaces}} }
 

diff --git a/lib/Mojolicious/Static.pm b/lib/Mojolicious/Static.pm
@@ -14,7 +14,7 @@ has paths   => sub { [] };
 
 # Bundled files
 my $PUBLIC = Mojo::Home->new(Mojo::Home->new->mojo_lib_dir)
-  ->rel_dir('Mojolicious/public');
+  ->rel_dir('Mojolicious/resources/public');
 
 sub dispatch {
   my ($self, $c) = @_;

diff --git a/lib/Mojolicious/public/favicon.ico → lib/Mojolicious/resources/public/favicon.ico b/lib/Mojolicious/public/favicon.ico → lib/Mojolicious/resources/public/favicon.ico
diff --git a/lib/Mojolicious/public/mojo/failraptor.png → ...ious/resources/public/mojo/failraptor.png b/lib/Mojolicious/public/mojo/failraptor.png → ...ious/resources/public/mojo/failraptor.png
diff --git a/lib/Mojolicious/public/mojo/jquery/jquery.js → ...us/resources/public/mojo/jquery/jquery.js b/lib/Mojolicious/public/mojo/jquery/jquery.js → ...us/resources/public/mojo/jquery/jquery.js
diff --git a/lib/Mojolicious/public/mojo/logo-black.png → ...ious/resources/public/mojo/logo-black.png b/lib/Mojolicious/public/mojo/logo-black.png → ...ious/resources/public/mojo/logo-black.png
diff --git a/lib/Mojolicious/public/mojo/logo-white.png → ...ious/resources/public/mojo/logo-white.png b/lib/Mojolicious/public/mojo/logo-white.png → ...ious/resources/public/mojo/logo-white.png
diff --git a/lib/Mojolicious/public/mojo/noraptor.png → ...icious/resources/public/mojo/noraptor.png b/lib/Mojolicious/public/mojo/noraptor.png → ...icious/resources/public/mojo/noraptor.png
diff --git a/lib/Mojolicious/public/mojo/notfound.png → ...icious/resources/public/mojo/notfound.png b/lib/Mojolicious/public/mojo/notfound.png → ...icious/resources/public/mojo/notfound.png
diff --git a/...ojolicious/public/mojo/pinstripe-dark.png → .../resources/public/mojo/pinstripe-dark.png b/...ojolicious/public/mojo/pinstripe-dark.png → .../resources/public/mojo/pinstripe-dark.png
diff --git a/...jolicious/public/mojo/pinstripe-light.png → ...resources/public/mojo/pinstripe-light.png b/...jolicious/public/mojo/pinstripe-light.png → ...resources/public/mojo/pinstripe-light.png
diff --git a/...blic/mojo/prettify/prettify-mojo-dark.css → ...blic/mojo/prettify/prettify-mojo-dark.css b/...blic/mojo/prettify/prettify-mojo-dark.css → ...blic/mojo/prettify/prettify-mojo-dark.css
diff --git a/...lic/mojo/prettify/prettify-mojo-light.css → ...lic/mojo/prettify/prettify-mojo-light.css b/...lic/mojo/prettify/prettify-mojo-light.css → ...lic/mojo/prettify/prettify-mojo-light.css
diff --git a/...ious/public/mojo/prettify/run_prettify.js → ...rces/public/mojo/prettify/run_prettify.js b/...ious/public/mojo/prettify/run_prettify.js → ...rces/public/mojo/prettify/run_prettify.js
diff --git a/lib/Mojolicious/public/mojo/stripes.png → ...licious/resources/public/mojo/stripes.png b/lib/Mojolicious/public/mojo/stripes.png → ...licious/resources/public/mojo/stripes.png
diff --git a/...icious/templates/mojo/development.html.ep → ...ources/templates/mojo/development.html.ep b/...icious/templates/mojo/development.html.ep → ...ources/templates/mojo/development.html.ep
diff --git a/...olicious/templates/mojo/exception.html.ep → ...esources/templates/mojo/exception.html.ep b/...olicious/templates/mojo/exception.html.ep → ...esources/templates/mojo/exception.html.ep
diff --git a/...ojolicious/templates/mojo/mojobar.html.ep → .../resources/templates/mojo/mojobar.html.ep b/...ojolicious/templates/mojo/mojobar.html.ep → .../resources/templates/mojo/mojobar.html.ep
diff --git a/...olicious/templates/mojo/not_found.html.ep → ...esources/templates/mojo/not_found.html.ep b/...olicious/templates/mojo/not_found.html.ep → ...esources/templates/mojo/not_found.html.ep
diff --git a/...ojolicious/templates/mojo/perldoc.html.ep → .../resources/templates/mojo/perldoc.html.ep b/...ojolicious/templates/mojo/perldoc.html.ep → .../resources/templates/mojo/perldoc.html.ep