Added sortable handle in validation settings and chart settings.

inc2734 · Jan 20, 2015 · 6586f56 · 6586f56
1 parent 2a23ae2
commit 6586f56
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 13 deletions.
diff --git a/classes/controllers/class.admin.php b/classes/controllers/class.admin.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * Name       : MW WP Form Admin Controller
- * Version    : 1.0.0
+ * Version    : 1.0.1
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : December 31, 2014
- * Modified   :
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -220,6 +220,7 @@ public function admin_enqueue_scripts() {
 			wp_enqueue_script( MWF_Config::NAME . '-repeatable', $url . '../../js/mw-wp-form-repeatable.js' );
 			wp_enqueue_script( MWF_Config::NAME . '-admin', $url . '../../js/admin.js' );
 			wp_enqueue_script( 'jquery-ui-dialog' );
+			wp_enqueue_script( 'jquery-ui-sortable' );
 
 			global $wp_scripts;
 			$ui = $wp_scripts->query( 'jquery-ui-core' );

diff --git a/classes/views/class.admin.php b/classes/views/class.admin.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * Name       : MW WP Form Admin View
- * Version    : 1.0.0
+ * Version    : 1.0.1
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : January 2, 2015
- * Modified   : 
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -91,6 +91,7 @@ public function validation_rule() {
 		<div class="repeatable-boxes">
 			<?php foreach ( $validation as $key => $value ) : $value = array_merge( $validation_keys, $value ); ?>
 			<div class="repeatable-box" <?php if ( $key === 0 ) : ?>style="display:none"<?php endif; ?>>
+				<div class="sortable-icon-handle"></div>
 				<div class="remove-btn"><b>×</b></div>
 				<div class="open-btn"><span><?php echo esc_attr( $value['target'] ); ?></span><b>▼</b></div>
 				<div class="repeatable-box-content">

diff --git a/classes/views/class.chart.php b/classes/views/class.chart.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * Name       : MW WP Form Chart View
- * Version    : 1.0.0
+ * Version    : 1.0.1
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : January 2, 2015
- * Modified   : 
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -85,6 +85,7 @@ public function index() {
 				<div class="repeatable-boxes">
 					<?php foreach ( $postdata as $key => $value ) :  ?>
 					<div class="repeatable-box" <?php if ( $key === 0 ) : ?>style="display:none"<?php endif; ?>>
+						<div class="sortable-icon-handle"></div>
 						<div class="remove-btn"><b>×</b></div>
 						<div class="open-btn"><span><?php echo esc_html( $value['target'] ); ?></span><b>▼</b></div>
 						<div class="repeatable-box-content">

diff --git a/css/admin.css b/css/admin.css
@@ -196,6 +196,27 @@ span#formkey_field {
 	margin: 0 0 0 10px;
 }
 
+/**
+ * ソートボタン
+ */
+#mw-wp-form_validation .repeatable-box .sortable-icon-handle,
+#mw-wp-form_chart .repeatable-box .sortable-icon-handle {
+	background: url( ../images/handle.png ) no-repeat;
+	cursor: move;
+	float: left;
+	margin-right: 10px;
+	height: 10px;
+	width: 10px;
+	overflow: hidden;
+	position: relative;
+	top: 4px;
+}
+#mw-wp-form_validation .repeatable-box .remove-btn b,
+#mw-wp-form_chart .repeatable-box .remove-btn b {
+	cursor: pointer;
+	display: block;
+}
+
 /**
  * 削除ボタン
  */

diff --git a/images/handle.png b/images/handle.png
diff --git a/js/admin-chart.js b/js/admin-chart.js
@@ -3,5 +3,8 @@ jQuery( function( $ ) {
 		add_position: 'last'
 	} );
 
-	$( '#mw-wp-form_chart .repeatable-boxes' ).sortable();
+	$( '#mw-wp-form_chart .repeatable-boxes' ).sortable( {
+		items : '> .repeatable-box',
+		handle: '.sortable-icon-handle'
+	} );
 } );
diff --git a/js/admin.js b/js/admin.js
@@ -9,12 +9,9 @@ jQuery( function( $ ) {
 		$( '#mw-wp-form_complete_message_metabox input[id^="qt_mw-wp-form_complete_message_mwform_"]' ).remove();
 	} );
 
-} );
-
-/**
- * フォームタグジェネレータ
- */
-jQuery( function( $ ) {
+	/**
+	 * フォームタグジェネレータ
+	 */
 	function mwform_create_shortcode( dialog_id ) {
 		var shortcode = [];
 		var shortcode_name = dialog_id.replace( 'dialog-', '' );
@@ -71,4 +68,12 @@ jQuery( function( $ ) {
 		var select = $( '.add-mwform-btn select' ).val();
 		$( '#dialog-' + select ).dialog( 'open' );
 	} );
+
+	/**
+	 * sortable
+	 */
+	$( '#mw-wp-form_validation .repeatable-boxes' ).sortable( {
+		items : '> .repeatable-box',
+		handle: '.sortable-icon-handle'
+	} );
 } );