theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.

Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
This commit is contained in:
Friendika
2011-02-06 15:50:50 -08:00
parent 8e988341d0
commit 147d7f3bbf
23 changed files with 107 additions and 26 deletions

View File

@@ -238,21 +238,10 @@ if($a->module != 'install')
require_once('nav.php');
/**
*
* Build the page - now that we have all the components
* Make sure the desired theme exists, though if the default theme doesn't exist we're stuffed.
*
*/
$default_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : 'default');
if((x($_SESSION,'theme')) && (! file_exists('view/theme/' . $_SESSION['theme'] . '/style.css')))
unset($_SESSION['theme']);
$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
'$stylesheet' => $a->get_baseurl() . '/view/theme/'
. ((x($_SESSION,'theme')) ? $_SESSION['theme'] : $default_theme)
. '/style.css'
));
$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url()));
$page = $a->page;
$profile = $a->profile;