Merge pull request #252 from codepress/release/3.4.7

Release/3.4.7

Author: DGStefan

assets/css/ac-jquery-ui.css

@@ -28,7 +28,9 @@ public function get_value( $post_id ) {
 			return $this->get_empty_char();
 		}
 
-		return ac_helper()->string->enumeration_list( $terms, 'and' );
+		$setting_limit = $this->get_setting( 'number_of_items' );
+
+		return ac_helper()->html->more( $terms, $setting_limit ? $setting_limit->get_value() : false );
 	}
 
 	/**
@@ -48,6 +50,7 @@ public function get_raw_value( $post_id ) {
 
 	public function register_settings() {
 		$this->add_setting( new Settings\Column\Taxonomy( $this ) );
+		$this->add_setting( new Settings\Column\NumberOfItems( $this ) );
 	}
 
 }

assets/css/table.css

@@ -10,8 +10,8 @@ class Html {
 	 * @param string $key
 	 * @param string $value
 	 *
-	 * @since 3.0
 	 * @return string
+	 * @since 3.0
 	 */
 	public function get_attribute_as_string( $key, $value ) {
 		return sprintf( '%s="%s"', $key, esc_attr( trim( $value ) ) );
@@ -20,8 +20,8 @@ public function get_attribute_as_string( $key, $value ) {
 	/**
 	 * @param array $attributes
 	 *
-	 * @since 3.0
 	 * @return string
+	 * @since 3.0
 	 */
 	public function get_attributes_as_string( array $attributes ) {
 		$output = array();
@@ -390,24 +390,22 @@ public function progress_bar( $args = array() ) {
 	}
 
 	public function more( $array, $number = 10, $glue = ', ' ) {
+		if ( ! $number ) {
+			return implode( $glue, $array );
+		}
+
 		$first_set = array_slice( $array, 0, $number );
 		$last_set = array_slice( $array, $number );
 
 		ob_start();
 
 		if ( $first_set ) {
+			$first = sprintf( '<span class="ac-show-more__part -first">%s</span>', implode( $glue, $first_set ) );
+			$more = $last_set ? sprintf( '<span class="ac-show-more__part -more">%s%s</span>', $glue, implode( $glue, $last_set ) ) : '';
+			$content = sprintf('<span class="ac-show-more__content">%s%s</span>', $first, $more );
+			$toggler = $last_set ? sprintf( '<span class="ac-show-more__divider">|</span><a class="ac-show-more__toggle" data-show-more-toggle data-more="%1$s" data-less="%2$s">%1$s</a>', sprintf( __( '%s more', 'codepress-admin-columns' ), count( $last_set ) ), strtolower( __( 'Hide', 'codepress-admin-columns' ) ) ) : '';
 
-			echo implode( $glue, $first_set );
-
-			if ( $last_set ) { ?>
-				<span class="ac-more-link-show">( <a><?php printf( __( 'Show %s more', 'codepress-admin-columns' ), count( $last_set ) ); ?></a> )</span>
-				<span class="ac-show-more-block">
-					<?php echo $glue . implode( $glue, $first_set ); ?>
-					<br/>
-                    <span class="ac-more-link-hide">( <a><?php _e( 'Hide', 'codepress-admin-columns' ); ?></a> )</span>
-                </span>
-				<?php
-			}
+			echo sprintf( '<span class="ac-show-more">%s</span>', $content . $toggler );
 		}
 
 		return ob_get_clean();

assets/js/admin-page-columns.js.map

@@ -111,7 +111,7 @@ protected function get_date_options() {
 		$custom_label = $this->get_html_label(
 			__( 'Custom:', 'codepress-admin-columns' ),
 			'',
-			sprintf( __( 'Learn more about %s.', 'codepress-admin-columns' ), ac_helper()->html->link( 'http://codex.wordpress.org/Formatting_Date_and_Time', __( 'date and time formatting', 'codepress-admin-columns' ) ), array( 'target' => '_blank' ) )
+			sprintf( __( 'Learn more about %s.', 'codepress-admin-columns' ), ac_helper()->html->link( 'https://wordpress.org/support/article/formatting-date-and-time/', __( 'date and time formatting', 'codepress-admin-columns' ), array( 'target' => '_blank' ) ) )
 		);
 
 		$custom_label .= '<input type="text" class="ac-setting-input-date__custom" value="' . esc_attr( $this->get_date_format() ) . '" disabled>';

assets/js/select2.js

@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Admin Columns
-Version: 3.4.6
+Version: 3.4.7
 Description: Customize columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
 Author: AdminColumns.com
 Author URI: https://www.admincolumns.com
@@ -36,7 +36,7 @@
 }
 
 define( 'AC_FILE', __FILE__ );
-define( 'AC_VERSION', '3.4.6' );
+define( 'AC_VERSION', '3.4.7' );
 
 require_once __DIR__ . '/classes/Dependencies.php';
 

assets/js/table.js

@@ -155,11 +155,11 @@ msgstr ""
 msgid "Taxonomy"
 msgstr ""
 
-#: classes/Helper/Html.php:403
-msgid "Show %s more"
+#: classes/Helper/Html.php:406
+msgid "%s more"
 msgstr ""
 
-#: classes/Helper/Html.php:407
+#: classes/Helper/Html.php:406
 msgid "Hide"
 msgstr ""