Merge branch '1.3/develop'

kenjis · Sep 1, 2012 · b7fa268 · b7fa268
2 parents 0d43c00 + 7b1a0fc
commit b7fa268
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/classes/pagination.html b/classes/pagination.html
@@ -160,26 +160,36 @@ <h4 id="global_config">Global Config Array</h4>
 	'total_items' => 10,
 	'per_page' => 20,
 	'template' => array(
-		'wrapper_start' => '&lt;div class="pagination"&gt; ',
-		'wrapper_end' => ' &lt;/div&gt;',
-		'page_start' => '&lt;span class="page-links"&gt; ',
-		'page_end' => ' &lt;/span&gt;',
-		'previous_start' => '&lt;span class="previous"&gt; ',
-		'previous_end' => ' &lt;/span&gt;',
-		'previous_inactive_start' => ' &lt;/span class="previous-inactive"&gt;',
-		'previous_inactive_end' => ' &lt;/span&gt;',
-		'previous_mark' => '&laquo; ',
-		'next_start' => '&lt;span class="next"&gt; ',
-		'next_end' => ' &lt;/span&gt;',
-		'next_inactive_start' => ' &lt;/span class="next-inactive"&gt;',
-		'next_inactive_end' => ' &lt;/span&gt;',
-		'next_mark' => ' &raquo;',
-		'active_start' => '&lt;span class="active"&gt; ',
-		'active_end' => ' &lt;/span&gt;',
-		'regular_start' => '',
-		'regular_end' => '',
+		'wrapper_start'           => '&lt;div class="pagination"&gt; ',
+		'wrapper_end'             => ' &lt;/div&gt;',
+		'page_start'              => '&lt;span class="page-links"&gt; ',
+		'page_end'                => ' &lt;/span&gt;',
+		'previous_start'          => '&lt;span class="previous"&gt; ',
+		'previous_end'            => ' &lt;/span&gt;',
+		'previous_inactive_start' => ' &lt;span class="previous-inactive"&gt;',
+		'previous_inactive_end'   => ' &lt;/span&gt;',
+		'previous_inactive_attrs' => array(),
+		'previous_mark'           => '&laquo; ',
+		'previous_attrs'          => array(),
+		'next_start'              => '&lt;span class="next"&gt; ',
+		'next_end'                => ' &lt;/span>',
+		'next_inactive_start'     => ' &lt;span class="next-inactive"&gt;',
+		'next_inactive_end'       => ' &lt;/span&gt;',
+		'next_inactive_attrs'     => array(),
+		'next_mark'               => ' &raquo;',
+		'next_attrs'              => array(),
+		'active_start'            => '&lt;span class="active"&gt; ',
+		'active_end'              => ' &lt;/span&gt;',
+		'active_attrs'            => array(),
+		'regular_start'           => '',
+		'regular_end'             => '',
+		'regular_attrs'           => array(),
 	),
 ));</code></pre>
+				<p class="note">
+					If you have a standard configuration for your entire application, you can also opt to store this structure
+					in the app/config/pagination.php config file, so you don't have to define it every time.
+				</p>
 				</article>
 
 				<article>

diff --git a/general/packages.html b/general/packages.html
@@ -115,7 +115,11 @@ <h3 id="creation">パッケージの作成</h3>
 
 			<p>クラスの準備が整ったら、それらを使用することができます。</p>
 
+<<<<<<< HEAD
 			<p class="note">Note: パッケージの名前空間がグローバルにエリアスされていない場合、名前空間を指定する必要があります:</p>
+=======
+			<p class="note">Note: if package namespaces aren't aliased to global you must supply it:</p>
+>>>>>>> 7b1a0fcea336ecbf8973367852b28516f29eeb18
 
 			<pre class="php"><code>// もしグローバルにエリアスされていたら
 $instance = new Myclass;