Fossil SCM

Move the side-bar documentation for the user-list page onto a separate page accessible from the "Help" submen of the user-list page, for improved readability.

drh 2015-11-17 14:29 UTC trunk

Commit 18df719ed56639956f3b07b988af8ef04c7a26bc

Parent 5853fcf132800f9…

1 file changed +16 -7

~ src/setup.c

M src/setup.c

+16 -7

		--- src/setup.c
		+++ src/setup.c
		@@ -153,14 +153,12 @@
153	153	login_needed(0);
154	154	return;
155	155	}
156	156
157	157	style_submenu_element("Add", "Add User", "setup_uedit");
	158	+ style_submenu_element("Help", "Help", "setup_ulist_notes");
158	159	style_header("User List");
159		- @ <table class="usetupLayoutTable">
160		- @ <tr><td class="usetupColumnLayout">
161		- @ <span class="note">Users:</span>
162	160	@ <table class="usetupUserList">
163	161	prevLevel = 0;
164	162	db_prepare(&s,
165	163	"SELECT uid, login, cap, info, 1 FROM user"
166	164	" WHERE login IN ('anonymous','nobody','developer','reader') "
		@@ -212,12 +210,24 @@
212	210	@ <td class="usetupListCap" style="text-align: center;padding-right: 15px;">%s(zCap)</td>
213	211	@ <td class="usetupListCon" style="text-align: left;">%h(db_column_text(&s,3))</td>
214	212	@ </tr>
215	213	}
216	214	@ </table>
217		- @ </td><td class="usetupColumnLayout">
218		- @ <span class="note">Notes:</span>
	215	+ style_footer();
	216	+ db_finalize(&s);
	217	+}
	218	+
	219	+/*
	220	+** WEBPAGE: setup_ulist_notes
	221	+**
	222	+** A documentation page showing notes about user configuration. This information
	223	+** used to be a side-bar on the user list page, but has been factored out for
	224	+** improved presentation.
	225	+*/
	226	+void setup_ulist_notes(void){
	227	+ style_header("User Configuration Notes");
	228	+ @ <h1>User Configuration Notes:</h1>
219	229	@ <ol>
220	230	@ <li><p>The permission flags are as follows:</p>
221	231	@ <table>
222	232	@ <tr><th valign="top">a</th>
223	233	@ <td><i>Admin:</i> Create and delete users</td></tr>
		@@ -295,14 +305,13 @@
295	305	@ <span class="usertype">anonymous</span>, and
296	306	@ <span class="usertype">nobody</span>.
297	307	@ </p></li>
298	308	@
299	309	@ </ol>
300		- @ </td></tr></table>
301	310	style_footer();
302		- db_finalize(&s);
303	311	}
	312	+
304	313
305	314	/*
306	315	** Return true if zPw is a valid password string. A valid
307	316	** password string is:
308	317	**
309	318

	--- src/setup.c
	+++ src/setup.c
	@@ -153,14 +153,12 @@
153	login_needed(0);
154	return;
155	}
156
157	style_submenu_element("Add", "Add User", "setup_uedit");

158	style_header("User List");
159	@ <table class="usetupLayoutTable">
160	@ <tr><td class="usetupColumnLayout">
161	@ <span class="note">Users:</span>
162	@ <table class="usetupUserList">
163	prevLevel = 0;
164	db_prepare(&s,
165	"SELECT uid, login, cap, info, 1 FROM user"
166	" WHERE login IN ('anonymous','nobody','developer','reader') "
	@@ -212,12 +210,24 @@
212	@ <td class="usetupListCap" style="text-align: center;padding-right: 15px;">%s(zCap)</td>
213	@ <td class="usetupListCon" style="text-align: left;">%h(db_column_text(&s,3))</td>
214	@ </tr>
215	}
216	@ </table>
217	@ </td><td class="usetupColumnLayout">
218	@ <span class="note">Notes:</span>












219	@ <ol>
220	@ <li><p>The permission flags are as follows:</p>
221	@ <table>
222	@ <tr><th valign="top">a</th>
223	@ <td><i>Admin:</i> Create and delete users</td></tr>
	@@ -295,14 +305,13 @@
295	@ <span class="usertype">anonymous</span>, and
296	@ <span class="usertype">nobody</span>.
297	@ </p></li>
298	@
299	@ </ol>
300	@ </td></tr></table>
301	style_footer();
302	db_finalize(&s);
303	}

304
305	/*
306	** Return true if zPw is a valid password string. A valid
307	** password string is:
308	**
309

	--- src/setup.c
	+++ src/setup.c
	@@ -153,14 +153,12 @@
153	login_needed(0);
154	return;
155	}
156
157	style_submenu_element("Add", "Add User", "setup_uedit");
158	style_submenu_element("Help", "Help", "setup_ulist_notes");
159	style_header("User List");



160	@ <table class="usetupUserList">
161	prevLevel = 0;
162	db_prepare(&s,
163	"SELECT uid, login, cap, info, 1 FROM user"
164	" WHERE login IN ('anonymous','nobody','developer','reader') "
	@@ -212,12 +210,24 @@
210	@ <td class="usetupListCap" style="text-align: center;padding-right: 15px;">%s(zCap)</td>
211	@ <td class="usetupListCon" style="text-align: left;">%h(db_column_text(&s,3))</td>
212	@ </tr>
213	}
214	@ </table>
215	style_footer();
216	db_finalize(&s);
217	}
218
219	/*
220	** WEBPAGE: setup_ulist_notes
221	**
222	** A documentation page showing notes about user configuration. This information
223	** used to be a side-bar on the user list page, but has been factored out for
224	** improved presentation.
225	*/
226	void setup_ulist_notes(void){
227	style_header("User Configuration Notes");
228	@ <h1>User Configuration Notes:</h1>
229	@ <ol>
230	@ <li><p>The permission flags are as follows:</p>
231	@ <table>
232	@ <tr><th valign="top">a</th>
233	@ <td><i>Admin:</i> Create and delete users</td></tr>
	@@ -295,14 +305,13 @@
305	@ <span class="usertype">anonymous</span>, and
306	@ <span class="usertype">nobody</span>.
307	@ </p></li>
308	@
309	@ </ol>

310	style_footer();

311	}
312
313
314	/*
315	** Return true if zPw is a valid password string. A valid
316	** password string is:
317	**
318

Fossil SCM

Keyboard Shortcuts