Make the "Keep Markup" section more user friendly FancyThemes#29

archon810 · May 16, 2014 · df70d0a · df70d0a
1 parent bceb350
commit df70d0a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/asset/js/advanced-excerpt.js b/asset/js/advanced-excerpt.js
@@ -26,7 +26,17 @@
 				$('#read-more').attr('disabled','disabled');
 			}
 		});
-
+
+		$('#dont-remove-any-markup').change(function(event){
+			if( $(this).is(':checked') ){
+				$('#tags-table tr').not(':first-child').hide();
+				$('.tags-control').hide();
+			} else {
+				$('#tags-table tr').not(':first-child').show();
+				$('.tags-control').show();
+			}
+		});
+
 		// Add a tag to the checkbox table
 		$('#add-tag').click(function(event){
 			event.preventDefault();

diff --git a/template/options.php b/template/options.php
@@ -155,8 +155,8 @@
 							<table id="tags-table">
 								<tr>
 									<td colspan="<?php echo $tag_cols; ?>">
-										<label for="allowed-tags">
-										<input name="allowed_tags[]" type="checkbox" id="allowed-tags" value="_all" <?php echo ( in_array( '_all', $allowed_tags ) ) ? 'checked="checked" ' : ''; ?> />
+										<label for="dont-remove-any-markup">
+										<input name="allowed_tags[]" type="checkbox" id="dont-remove-any-markup" value="_all" <?php echo ( in_array( '_all', $allowed_tags ) ) ? 'checked="checked" ' : ''; ?> />
 				   						<?php _e( "Don't remove any markup", 'advanced-excerpt' ); ?>
 				   						</label>
 									</td>
@@ -166,7 +166,7 @@
 								foreach ( $tag_list as $tag ) :
 									if ( $tag == '_all' ) continue;
 									if ( 0 == $i % $tag_cols ) : ?>
-									<tr>
+									<tr<?php echo ( in_array( '_all', $allowed_tags ) ) ? ' style="display: none;"' : '' ?>>
 									<?php endif; $i++; ?>
 										<td>
 											<label for="<?php echo 'ae-' . $tag; ?>">
@@ -186,15 +186,18 @@
 									<?php endif; ?>
 							</table>
 
-							<a href="" id="select-all"><?php _e( "Select all", 'advanced-excerpt' ); ?></a> / <a href="" id="select-none"><?php _e( "Select none", 'advanced-excerpt' ); ?></a><br />
-							<?php _e( "More tags", 'advanced-excerpt' ); ?>
-							<select name="more_tags" id="more-tags">
-							<?php foreach ( array_diff( $this->options_all_tags, $this->options_basic_tags ) as $tag ) : ?>
-								<option value="<?php echo $tag; ?>"><?php echo $tag; ?></option>
-							<?php endforeach; ?>
-							</select>
+							<div class="tags-control"<?php echo ( in_array( '_all', $allowed_tags ) ) ? ' style="display: none;"' : '' ?>>
+								<a href="" id="select-all"><?php _e( "Select all", 'advanced-excerpt' ); ?></a> / <a href="" id="select-none"><?php _e( "Select none", 'advanced-excerpt' ); ?></a><br />
+								<?php _e( "More tags", 'advanced-excerpt' ); ?>
+								<select name="more_tags" id="more-tags">
+								<?php foreach ( array_diff( $this->options_all_tags, $this->options_basic_tags ) as $tag ) : ?>
+									<option value="<?php echo $tag; ?>"><?php echo $tag; ?></option>
+								<?php endforeach; ?>
+								</select>
+
+								<input type="button" name="add_tag" id="add-tag" class="button" value="<?php _e( "Add tag", 'advanced-excerpt' ); ?>" />
+							</div>
 
-							<input type="button" name="add_tag" id="add-tag" class="button" value="<?php _e( "Add tag", 'advanced-excerpt' ); ?>" />
 						</td>
 					</tr>
 				</table>