Skip to content

Commit

Permalink
Fixed a bug where Configuration Tabs are not displayed correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@dengenxp
dengenxp committed Jan 2, 2017
1 parent 7f0b1ac commit 5a0f87f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 200 deletions.
192 changes: 0 additions & 192 deletions public_html/layout/modern_curve/jquery_ui/jquery-ui.geeklog.css
View file
Expand Up @@ -115,195 +115,3 @@
.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
.ui-timepicker-rtl dl dt{ float: right; clear: right; }
.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }

/* modify for Denim */
.ui-timepicker-div dl { margin: 0; }
.ui-timepicker-div dt { font-weight: normal; margin: 0; }
.ui-timepicker-rtl dl { margin: 0; }
.ui-timepicker-rtl dt { font-weight: normal; margin: 0; }


/*
* Customize for Geeklog Denim Theme
*
*/

/* Component containers
----------------------------------*/

.ui-widget-header {
border: 1px solid #cccccc;
}

/* Interaction states
----------------------------------*/

.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid #dddddd;
font-weight: normal;
color: #555555;
}
.ui-state-default a,
.ui-state-default a:link,
.ui-state-default a:visited {
color: #555555;
}
.ui-state-hover,
.ui-widget-content .ui-state-hover,
.ui-widget-header .ui-state-hover,
.ui-state-focus,
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
border: 1px solid #dddddd;
font-weight: normal;
color: #555555;
}
.ui-state-hover a,
.ui-state-hover a:hover {
color: #555555;
}
.ui-state-active,
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #dddddd;
font-weight: normal;
color: #111111;
}
.ui-state-active a,
.ui-state-active a:link,
.ui-state-active a:visited {
color: #111111;
}

.ui-widget :active {
outline: none;
}

/* Tabs
----------------------------------*/

.ui-tabs {
margin-bottom: 0;
}

/* Datepicker
----------------------------------*/

.ui-datepicker {
font-size: 1em;
}
.ui-datepicker th {
background: none;
padding: .6em .3em;
}
.ui-datepicker-trigger {
vertical-align: middle;
}

/* Autocomplete
----------------------------------*/

.ui-autocomplete {
background: #FFF;
border: 1px solid #DDD;
}

/* Configuration UI
----------------------------------*/

#geeklog_config_editor .ui-widget-content {
border: none;
background: none;
}
#geeklog_config_editor .ui-widget-header {
background: none;
border: none;
border-bottom: 1px solid #DDD;
}
#geeklog_config_editor .ui-tabs .ui-tabs-panel {
background: none;
border: none;
padding: 1em 0 0;
}
#geeklog_config_editor #tabs-dropdown .ui-widget-content {
background: #FCFDFD;
border: 1px solid #A6C9E2;
}
#geeklog_config_editor #tabs-dropdown {
background: #FFF;
border: 1px solid #DDD;
}
#geeklog_config_editor .ui-state-default,
#geeklog_config_editor .ui-widget-content .ui-state-default,
#geeklog_config_editor .ui-widget-header .ui-state-default {
background: #F5F5F5;
}
#geeklog_config_editor .ui-state-hover,
#geeklog_config_editor .ui-widget-content .ui-state-hover,
#geeklog_config_editor .ui-widget-header .ui-state-hover,
#geeklog_config_editor .ui-state-focus,
#geeklog_config_editor .ui-widget-content .ui-state-focus,
#geeklog_config_editor .ui-widget-header .ui-state-focus {
background: #F5F5F5;
}
#geeklog_config_editor .ui-state-active,
#geeklog_config_editor .ui-widget-content .ui-state-active,
#geeklog_config_editor .ui-widget-header .ui-state-active {
background: #FFF;
}

/* Selected Conf Row */
.active-config {
background: #EEE;
border-radius: 4px 4px 4px 4px;
}

/* Tooltip Balloon */
#tooltip-container {
border:2px solid #83B3D8;
}
#tooltip-close {
position: absolute;
top: 1px;
right: 1px;
z-index: 20010;
display: block;
border:2px solid #83B3D8;
border-radius: 4px 4px 4px 4px;
background: #fff;
width: 25px;
height: 25px;
line-height: 25px;
font-weight: bold;
text-align: center;
vertical-align: middle;
text-decoration: none;
}
#tooltip-close:link,
#tooltip-close:hover {
text-decoration: none;
}

/* Validation */
.saved_message {
margin-top: 5px;
}

/*
* Support for Right-To-Left Languages
*
*/
body[dir="rtl"] .ui-tabs .ui-tabs-nav li {
float: right;
}
body[dir="rtl"] .ui-tabs .ui-tabs-nav li a {
float: right;
}
body[dir="rtl"] #tooltip-close {
top: 1px;
right: auto;
left: 1px;
}

16 changes: 8 additions & 8 deletions system/classes/scripts.class.php
View file
Expand Up @@ -126,10 +126,10 @@ private function findJavaScriptLibraries()
$this->jquery_ui_cdn_file = 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $version_jQuery_ui . '/jquery-ui.min.js';

// Set jQuery UI CSS
$this->setCSSFilePrivate('jquery-ui', $theme_path . '/jquery_ui/jquery-ui.min.css', false);
$this->setCSSFilePrivate('jquery-ui.structure', $theme_path . '/jquery_ui/jquery-ui.structure.min.css', false);
$this->setCSSFilePrivate('jquery-ui.theme', $theme_path . '/jquery_ui/jquery-ui.theme.min.css', false);
$this->setCSSFilePrivate('jquery-ui.geeklog', $theme_path . '/jquery_ui/jquery-ui.geeklog.css', false);
$this->setCSSFilePrivate('jquery-ui', $theme_path . '/jquery_ui/jquery-ui.min.css', 0.1, false);
$this->setCSSFilePrivate('jquery-ui.structure', $theme_path . '/jquery_ui/jquery-ui.structure.min.css', 0.2, false);
$this->setCSSFilePrivate('jquery-ui.theme', $theme_path . '/jquery_ui/jquery-ui.theme.min.css', 0.3, false);
$this->setCSSFilePrivate('jquery-ui.geeklog', $theme_path . '/jquery_ui/jquery-ui.geeklog.css', 0.4, false);

// Set jQuery UI
$names[] = 'jquery-ui';
Expand Down Expand Up @@ -180,13 +180,12 @@ public function setJavaScriptLibrary($name, $footer = true)
// Check that file exists, if not use Google version
if (!file_exists($_CONF['path_html'] . $this->library_files[$name]['file'])) {
$this->jquery_ui_cdn = true;

$this->css_files['jquery-ui.theme']['load'] = true;
$this->css_files['jquery-ui']['load'] = false;
} else {
$this->css_files['jquery-ui']['load'] = true;
}
$this->css_files['jquery-ui.structure']['load'] = true;
$this->css_files['jquery-ui.theme']['load'] = true;

// Geeklog specific css overrides for jQuery (includes timepicker-addon css)
$this->css_files['jquery-ui.geeklog']['load'] = true;
Expand Down Expand Up @@ -332,10 +331,11 @@ public function setJavaScriptFile($name, $file, $footer = true, $priority = 100)
*
* @param string $name name of CSS file
* @param string $file location of file relative to public_html directory. Include '/' at beginning
* @param int $priority In what order the script should be loaded in
* @param boolean $load set to true to load script right away. Should only be loaded when related script is loaded
* @return boolean
*/
private function setCSSFilePrivate($name, $file, $load = true)
private function setCSSFilePrivate($name, $file, $priority = 100, $load = true)
{
global $_CONF;

Expand All @@ -357,7 +357,7 @@ private function setCSSFilePrivate($name, $file, $load = true)

$this->css_files[$name]['file'] = $file;
$this->css_files[$name]['extra'] = '';
$this->css_files[$name]['priority'] = 100; // Default is 100
$this->css_files[$name]['priority'] = $priority; // Default is 100
$this->css_files[$name]['constant'] = false;
$this->css_files[$name]['load'] = $load;

Expand Down

0 comments on commit 5a0f87f

Please sign in to comment.