Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove inline styling from mail

Browse Source
This commit is contained in:
Mike Koch 2015-09-10 16:22:50 -04:00
parent 93116c596c
commit 98828ef1de
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/mail.php
View File

@ -57,9 +57,9 @@ while ($row=hesk_dbFetchAssoc($res))
} }
/* What folder are we in? */ /* What folder are we in? */
$hesk_settings['mailtmp']['inbox'] = '<a href="mail.php"><i class="fa fa-download"></i></a> <a href="mail.php">'.$hesklang['inbox'].'</a>'; $hesk_settings['mailtmp']['inbox'] = '<a href="mail.php"><i class="fa fa-download font-size-16p"></i></a> <a href="mail.php">'.$hesklang['inbox'].'</a>';
$hesk_settings['mailtmp']['outbox'] = '<a href="mail.php?folder=outbox"><i class="fa fa-upload" style="font-size: 16px"></i></a> <a href="mail.php?folder=outbox">'.$hesklang['outbox'].'</a>'; $hesk_settings['mailtmp']['outbox'] = '<a href="mail.php?folder=outbox"><i class="font-size-16p fa fa-upload"></i></a> <a href="mail.php?folder=outbox">'.$hesklang['outbox'].'</a>';
$hesk_settings['mailtmp']['new'] = '<a href="mail.php?a=new"><i class="fa fa-pencil-square-o" style="font-size:16px"></i></a> <a href="mail.php?a=new">'.$hesklang['m_new'].'</a>'; $hesk_settings['mailtmp']['new'] = '<a href="mail.php?a=new"><i class="font-size-16p fa fa-pencil-square-o"></i></a> <a href="mail.php?a=new">'.$hesklang['m_new'].'</a>';
/* Get action */ /* Get action */
if ( $action = hesk_REQUEST('a') ) if ( $action = hesk_REQUEST('a') )
@ -76,12 +76,12 @@ if (isset($_GET['folder']) && hesk_GET('folder') == 'outbox')
$hesk_settings['mailtmp']['this'] = 'from'; $hesk_settings['mailtmp']['this'] = 'from';
$hesk_settings['mailtmp']['other'] = 'to'; $hesk_settings['mailtmp']['other'] = 'to';
$hesk_settings['mailtmp']['m_from'] = $hesklang['m_to']; $hesk_settings['mailtmp']['m_from'] = $hesklang['m_to'];
$hesk_settings['mailtmp']['outbox'] = '<b><i class="fa fa-upload" style="font-size:16px"></i> '.$hesklang['outbox'].'</b>'; $hesk_settings['mailtmp']['outbox'] = '<b><i class="font-size-16p fa fa-upload"></i> '.$hesklang['outbox'].'</b>';
$hesk_settings['mailtmp']['folder'] = 'outbox'; $hesk_settings['mailtmp']['folder'] = 'outbox';
} }
elseif ($action == 'new') elseif ($action == 'new')
{ {
$hesk_settings['mailtmp']['new'] = '<b><i class="fa fa-pencil-square-o" style="font-size: 16px"></i> '.$hesklang['m_new'].'</b>'; $hesk_settings['mailtmp']['new'] = '<b><i class="font-size-16p fa fa-pencil-square-o"></i> '.$hesklang['m_new'].'</b>';
$_SESSION['hide']['list'] = 1; $_SESSION['hide']['list'] = 1;
/* Do we have a recipient selected? */ /* Do we have a recipient selected? */
@ -97,7 +97,7 @@ else
$hesk_settings['mailtmp']['m_from'] = $hesklang['m_from']; $hesk_settings['mailtmp']['m_from'] = $hesklang['m_from'];
if ($action != 'read') if ($action != 'read')
{ {
$hesk_settings['mailtmp']['inbox'] = '<b><i class="fa fa-download" style="font-size: 16px"></i> '.$hesklang['inbox'].'</b>'; $hesk_settings['mailtmp']['inbox'] = '<b><i class="font-size-16p fa fa-download"></i> '.$hesklang['inbox'].'</b>';
$hesk_settings['mailtmp']['folder'] = ''; $hesk_settings['mailtmp']['folder'] = '';
} }
} }
@ -474,10 +474,10 @@ function show_message()
$folder = '&amp;folder=outbox'; $folder = '&amp;folder=outbox';
if ($pm['to'] == $_SESSION['id']) if ($pm['to'] == $_SESSION['id'])
{ {
echo '<a href="mail.php?a=mark_unread&amp;id='.$id.'&amp;token='.hesk_token_echo(0).'"><i style="font-size: 14px" class="fa fa-envelope-o"></i></a> '; echo '<a href="mail.php?a=mark_unread&amp;id='.$id.'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-envelope-o font-size-14p"></i></a> ';
$folder = ''; $folder = '';
} }
echo '<a href="mail.php?a=delete&amp;id='.$id.'&amp;token='.hesk_token_echo(0).$folder.'" onclick="return hesk_confirmExecute(\''.hesk_makeJsString($hesklang['delm']).'?\');"><i class="fa fa-times" style="font-size: 14px; color: red"></i></a>'; echo '<a href="mail.php?a=delete&amp;id='.$id.'&amp;token='.hesk_token_echo(0).$folder.'" onclick="return hesk_confirmExecute(\''.hesk_makeJsString($hesklang['delm']).'?\');"><i class="fa fa-times font-size-14p red"></i></a>';
?> ?>
</td> </td>

10
css/hesk_newStyle.css
View File

@ -390,5 +390,13 @@ button.dropdown-submit {
} }
.font-size-120 { .font-size-120 {
font-size: 1.2em; font-size: 1.2em !important;
}
.font-size-14p {
font-size: 14px !important;
}
.font-size-16p {
font-size: 16px !important;
} }