Skip to content

Commit

Permalink
Fixed issue: Page Header and TopBar: Settings - Global
Browse files Browse the repository at this point in the history
- Added green bar
- Added shadow under top bar
- Adjusted save button little bit down.
  • Loading branch information
thedirtypanda committed Jun 10, 2021
1 parent af18181 commit 1a97145
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
7 changes: 7 additions & 0 deletions application/controllers/admin/globalsettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function __construct($controller, $id)
*
* @access public
* @return void
* @throws CHttpException
*/
public function index()
{
Expand All @@ -65,6 +66,9 @@ public function refreshAssets()
}
}

/**
* @throws CHttpException
*/
private function _displaySettings()
{
if (!Permission::model()->hasGlobalPermission('settings', 'read')) {
Expand All @@ -81,6 +85,7 @@ private function _displaySettings()
$datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s', dateShift(getGlobalSetting("updatelastcheck"), 'Y-m-d H:i:s', getGlobalSetting('timeadjust')));
$data['updatelastcheck'] = $datetimeobj->format($dateformatdetails['phpdate'] . " H:i:s");

// @todo getGlobalSetting is deprecated!
$data['updateavailable'] = (getGlobalSetting("updateavailable") && Yii::app()->getConfig("updatable"));
$data['updatable'] = Yii::app()->getConfig("updatable");
$data['updateinfo'] = getGlobalSetting("updateinfo");
Expand Down Expand Up @@ -117,6 +122,8 @@ private function _displaySettings()
$data['sideMenuBehaviour'] = getGlobalSetting('sideMenuBehaviour');
$data['aListOfThemeObjects'] = AdminTheme::getAdminThemeList();

$data['pageTitle'] = "Global settings";

$this->_renderWrappedTemplate('globalsettings', 'globalSettings_view', $data);
}

Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/super/fullpagebar_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<!-- Save -->
<?php if(isset($fullpagebar['savebutton']['form'])):?>
<a class="btn btn-success" href="#" role="button" id="save-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>">
<a class="btn btn-success" href="#" role="button" id="save-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>" style="margin-top: 10px;">
<span class="fa fa-floppy-o"></span>
<?php eT("Save");?>
</a>
Expand Down
1 change: 0 additions & 1 deletion modules/admin/globalsettings/views/globalSettings_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
</script>

<div class="container-fluid welcome full-page-wrapper">
<div class="pagetitle h3"><?php eT("Global settings"); ?></div>

<ul class="nav nav-tabs" id="settingTabs">
<li role="presentation" class="active"><a role="tab" data-toggle="tab" href='#overview'><?php eT("Overview"); ?></a></li>
Expand Down

0 comments on commit 1a97145

Please sign in to comment.