Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
moved bundled static files to mojo directory
  • Loading branch information
kraih committed Jan 24, 2013
1 parent cd84fd9 commit 99621b4
Show file tree
Hide file tree
Showing 36 changed files with 24 additions and 24 deletions.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions lib/Mojolicious/templates/exception.development.html.ep
Expand Up @@ -4,9 +4,9 @@
<title>Server error</title>
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Expires" content="-1">
%= javascript '/js/jquery.js'
%= stylesheet '/css/prettify-mojo.css'
%= javascript '/js/prettify.js'
%= javascript '/mojo/jquery/jquery.js'
%= stylesheet '/mojo/prettify/prettify-mojo.css'
%= javascript '/mojo/prettify/prettify.js'
%= stylesheet begin
a img { border: 0 }
body {
Expand Down Expand Up @@ -39,7 +39,7 @@
}
.code {
background-color: #1a1a1a;
background: url(<%= url_for '/mojolicious-pinstripe.gif' %>);
background: url(<%= url_for '/mojo/pinstripe.gif' %>);
color: #eee;
text-shadow: #333 0 1px 0;
}
Expand Down Expand Up @@ -219,7 +219,7 @@
</div>
<div id="footer">
%= link_to 'http://mojolicio.us' => begin
%= image '/mojolicious-black.png', alt => 'Mojolicious logo'
%= image '/mojo/logo-black.png', alt => 'Mojolicious logo'
% end
</div>
%= javascript begin
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojolicious/templates/exception.html.ep
Expand Up @@ -4,7 +4,7 @@
%= stylesheet begin
body { background-color: #caecf6 }
#raptor {
background: url(<%= url_for '/mojolicious-failraptor.png' %>);
background: url(<%= url_for '/mojo/failraptor.png' %>);
height: 488px;
left: 50%;
margin-left: -371px;
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojolicious/templates/mojobar.html.ep
@@ -1,4 +1,4 @@
%= javascript '/js/jquery.js'
%= javascript '/mojo/jquery/jquery.js'
<div id="mojobar">
%= stylesheet scoped => 'scoped', begin
#mojobar {
Expand Down Expand Up @@ -56,7 +56,7 @@
% end
<div id="mojobar-logo">
%= link_to 'http://mojolicio.us' => begin
%= image '/mojolicious-white.png', alt => 'Mojolicious logo'
%= image '/mojo/logo-white.png', alt => 'Mojolicious logo'
% end
</div>
<div id="mojobar-links">
Expand Down
6 changes: 3 additions & 3 deletions lib/Mojolicious/templates/not_found.development.html.ep
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>Page not found</title>
%= stylesheet '/css/prettify-mojo.css'
%= javascript '/js/prettify.js'
%= stylesheet '/mojo/prettify/prettify-mojo.css'
%= javascript '/mojo/prettify/prettify.js'
%= stylesheet begin
body {
background-color: #f5f6f8;
Expand Down Expand Up @@ -117,7 +117,7 @@
</div>
<div id="footer">
%= link_to 'http://mojolicio.us' => begin
%= image '/mojolicious-black.png', alt => 'Mojolicious logo'
%= image '/mojo/logo-black.png', alt => 'Mojolicious logo'
% end
</div>
</body>
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojolicious/templates/not_found.html.ep
Expand Up @@ -10,7 +10,7 @@
top: 60%;
}
#notfound {
background: url(<%= url_for '/mojolicious-notfound.png' %>);
background: url(<%= url_for '/mojo/notfound.png' %>);
height: 62px;
left: 50%;
margin-left: -153px;
Expand All @@ -22,7 +22,7 @@
% end
<body>
%= link_to url_for->base => begin
%= image '/mojolicious-noraptor.png', alt => 'Bye!', id => 'noraptor'
%= image '/mojo/noraptor.png', alt => 'Bye!', id => 'noraptor'
% end
<div id="notfound"></div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions lib/Mojolicious/templates/perldoc.html.ep
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title><%= $title %></title>
%= stylesheet '/css/prettify-mojo.css'
%= javascript '/js/prettify.js'
%= stylesheet '/mojo/prettify/prettify-mojo.css'
%= javascript '/mojo/prettify/prettify.js'
%= stylesheet begin
a { color: inherit }
a:hover { color: #2a2a2a }
Expand All @@ -24,7 +24,7 @@
h1 a, h2 a, h3 a { text-decoration: none }
pre {
background-color: #eee;
background: url(<%= url_for '/mojolicious-pinstripe.gif' %>);
background: url(<%= url_for '/mojo/pinstripe.gif' %>);
-moz-border-radius: 5px;
border-radius: 5px;
color: #eee;
Expand Down Expand Up @@ -88,7 +88,7 @@
</div>
<div id="footer">
%= link_to 'http://mojolicio.us' => begin
%= image '/mojolicious-black.png', alt => 'Mojolicious logo'
%= image '/mojo/logo-black.png', alt => 'Mojolicious logo'
% end
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions t/mojolicious/group_lite_app.t
Expand Up @@ -264,10 +264,10 @@ $t->get_ok('/bridge2stash' => {'X-Flash' => 1})->status_is(200)
->content_is("stash too!!!!!!!\n");

# Random static requests
$t->get_ok('/mojolicious-white.png')->status_is(200);
$t->get_ok('/mojolicious-black.png')->status_is(200);
$t->get_ok('/mojolicious-white.png')->status_is(200);
$t->get_ok('/mojolicious-black.png')->status_is(200);
$t->get_ok('/mojo/logo-white.png')->status_is(200);
$t->get_ok('/mojo/logo-black.png')->status_is(200);
$t->get_ok('/mojo/logo-white.png')->status_is(200);
$t->get_ok('/mojo/logo-black.png')->status_is(200);

# With cookies, session and flash again
$t->get_ok('/bridge2stash')->status_is(200)
Expand Down
6 changes: 3 additions & 3 deletions t/mojolicious/rebased_lite_app.t
Expand Up @@ -44,7 +44,7 @@ my $t = Test::Mojo->new;
$t->get_ok('/')->status_is(200)->header_is('X-Route' => 'root')
->content_is(<<EOF);
http://kraih.com/rebased/
<script src="/rebased/js/jquery.js"></script>
<script src="/rebased/mojo/jquery/jquery.js"></script>
<img src="/rebased/images/test.png" />
http://kraih.com/rebased/foo
/rebased/foo
Expand Down Expand Up @@ -87,7 +87,7 @@ EOF
$t->get_ok('/baz')->status_is(200)->header_is('X-Route' => 'baz')
->content_is(<<EOF);
http://kraih.com/rebased/
<script src="/rebased/js/jquery.js"></script>
<script src="/rebased/mojo/jquery/jquery.js"></script>
<img src="/rebased/images/test.png" />
http://kraih.com/rebased/foo
/rebased/foo
Expand All @@ -103,7 +103,7 @@ done_testing();
__DATA__
@@ root.html.ep
%= $self->req->url->base
%= javascript '/js/jquery.js'
%= javascript '/mojo/jquery/jquery.js'
%= image '/images/test.png'
%= url_for('foo')->to_abs
%= url_for 'foo'
Expand Down

0 comments on commit 99621b4

Please sign in to comment.