Skip to content

Commit

Permalink
Use CSS for spacing before checkbox/radio labels
Browse files Browse the repository at this point in the history 
Use padding-6 class and remove hardcoded whitespace

Fixes #23243
  • Loading branch information
@dregad
dregad committed Oct 7, 2017
1 parent fc771e1 commit 65ed709
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions account_prefs_inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ function edit_account_prefs( $p_user_id = null, $p_error_if_protected = true, $p
<td>
<label for="bugnote-order-desc" class="inline padding-right-8">
<input type="radio" class="ace input-sm" id="bugnote-order-desc" name="bugnote_order" value="DESC" <?php check_checked( $t_pref->bugnote_order, 'DESC' ); ?> />
<span class="lbl"> <?php echo lang_get( 'bugnote_order_desc' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'bugnote_order_desc' ) ?></span>
</label>
<label for="bugnote-order-asc" class="inline padding-right-8">
<input type="radio" class="ace input-sm" id="bugnote-order-asc" name="bugnote_order" value="ASC" <?php check_checked( $t_pref->bugnote_order, 'ASC' ); ?> />
<span class="lbl"> <?php echo lang_get( 'bugnote_order_asc' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'bugnote_order_asc' ) ?></span>
</label>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion bug_actiongroup_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
if( access_has_project_level( config_get( 'set_view_status_threshold' ), $t_project_id ) ) {
?>
<input type="checkbox" class="ace" name="private" <?php check_checked( $t_default_bugnote_view_status, VS_PRIVATE ); ?> />
<label class="lbl"> <?php echo lang_get( 'private' ); ?> </label>
<label class="lbl padding-6"><?php echo lang_get( 'private' ); ?></label>
<?php
} else {
echo get_enum_element( 'project_view_state', $t_default_bugnote_view_status );
Expand Down
2 changes: 1 addition & 1 deletion bug_change_status_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
?>
<input type="checkbox" id="bugnote_add_view_status" class="ace" name="private"
<?php check_checked( $t_default_bugnote_view_status, VS_PRIVATE ); ?> />
<label class="lbl" for="bugnote_add_view_status"> <?php echo lang_get( 'private' ) ?> </label>
<label class="lbl padding-6" for="bugnote_add_view_status"><?php echo lang_get( 'private' ) ?></label>
<?php
} else {
echo get_enum_element( 'project_view_state', $t_default_bugnote_view_status );
Expand Down
10 changes: 5 additions & 5 deletions bug_report_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,12 +654,12 @@
<td>
<label>
<input <?php echo helper_get_tab_index() ?> type="radio" class="ace" name="view_state" value="<?php echo VS_PUBLIC ?>" <?php check_checked( $f_view_state, VS_PUBLIC ) ?> />
<span class="lbl"> <?php echo lang_get( 'public' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'public' ) ?></span>
</label>
&#160;&#160;&#160;&#160;
<label>
<input <?php echo helper_get_tab_index() ?> type="radio" class="ace" name="view_state" value="<?php echo VS_PRIVATE ?>" <?php check_checked( $f_view_state, VS_PRIVATE ) ?> />
<span class="lbl"> <?php echo lang_get( 'private' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'private' ) ?></span>
</label>
</td>
</tr>
Expand All @@ -686,12 +686,12 @@
<td>
<label>
<input <?php echo helper_get_tab_index() ?> type="checkbox" class="ace" id="copy_notes_from_parent" name="copy_notes_from_parent" <?php check_checked( $f_copy_notes_from_parent ) ?> />
<span class="lbl"> <?php echo lang_get( 'copy_notes_from_parent' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'copy_notes_from_parent' ) ?></span>
</label>
&#160;&#160;&#160;&#160;
<label>
<input <?php echo helper_get_tab_index() ?> type="checkbox" class="ace" id="copy_attachments_from_parent" name="copy_attachments_from_parent" <?php check_checked( $f_copy_attachments_from_parent ) ?> />
<span class="lbl"> <?php echo lang_get( 'copy_attachments_from_parent' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'copy_attachments_from_parent' ) ?></span>
</label>
</td>
</tr>
Expand All @@ -705,7 +705,7 @@
<td>
<label>
<input <?php echo helper_get_tab_index() ?> type="checkbox" class="ace" id="report_stay" name="report_stay" <?php check_checked( $f_report_stay ) ?> />
<span class="lbl"> <?php echo lang_get( 'check_report_more_bugs' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'check_report_more_bugs' ) ?></span>
</label>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion bugnote_add_inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<td>
<label for="bugnote_add_view_status">
<input type="checkbox" class="ace" id="bugnote_add_view_status" name="private" <?php check_checked( $t_default_bugnote_view_status, VS_PRIVATE ); ?> />
<span class="lbl"> <?php echo lang_get( 'private' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'private' ) ?></span>
</label>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions core/filter_form_api.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ function print_filter_do_filter_by_date( $p_hide_checkbox = false, array $p_filt
<input class="input-xs ace js_switch_date_inputs_trigger" type="checkbox" id="use_date_filters" class="input-xs"
name="<?php echo FILTER_PROPERTY_FILTER_BY_DATE_SUBMITTED ?>"
<?php check_checked( gpc_string_to_bool( $p_filter[FILTER_PROPERTY_FILTER_BY_DATE_SUBMITTED] ), true ) ?> />
<span class="lbl small"> <?php echo lang_get( 'use_date_filters' )?></span>
<span class="lbl padding-6 small"><?php echo lang_get( 'use_date_filters' )?></span>
</label>
</td>
</tr>
Expand Down Expand Up @@ -1451,7 +1451,7 @@ function print_filter_do_filter_by_last_updated_date( $p_hide_checkbox = false,
<input class="input-xs ace js_switch_date_inputs_trigger" type="checkbox" id="use_last_updated_date_filters" class="input-xs"
name="<?php echo FILTER_PROPERTY_FILTER_BY_LAST_UPDATED_DATE ?>"
<?php check_checked( gpc_string_to_bool( $p_filter[FILTER_PROPERTY_FILTER_BY_LAST_UPDATED_DATE] ), true ) ?> />
<span class="lbl small"> <?php echo lang_get( 'use_last_updated_date_filters' )?></span>
<span class="lbl padding-6 small"><?php echo lang_get( 'use_last_updated_date_filters' )?></span>
</label>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions login_password_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ class="form-control autofocus">
<div class="clearfix">
<label for="remember-login" class="inline">
<input id="remember-login" type="checkbox" name="perm_login" class="ace" <?php echo ( $f_perm_login ? 'checked="checked" ' : '' ) ?> />
<span class="lbl"> <?php echo lang_get( 'save_login' ) ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'save_login' ) ?></span>
</label>
</div>
<?php } ?>
<?php if( $t_session_validation ) { ?>
<div class="clearfix">
<label for="secure-session" class="inline">
<input id="secure-session" type="checkbox" name="secure_session" class="ace" <?php echo ( $t_default_secure_session ? 'checked="checked" ' : '' ) ?> />
<span class="lbl"> <?php echo lang_get( 'secure_session_long' ) ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'secure_session_long' ) ?></span>
</label>
</div>
<?php } ?>
Expand Down
10 changes: 5 additions & 5 deletions manage_filter_edit_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@
<td>
<label>
<input type="radio" class="ace" name="is_public" value="1" <?php check_checked( (bool)filter_get_field( $f_filter_id, 'is_public' ), true ) ?> />
<span class="lbl"> <?php echo lang_get( 'public' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'public' ) ?></span>
</label>
&#160;&#160;&#160;&#160;
<label>
<input type="radio" class="ace" name="is_public" value="0" <?php check_checked( (bool)filter_get_field( $f_filter_id, 'is_public' ), false ) ?> />
<span class="lbl"> <?php echo lang_get( 'private' ) ?> </span>
<span class="lbl padding-6"><?php echo lang_get( 'private' ) ?></span>
</label>
</td>
</tr>
Expand All @@ -183,20 +183,20 @@
<td>
<label class="inline">
<input type="radio" class="ace input-sm" name="filter_project_id" value="<?php echo ALL_PROJECTS ?>" <?php check_checked( ALL_PROJECTS == $t_filter_project_id ) ?>>
<span class="lbl"> <?php echo lang_get( 'all_projects' ) ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'all_projects' ) ?></span>
</label>
<br>
<?php if( ALL_PROJECTS != $t_filter_project_id ) { ?>
<label>
<input type="radio" class="ace input-sm" name="filter_project_id" value="<?php echo $t_filter_project_id ?>" <?php check_checked( ALL_PROJECTS != $t_filter_project_id ) ?>>
<span class="lbl"> <?php echo lang_get( 'stored_project' ) . ' (' . project_get_name( $t_filter_project_id ) . ')' ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'stored_project' ) . ' (' . project_get_name( $t_filter_project_id ) . ')' ?></span>
</label>
<br>
<?php } ?>
<?php if( $t_filter_project_id != $t_current_project_id ) { ?>
<label>
<input type="radio" class="ace input-sm" name="filter_project_id" value="<?php echo $t_current_project_id ?>">
<span class="lbl"> <?php echo lang_get( 'current_project' ) . ' (' . project_get_name( $t_current_project_id ) . ')' ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'current_project' ) . ' (' . project_get_name( $t_current_project_id ) . ')' ?></span>
</label>
<?php } ?>
</td>
Expand Down
4 changes: 2 additions & 2 deletions manage_user_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,11 @@
<input type="hidden" name="filter" value="<?php echo string_attribute( $f_filter ); ?>" />
<label class="inline">
<input type="checkbox" class="ace" name="hideinactive" value="<?php echo ON ?>" <?php check_checked( (int)$c_hide_inactive, ON ); ?> />
<span class="lbl"> <?php echo lang_get( 'hide_inactive' ) ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'hide_inactive' ) ?></span>
</label>
<label class="inline">
<input type="checkbox" class="ace" name="showdisabled" value="<?php echo ON ?>" <?php check_checked( (int)$c_show_disabled, ON ); ?> />
<span class="lbl"> <?php echo lang_get( 'show_disabled' ) ?></span>
<span class="lbl padding-6"><?php echo lang_get( 'show_disabled' ) ?></span>
</label>
<input type="submit" class="btn btn-primary btn-sm btn-white btn-round" value="<?php echo lang_get( 'filter_button' ) ?>" />
</fieldset>
Expand Down
16 changes: 8 additions & 8 deletions plugins/MantisCoreFormatting/pages/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
</th>
<td class="center" width="20%">
<label><input type="radio" class="ace" name="process_text" value="1" <?php echo( ON == plugin_config_get( 'process_text' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_enabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_enabled' )?></span></label>
</td>
<td class="center" width="20%">
<label><input type="radio" class="ace" name="process_text" value="0" <?php echo( OFF == plugin_config_get( 'process_text' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_disabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_disabled' )?></span></label>
</td>
</tr>

Expand All @@ -72,11 +72,11 @@
</th>
<td class="center">
<label><input type="radio" class="ace" name="process_urls" value="1" <?php echo( ON == plugin_config_get( 'process_urls' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_enabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_enabled' )?></span></label>
</td>
<td class="center">
<label><input type="radio" class="ace" name="process_urls" value="0" <?php echo( OFF == plugin_config_get( 'process_urls' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_disabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_disabled' )?></span></label>
</td>
</tr>

Expand All @@ -91,11 +91,11 @@
</th>
<td class="center">
<label><input type="radio" class="ace" name="process_buglinks" value="1" <?php echo( ON == plugin_config_get( 'process_buglinks' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_enabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_enabled' )?></span></label>
</td>
<td class="center">
<label><input type="radio" class="ace" name="process_buglinks" value="0" <?php echo( OFF == plugin_config_get( 'process_buglinks' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_disabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_disabled' )?></span></label>
</td>
</tr>

Expand All @@ -109,11 +109,11 @@
</th>
<td class="center">
<label><input type="radio" class="ace" name="process_markdown" value="1" <?php echo( ON == plugin_config_get( 'process_markdown' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_enabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_enabled' )?></span></label>
</td>
<td class="center">
<label><input type="radio" class="ace" name="process_markdown" value="0" <?php echo( OFF == plugin_config_get( 'process_markdown' ) ) ? 'checked="checked" ' : ''?>/>
<span class="lbl"> <?php echo lang_get( 'plugin_format_disabled' )?> </span></label>
<span class="lbl padding-6"><?php echo lang_get( 'plugin_format_disabled' )?></span></label>
</td>
</tr>

Expand Down
2 changes: 1 addition & 1 deletion plugins/XmlImportExport/pages/import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<td>
<label for="keepcategory">
<input type="checkbox" class="ace" checked="checked" id="keepcategory" name="keepcategory" />
<span class="lbl"> <?php echo plugin_lang_get( 'keep_same_category' );?> </span>
<span class="lbl padding-6"><?php echo plugin_lang_get( 'keep_same_category' );?></span>
</label>
<br><br>

Expand Down
4 changes: 2 additions & 2 deletions query_store_page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<div class="checkbox">
<label>
<input type="checkbox" class="ace" name="is_public" value="on" />
<span class="lbl"> <?php print lang_get( 'make_public' ); ?> </span>
<span class="lbl padding-6"><?php print lang_get( 'make_public' ); ?></span>
</label>
</div>
&#160;&#160;&#160;&#160;
Expand All @@ -105,7 +105,7 @@
<div class="checkbox">
<label>
<input type="checkbox" class="ace" name="all_projects" value="on" <?php check_checked( ALL_PROJECTS == helper_get_current_project() ) ?> />
<span class="lbl"> <?php print lang_get( 'all_projects' ); ?> </span>
<span class="lbl padding-6"><?php print lang_get( 'all_projects' ); ?></span>
</label>
</div>

Expand Down
2 changes: 1 addition & 1 deletion view_all_inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function write_bug_rows( array $p_rows ) {
if( $g_checkboxes_exist ) {
echo '<label class="inline">';
echo '<input class="ace check_all input-sm" type="checkbox" id="bug_arr_all" name="bug_arr_all" value="all" />';
echo '<span class="lbl"> ' . lang_get( 'select_all' ) . ' </span > ';
echo '<span class="lbl padding-6">' . lang_get( 'select_all' ) . ' </span > ';
echo '</label>';
}
if( $g_checkboxes_exist ) {
Expand Down

0 comments on commit 65ed709

Please sign in to comment.