本家変更分をmerge

NEKOGET · Dec 19, 2016 · b5fbebf · b5fbebf
2 parents 0a38d02 + 5a473c0
commit b5fbebf
Show file tree

Hide file tree

Showing 15 changed files with 480 additions and 98 deletions.
diff --git a/classes/agent/usage.html b/classes/agent/usage.html
@@ -50,7 +50,7 @@ <h2>Agent クラス</h2>
 			<p>Agent クラスは、ブラウザ種別、バージョン、プラットフォーム、OS など、クライアントのユーザーエージェント文字列に関する情報を取得可能にします。</p>
 
 			<section>
-				<h2>使用方法</h2>
+				<h3>使用方法</h3>
 
 				<article>
 					<h4 id="method_accepts_charset" class="method">accepts_charset($charset = 'utf-8')</h4>

diff --git a/classes/database/dbutil.html b/classes/database/dbutil.html
@@ -963,7 +963,7 @@ <h4 class="method" id="method_drop_index">drop_index($table, $index_name, $db =
 			</article>
 
 			<article>
-				<h4 class="method" id="method_add_foregin_key">add_foregin_key($table, $foreign_key)</h4>
+				<h4 class="method" id="method_add_foreign_key">add_foregin_key($table, $foreign_key)</h4>
 				<p><strong>add_foreign_key</strong> メソッドは、既存テーブルに外部キーを追加します。</p>
 				<table class="method">
 					<tbody>

diff --git a/classes/presenter.html b/classes/presenter.html
@@ -191,6 +191,53 @@ <h4 class="method" id="method_view">view()</h4>
 				</p>
 			</article>
 
+			<article>
+				<h4 class="method" id="method_set_view">set_view($view = null)</h4>
+				<p>The <strong>set_view</strong> method can be used to change the View associated with the presenter.</p>
+				<table class="method">
+					<tbody>
+						<tr>
+							<th>Static</th>
+							<td>No</td>
+						</tr>
+						<tr>
+							<th>Parameters</th>
+							<td>
+								<table class="parameters">
+									<tr>
+										<th>Param</th>
+										<th>Default</th>
+										<th class="description">Description</th>
+									</tr>
+									<tr>
+										<th><kbd>$view</kbd></th>
+										<td><pre class="php"><code>null</code></pre></td>
+										<td class="description">Name of the view file, or a valid View object.</td>
+									</tr>
+								</table>
+							</td>
+						<tr>
+							<th>Example</th>
+							<td>
+								<pre class="php"><code>// create a presenter instance
+$presenter = Presenter::Forge('admin/public');
+
+// some code here that changes the associated view
+if ($something)
+{
+	$presenter->set_view('admin/member');
+}</code></pre>
+							</td>
+						</tr>
+						</tr>
+					</tbody>
+				</table>
+
+				<p class="note">
+					When you use this method, any variables set on or bound to the original View object will be transferred to the new View.
+				</p>
+			</article>
+
 			<h3 id="view">View オブジェクトの互換性</h3>
 
 			<p>

diff --git a/classes/profiler.html b/classes/profiler.html
@@ -47,7 +47,38 @@ <h1>
 
 			<h2>Profiler クラス</h2>
 
-			<p><strong>Profiler クラス</strong>を使うと、独自のプロファイリング情報をプロファイラに送ることができます。</p>
+			<p>The profiler class allows you to add your own profiling information to the profiler. It implements a customized version of PHPQuickProfiler (PQP).</p>
+
+			<h3>Configure runtime behaviour</h3>
+
+			<p>
+				The profiler contains a collection of javascript global variables through which you can control the initial state of the profiler.
+				<ul>
+					<li>
+						<strong>PQP_SHOWONLOAD</strong>: boolean, if true, the profiler is opened on page load, if false. The default is false.
+					</li>
+					<li>
+						<strong>PQP_HEIGHT</strong>: string, "tall" shows double the info from "short". The default is "tall".
+					</li>
+					<li>
+						<strong>PQP_DETAILS</strong>: boolean, if false, no details will be shown, only the tab information. The default is true.
+					</li>
+					<li>
+						<strong>PQP_BOTTOM</strong>: boolean, if true, the profiler is attached to the bottom of the viewport. If false, it is displayed below the output. The default is true.
+					</li>
+				</ul>
+				<strong>Example:</strong>
+			</p/>
+				<pre class="php"><code>	&lt;script type="text/javascript"&gt;
+		var PQP_SHOWONLOAD = true;
+		var PQP_HEIGHT = 'short';
+		var PQP_DETAILS = true;
+		var PQP_BOTTOM = true;
+	&lt;/script&gt;
+</code></pre>
+
+
+			<h3>Class methods</h3>
 
 			<article>
 				<h4 class="method" id="method_mark">mark($label)</h4>