- added folder_moved image

- new feature: bookmark topics
- fixed post details link
- added confirmation screen to cookie deletion


git-svn-id: file:///svn/phpbb/trunk@4912 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/styles/subSilver/imageset/imageset.cfg

@@ -40,6 +40,7 @@ forum_link*folder_link_big.gif*25*46
 sub_forum*subfolder_big.gif*25*46
 sub_forum_new*subfolder_new_big.gif*25*46
 folder*folder.gif*18*19
+folder_moved*folder_moved.gif*18*19
 folder_posted*folder_posted.gif*18*19
 folder_new*folder_new.gif*18*19
 folder_new_posted*folder_new_posted.gif*18*19
@@ -66,6 +67,4 @@ folder_global_new_posted***
 poll_left*vote_lcap.gif*12*4
 poll_center*voting_bar.gif*12*
 poll_right*vote_rcap.gif*12*4
-karma_left***
-karma_center*karma/karma{SUFFIX}.gif*6*69
-karma_right***
+attach_progress_bar*attach_progress_bar.gif*16*280

phpBB/styles/subSilver/template/posting_progress_bar.html

@@ -27,7 +27,7 @@
 	<td>
 		<table width="100%" border="0" cellspacing="1" cellpadding="4">
 		<tr> 
-			<td valign="top" class="row1" align="center"><br /><span class="gen">{L_UPLOAD_IN_PROGRESS}</span><br /><br /><img src="./images/upload.gif" width="280" height="16" align="center" /><br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
+			<td valign="top" class="row1" align="center"><br /><span class="gen">{L_UPLOAD_IN_PROGRESS}</span><br /><br /><div style="align:center">{PROGRESS_BAR}</div><br /><br /><span class="genmed"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span><br /><br /></td>
 		</tr>
 		</table>
 	</td>

phpBB/styles/subSilver/template/ucp_main_bookmarks.html

@@ -0,0 +1,49 @@
+<!-- INCLUDE ucp_header.html -->
+
+<!-- $Id$ -->
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th colspan="5">{L_UCP}</th>
+	</tr>
+	<tr>
+		<td class="row1" colspan="5" align="center"><span class="genmed">{L_UCP_WELCOME}</span></td>
+	</tr>
+	<tr>
+		<th colspan="5">{L_BOOKMARKS}</th>
+	</tr>
+
+	<!-- IF S_NO_DISPLAY_BOOKMARKS -->
+	<tr class="row1">
+		<td colspan="5" align="center"><b class="genmed">{L_BOOKMARKS_DISABLED}</b></td>
+	</tr>
+	<!-- ELSE -->
+
+	<!-- BEGIN topicrow -->
+
+	<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
+	<!-- IF topicrow.S_DELETED_TOPIC -->
+		<td class="postdetails" style="padding: 4px" width="100%" colspan="2">{L_DELETED_TOPIC}</td>
+	<!-- ELSE -->
+		<td style="padding: 4px;" width="100%"><p class="topictitle">{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><br /><span class="gensmall">{L_FORUM}: <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span></td>
+		<td class="postdetails" style="padding: 4px;" align="left" valign="top" nowrap="nowrap">{L_POSTED}:<br />{topicrow.POSTED_AT}</td>
+	<!-- ENDIF -->
+		<td class="postdetails" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF topicrow.U_MOVE_UP --><a href="{topicrow.U_MOVE_UP}">{L_MOVE_UP}</a><!-- ENDIF --><!-- IF topicrow.U_MOVE_UP and topicrow.U_MOVE_DOWN --> | <!-- ENDIF --><!-- IF topicrow.U_MOVE_DOWN --><a href="{topicrow.U_MOVE_DOWN}">{L_MOVE_DOWN}</a><!-- ENDIF --></td>
+		<td style="padding: 4px;"> <input type="checkbox" name="t[{topicrow.TOPIC_ID}]" /> </td>
+	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row1">
+		<td colspan="5" align="center"><b class="genmed">{L_NO_BOOKMARKS}</b></td>
+	</tr>
+	<!-- END topicrow -->
+
+	<tr>
+		<td class="cat" colspan="5" align="right"><input class="btnlite" type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" />&nbsp;</td>
+	</tr>
+	<!-- ENDIF -->
+</table>
+
+<!-- IF not S_NO_DISPLAY_BOOKMARKS --><div class="gensmall" style="float: right; padding-top: 2px;"><b><a href="javascript:marklist('ucp', true);">{L_MARK_ALL}</a> :: <a  href="javascript:marklist('ucp', false);">{L_UNMARK_ALL}</a></b></div><!-- ENDIF -->
+
+<!-- INCLUDE ucp_footer.html -->

phpBB/styles/subSilver/template/viewforum_body.html

@@ -273,6 +273,9 @@
 					<td>&nbsp;&nbsp;</td>
 					<td class="gensmall">{FOLDER_LOCKED_IMG}</td>
 					<td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td>
+					<td>&nbsp;&nbsp;</td>
+					<td width="20" align="center">{FOLDER_MOVED_IMG}</td>
+					<td class="gensmall">{L_MOVED_TOPIC}</td>
 				</tr>
 			</table></td>
 			<td align="right"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td>

phpBB/styles/subSilver/template/viewtopic_body.html

@@ -46,7 +46,8 @@
 				<td class="cat" colspan="2"><table width="100%" cellspacing="0">
 					<tr>
 						<td class="nav" nowrap="nowrap">&nbsp;
-						<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
+						<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC or U_BOOKMARK_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
+						<!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
 						<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a><!-- IF U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
 						<!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- IF U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
 						<!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF -->