- 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

phpBB/styles/subSilver/imageset/imageset.cfg

@@ -14,7 +14,7 @@
 # the value, then enclose the value with single or double quotes. 
 # Single and double quotes do not need to be escaped.
 #
-# 
+#
 
 # General Information about this style
 name = subSilver
@@ -73,6 +73,18 @@ img_folder_locked = folder_lock.gif*18*19
 img_folder_locked_posted = folder_lock_posted.gif*18*19
 img_folder_locked_new = folder_lock_new.gif*18*19
 img_folder_locked_new_posted = folder_lock_new_posted.gif*18*19
+img_folder_locked_announce = folder_lock_announce.gif*18*19
+img_folder_locked_announce_new = folder_lock_announce_new.gif*18*19
+img_folder_locked_announce_posted = folder_lock_announce_posted.gif*18*19
+img_folder_locked_announce_new_posted = folder_lock_announce_new_posted.gif*18*19
+img_folder_locked_global = folder_lock_announce.gif*18*19
+img_folder_locked_global_new = folder_lock_announce_new.gif*18*19
+img_folder_locked_global_posted = folder_lock_announce_posted.gif*18*19
+img_folder_locked_global_new_posted = folder_lock_announce_new_posted.gif*18*19
+img_folder_locked_sticky = folder_lock_sticky.gif*18*19
+img_folder_locked_sticky_new = folder_lock_sticky_new.gif*18*19
+img_folder_locked_sticky_posted = folder_lock_sticky_posted.gif*18*19
+img_folder_locked_sticky_new_posted = folder_lock_sticky_new_posted.gif*18*19
 img_folder_sticky = folder_sticky.gif*18*19
 img_folder_sticky_posted = folder_sticky_posted.gif*18*19
 img_folder_sticky_new = folder_sticky_new.gif*18*19

phpBB/styles/subSilver/template/mcp_notes_user.html

@@ -46,24 +46,41 @@
 </tr>
 </table>
 
+<br />
+
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 <tr>
-	<th colspan="2" align="center">{L_FEEDBACK}</th>
+	<th colspan="5" align="center">{L_FEEDBACK}</th>
 </tr>
 <!-- IF S_USER_NOTES -->
 
+	<tr align="center">
+		<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
+	</tr>
+	<tr>
+		<th>{L_REPORT_BY}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
+		<th>{L_ACTION}</th>
+		<th><!-- IF S_CLEAR_ALLOWED -->{L_MARK}<!-- ENDIF --></th>
+	</tr>
+
 	<!-- BEGIN usernotes -->
 		<!-- IF usernotes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td<!-- IF not S_CLEAR_ALLOWED --> colspan="2"<!-- ENDIF -->><span class="gensmall">{L_REPORT_BY}: <b>{usernotes.REPORT_BY}</b> {L_REPORTED}: {usernotes.REPORT_AT}</span><hr /><span class="gen">{usernotes.ACTION}</span></td>
-			<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" class="radio" name="marknote[]" value="{usernotes.ID}" /></td><!-- ENDIF -->
+			<td class="gen">{usernotes.REPORT_BY}</td>
+			<td style="text-align: center;">{usernotes.IP}</td>
+			<td style="text-align: center;">{usernotes.REPORT_AT}</td>
+			<td class="gen">
+				{usernotes.ACTION}
+				<!-- IF usernotes.DATA --><br />&#187; <span class="gensmall">[ {usernotes.DATA} ]</span><!-- ENDIF -->
+			</td>
+			<td style="text-align: center;"><!-- IF S_CLEAR_ALLOWED --><input type="checkbox" class="radio" name="marknote[]" value="{usernotes.ID}" /><!-- ENDIF --></td>
 		</tr>
 	<!-- END usernotes -->
-	<tr align="center">
-		<td class="row3" colspan="2"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
-	</tr>
+
 	<!-- IF S_CLEAR_ALLOWED -->
 		<tr>
-			<td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />&nbsp; <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td>
+			<td class="cat" colspan="5" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />&nbsp; <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td>
 		</tr>
 	<!-- ENDIF -->