no need for javascript and stylesheet helpers most of the time

mojolicious · Apr 3, 2014 · d35255e · d35255e
1 parent 878b84e
commit d35255e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/examples/websocket.pl b/examples/websocket.pl
@@ -24,7 +24,7 @@
 <html>
   <head>
     <title>WebSocket Test</title>
-    %= javascript begin
+    <script>
       var ws;
       if ("WebSocket" in window) {
         ws = new WebSocket('<%= url_for('test')->to_abs %>');
@@ -40,7 +40,7 @@
       else {
         document.body.innerHTML += 'Browser does not support WebSockets.';
       }
-    % end
+    </script>
   </head>
   <body>Testing WebSockets: </body>
 </html>
diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod
@@ -705,10 +705,10 @@ with methods like L<Mojolicious::Validator::Validation/"is_valid">.
   <!DOCTYPE html>
   <html>
     <head>
-      %= stylesheet begin
+      <style>
         label.field-with-error { color: #dd7e5e }
         input.field-with-error { background-color: #fd9e7e }
-      % end
+      </style>
     </head>
     <body>
       %= form_for index => begin

diff --git a/lib/Mojolicious/Lite.pm b/lib/Mojolicious/Lite.pm
@@ -917,15 +917,15 @@ and return them with L<Mojolicious::Controller/"send">.
   <html>
     <head>
       <title>Echo</title>
-      %= javascript begin
+      <script>
         var ws = new WebSocket('<%= url_for('echo')->to_abs %>');
         ws.onmessage = function (event) {
           document.body.innerHTML += JSON.parse(event.data).msg;
         };
         ws.onopen = function (event) {
           ws.send(JSON.stringify({msg: 'I ♥ Mojolicious!'}));
         };
-      % end
+      </script>
     </head>
   </html>
 

diff --git a/lib/Mojolicious/templates/development.html.ep b/lib/Mojolicious/templates/development.html.ep
@@ -8,7 +8,7 @@
     %= javascript '/mojo/jquery/jquery.js'
     %= javascript '/mojo/prettify/run_prettify.js'
     %= stylesheet '/mojo/prettify/prettify-mojo-dark.css'
-    %= stylesheet begin
+    <style>
       a img { border: 0 }
       body {
         background: url(<%= url_for '/mojo/pinstripe-light.png' %>);
@@ -111,11 +111,11 @@
         max-width: 1000px;
         margin: 0 auto;
       }
-    % end
+    </style>
   </head>
   <body>
     %= include inline => app->renderer->_bundled('mojobar')
-    %= javascript begin
+    <script>
       function mojoDrawer (handle, drawer) {
         $(handle).click(function() {
           $(drawer).slideToggle('slow');
@@ -129,7 +129,7 @@
         mojoDrawer('#trace', '#frames');
         mojoDrawer('#more', '#infos');
       });
-    % end
+    </script>
     <div id="wrapperlicious">
       % my $kv = begin
         % my ($key, $value) = @_;
@@ -177,7 +177,7 @@
               </table>
             </div>
             <div class="tap">tap for more</div>
-            %= javascript begin
+            <script>
               var current = '#context';
               $('#showcase').click(function() {
                 $(current).slideToggle('slow', function() {
@@ -191,7 +191,7 @@
                 });
               });
               $('#insight').toggle();
-            % end
+            </script>
           % }
         </div>
         <div id="trace" class="box spaced">

diff --git a/lib/Mojolicious/templates/exception.html.ep b/lib/Mojolicious/templates/exception.html.ep
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head><title>Server error</title></head>
-   %= stylesheet begin
+  <style>
       body { background-color: #caecf6 }
       #raptor {
         background: url(<%= url_for '/mojo/failraptor.png' %>);
@@ -13,6 +13,6 @@
         top: 50%;
         width: 743px;
       }
-    % end
+    </style>
   <body><div id="raptor"></div></body>
 </html>
diff --git a/lib/Mojolicious/templates/mojobar.html.ep b/lib/Mojolicious/templates/mojobar.html.ep
@@ -67,7 +67,7 @@
     %= end
   </div>
 </div>
-%= javascript begin
+<script>
   var mojobar = $('#mojobar');
   var mojobarHeight = mojobar.outerHeight();
   function fixOffset() {
@@ -120,4 +120,4 @@
       fixOffset();
     });
   });
-% end
+</script>
diff --git a/lib/Mojolicious/templates/not_found.html.ep b/lib/Mojolicious/templates/not_found.html.ep
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head><title>Page not found</title></head>
-   %= stylesheet begin
+  <style>
       a img { border: 0 }
       body { background-color: #caecf6 }
       #noraptor {
@@ -19,7 +19,7 @@
         top: 50%;
         width: 306px;
       }
-    % end
+    </style>
   <body>
     %= link_to url_for->base => begin
       %= image '/mojo/noraptor.png', alt => 'Bye!', id => 'noraptor'

diff --git a/lib/Mojolicious/templates/perldoc.html.ep b/lib/Mojolicious/templates/perldoc.html.ep
@@ -4,7 +4,7 @@
     <title><%= $title %></title>
     %= javascript '/mojo/prettify/run_prettify.js'
     %= stylesheet '/mojo/prettify/prettify-mojo-light.css'
-    %= stylesheet begin
+    <style>
       a { color: inherit }
       a:hover { color: #2a2a2a }
       a img { border: 0 }
@@ -75,7 +75,7 @@
       h1:hover .permalink, h2:hover .permalink, h3:hover .permalink {
         display: block;
       }
-    % end
+    </style>
   </head>
   <body>
     %= include inline => app->renderer->_bundled('mojobar')