Reverse order of edit and frontend preview links

westonruter · westonruter · commit 9ab02b84ae82 · 2016-08-27T21:02:07.000-07:00
diff --git a/js/customize-snapshots.js b/js/customize-snapshots.js
@@ -220,7 +220,27 @@
 		component.snapshotButton.prop( 'disabled', true );
 		component.snapshotButton.insertAfter( publishButton );
 
-		// Schedule button.
+		// Preview link.
+		component.previewLink = $( $.trim( wp.template( 'snapshot-preview-link' )() ) );
+		component.previewLink.toggle( api.state( 'snapshot-saved' ).get() );
+		component.previewLink.attr( 'target', component.data.uuid );
+		setPreviewLinkHref = _.debounce( function() {
+			if ( api.state( 'snapshot-exists' ).get() ) {
+				component.previewLink.attr( 'href', component.getSnapshotFrontendPreviewUrl() );
+			} else {
+				component.previewLink.attr( 'href', component.frontendPreviewUrl.get() );
+			}
+		} );
+		component.frontendPreviewUrl.bind( setPreviewLinkHref );
+		setPreviewLinkHref();
+		api.state.bind( 'change', setPreviewLinkHref );
+		api.bind( 'saved', setPreviewLinkHref );
+		component.snapshotButton.after( component.previewLink );
+		api.state( 'snapshot-saved' ).bind( function( saved ) {
+			component.previewLink.toggle( saved );
+		} );
+
+		// Edit button.
 		component.snapshotExpandButton = $( $.trim( wp.template( 'snapshot-expand-button' )( {} ) ) );
 		component.snapshotExpandButton.insertAfter( component.snapshotButton );
 
@@ -286,26 +306,6 @@
 			}
 		} );
 
-		// Preview link.
-		component.previewLink = $( $.trim( wp.template( 'snapshot-preview-link' )() ) );
-		component.previewLink.toggle( api.state( 'snapshot-saved' ).get() );
-		component.previewLink.attr( 'target', component.data.uuid );
-		setPreviewLinkHref = _.debounce( function() {
-			if ( api.state( 'snapshot-exists' ).get() ) {
-				component.previewLink.attr( 'href', component.getSnapshotFrontendPreviewUrl() );
-			} else {
-				component.previewLink.attr( 'href', component.frontendPreviewUrl.get() );
-			}
-		} );
-		component.frontendPreviewUrl.bind( setPreviewLinkHref );
-		setPreviewLinkHref();
-		api.state.bind( 'change', setPreviewLinkHref );
-		api.bind( 'saved', setPreviewLinkHref );
-		component.snapshotButton.after( component.previewLink );
-		api.state( 'snapshot-saved' ).bind( function( saved ) {
-			component.previewLink.toggle( saved );
-		} );
-
 		// Submit for review button.
 		if ( ! component.data.currentUserCanPublish ) {
 			publishButton.hide();
diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
@@ -1405,8 +1405,6 @@ public function remove_all_non_snapshot_admin_bar_links( $wp_admin_bar ) {
 	 */
 	public function render_templates() {
 		$data = $this->get_month_choices();
-
-		$description = __( 'Schedule changes to publish (go live) at a future date.', 'customize-snapshots' );
 		?>
 		<script type="text/html" id="tmpl-snapshot-preview-link">
 			<a href="#" target="frontend-preview" id="snapshot-preview-link" class="dashicons dashicons-welcome-view-site" title="<?php esc_attr_e( 'View on frontend', 'customize-snapshots' ) ?>">
@@ -1442,7 +1440,7 @@ public function render_templates() {
 								<span class="reset-time">(<a href="#" title="<?php esc_attr_e( 'Reset scheduled date to original or current date', 'customize-snapshots' ); ?>"><?php esc_html_e( 'Reset', 'customize-snapshots' ) ?></a>)</span>
 							</label>
 							<p class="snapshot-schedule-description">
-								<?php echo esc_html( $description ); ?>
+								<?php esc_html_e( 'Schedule changes to publish (go live) at a future date.', 'customize-snapshots' ); ?>
 							</p>
 							<div class="snapshot-schedule-control date-inputs clear">
 								<label>
