Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -41,6 +41,7 @@ class Datetime
|
||||
{
|
||||
$return = array();
|
||||
$return['pre'] = '$val = ( ' . $data . ' instanceof \IPS\DateTime ) ? ' . $data . ' : \IPS\DateTime::ts( ' . $data . ' );';
|
||||
$useTitle = isset( $options['notitle'] ) ? "useTitle: false" : "useTitle: true";
|
||||
|
||||
if( isset( $options['dateonly'] ) )
|
||||
{
|
||||
@@ -52,15 +53,15 @@ class Datetime
|
||||
}
|
||||
elseif ( isset( $options['lowercase'] ) )
|
||||
{
|
||||
$return['return'] = '$val->html(FALSE)';
|
||||
$return['return'] = '$val->html(FALSE, ' . $useTitle . ')';
|
||||
}
|
||||
elseif ( isset( $options['short'] ) )
|
||||
{
|
||||
$return['return'] = '$val->html(TRUE, TRUE)';
|
||||
$return['return'] = '$val->html(TRUE, TRUE, ' . $useTitle . ')';
|
||||
}
|
||||
else
|
||||
{
|
||||
$return['return'] = '$val->html()';
|
||||
$return['return'] = '$val->html(' . $useTitle . ')';
|
||||
}
|
||||
|
||||
return $return;
|
||||
|
||||
@@ -64,6 +64,9 @@ class Theme
|
||||
case 'custom_css_for_output':
|
||||
return "\IPS\Theme::i()->getCustomCssForOutput()";
|
||||
|
||||
case 'custom_css_for_theme_editor_codebox':
|
||||
return "\IPS\Theme::i()->getCustomCssForThemeEditorCodebox()";
|
||||
|
||||
case 'custom_css':
|
||||
return "\IPS\Theme::i()->custom_css";
|
||||
|
||||
@@ -92,7 +95,14 @@ class Theme
|
||||
return "\IPS\Theme::i()->getLayoutValue('{$variable}')";
|
||||
}
|
||||
|
||||
return ( array_key_exists( $data, SystemTheme::i()->settings ) ) ? "\IPS\Theme::i()->settings['{$data}']" : '';
|
||||
/* If we are still here, this is legacy syntax; treat it as a variable */
|
||||
$cssVariables = SystemTheme::i()->getCssVariables();
|
||||
if( array_key_exists( $data, $cssVariables ) )
|
||||
{
|
||||
return "\IPS\Theme::i()->getParsedCssVariableFromKey( '{$data}' )";
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
catch( InvalidArgumentException $e )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user