- tackle some usability issues

- fix bug #3147 - added the lock-images made by SHS` - fixed MSSQL errors (adding the correct ESCAPE sequence) git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2006-07-09 16:23:57 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2006-07-09 16:23:57 +0000
commit: 46af817cb058e2eecd89081af4a40075426a32ef (patch)
tree: d27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/adm
parent: 455add06f29400af3176eea7c4958ed772934460 (diff)
download: forums-46af817cb058e2eecd89081af4a40075426a32ef.tar
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz
forums-46af817cb058e2eecd89081af4a40075426a32ef.zip
4 files changed, 55 insertions, 33 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 353ad7aff0..dff974e818 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -123,6 +123,16 @@
 			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
+	<!-- IF S_SHOW_DISPLAY_ON_INDEX -->
+		<dl>
+			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		</dl>
+	<!-- ENDIF -->
+		<dl>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dd><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
+		</dl>
 		<dl>
 			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
 			<dd><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
@@ -131,17 +141,27 @@
 			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
 			<dd><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
-	<!-- IF S_SHOW_DISPLAY_ON_INDEX -->
-		<dl>
-			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
-		</dl>
-	<!-- ENDIF -->
 		<dl>
 			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
 			<dd><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
 		<dl>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+			<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+			<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
+		</dl>
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
+		<dl>
 			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
 			<dd><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
@@ -169,18 +189,6 @@
 			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
 			<dd><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
 		</dl>
-		<dl>
-			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-			<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
-		</dl>
 		</fieldset>
 	</div>
 
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 55e7220cf4..c4dc501d93 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -153,12 +153,16 @@
 
 	<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
 
-	<h1>{L_GROUP_MEMBERS}</h1>
+	<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
 
 	<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
 
 	<form id="list" method="post" action="{U_ACTION}">
 
+	<fieldset class="quick">
+		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
+	</fieldset>
+
 	<table cellspacing="1">
 	<thead>
 	<tr>
@@ -269,9 +273,10 @@
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 50%">{L_MANAGE}</th>
+		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="3">{L_OPTIONS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -297,18 +302,19 @@
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
-		<th style="width: 50%">{L_MANAGE}</th>
+		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th colspan="3">{L_OPTIONS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
 		<!-- ELSE -->
 		<tr>
-			<td><a href="{groups.U_LIST}">{groups.GROUP_NAME}</a></td>
+			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;"><a href="{groups.U_DEFAULT}">{L_GROUP_DEFAULT}</a></td>
-			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_EDIT}</a></td>
+			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
+			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
 		</tr>
 		<!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index bc30e54ff6..d68e9d2547 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -60,10 +60,10 @@
 	<td><b>{UPLOAD_DIR_SIZE}</b></td>
 </tr>
 <tr>
+	<td>{L_DATABASE_SERVER_INFO}: </td>
+	<td><b>{DATABASE_INFO}</b></td>
 	<td>{L_GZIP_COMPRESSION}: </td>
 	<td><b>{GZIP_COMPRESSION}</b></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -104,6 +104,10 @@
 	<!-- END log -->
 	</tbody>
 	</table>
+
+	<br />
+	<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
+
 <!-- ENDIF -->
 
 <!-- IF S_INACTIVE_USERS -->
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 2c49e94ccf..4cd6ec0ada 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -506,15 +506,16 @@
 
 	<p>{L_EXPLAIN}</p>
 
-	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 3 --> <!-- ENDIF -->
+	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
 
 	<table cellspacing="1">
-		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" />
+		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
 	<thead>
 	<tr>
 		<th>{L_NAME}</th>
 		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
 		<th>{L_OPTIONS}</th>
+		<th>{L_ACTIONS}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -523,15 +524,18 @@
 	</tr>
 	<!-- BEGIN installed -->
 	<tr>
-		<td><a href="{installed.U_EDIT}">{installed.NAME}</a><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
+		<td><strong>{installed.NAME}</strong></a><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
 		<!-- IF S_STYLE -->
 			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
 		<!-- ENDIF -->
 		<td style="text-align: center;">
+			{installed.S_OPTIONS}
+		</td>
+		<td style="text-align: center;">
 			<!-- IF S_STYLE -->
 				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
 			<!-- ENDIF -->
-			{installed.S_OPTIONS}
+			{installed.S_ACTIONS}
 			<!-- IF S_STYLE -->
 				| <a href="{installed.U_PREVIEW}" onclick="this.target='_preview';">{L_PREVIEW}</a>
 			<!-- ENDIF -->
@@ -548,7 +552,7 @@
 	<!-- BEGIN uninstalled -->
 		<tr>
 			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><b>{uninstalled.NAME}</b><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
-			<td style="text-align: center;"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
+			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
 		</tr>
 	<!-- END uninstalled -->
 	</tbody>
author	Meik Sievertsen <acydburn@phpbb.com>	2006-07-09 16:23:57 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2006-07-09 16:23:57 +0000
commit	46af817cb058e2eecd89081af4a40075426a32ef (patch)
tree	d27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/adm
parent	455add06f29400af3176eea7c4958ed772934460 (diff)
download	forums-46af817cb058e2eecd89081af4a40075426a32ef.tar forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2 forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz forums-46af817cb058e2eecd89081af4a40075426a32ef.zip