Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@micker
micker committed Dec 6, 2023
1 parent c84d856 commit ed9897f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 54 deletions.
12 changes: 9 additions & 3 deletions media/css/admin-style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ button.iconpicker {
background: #fff !important;

}
body .form-grid .control-group .controls > div, body .form-grid .control-group .controls {
flex-basis: initial !important;
display: initial !important;
body .form-grid .control-group .controls > div {
display: initial;
flex-basis: 100%;
}
body .form-grid .control-group .controls {
display: initial;
}
body .form-grid .control-group .control-label {
width: 100% !important;
}
body .popover.iconpicker-popover.bottom.in {
color: #000 !important;
Expand Down
61 changes: 10 additions & 51 deletions tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@
$user = $app->getIdentity();
$userId = $user->id;

//HTMLHelper::_('stylesheet', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
HTMLHelper::_('stylesheet', 'media/mod_flexiadmin/css/style.css');
HTMLHelper::_('stylesheet', 'media/mod_flexiadmin/css/bootstrap-iconpicker.css');
HTMLHelper::_('stylesheet', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css');

//HTMLHelper::_('stylesheet', 'media/mod_flexiadmin/css/style.css');
//HTMLHelper::_('stylesheet', 'media/mod_flexiadmin/css/font-awesome.min.css');
$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
$wa->registerStyle('mod_dashboard.style', 'media/mod_flexiadmin/css/style.css');
$wa->registerStyle('mod_dashboard.style2', 'media/mod_flexiadmin/css/font-awesome.min.css');
$wa->useStyle('mod_dashboard.style');
$wa->useStyle('mod_dashboard.style2');

$force_fullwidth = $params->get('force_fullwidth', '1');

Expand Down Expand Up @@ -202,7 +206,7 @@ class="align-items-center">
$icon = !empty($free_button->iconbutton) ? $free_button->iconbutton : 'fa-edit';
$style = !empty($free_button->coloricon) ? 'style="color: ' . $free_button->coloricon . '"' : '';
?>
<i class="fa <?php echo $icon . ' ' . $iconsize; ?>" <?php echo $style; ?>></i>
<i class="<?php echo $icon . ' ' . $iconsize; ?>" <?php echo $style; ?>></i>
</div>
<div class="quickicon-name d-flex align-items-center">
<?php echo Text::_($free_button->button_name); ?>
Expand Down Expand Up @@ -551,51 +555,6 @@ class="align-items-center">
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

<?php if ($displayfreetab) : ?>

<?php $list_freebuttons = $params->get('free_button'); ?>
<?php if ($list_freebuttons) : ?>

<?php foreach ($list_freebuttons as $list_freebuttons_idx => $free_buttons) : ?>
<?php $tabname = strtolower(preg_replace('/[^a-zA-Z0-9-_\.]/', '', $free_buttons->freenametab)); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', $tabname, Text::_($free_buttons->freenametab)); ?>

<div class="row">
<div class="col-lg-12">
<nav class="quick-icons dashboard" aria-label="Quick links creation">
<ul class="flex-wrap">

<?php foreach ($free_buttons->free_button as $free_button_idx => $free_button) : ?>
<li class="quickicon quickicon-single col <?php echo $free_button->displayline ? 'newlinegrid' : ''; ?>">
<a href="<?php echo $free_button->linkbutton; ?>"
target="<?php echo $free_button->targetlink; ?>">
<div class="quickicon-icon d-flex align-items-end big">
<?php
$icon = !empty($free_button->iconbutton) ? $free_button->iconbutton : 'fa-edit';
$style = !empty($free_button->coloricon) ? 'color: ' . $free_button->coloricon . ';' : '';
?>
<i class="fas <?php echo $icon . ' ' . $iconsize; ?>"
style="<?php echo $style; ?>"
></i>
</div>
<div class="quickicon-name d-flex align-items-center">
<?php echo Text::_($free_button->freebutton); ?>
</div>
</a>
</li>
<?php endforeach; ?>

<?php echo !empty($edit_item_button->displayline) ? 'newlinegrid' : ''; ?>
</ul>
</nav>
</div>
</div>

<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endforeach; ?>

<?php endif; ?>
<?php endif; ?>

<?php if ($displayanalytics && $analytics_url) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'create', Text::_($analytics_tab_name)); ?>
Expand Down Expand Up @@ -651,7 +610,7 @@ class="align-items-center">
<div class="card-header">
<?php $style = !empty($customBlock->icon_color) ? 'color: ' . $customBlock->icon_color : ''; ?>
<h3 class="module-title">
<i class="fa <?php echo $customBlock->icon ?>" style="<?php echo $style; ?>"></i>
<i class="<?php echo $customBlock->icon ?>" style="<?php echo $style; ?>"></i>
<?php echo Text::_($customBlock->block_title); ?> :
</h3>
<div class="module-actions">
Expand Down

0 comments on commit ed9897f

Please sign in to comment.