From fc295f5f0eef6b761c7c2d825bc01501e8882a25 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 26 Apr 2007 18:41:26 +0000
Subject: checking in some fixes. ;) Most of them are really minor, including:
 - correctly enter report notification into db - fix double-quote pm issue

git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/attachment.html         | 14 ++++++--------
 phpBB/styles/prosilver/template/mcp_notes_user.html     |  2 +-
 phpBB/styles/prosilver/template/memberlist_search.html  |  4 ++++
 phpBB/styles/prosilver/template/memberlist_view.html    |  2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options.html |  3 +++
 5 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles/prosilver/template')

diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html
index 1bb23b8eac..de46720baf 100644
--- a/phpBB/styles/prosilver/template/attachment.html
+++ b/phpBB/styles/prosilver/template/attachment.html
@@ -7,25 +7,23 @@
 		<!-- IF _file.S_THUMBNAIL -->
 		<dl class="thumbnail">
 			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>
-			
 			<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF -->
 		</dl>
 		<!-- ENDIF -->
 
 
 		<!-- IF _file.S_IMAGE -->
-		
-			<img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" />
-
-		<p>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</p>
+		<dl class="file">
+			<dt><img src="{_file.U_DOWNLOAD_LINK}" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
+			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
+			<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
+		</dl>
 		<!-- ENDIF -->
 
 		<!-- IF _file.S_FILE -->
 		<dl class="file">
 			<dt><!-- IF _file.UPLOAD_ICON -->{_file.UPLOAD_ICON} <!-- ENDIF --><a class="postlink" href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a></dt> 
-			<!-- IF not _file.S_THUMBNAIL and _file.COMMENT -->
-				<dd><em>{_file.COMMENT}</em></dd>
-			<!-- ENDIF -->
+			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
 			<dd>({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
 		</dl>			
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 7e34ee2702..1be69178dd 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -62,7 +62,7 @@
 		<th>{L_REPORT_BY}</th>
 		<th style="text-align: center">{L_IP}</th>
 		<th style="text-align: center">{L_TIME}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION_NOTE}</th>
 		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
 	</tr>
 	</thead>
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 0db9af4bf4..07fa6069f6 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -89,6 +89,10 @@ function insert_single(user)
 		<dt><label for="ip">{L_POST_IP}:</label></dt>
 		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
 	</dl>
+	<dl>
+		<dt><label for="search_group_id">{L_GROUP}:</label></dt>
+		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
+	</dl>
 	<dl>
 		<dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt>
 		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index b6433a1f8a..a9408c3cab 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -17,7 +17,7 @@
 	<dl class="left-box details" style="width: 80%;">
 		<dt>{L_USERNAME}:</dt>
 		<dd>
-			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
+			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
 			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
 			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
 		</dd>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 70f68f2c60..8babd7fc1b 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -1,6 +1,9 @@
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
+	<!-- IF not S_UPLOAD_AVATAR_FILE and not S_UPLOAD_AVATAR_URL and not S_LINK_AVATAR and not S_DISPLAY_GALLERY -->
+		<p>{L_AVATAR_FEATURES_DISABLED}</p>
+	<!-- ENDIF -->
 
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-- 
cgit v1.2.1