Skip to content

Commit

Permalink
Merge branch 'icon-api-new-func'
Browse files Browse the repository at this point in the history 
PR #1725
  • Loading branch information
@dregad
dregad committed Jan 8, 2021
2 parents e512b3d + a52aeeb commit dc62d61
Show file tree
Hide file tree
Showing 103 changed files with 417 additions and 292 deletions.
4 changes: 2 additions & 2 deletions account_page.php
View file
Expand Up @@ -130,7 +130,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-user"></i>
<?php print_icon( 'fa-user', 'ace-icon' ); ?>
<?php echo lang_get( 'edit_account_title' ) ?>
</h4>
</div>
Expand Down Expand Up @@ -275,7 +275,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-puzzle-piece"></i>
<?php print_icon( 'fa-puzzle-piece', 'ace-icon' ); ?>
<?php echo lang_get( 'assigned_projects' ) ?>
</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion account_prefs_inc.php
View file
Expand Up @@ -98,7 +98,7 @@ function edit_account_prefs( $p_user_id = null, $p_error_if_protected = true, $p
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-sliders"></i>
<?php print_icon( 'fa-sliders', 'ace-icon' ); ?>
<?php echo lang_get( 'default_account_preferences_title' ) ?>
</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion account_prof_edit_page.php
View file
Expand Up @@ -102,7 +102,7 @@

<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-user"></i>
<?php print_icon( 'fa-user', 'ace-icon' ); ?>
<?php echo lang_get( 'edit_profile' ) ?>
</h4>
</div>
Expand Down
8 changes: 4 additions & 4 deletions account_prof_menu_page.php
View file
Expand Up @@ -100,7 +100,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-file-o"></i>
<?php print_icon( 'fa-file-o', 'ace-icon' ); ?>
<?php echo lang_get( 'manage_profiles_link' ) ?>
</h4>
</div>
Expand Down Expand Up @@ -151,12 +151,12 @@
?>
<td class="center">
<?php if( $t_is_global_profile ) { ?>
<i class="ace-icon fa fa-check fa-lg"></i>
<?php print_icon( 'fa-check', 'ace-icon fa-lg' ); ?>
<?php } ?>
</td>
<td class="center">
<?php if( $t_is_default_profile ) { ?>
<i class="ace-icon fa fa-check fa-lg"></i>
<?php print_icon( 'fa-check', 'ace-icon fa-lg' ); ?>
<?php } ?>
</td>
<?php
Expand Down Expand Up @@ -244,7 +244,7 @@

<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-file-o"></i>
<?php print_icon( 'fa-file-o', 'ace-icon' ); ?>
<?php echo lang_get( 'add_profile' ) ?>
</h4>
</div>
Expand Down
5 changes: 3 additions & 2 deletions account_sponsor_page.php
View file
Expand Up @@ -200,7 +200,8 @@
# summary
echo '<td>' . string_display_line( $t_bug->summary );
if( VS_PRIVATE == $t_bug->view_state ) {
printf( ' <i class="fa fa-lock" title="%s"></i>', lang_get( 'private' ) );
echo ' ';
print_icon( 'fa-lock', '', lang_get( 'private' ) );
}
echo '</td>';

Expand Down Expand Up @@ -325,7 +326,7 @@
# summary
echo '<td>' . string_display_line( $t_bug->summary );
if( VS_PRIVATE == $t_bug->view_state ) {
printf( ' <i class="fa fa-lock" title="%s"></i>', lang_get( 'private' ) );
print_icon( 'fa-lock', '', lang_get( 'private' ) );
}
echo '</td>';

Expand Down
2 changes: 1 addition & 1 deletion adm_config_page.php
View file
Expand Up @@ -146,7 +146,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-sliders"></i>
<?php print_icon( 'fa-sliders', 'ace-icon' ); ?>
<?php echo $t_action_label; ?>
</h4>
</div>
Expand Down
6 changes: 3 additions & 3 deletions adm_config_report.php
View file
Expand Up @@ -242,7 +242,7 @@ function check_config_value( $p_config ) {
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-filter"></i>
<?php print_icon( 'fa-filter', 'ace-icon' ); ?>
<?php echo lang_get( 'filters' ) ?>
</h4>
</div>
Expand Down Expand Up @@ -320,8 +320,8 @@ function check_config_value( $p_config ) {
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-database"></i>
<?php echo lang_get( 'database_configuration' ) ?>
<?php print_icon( 'fa-database', 'ace-icon' ); ?>
<?php echo lang_get( 'database_configuration' ) ?>
</h4>
</div>

Expand Down
4 changes: 2 additions & 2 deletions adm_permissions_report.php
View file
Expand Up @@ -65,7 +65,7 @@ function get_section_begin_apr( $p_section_name ) {
$t_output .= '<div class="widget-box widget-color-blue2">';
$t_output .= ' <div class="widget-header widget-header-small">';
$t_output .= ' <h4 class="widget-title lighter uppercase">';
$t_output .= ' <i class="ace-icon fa fa-lock"></i>';
$t_output .= ' ' . icon_get( 'fa-lock', 'ace-icon' );
$t_output .= $p_section_name;
$t_output .= ' </h4>';
$t_output .= ' </div>';
Expand Down Expand Up @@ -102,7 +102,7 @@ function get_capability_row( $p_caption, $p_access_level ) {
$t_output = '<tr><td>' . string_display_line( $p_caption ) . '</td>';
foreach( $t_access_levels as $t_access_level ) {
if( $t_access_level >= (int)$p_access_level ) {
$t_value = '<i class="fa fa-check fa-lg blue"></i>';
$t_value = icon_get( 'fa-check', 'fa-lg blue' );
} else {
$t_value = '&#160;';
}
Expand Down
2 changes: 1 addition & 1 deletion admin/db_stats.php
View file
Expand Up @@ -65,7 +65,7 @@ function helper_table_row_count( $p_table ) {
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-database"></i>
<?php print_icon( 'fa-database', 'ace-icon' ); ?>
<?php echo lang_get( 'mantisbt_database_statistics' ) ?>
</h4>
</div>
Expand Down
8 changes: 4 additions & 4 deletions admin/email_queue.php
View file
Expand Up @@ -85,13 +85,13 @@

if( !$t_result ) {
echo '<div class="alert alert-sm alert-danger">';
echo '<i class="ace-icon fa fa-times fa-lg"></i> ';
print_icon( 'fa-times', 'ace-icon fa-lg' );
echo '<strong>Testing Mail</strong> - ';
echo ' PROBLEMS SENDING MAIL TO: ' . config_get_global( 'webmaster_email' ) . '. Please check your php/mail server settings.';
echo '</div>';
} else {
echo '<div class="alert alert-sm alert-success">';
echo '<i class="ace-icon fa fa-check fa-lg"></i> ';
print_icon( 'fa-check', 'ace-icon fa-lg' );
echo '<strong>Testing Mail</strong> - ';
echo ' mail() send successful.';
echo '</div>';
Expand All @@ -105,8 +105,8 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-envelope"></i>
Email Queue
<?php print_icon( 'fa-envelope', 'ace-icon' ); ?>
Email Queue
</h4>
</div>
<div class="widget-body">
Expand Down
2 changes: 1 addition & 1 deletion admin/index.php
View file
Expand Up @@ -55,7 +55,7 @@ function print_info_row( $p_description, $p_value ) {
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-download"></i>
<?php print_icon( 'fa-download', 'ace-icon' ); ?>
<?php echo lang_get( 'install_information' ) ?>
</h4>
</div>
Expand Down
17 changes: 9 additions & 8 deletions admin/move_attachments.php
View file
Expand Up @@ -309,14 +309,15 @@ function move_attachments_to_disk( $p_type, array $p_projects ) {
echo '<div class="widget-box widget-color-blue2">';
echo '<div class="widget-header widget-header-small">';
echo '<h4 class="widget-title lighter">';
echo '<i class="ace-icon fa fa-paperclip"></i>';
printf(
"Project '%s' : %d attachments %s",
$t_row['name'],
$t_row['rows'],
( 0 == $t_row['failed']
? 'moved successfully'
: 'to move, ' . $t_row['failed'] . ' failures') );
print_icon( 'fa-paperclip', 'ace-icon' );
printf(
"Project '%s' : %d attachments %s",
$t_row['name'],
$t_row['rows'],
( 0 == $t_row['failed']
? 'moved successfully'
: 'to move, ' . $t_row['failed'] . ' failures')
);
echo '</h4>';
echo '</div>';
echo '<div class="widget-body">';
Expand Down
2 changes: 1 addition & 1 deletion admin/move_attachments_page.php
View file
Expand Up @@ -107,7 +107,7 @@ function get_attachment_stats( $p_file_type, $p_in_db ) {
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-paperclip"></i>
<?php print_icon( 'fa-paperclip', 'ace-icon' ); ?>
<?php echo "$t_type to move"; ?>
</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/system_utils.php
View file
Expand Up @@ -43,7 +43,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-wrench"></i>
<?php print_icon( 'fa-wrench', 'ace-icon' ); ?>
System Utilities
</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/test_langs.php
View file
Expand Up @@ -61,7 +61,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-text-width"></i>
<?php print_icon( 'fa-text-width', 'ace-icon' ); ?>
Test Langs
</h4>
</div>
Expand Down
4 changes: 2 additions & 2 deletions api_tokens_page.php
View file
Expand Up @@ -58,7 +58,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-plus"></i>
<?php print_icon( 'fa-plus', 'ace-icon' ); ?>
<?php echo lang_get( 'api_token_create_form_title' ) ?>
</h4>
</div>
Expand Down Expand Up @@ -112,7 +112,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-ticket"></i>
<?php print_icon( 'fa-ticket', 'ace-icon' ); ?>
<?php echo lang_get( 'api_tokens_title' ) ?>
</h4>
</div>
Expand Down
10 changes: 5 additions & 5 deletions billing_inc.php
View file
Expand Up @@ -102,13 +102,13 @@
<div class="col-md-12 col-xs-12">
<div id="time_tracking_stats" class="widget-box widget-color-blue2 <?php echo $t_block_css ?>">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-clock-o"></i>
<?php echo lang_get( 'time_tracking' ) ?>
</h4>
<h4 class="widget-title lighter">
<?php print_icon( 'fa-clock-o', 'ace-icon' ); ?>
<?php echo lang_get( 'time_tracking' ) ?>
</h4>
<div class="widget-toolbar">
<a data-action="collapse" href="#">
<i class="1 ace-icon <?php echo $t_block_icon ?> fa bigger-125"></i>
<?php print_icon( $t_block_icon, 'ace-icon 1 bigger-125' ); ?>
</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion bug_actiongroup_page.php
View file
Expand Up @@ -323,7 +323,7 @@
'data-picker-locale="' . lang_get_current_datetime_locale() .
'" data-picker-format="' . config_get( 'datetime_picker_format' ) . '"' .
'" value="' . $t_date_to_display . '" />';
echo '<i class="fa fa-calendar fa-xlg datetimepicker"></i>';
print_icon( 'fa-calendar', 'fa-xlg datetimepicker' );
} else {
echo '<select name="' . $t_form . '" class="input-sm" required>';

Expand Down
2 changes: 1 addition & 1 deletion bug_change_status_page.php
View file
Expand Up @@ -245,7 +245,7 @@
data-picker-locale="<?php lang_get_current_datetime_locale() ?>"
data-picker-format="<?php echo config_get( 'datetime_picker_format' ) ?>"
<?php helper_get_tab_index() ?> value="<?php echo $t_date_to_display ?>" />
<i class="fa fa-calendar fa-xlg datetimepicker"></i>
<?php print_icon( 'fa-calendar', 'fa-xlg datetimepicker' ); ?>
</td>
</tr>

Expand Down
2 changes: 1 addition & 1 deletion bug_relationship_graph.php
View file
Expand Up @@ -106,7 +106,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-sitemap"></i>
<?php print_icon( 'fa-sitemap', 'ace-icon' ); ?>
<?php echo $t_title ?>
</h4>
</div>
Expand Down
5 changes: 3 additions & 2 deletions bug_reminder_page.php
View file
Expand Up @@ -78,7 +78,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-envelope"></i>
<?php print_icon( 'fa-envelope', 'ace-icon' ); ?>
<?php echo lang_get( 'bug_reminder' ) ?>
</h4>
</div>
Expand Down Expand Up @@ -158,8 +158,9 @@ class="form-control <?php echo $t_bugnote_class; ?>"></textarea>
</form>
<br>
<div class="alert alert-info">
<p><i class="fa fa-info-circle fa-lg"> </i>
<p>
<?php
print_icon( 'fa-info-circle', 'fa-lg' ); ?>
echo lang_get( 'reminder_explain' ) . ' ';
if( ON == config_get( 'reminder_recipients_monitor_bug' ) ) {
echo lang_get( 'reminder_monitor' ) . ' ';
Expand Down
7 changes: 4 additions & 3 deletions bug_report_page.php
View file
Expand Up @@ -249,7 +249,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-edit"></i>
<?php print_icon( 'fa-edit', 'ace-icon' ); ?>
<?php echo lang_get( 'enter_report_details_title' ) ?>
</h4>
</div>
Expand Down Expand Up @@ -367,7 +367,7 @@
'data-picker-locale="' . lang_get_current_datetime_locale() .
'" data-picker-format="' . config_get( 'datetime_picker_format' ) . '" ' .
'size="20" maxlength="16" value="' . $t_date_to_display . '" />' ?>
<i class="fa fa-calendar fa-xlg datetimepicker"></i>
<?php print_icon( 'fa-calendar', 'fa-xlg datetimepicker' ); ?>
</td>
</tr>
<?php } ?>
Expand Down Expand Up @@ -679,7 +679,8 @@
<?php print_dropzone_template() ?>
<input type="hidden" name="max_file_size" value="<?php echo $t_max_file_size ?>" />
<div class="dropzone center" <?php print_dropzone_form_data() ?>>
<i class="upload-icon ace-icon fa fa-cloud-upload blue fa-3x"></i><br>
<?php print_icon( 'fa-cloud-upload', 'upload-icon ace-icon blue fa-3x' ); ?>
<br>
<span class="bigger-150 grey"><?php echo lang_get( 'dropzone_default_message' ) ?></span>
<div id="dropzone-previews-box" class="dropzone-previews dz-max-files-reached"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion bug_revision_view_page.php
View file
Expand Up @@ -204,7 +204,7 @@ function show_revision( array $p_revision ) {
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-history"></i>
<?php print_icon( 'fa-history', 'ace-icon' ); ?>
<?php echo lang_get( 'view_revisions' ), ': ', $t_title ?>
</h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion bug_sponsorship_list_view_inc.php
View file
Expand Up @@ -85,7 +85,7 @@
<table class="width100" cellspacing="1">
<tr>
<td width="50" rowspan="3">
<i class="fa fa-usd" title="<?php echo lang_get( 'sponsor_verb' ) ?>"></i>
<?php print_icon( 'fa-usd', '', lang_get( 'sponsor_verb' ) ); ?>
</td>
<td class="form-title" colspan="2"><?php
collapse_icon( 'sponsorship' );
Expand Down
6 changes: 3 additions & 3 deletions bug_update_page.php
View file
Expand Up @@ -168,7 +168,7 @@
<div class="widget-box widget-color-blue2">
<div class="widget-header widget-header-small">
<h4 class="widget-title lighter">
<i class="ace-icon fa fa-comments"></i>
<?php print_icon( 'fa-comments', 'ace-icon' ); ?>
<?php echo lang_get( 'updating_bug_advanced_title' ) ?>
</h4>
<div class="widget-toolbar no-border">
Expand Down Expand Up @@ -341,7 +341,7 @@
echo '<input ' . helper_get_tab_index() . ' type="text" id="due_date" name="due_date" class="datetimepicker input-sm" size="16" ' .
'data-picker-locale="' . lang_get_current_datetime_locale() . '" data-picker-format="' . config_get( 'datetime_picker_format' ) . '" ' .
'maxlength="16" value="' . $t_date_to_display . '" />';
echo '<i class="fa fa-calendar fa-xlg datetimepicker"></i>';
print_icon( 'fa-calendar', 'fa-xlg datetimepicker' );
} else {
if( !date_is_null( $t_bug->due_date ) ) {
echo date( config_get( 'short_date_format' ), $t_bug->due_date );
Expand Down Expand Up @@ -424,7 +424,7 @@
$t_status_css = html_get_status_css_fg( $t_bug->status );

echo '<td class="bug-status">';
echo '<i class="fa fa-square fa-status-box ' . $t_status_css . '"></i> ';
print_icon( 'fa-square', 'fa-status-box ' . $t_status_css );
print_status_option_list( 'status', $t_bug->status,
access_can_close_bug( $t_bug ),
$t_bug->project_id );
Expand Down

0 comments on commit dc62d61

Please sign in to comment.