Show
Ignore:
Timestamp:
09/03/2007 01:36:13 PM (15 months ago)
Author:
Shadowhand
Message:

This should fix the issues with the User Guide

Location:
trunk/modules/user_guide
Files:
1 removed
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/modules/user_guide/controllers/user_guide.php

    r475 r483  
    3737                Event::add('system.pre_output', array($this, '_tags')); 
    3838 
     39                // For i18n 
     40                $locale = Config::item('core.locale', TRUE); 
     41 
    3942                // Set the view that will be loaded 
    4043                $category = ($category == FALSE)  ? 'kohana' : $category; 
    41                 $content  = rtrim('user_guide/content/'.$category.'/'.$section, '/'); 
     44                $content  = rtrim('user_guide/'.$locale.'content/'.$category.'/'.$section, '/'); 
    4245 
    4346                // Load session for AJAX page storage 
    … …  
    6265                                url::redirect($ajax_return); 
    6366                         
    64                         $template = $this->load->view('user_guide/template'); 
    65                         $template->menu   = $this->load->view('user_guide/menu', array('active_category' => $category, 'active_section' => $section)); 
     67                        $template          = $this->load->view('user_guide/'.$locale.'template'); 
     68                        $template->menu    = $this->load->view('user_guide/'.$locale.'menu', array('active_category' => $category, 'active_section' => $section)); 
    6669                        $template->content = $this->load->view($content)->render(FALSE, 'Markdown'); 
    6770 

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

    r476 r483  
    7070: <?php echo html::anchor('user_guide/libraries/session', 'Session Library') ?>  
    7171 
    72 <?php echo $this->load->view('user_guide/content/abbr') ?> 
     72<?php echo $this->load->view('user_guide/en/content/abbr') ?> 
    7373<?php /* $Id$ */ ?> 

  • trunk/modules/user_guide/views/user_guide/en/content/kohana/requirements.php

    r475 r483  
    55Kohana will run in almost any environment with minimal configuration. There are a few minimum server requirements: 
    66 
    7  1. [Unicode](http://unicode.org/) support 
    8  2. PHP version >= 5.1 
    9  3. An HTTP server. Kohana is known to work with: 
    10    * Apache 1.x 
    11    * Apache 2.x 
    12    * lighttpd 
    13    * IIS version >= 5 
     7 1. Server with [Unicode](http://unicode.org/) support 
     8 2. PHP version &gt;= 5.1 with PDO support 
     9 3. An HTTP server. Kohana is known to work with: Apache 1.3+, Apache 2.0+, lighttpd, and MS IIS 
    1410 
    1511Optionally, if you wish to use a database with Kohana, you will need a database server. Kohana use <?php echo html::anchor('http://php.net/pdo', 'PDO') ?> to connect to your database. All of the PDO <?php echo html::anchor('http://php.net/manual/en/ref.pdo.php#pdo.drivers', 'supported databases') ?> are supported by Kohana, provided that your server has the driver available. 
    … …  
    2016 2. [mcrypt](http://php.net/mcrypt) will dramatically speed up Kohana's encryption and hashing routines 
    2117 
    22 <?php echo $this->load->view('user_guide/content/abbr') ?> 
    23  
     18<?php echo $this->load->view('user_guide/en/content/abbr') ?> 
    2419<?php /* $Id$ */ ?>