Changeset 485

Timestamp:

09/03/2007 07:12:20 PM (15 months ago)

Author:

Shadowhand

Message:

Fixing a typo in the User Guide

Location:

trunk/modules/user_guide

Files:

• controllers/user_guide.php (modified) (3 diffs)
• views/user_guide/en/content/general/configuration.php (modified) (1 diff)
• views/user_guide/js/effects.js (modified) (1 diff)
• views/user_guide/media (added)

trunk/modules/user_guide/controllers/user_guide.php

@@ -34 +34 @@
                 }
 
-                // For Kohana's custom tags to be handled properly
-                Event::add('system.pre_output', array($this, '_tags'));
-
                 // For i18n
                 $locale = Config::item('core.locale', TRUE);
@@ -44 +41 @@
                 $content  = rtrim('user_guide/'.$locale.'content/'.$category.'/'.$section, '/');
 
-                // Load markdown
-                require Kohana::find_file('vendor', 'Markdown');
-
                 $template          = $this->load->view('user_guide/'.$locale.'template');
                 $template->menu    = $this->load->view('user_guide/'.$locale.'menu', array('active_category' => $category, 'active_section' => $section));
-                $template->content = $this->load->view($content)->render(FALSE, 'Markdown');
+                $template->content = $this->load->view($content)->render(FALSE, array($this, '_tags'));
 
                 // Display output
@@ -55 +49 @@
         }
 
-        public function _tags()
+        public function _tags($output)
         {
-                Kohana::$output = preg_replace_callback('!<(benchmark|config|definition|event|file)>.+?</[^>]+>!', array($this, '_tag_update'), Kohana::$output);
+                // Load markdown
+                require Kohana::find_file('vendor', 'Markdown');
+
+                $output = Markdown($output);
+
+                $output = str_replace(array
+                (
+                        '<pre><code>', '</code></pre>',
+                        '<code>', '</code>'
+                ), array
+                (
+                        '<pre class="prettyprint">', '</pre>',
+                        '<code class="prettyprint">', '</code>'
+                ),
+                $output);
+
+                $output = preg_replace_callback('!<(benchmark|config|definition|event|file)>.+?</[^>]+>!', array($this, '_tag_update'), $output);
+
+                return $output;
         }
 

trunk/modules/user_guide/views/user_guide/en/content/general/configuration.php

@@ -19 +19 @@
 
 permitted_uri_chars
-: List of characters that are allowed in URI strings. The default settings should work for almost every application. **If you can this option, the security of Kohana may diminish.**
+: List of characters that are allowed in URI strings. The default settings should work for almost every application. **If you change this option, the security of Kohana may diminish.**
 
 locale

trunk/modules/user_guide/views/user_guide/js/effects.js

@@ -1 +1 @@
 // $Id$
-// Behavior attachment
 $(document).ready(function(){
         // Menu opacity hover effect, much fancy pants!