move monument name out of heading

also provide path to actual monument to allow user easy access to the monument they visited
wikimedia · Jul 30, 2012 · 59844d2 · 59844d2
1 parent 35ecf9e
commit 59844d2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/assets/www/app.css b/assets/www/app.css
@@ -423,6 +423,7 @@ button.myLocation,
 }
 
 #about-page a,
+#completed-upload-detail a,
 #login-page #login-create-account-msg a {
 	color: #666;
 	text-decoration: underline;

diff --git a/assets/www/index.html b/assets/www/index.html
@@ -45,6 +45,12 @@
 		</li>
 	</script>
 	<script type='text/html' id='upload-completed-item-detail-template'>
+		<h3><%= monument.name %></h3>
+		<p>
+			<a class="monumentLink">
+				<msg key="upload-monument-link-text"></msg>
+			</a>
+		</p>
 		<img class='uploaded-image-full' src='<%= upload.file %>' />
 		<div class='uploaded-image-details'>
 			<a><%= upload.title %></a>

diff --git a/assets/www/js/app.js b/assets/www/js/app.js
@@ -509,7 +509,11 @@ require( [ 'jquery', 'l10n', 'geo', 'api', 'templates', 'monuments', 'monument',
 					$uploadItem = $( uploadsTemplate( { upload: upload, monument: monument } ) );
 					$uploadItem.click( function() {
 						$( '#completed-upload-detail' ).html( uploadCompleteTemplate( { upload: upload, monument: monument } ) );
-						$( '#completed-upload-detail-page .actionbar h2' ).text( monument.name );
+						$( '#completed-upload-detail .monumentLink' ).
+							data( 'monument', new Monument( monument, commonsApi ) ).
+							click( function() {
+								showMonumentDetail( $( this ).data( 'monument' ) );
+							} ).localize();
 						showPage( 'completed-upload-detail-page' );
 					} );
 					$( '#uploads-list' ).append( $uploadItem );

diff --git a/assets/www/messages/messages-en.properties b/assets/www/messages/messages-en.properties
@@ -96,6 +96,8 @@ search-monument-placeholder=Search monuments
 upload-latest-title=Your photo
 upload-latest-view=Why not <a>share</a> this awesome photo with your friends?
 no-uploads=You haven't really uploaded anything yet, have you?
+upload-completeddetail-title=Your upload
+upload-monument-link-text=View this monument
 
 settings-title=Settings
 settings-account-header=Account

diff --git a/assets/www/messages/messages-qqq.properties b/assets/www/messages/messages-qqq.properties
@@ -41,3 +41,5 @@ continue-upload=Button label to continue with the upload.
 skip-warning=Checkbox label offering to skip the file size warning in future. 
 
 uploading-status=Status message during uploading.
+upload-completeddetail-title=When viewing a photo the user uploaded this is the heading
+upload-monument-link-text=Label for link that takes user from photo upload page to monument