Simplify and add context for 'Edit' links

starverte · Apr 11, 2016 · 6c8b6ef · 6c8b6ef
1 parent 7ed7a64
commit 6c8b6ef
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 37 deletions.
diff --git a/format-aside.php b/format-aside.php
@@ -11,7 +11,7 @@
   <div class="row">
     <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-xs-12' ); ?>>
       <div class="entry-content">
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit Aside</a><?php } ?>
+        <?php edit_post_link( __( 'Edit Aside', 'flint' ), '', '', 0, 'btn btn-default btn-sm btn-edit hidden-xs' ); ?>
         <blockquote><?php flint_the_content(); ?></blockquote>
       </div><!-- .entry-content -->
 

diff --git a/format-chat.php b/format-chat.php
@@ -14,9 +14,13 @@
     <?php echo flint_post_margin( true ); ?>
     <article id="post-<?php the_ID(); ?>" <?php flint_post_class(); ?>>
       <header class="entry-header">
-        <h1 class="entry-title"><?php if ( is_single() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit Chat</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_single() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link( __( 'Edit Chat', 'flint' ), '', '', 0, 'btn btn-default btn-sm btn-edit hidden-xs' ); ?>
 
         <?php if ( 'post' === get_post_type() ) : ?>
           <div class="entry-meta">

diff --git a/format-gallery.php b/format-gallery.php
@@ -14,9 +14,13 @@
     <?php echo flint_post_margin( true ); ?>
     <article id="post-<?php the_ID(); ?>" <?php flint_post_class(); ?>>
       <header class="entry-header">
-        <h1 class="entry-title"><?php if ( is_single() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit Gallery</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_single() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link( __( 'Edit Gallery', 'flint' ), '', '', 0, 'btn btn-default btn-sm btn-edit hidden-xs' ); ?>
         <?php if ( ! is_single() ) { ?><a class="btn btn-info btn-block visible-xs-block" href="<?php echo get_permalink(); ?>">View gallery</a><?php } ?>
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_post' ); ?>

diff --git a/format-link.php b/format-link.php
@@ -15,7 +15,7 @@
     <article id="post-<?php the_ID(); ?>" <?php flint_post_class(); ?>>
       <div class="entry-content">
         <h3><?php flint_the_content(); ?></h3>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit Link</a><?php } ?>
+        <?php edit_post_link( __( 'Edit Link', 'flint' ), '', '', 0, 'btn btn-default btn-sm btn-edit hidden-xs' ); ?>
       </div><!-- .entry-content -->
 
       <footer class="entry-meta clearfix">

diff --git a/format-status.php b/format-status.php
@@ -12,7 +12,7 @@
     <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-xs-12' ); ?>>
       <div class="entry-content">
         <h4><?php flint_the_content(); ?></h4>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit Status</a><?php } ?>
+        <?php edit_post_link( __( 'Edit Status', 'flint' ), '', '', 0, 'btn btn-default btn-sm btn-edit hidden-xs' ); ?>
       </div><!-- .entry-content -->
 
       <footer class="entry-meta clearfix">

diff --git a/format.php b/format.php
@@ -8,18 +8,30 @@
  * @since 1.0.1
  */
 
+global $wp_post_types;
+$type = get_post_type();
+$_type = $wp_post_types[ $type ];
 ?>
 
   <div class="row">
     <?php echo flint_post_margin( true ); ?>
     <article id="post-<?php the_ID(); ?>" <?php flint_post_class(); ?>>
       <header class="entry-header">
-        <?php $type = get_post_type(); ?>
         <?php do_action( 'flint_open_entry_header_' . $type ); ?>
 
-        <h1 class="entry-title"><?php if ( is_single() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_single() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link(
+            sprintf( __( 'Edit %s', 'flint' ),  $_type->labels->singular_name ),
+            '',
+            '',
+            0,
+            'btn btn-default btn-sm btn-edit hidden-xs'
+          ); ?>
 
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_' . $type ); ?>

diff --git a/image.php b/image.php
@@ -33,7 +33,7 @@
                   get_the_title( $post->post_parent )
                 );
               ?>
-              <?php edit_post_link( __( 'Edit', 'flint' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
+              <?php edit_post_link( __( 'Edit Post', 'flint' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
             </div><!-- .entry-meta -->
 
             <nav role="navigation" id="image-navigation" class="navigation-image">

diff --git a/inc/class-walker-comment.php b/inc/class-walker-comment.php
@@ -36,7 +36,7 @@ protected function ping( $comment, $depth, $args ) {
 ?>
 		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
 			<div class="comment-body">
-				<?php esc_html_e( 'Pingback:', 'flint' ); ?> <?php comment_author_link(); ?> <?php flint_edit_comment_link( __( 'Edit', 'flint' ), '<span class="edit-link">', '</span>' ); ?>
+				<?php esc_html_e( 'Pingback:', 'flint' ); ?> <?php comment_author_link(); ?> <?php flint_edit_comment_link( __( 'Edit Pingback', 'flint' ), '<span class="edit-link">', '</span>' ); ?>
 			</div>
 <?php
 	}
@@ -79,7 +79,7 @@ protected function comment( $comment, $depth, $args ) {
 		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 			<?php
 				/* translators: 1: date, 2: time */
-				printf( __( '%1$s at %2$s', 'flint' ), get_comment_date(),  get_comment_time() ); ?></a><?php flint_edit_comment_link( __( 'Edit', 'flint' ), '&nbsp;&nbsp;', '' );
+				printf( __( '%1$s at %2$s', 'flint' ), get_comment_date(),  get_comment_time() ); ?></a><?php flint_edit_comment_link( __( 'Edit Comment', 'flint' ), '&nbsp;&nbsp;', '' );
 			?>
 		</div>
 

diff --git a/inc/template-tags.php b/inc/template-tags.php
@@ -1211,7 +1211,7 @@ function flint_edit_comment_link( $text = null, $before = '', $after = '' ) {
 	}
 
 	if ( null === $text ) {
-		$text = __( 'Edit This', 'flint' );
+		$text = __( 'Edit Comment', 'flint' );
 	}
 
 	$link = '<a class="comment-edit-link btn btn-default btn-sm" href="' . get_edit_comment_link( $comment->comment_ID ) . '">' . $text . '</a>';

diff --git a/templates/full-content.php b/templates/full-content.php
@@ -6,6 +6,9 @@
  * @since 1.1.0
  */
 
+global $wp_post_types;
+$type = get_post_type();
+$_type = $wp_post_types[ $type ];
 ?>
 
   <div class="row">
@@ -14,12 +17,21 @@
     </div>
     <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-xs-12 col-sm-10 col-md-8' ); ?>>
       <header class="entry-header">
-        <?php $type = get_post_type(); ?>
         <?php do_action( 'flint_open_entry_header_' . $type ); ?>
 
-        <h1 class="entry-title"><?php if ( is_singular() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_singular() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link(
+            sprintf( __( 'Edit %s', 'flint' ),  $_type->labels->singular_name ),
+            '',
+            '',
+            0,
+            'btn btn-default btn-sm btn-edit hidden-xs'
+          ); ?>
 
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_' . $type ); ?>

diff --git a/templates/narrow-content.php b/templates/narrow-content.php
@@ -6,6 +6,9 @@
  * @since 1.1.0
  */
 
+global $wp_post_types;
+$type = get_post_type();
+$_type = $wp_post_types[ $type ];
 ?>
 
   <div class="row">
@@ -15,12 +18,21 @@
     </div>
     <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-xs-12 col-sm-8 col-md-6' ); ?>>
       <header class="entry-header">
-        <?php $type = get_post_type(); ?>
         <?php do_action( 'flint_open_entry_header_' . $type ); ?>
 
-        <h1 class="entry-title"><?php if ( is_singular() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_singular() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link(
+            sprintf( __( 'Edit %s', 'flint' ),  $_type->labels->singular_name ),
+            '',
+            '',
+            0,
+            'btn btn-default btn-sm btn-edit hidden-xs'
+          ); ?>
 
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_' . $type ); ?>

diff --git a/templates/slim-content.php b/templates/slim-content.php
@@ -6,6 +6,9 @@
  * @since 1.1.0
  */
 
+global $wp_post_types;
+$type = get_post_type();
+$_type = $wp_post_types[ $type ];
 ?>
 
   <div class="row">
@@ -15,12 +18,21 @@
     </div>
     <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-xs-12 col-sm-8 col-md-4' ); ?>>
       <header class="entry-header">
-        <?php $type = get_post_type(); ?>
         <?php do_action( 'flint_open_entry_header_' . $type ); ?>
 
-        <h1 class="entry-title"><?php if ( is_singular() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_singular() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link(
+            sprintf( __( 'Edit %s', 'flint' ),  $_type->labels->singular_name ),
+            '',
+            '',
+            0,
+            'btn btn-default btn-sm btn-edit hidden-xs'
+          ); ?>
 
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_' . $type ); ?>

diff --git a/templates/wide-content.php b/templates/wide-content.php
@@ -6,17 +6,29 @@
  * @since 1.1.0
  */
 
+global $wp_post_types;
+$type = get_post_type();
+$_type = $wp_post_types[ $type ];
 ?>
 
   <div class="row">
     <article id="post-<?php the_ID(); ?>" <?php post_class( 'col-xs-12' ); ?>>
       <header class="entry-header">
-        <?php $type = get_post_type(); ?>
         <?php do_action( 'flint_open_entry_header_' . $type ); ?>
 
-        <h1 class="entry-title"><?php if ( is_singular() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_singular() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link(
+            sprintf( __( 'Edit %s', 'flint' ),  $_type->labels->singular_name ),
+            '',
+            '',
+            0,
+            'btn btn-default btn-sm btn-edit hidden-xs'
+          ); ?>
 
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_' . $type ); ?>

diff --git a/type.php b/type.php
@@ -6,18 +6,31 @@
  * @since 1.0.1
  */
 
+global $wp_post_types;
+$type = get_post_type();
+$_type = $wp_post_types[ $type ];
+
 ?>
 
   <div class="row">
     <?php echo flint_post_margin( true ); ?>
     <article id="post-<?php the_ID(); ?>" <?php flint_post_class(); ?>>
       <header class="entry-header">
-        <?php $type = get_post_type(); ?>
         <?php do_action( 'flint_open_entry_header_' . $type ); ?>
 
-        <h1 class="entry-title"><?php if ( is_singular() ) { echo the_title();
-} else { echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>'; } ?></h1>
-        <?php if ( current_user_can( 'edit_posts' ) ) { ?><a class="btn btn-default btn-sm btn-edit hidden-xs" href="<?php echo get_edit_post_link(); ?>">Edit</a><?php } ?>
+        <h1 class="entry-title"><?php
+          if ( is_singular() ) {
+            echo the_title();
+          } else {
+            echo '<a href="' . get_permalink() . '" rel="bookmark">' . get_the_title() . '</a>';
+          } ?></h1>
+        <?php edit_post_link(
+            sprintf( __( 'Edit %s', 'flint' ),  $_type->labels->singular_name ),
+            '',
+            '',
+            0,
+            'btn btn-default btn-sm btn-edit hidden-xs'
+          ); ?>
 
         <div class="entry-meta">
           <?php do_action( 'flint_entry_meta_above_' . $type ); ?>