Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into …

…develop
amacneil · Oct 11, 2011 · 2c129c8 · 2c129c8
2 parents e347927 + 8352f09
commit 2c129c8
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 69 deletions.
diff --git a/user_guide_src/source/_themes/eldocs/layout.html b/user_guide_src/source/_themes/eldocs/layout.html
@@ -124,7 +124,15 @@
 
 	{%- block footer %}			
 		<div id="footer">
-			<p class="top"><a href="#header" title="Return to top">Return to top</a></p>
+			<p class="top">
+				{% if prev %}
+				<span class="prev">Previous Topic: <a href="{{ prev.link }}">{{ prev.title }}</a></span>
+				{% endif %}
+				{% if next %}
+				<span class="next">Next Topic: <a href="{{ next.link }}">{{ next.title }}</a></span>
+				{% endif %}
+				<a href="#header" title="Return to top">Return to top</a>
+			</p>
 			<p><a href="{{ project_url }}">{{ project }}</a> &ndash; Copyright &copy; {{ copyright }}</a> &ndash; Last updated: {{ last_updated }}</p>
 		</div><!-- /#footer -->
 	{%- endblock %}

diff --git a/user_guide_src/source/_themes/eldocs/static/asset/css/common.css b/user_guide_src/source/_themes/eldocs/static/asset/css/common.css
@@ -119,6 +119,8 @@ img{ display: block; max-width: 100%; }
 fieldset{ border: 0; }
 
 .top{ float: right; }
+.next{ padding: 0 20px 0 10px; }
+.prev{ padding-right: 10px; }
 
 .highlight-ci,
 .highlight-ee,

diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst
@@ -6,24 +6,20 @@ CodeIgniter comes with a full-featured and very fast abstracted database
 class that supports both traditional structures and Active Record
 patterns. The database functions offer clear, simple syntax.
 
--  :doc:`Quick Start: Usage Examples <examples>`
--  :doc:`Database Configuration <configuration>`
--  :doc:`Connecting to a Database <connecting>`
--  :doc:`Running Queries <queries>`
--  :doc:`Generating Query Results <results>`
--  :doc:`Query Helper Functions <helpers>`
--  :doc:`Active Record Class <active_record>`
--  :doc:`Transactions <transactions>`
--  :doc:`Table MetaData <table_data>`
--  :doc:`Field MetaData <fields>`
--  :doc:`Custom Function Calls <call_function>`
--  :doc:`Query Caching <caching>`
--  :doc:`Database manipulation with Database Forge <forge>`
--  :doc:`Database Utilities Class <utilities>`
-
 .. toctree::
-	:glob:
 	:titlesonly:
-	:hidden:
 
-	*
+	Quick Start: Usage Examples <examples>
+	Database Configuration <configuration>
+	Connecting to a Database <connecting>
+	Running Queries <queries>
+	Generating Query Results <results>
+	Query Helper Functions <helpers>
+	Active Record Class <active_record>
+	Transactions <transactions>
+	Table MetaData <table_data>
+	Field MetaData <fields>
+	Custom Function Calls <call_function>
+	Query Caching <caching>
+	Database Manipulation with Database Forge <forge>
+	Database Utilities Class <utilities>
diff --git a/user_guide_src/source/general/index.rst b/user_guide_src/source/general/index.rst
@@ -1,39 +1,32 @@
-##################
-General
-##################
-
-
--  :doc:`CodeIgniter URLs <urls>`
--  :doc:`Controllers <controllers>`
--  :doc:`Reserved Names <reserved_names>`
--  :doc:`Views <views>`
--  :doc:`Models <models>`
--  :doc:`Helpers <helpers>`
--  :doc:`Using CodeIgniter Libraries <libraries>`
--  :doc:`Creating Your Own Libraries <creating_libraries>`
--  :doc:`Using CodeIgniter Drivers <drivers>`
--  :doc:`Creating Your Own Drivers <creating_drivers>`
--  :doc:`Creating Core Classes <core_classes>`
--  :doc:`Creating Ancillary Classes  <ancillary_classes>`
--  :doc:`Hooks - Extending the Core <hooks>`
--  :doc:`Auto-loading Resources <autoloader>`
--  :doc:`Common Function <common_functions>`
--  :doc:`URI Routing <routing>`
--  :doc:`Error Handling <errors>`
--  :doc:`Caching <caching>`
--  :doc:`Profiling Your Application <profiling>`
--  :doc:`Running via the CLI <cli>`
--  :doc:`Managing Applications <managing_apps>`
--  :doc:`Handling Multiple Environments <environments>`
--  :doc:`Alternative PHP Syntax <alternative_php>`
--  :doc:`Security <security>`
--  :doc:`PHP Style Guide <styleguide>`
--  :doc:`Server Requirements <requirements>`
--  :doc:`Credits <credits>`
+##############
+General Topics
+##############
 
 .. toctree::
-	:glob:
 	:titlesonly:
-	:hidden:
 
-	*
+	urls
+	controllers
+	reserved_names
+	views
+	models
+	Helpers <helpers>
+	libraries
+	creating_libraries
+	drivers
+	creating_drivers
+	core_classes
+	ancillary_classes
+	hooks
+	autoloader
+	common_functions
+	routing
+	errors
+	Caching <caching>
+	profiling
+	cli
+	managing_apps
+	environments
+	alternative_php
+	security
+	PHP Style Guide <styleguide>
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst
@@ -1,6 +1,7 @@
-########################
-General Style and Syntax
-########################
+###############
+PHP Style Guide
+###############
+
 
 The following page describes the use of coding rules adhered to when
 developing CodeIgniter.

diff --git a/user_guide_src/source/index.rst b/user_guide_src/source/index.rst
@@ -37,10 +37,13 @@ CodeIgniter is right for you if:
 
 	*
 	overview/index
+	general/requirements
 	installation/index
 	general/index
 	libraries/index
-	database/index
 	helpers/index
+	database/index
 	documentation/index
-	tutorial/index
+	tutorial/index
+	general/quick_reference
+	general/credits
diff --git a/user_guide_src/source/overview/index.rst b/user_guide_src/source/overview/index.rst
@@ -4,15 +4,13 @@ CodeIgniter Overview
 
 The following pages describe the broad concepts behind CodeIgniter:
 
--  :doc:`CodeIgniter at a Glance <at_a_glance>`
--  :doc:`Supported Features <features>`
--  :doc:`Application Flow Chart <appflow>`
--  :doc:`Introduction to the Model-View-Controller <mvc>`
--  :doc:`Design and Architectural Goals <goals>`
-
 .. toctree::
-	:glob:
-	:hidden:
 	:titlesonly:
 
-	*
+	Getting Started <getting_started>
+	CodeIgniter at a Glance <at_a_glance>
+	CodeIgniter Cheatsheets <cheatsheets>
+	Supported Features <features>
+	Application Flow Chart <appflow>
+	Model-View-Controller <mvc>
+	Architectural Goals <goals>
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
@@ -40,7 +40,6 @@ Enjoy your exploration of the CodeIgniter framework.
 	:hidden:
 	:titlesonly:
 
-	index
 	static_pages
 	news_section
 	create_news_items