Browse Source

Some more inline style removal

merge-requests/2/head
Mike Koch 6 years ago
parent
commit
6b471e797d
  1. 2
      admin/admin_main.php
  2. 74
      admin/admin_settings.php
  3. 2
      admin/export.php
  4. 2
      admin/find_tickets.php
  5. 2
      admin/mail.php
  6. 2
      admin/manage_canned.php
  7. 2
      admin/manage_categories.php
  8. 2
      admin/manage_knowledgebase.php
  9. 2
      admin/manage_permission_templates.php
  10. 2
      admin/manage_statuses.php
  11. 2
      admin/manage_ticket_templates.php
  12. 2
      admin/manage_users.php
  13. 2
      admin/new_ticket.php
  14. 2
      admin/reports.php
  15. 4
      admin/show_tickets.php
  16. 26
      css/hesk_newStyle.css
  17. 18
      css/hesk_newStyleRTL.css

2
admin/admin_main.php

@ -73,7 +73,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
echo '
<div class="panel panel-default">
<div class="panel-heading">
<h4>'.$hesklang['open_tickets'].' <span class="nu-floatRight" style="margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success">'.$hesklang['nti'].'</a></span></h4>
<h4>'.$hesklang['open_tickets'].' <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success">'.$hesklang['nti'].'</a></span></h4>
</div>'; // The rest of the panel will be printed by print_tickets.inc.php
}

74
admin/admin_settings.php

@ -96,7 +96,7 @@ if ( defined('HESK_DEMO') )
?>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading"><?php echo $hesklang['installation_information']; ?></div>
@ -113,14 +113,14 @@ if ( defined('HESK_DEMO') )
if ($latest === true)
{
$cellClass = 'class="success"';
$cellClass = 'success';
} elseif ($latest != -1)
{
$cellClass = 'class="warning"';
$cellClass = 'warning';
}
}
?>
<td style="padding-left: 10px" <?php echo $cellClass; ?>>
<td class="pad-right-10 <?php echo $cellClass; ?>">
<?php echo $hesk_settings['hesk_version']; ?>
<?php
if ($hesk_settings['check_updates'])
@ -155,7 +155,7 @@ if ( defined('HESK_DEMO') )
</td>
</tr>
<tr>
<td class="text-right" style="padding-bottom: 5px">
<td class="text-right pad-up-5">
<?php echo $hesklang['mods_for_hesk_version']; ?>:
</td>
<?php
@ -165,14 +165,14 @@ if ( defined('HESK_DEMO') )
$latest = hesk_checkMfhVersion($modsForHeskVersion);
if ($latest === true)
{
$cellClass = 'class="success"';
$cellClass = 'success';
} elseif ($latest != -1)
{
$cellClass = 'class="warning"';
$cellClass = 'warning';
}
}
?>
<td <?php echo $cellClass; ?> style="padding-left: 10px; padding-bottom: 5px">
<td class="pad-right-10 pad-up-5 <?php echo $cellClass; ?>">
<?php echo $modsForHeskVersion; ?>
<?php
if ($hesk_settings['check_updates'])
@ -195,12 +195,12 @@ if ( defined('HESK_DEMO') )
</tr>
<tr><td class="text-right">
<?php echo $hesklang['phpv']; ?>:
</td><td style="padding-left: 10px">
</td><td class="pad-right-10">
<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : PHP_VERSION . ' ' . (function_exists('mysqli_connect') ? '(MySQLi)' : '(MySQL)'); ?>
</td></tr>
<tr><td class="text-right" style="padding-bottom: 5px">
<tr><td class="text-right pad-up-5">
<?php echo $hesklang['mysqlv']; ?>:
</td><td style="padding-left: 10px; padding-bottom: 5px">
</td><td class="pad-right-10 pad-up-5">
<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : hesk_dbResult( hesk_dbQuery('SELECT VERSION() AS version') ); ?>
</td></tr>
<tr>
@ -211,7 +211,7 @@ if ( defined('HESK_DEMO') )
$heskSettingsWritable = is_writable(HESK_PATH . 'hesk_settings.inc.php');
$cellClass = $heskSettingsWritable ? 'success' : 'danger';
?>
<td style="padding-left: 10px" class="<?php echo $cellClass; ?>">
<td class="pad-right-10 <?php echo $cellClass; ?>">
<?php
if ($heskSettingsWritable) {
$enable_save_settings=1;
@ -231,7 +231,7 @@ if ( defined('HESK_DEMO') )
$attachmentsWritable = is_writable(HESK_PATH . $hesk_settings['attach_dir']);
$cellClass = $attachmentsExist && $attachmentsWritable ? 'success' : 'danger';
?>
<td style="padding-left: 10px" class="<?php echo $cellClass; ?>">
<td class="pad-right-10 <?php echo $cellClass; ?>">
<?php
if ($attachmentsExist)
{
@ -500,7 +500,7 @@ if ( defined('HESK_DEMO') )
<div class="tab-content summaryList tabPadding">
<!-- General Settings -->
<div class="tab-pane fade in active" id="general">
<h6 style="font-weight: bold"><?php echo $hesklang['gs']; ?></h6>
<h6 class="bold"><?php echo $hesklang['gs']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -534,7 +534,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['lgs']; ?></h6>
<h6 class="bold"><?php echo $hesklang['lgs']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
<label for="s_language" class="col-sm-3 control-label"><?php echo $hesklang['hesk_lang']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#9','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
@ -559,7 +559,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['db']; ?></h6>
<h6 class="bold"><?php echo $hesklang['db']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -594,7 +594,7 @@ if ( defined('HESK_DEMO') )
</div>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input type="button" class="btn btn-default" onclick="hesk_testMySQL()" value="<?php echo $hesklang['mysqltest']; ?>" style="margin-top:4px" />
<input type="button" class="btn btn-default move-down-4" onclick="hesk_testMySQL()" value="<?php echo $hesklang['mysqltest']; ?>" />
<!-- START MYSQL TEST -->
<div id="mysql_test" style="display:none">
</div>
@ -648,7 +648,7 @@ if ( defined('HESK_DEMO') )
<!-- Helpdesk Settings -->
<div class="tab-pane fade in" id="helpdesk">
<h6 style="font-weight: bold"><?php echo $hesklang['hd']; ?></h6>
<h6 class="bold"><?php echo $hesklang['hd']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -724,7 +724,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['features']; ?></h6>
<h6 class="bold"><?php echo $hesklang['features']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="row">
<div class="col-md-6">
@ -1021,7 +1021,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['sp']; ?></h6>
<h6 class="bold"><?php echo $hesklang['sp']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1125,7 +1125,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<br/>
<h6 style="font-weight: bold"><?php echo $hesklang['security']; ?></h6>
<h6 class="bold"><?php echo $hesklang['security']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1175,7 +1175,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<br/>
<h6 style="font-weight: bold"><?php echo $hesklang['attachments']; ?></h6>
<h6 class="bold"><?php echo $hesklang['attachments']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1267,7 +1267,7 @@ if ( defined('HESK_DEMO') )
</div>
<div class="tab-pane fade in" id="knowledgebase">
<h6 style="font-weight: bold"><?php echo $hesklang['kb_set']; ?></h6>
<h6 class="bold"><?php echo $hesklang['kb_set']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
<label for="s_kb_enable" class="col-sm-4 control-label"><?php echo $hesklang['s_ekb']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#22','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
@ -1485,7 +1485,7 @@ if ( defined('HESK_DEMO') )
<!-- Custom Fields Tab -->
<div class="tab-pane fade in" id="customFields">
<h6 style="font-weight: bold"><?php echo $hesklang['custom_use']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>custom.html#41','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
<h6 class="bold"><?php echo $hesklang['custom_use']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>custom.html#41','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
<div class="footerWithBorder blankSpace"></div>
@ -1572,7 +1572,7 @@ if ( defined('HESK_DEMO') )
<!-- Email Tab -->
<div class="tab-pane fade in" id="email">
<h6 style="font-weight: bold"><?php echo $hesklang['emlsend']; ?></h6>
<h6 class="bold"><?php echo $hesklang['emlsend']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1789,7 +1789,7 @@ if ( defined('HESK_DEMO') )
</div> <!-- END SMTP SETTINGS DIV -->
<h6 style="font-weight: bold"><?php echo $hesklang['emlpipe']; ?></h6>
<h6 class="bold"><?php echo $hesklang['emlpipe']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1805,7 +1805,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['pop3']; ?></h6>
<h6 class="bold"><?php echo $hesklang['pop3']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1897,7 +1897,7 @@ if ( defined('HESK_DEMO') )
</div>
<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">
<input type="button" class="btn btn-default" onclick="hesk_testPOP3()" value="<?php echo $hesklang['pop3test']; ?>" style="margin-top:4px" />
<input type="button" class="btn btn-default move-down-4" onclick="hesk_testPOP3()" value="<?php echo $hesklang['pop3test']; ?>" />
</div>
</div>
<table border="0" width="100%">
@ -1962,7 +1962,7 @@ if ( defined('HESK_DEMO') )
</div> <!-- END POP3 SETTINGS DIV -->
<h6 style="font-weight: bold"><?php echo $hesklang['loops']; ?></h6>
<h6 class="bold"><?php echo $hesklang['loops']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -1981,7 +1981,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['suge']; ?></h6>
<h6 class="bold"><?php echo $hesklang['suge']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -2025,7 +2025,7 @@ if ( defined('HESK_DEMO') )
</table>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['custnot']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#65','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
<h6 class="bold"><?php echo $hesklang['custnot']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#65','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
<label for="s_notify_new" class="col-sm-3 control-label"><?php echo $hesklang['notnew']; ?></label>
@ -2054,7 +2054,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['other']; ?></h6>
<h6 class="bold"><?php echo $hesklang['other']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -2090,7 +2090,7 @@ if ( defined('HESK_DEMO') )
{
?>
<label>
<i class="fa fa-ban" style="color: red; font-size: 1.2em; margin-left: -20px; font-weight: bold"
<i class="fa fa-ban bold" style="color: red; font-size: 1.2em; margin-left: -20px;"
data-toggle="popover"
title="<?php echo $hesklang['feature_disabled']; ?>"
data-content="<?php echo $hesklang['multi_eml_disabled']; ?>"></i> <?php echo $hesklang['meml2']; ?></label>
@ -2232,7 +2232,7 @@ if ( defined('HESK_DEMO') )
<!-- Miscellaneous Tab -->
<div class="tab-pane fade in" id="misc">
<h6 style="font-weight: bold"><?php echo $hesklang['dat']; ?></h6>
<h6 class="bold"><?php echo $hesklang['dat']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -2282,7 +2282,7 @@ if ( defined('HESK_DEMO') )
</div>
</div>
<h6 style="font-weight: bold"><?php echo $hesklang['other']; ?></h6>
<h6 class="bold"><?php echo $hesklang['other']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="form-group">
@ -2392,7 +2392,7 @@ if ( defined('HESK_DEMO') )
</div>
<!-- Mods For Hesk: Color settings -->
<div class="tab-pane fade in" id="colors">
<h6 style="font-weight: bold"><?php echo $hesklang['uiColors']; ?></h6>
<h6 class="bold"><?php echo $hesklang['uiColors']; ?></h6>
<div class="footerWithBorder blankSpace"></div>
<div class="row">
<div class="col-sm-6 col-xs-12">
@ -2714,7 +2714,7 @@ function hesk_cacheMfhLatestVersion($latest)
function hesk_testLanguage($return_options = 0)
{
global $hesk_settings, $hesklang;
global $hesk_settings, $hesklang, $modsForHesk_settings;
/* Get a list of valid emails */
include_once(HESK_PATH . 'inc/email_functions.inc.php');

2
admin/export.php

@ -705,7 +705,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading"><?php echo $hesklang['export']; ?></div>

2
admin/find_tickets.php

@ -70,7 +70,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<h4><?php echo $hesklang['tickets_found']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><?php echo $hesklang['nti']; ?></a></span></h4>
<h4><?php echo $hesklang['tickets_found']; ?> <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success"><?php echo $hesklang['nti']; ?></a></span></h4>
</div>
<?php

2
admin/mail.php

@ -135,7 +135,7 @@ function confirm_delete()
//-->
</script>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div class="col-md-3">
<div class="panel panel-default">
<div class="panel-heading"><?php echo $hesklang['navigation']; ?></div>

2
admin/manage_canned.php

@ -119,7 +119,7 @@ function hesk_insertAtCursor(myField, myValue) {
$j=0;
$num = hesk_dbNumRows($result);
?>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading"><?php echo $hesklang['savedResponses']; ?></div>

2
admin/manage_categories.php

@ -100,7 +100,7 @@ else {return false;}
$options .= '>'.$mycat['name'].'</option>';
}
?>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div align="left" class="col-md-4">
<ul class="nav nav-tabs">
<li class="active"><a href="#addCat" data-toggle="tab"><?php echo $hesklang['add_cat']; ?></a></li>

2
admin/manage_knowledgebase.php

@ -601,7 +601,7 @@ function list_draft() {
<?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus" style="color: green;font-size:16px"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
</div>
<h3 style="padding-bottom:5px;">&raquo; <?php echo $hesklang['artd']; ?></h3>
<h3 class="pad-up-5">&raquo; <?php echo $hesklang['artd']; ?></h3>
<div align="center">
<table border="0" width="100%" cellspacing="1" cellpadding="3" class="white">

2
admin/manage_permission_templates.php

@ -90,7 +90,7 @@ else {return false;}
array_push($categories, $row);
}
?>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div class="col-md-10 col-md-offset-1">
<h3><?php echo $hesklang['manage_permission_templates']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="tooltip" data-placement="right"

2
admin/manage_statuses.php

@ -96,7 +96,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="panel-heading">
<h4>
<?php echo $hesklang['statuses']; ?>
<span class="nu-floatRight" style="margin-top: -7px">
<span class="nu-floatRight panel-buton">
<button class="btn btn-success" data-toggle="modal" data-target="#modal-status-new">
<i class="fa fa-plus-circle"></i>
<?php

2
admin/manage_ticket_templates.php

@ -99,7 +99,7 @@ $i=1;
$j=0;
$num = hesk_dbNumRows($result);
?>
<div class="row" style="margin-top: 20px;">
<div class="row move-down-20">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">

2
admin/manage_users.php

@ -176,7 +176,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?>
<div style="margin-top: 20px" class="row">
<div class="row move-down-20">
<div class="col-md-10 col-md-offset-1">
<script language="Javascript" type="text/javascript"><!--
function confirm_delete()

2
admin/new_ticket.php

@ -149,7 +149,7 @@ if (!$show['show']) {
<li><a href="admin_main.php"><?php echo $hesk_settings['hesk_title']; ?></a></li>
<li class="active"><?php echo $hesklang['nti2']; ?></li>
</ol>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<?php if ($columnWidth == 'col-md-8'): ?>
<div class="col-md-4">
<div class="panel panel-default">

2
admin/reports.php

@ -231,7 +231,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?>
<div class="row" style="margin-top: 20px">
<div class="row move-down-20">
<div align="left" class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">

4
admin/show_tickets.php

@ -59,14 +59,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?>
<div class="row">
<div class="col-md-12" style="margin-top: 20px">
<div class="col-md-12 move-down-20">
<?php
/* This will handle error, success and notice messages */
hesk_handle_messages();
?>
<div class="panel panel-default">
<div class="panel-heading">
<h4><?php echo $hesklang['tickets']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> New ticket</a></span></h4>
<h4><?php echo $hesklang['tickets']; ?> <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> New ticket</a></span></h4>
</div>
<?php
/* Print the list of tickets */

26
css/hesk_newStyle.css

@ -163,7 +163,7 @@
.ticketPropertyText:hover {
white-space: normal;
overflow: none;
overflow: visible;
}
}
@ -347,4 +347,28 @@ button.dropdown-submit {
.pad-down-20 {
padding-top: 20px;
}
.pad-right-10 {
padding-left: 10px;
}
.pad-up-5 {
padding-down: 5px;
}
.panel-button {
margin-top: -7px;
}
.bold {
font-weight: bold;
}
.move-down-20 {
margin-top: 20px;
}
.move-down-4 {
margin-top: 4px;
}

18
css/hesk_newStyleRTL.css

@ -165,7 +165,7 @@
.ticketPropertyText:hover {
white-space: normal;
overflow: none;
overflow: visible;
}
}
.ticketPropertyText {
@ -341,4 +341,20 @@ button.dropdown-submit {
.pad-down-20 {
padding-top: 20px;
}
.pad-right-10 {
padding-right: 10px;
}
.panel-button {
margin-top: -7px;
}
.bold {
font-weight: bold;
}
.move-down-20 {
margin-top: 20px;
}
Loading…
Cancel
Save