diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php index ceefa793fd25e2c550a7be4ea31773061b24e9f6..632716ca1c9703ad252f94750ba85d7d20d53b1d 100644 --- a/include/staff/helptopics.inc.php +++ b/include/staff/helptopics.inc.php @@ -19,7 +19,8 @@ $order_by = 'sort'; </div> <div class="pull-right flush-right"> <?php if ($cfg->getTopicSortMode() != 'a') { ?> - <input class="button no-confirm" type="submit" name="sort" value="Save" /> + <button class="button no-confirm" type="submit" name="sort"><i class="icon-save"></i> + <?php echo __('Save'); ?></button> <?php } ?> <a href="helptopics.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Help Topic');?></a> <span class="action-button" data-dropdown="#action-dropdown-more"> @@ -57,18 +58,20 @@ $order_by = 'sort'; <input type="hidden" id="action" name="a" value="sort" > <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> - <!-- <div class="pull-right"><?php //echo __('Sorting Mode'); ?>: + <thead> +<tr><td colspan="7"> + <div style="padding:3px" class="pull-right"><?php echo __('Sorting Mode'); ?>: <select name="help_topic_sort_mode" onchange="javascript: var $form = $(this).closest('form'); $form.find('input[name=a]').val('sort'); $form.submit(); "> -<?php// foreach (OsticketConfig::allTopicSortModes() as $i=>$m) - //echo sprintf('<option value="%s"%s>%s</option>', - // $i, $i == $cfg->getTopicSortMode() ? ' selected="selected"' : '', $m); ?> +<?php foreach (OsticketConfig::allTopicSortModes() as $i=>$m) + echo sprintf('<option value="%s"%s>%s</option>', + $i, $i == $cfg->getTopicSortMode() ? ' selected="selected"' : '', $m); ?> </select> - </div>--> - <thead> + </div> +</td></tr> <tr> <th width="4%" style="height:20px;"> </th> <th style="padding-left:4px;vertical-align:middle" width="36%"><?php echo __('Help Topic'); ?></th> @@ -124,7 +127,7 @@ $order_by = 'sort'; <td> <?php if ($cfg->getTopicSortMode() == 'm') { ?> - <i class="icon-sort"></i> + <i class="icon-sort faded"></i> <?php } ?> <a href="helptopics.php?id=<?php echo $id; ?>"><?php echo Topic::getTopicName($id); ?></a> diff --git a/include/staff/profile.inc.php b/include/staff/profile.inc.php index d11c0f4c67f94f90465d0f50f5a31a136701234d..a41e31304dc72a3ecbc732e7dba3e9bb59bb02f6 100644 --- a/include/staff/profile.inc.php +++ b/include/staff/profile.inc.php @@ -314,7 +314,8 @@ if ($avatar->isChangeable()) { ?> <p style="text-align:center;"> <button class="button action-button" type="submit" name="submit" ><i class="icon-save"></i> <?php echo __('Save Changes'); ?></button> - <button class="button action-button" type="reset" name="reset"><?php echo __('Reset');?></button> + <button class="button action-button" type="reset" name="reset"><i class="icon-undo"></i> + <?php echo __('Reset');?></button> <button class="red button action-button" type="button" name="cancel" onclick="window.history.go(-1);"><i class="icon-remove-circle"></i> <?php echo __('Cancel');?></button> </p> <div class="clear"></div> diff --git a/scp/dashboard.php b/scp/dashboard.php index d5a5b60b563ef7c385d16f2aac93f0f7c40c4bbc..3bece49a338f21326711f13d84e941e603fa7e1e 100644 --- a/scp/dashboard.php +++ b/scp/dashboard.php @@ -35,9 +35,9 @@ if ($_POST['export']) { Http::download("stats-$group-$ts.csv", 'text/csv'); $output = fopen('php://output', 'w'); fputs($output, chr(0xEF) . chr(0xBB) . chr(0xBF)); - fputcsv($output, $data['columns'], $delimeter); + fputcsv($output, $data['columns'], $delimiter); foreach ($data['data'] as $row) - fputcsv($output, $row, $delimeter); + fputcsv($output, $row, $delimiter); exit; } }