Merge pull request #1412 from annando/1502-vier-plus-default
"plus" is now the default style at "vier" for new installations
This commit is contained in:
commit
eb1f21d1e5
|
@ -14,6 +14,9 @@ function theme_content(&$a){
|
||||||
if ($style == "")
|
if ($style == "")
|
||||||
$style = get_config('vier', 'style');
|
$style = get_config('vier', 'style');
|
||||||
|
|
||||||
|
if ($style == "")
|
||||||
|
$style = "plus";
|
||||||
|
|
||||||
return vier_form($a,$style);
|
return vier_form($a,$style);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,12 +44,12 @@ function theme_admin_post(&$a){
|
||||||
|
|
||||||
function vier_form(&$a, $style){
|
function vier_form(&$a, $style){
|
||||||
$styles = array(
|
$styles = array(
|
||||||
"shadow"=>"Shadow",
|
|
||||||
"flat"=>"Flat",
|
|
||||||
"netcolour"=>"Coloured Networks",
|
|
||||||
"breathe"=>"Breathe",
|
|
||||||
"plus"=>"Plus",
|
"plus"=>"Plus",
|
||||||
"dark"=>"Dark"
|
"breathe"=>"Breathe",
|
||||||
|
"dark"=>"Dark",
|
||||||
|
"shadow"=>"Shadow",
|
||||||
|
"netcolour"=>"Coloured Networks",
|
||||||
|
"flat"=>"Flat"
|
||||||
);
|
);
|
||||||
$t = get_markup_template("theme_settings.tpl" );
|
$t = get_markup_template("theme_settings.tpl" );
|
||||||
$o .= replace_macros($t, array(
|
$o .= replace_macros($t, array(
|
||||||
|
|
|
@ -21,6 +21,9 @@ $style = get_pconfig(local_user(), 'vier', 'style');
|
||||||
if ($style == "")
|
if ($style == "")
|
||||||
$style = get_config('vier', 'style');
|
$style = get_config('vier', 'style');
|
||||||
|
|
||||||
|
if ($style == "")
|
||||||
|
$style = "plus";
|
||||||
|
|
||||||
if ($style == "flat")
|
if ($style == "flat")
|
||||||
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
|
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
|
||||||
else if ($style == "netcolour")
|
else if ($style == "netcolour")
|
||||||
|
|
Loading…
Reference in a new issue