From 619b122cc8c213df558838ce9cc1c157a85a65b6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 10 Oct 2011 16:26:27 -0500 Subject: incremental improvement to user guide ToC --- user_guide_src/source/_themes/eldocs/layout.html | 11 +++++++- .../_themes/eldocs/static/asset/css/common.css | 2 ++ user_guide_src/source/database/index.rst | 32 ++++++++++------------ user_guide_src/source/general/index.rst | 32 ++++++++++++++++++++-- user_guide_src/source/general/styleguide.rst | 7 +++-- user_guide_src/source/index.rst | 7 +++-- user_guide_src/source/overview/index.rst | 16 +++++------ 7 files changed, 71 insertions(+), 36 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/_themes/eldocs/layout.html b/user_guide_src/source/_themes/eldocs/layout.html index 4e083a1d3..ce54fa7ae 100644 --- a/user_guide_src/source/_themes/eldocs/layout.html +++ b/user_guide_src/source/_themes/eldocs/layout.html @@ -124,7 +124,16 @@ {%- block 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 index c216c3666..28182a162 100644 --- 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 index 3b59986be..ab12b7cb7 100644 --- 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 ` -- :doc:`Database Configuration ` -- :doc:`Connecting to a Database ` -- :doc:`Running Queries ` -- :doc:`Generating Query Results ` -- :doc:`Query Helper Functions ` -- :doc:`Active Record Class ` -- :doc:`Transactions ` -- :doc:`Table MetaData ` -- :doc:`Field MetaData ` -- :doc:`Custom Function Calls ` -- :doc:`Query Caching ` -- :doc:`Database manipulation with Database Forge ` -- :doc:`Database Utilities Class ` - .. toctree:: - :glob: :titlesonly: - :hidden: - * \ No newline at end of file + Quick Start: Usage Examples + Database Configuration + Connecting to a Database + Running Queries + Generating Query Results + Query Helper Functions + Active Record Class + Transactions + Table MetaData + Field MetaData + Custom Function Calls + Query Caching + Database Manipulation with Database Forge + Database Utilities Class \ No newline at end of file diff --git a/user_guide_src/source/general/index.rst b/user_guide_src/source/general/index.rst index 1ece12bef..2bc684a1d 100644 --- a/user_guide_src/source/general/index.rst +++ b/user_guide_src/source/general/index.rst @@ -1,6 +1,32 @@ +############## +General Topics +############## + .. toctree:: - :glob: - :hidden: :titlesonly: - * \ No newline at end of file + urls + controllers + reserved_names + views + models + Helpers + libraries + creating_libraries + drivers + creating_drivers + core_classes + ancillary_classes + hooks + autoloader + common_functions + routing + errors + Caching + profiling + cli + managing_apps + environments + alternative_php + security + PHP Style Guide \ No newline at end of file diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index 0373fc791..b3dc08871 100644 --- 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 index e53182550..b95161271 100644 --- a/user_guide_src/source/index.rst +++ b/user_guide_src/source/index.rst @@ -37,9 +37,12 @@ CodeIgniter is right for you if: * overview/index + general/requirements installation/index general/index libraries/index - database/index helpers/index - documentation/index \ No newline at end of file + database/index + documentation/index + general/quick_reference + general/credits \ No newline at end of file diff --git a/user_guide_src/source/overview/index.rst b/user_guide_src/source/overview/index.rst index d541e796c..dc91f78c4 100644 --- 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 ` -- :doc:`Supported Features ` -- :doc:`Application Flow Chart ` -- :doc:`Introduction to the Model-View-Controller ` -- :doc:`Design and Architectural Goals ` - .. toctree:: - :glob: - :hidden: :titlesonly: - * \ No newline at end of file + Getting Started + CodeIgniter at a Glance + CodeIgniter Cheatsheets + Supported Features + Application Flow Chart + Model-View-Controller + Architectural Goals \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 9286a8f71305f557997401b55138e8ef483839f9 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 10 Oct 2011 16:46:43 -0500 Subject: unhid general topics ToC for navigation --- user_guide_src/source/general/index.rst | 1 - 1 file changed, 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/general/index.rst b/user_guide_src/source/general/index.rst index 1335e9dd4..2162b8140 100644 --- a/user_guide_src/source/general/index.rst +++ b/user_guide_src/source/general/index.rst @@ -4,7 +4,6 @@ General Topics .. toctree:: :titlesonly: - :hidden: urls controllers -- cgit v1.2.3-24-g4f1b From 8352f093567caf7e64e38698b6d9cf65396d5a10 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 10 Oct 2011 17:22:33 -0500 Subject: removed 'index' listing from tutorial index toc --- user_guide_src/source/tutorial/index.rst | 1 - 1 file changed, 1 deletion(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst index eb6f11e34..c959d04d2 100644 --- 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 -- cgit v1.2.3-24-g4f1b