From: <mar...@us...> - 2010-04-06 22:21:07
|
Revision: 26499 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26499&view=rev Author: marclaporte Date: 2010-04-06 22:20:49 +0000 (Tue, 06 Apr 2010) Log Message: ----------- [MOD] Now that Beta1 is out, we are now moving to new default theme fivealive.css which is part of the new branding strategy. Details at branding.tikiwiki.org Please help tweak/improve/fix this theme. Modified Paths: -------------- branches/5.x/installer/tiki-installer.php branches/5.x/lib/setup/prefs.php branches/5.x/templates/database-connection-error.tpl branches/5.x/tiki-install.php Modified: branches/5.x/installer/tiki-installer.php =================================================================== --- branches/5.x/installer/tiki-installer.php 2010-04-06 21:01:14 UTC (rev 26498) +++ branches/5.x/installer/tiki-installer.php 2010-04-06 22:20:49 UTC (rev 26499) @@ -460,7 +460,7 @@ $smarty->load_filter('pre', 'tr'); $smarty->load_filter('output', 'trimwhitespace'); $smarty->assign('mid', 'tiki-install.tpl'); -$smarty->assign('style', 'strasa.css'); +$smarty->assign('style', 'fivealive.css'); $smarty->assign('virt', isset($virt) ? $virt : null ); $smarty->assign('multi', isset($multi) ? $multi : null ); $smarty->assign('lang', $language); @@ -857,8 +857,7 @@ include "lib/headerlib.php"; -$headerlib->add_cssfile('styles/strasa.css'); -$headerlib->add_cssfile('styles/strasa/options/fixed_width.css'); +$headerlib->add_cssfile('styles/fivealive.css'); $smarty->assign_by_ref('headerlib',$headerlib); Modified: branches/5.x/lib/setup/prefs.php =================================================================== --- branches/5.x/lib/setup/prefs.php 2010-04-06 21:01:14 UTC (rev 26498) +++ branches/5.x/lib/setup/prefs.php 2010-04-06 22:20:49 UTC (rev 26499) @@ -1236,8 +1236,7 @@ 'slide_style' => 'slidestyle.css', 'site_favicon' => 'favicon.png', 'site_favicon_type' => 'image/png', - 'style' => 'strasa.css', - 'style_option' => 'fixed_width.css', + 'style' => 'fivealive.css', 'use_context_menu_icon' => 'y', 'use_context_menu_text' => 'y', 'feature_site_report' => 'n', Modified: branches/5.x/templates/database-connection-error.tpl =================================================================== --- branches/5.x/templates/database-connection-error.tpl 2010-04-06 21:01:14 UTC (rev 26498) +++ branches/5.x/templates/database-connection-error.tpl 2010-04-06 22:20:49 UTC (rev 26499) @@ -5,8 +5,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title>{tr}System error.{/tr}</title> - <link rel="stylesheet" href="styles/strasa.css" type="text/css"/> - <link rel="stylesheet" href="styles/strasa/options/fixed_width.css" type="text/css"/> + <link rel="stylesheet" href="styles/fivealive.css" type="text/css"/> <style type="text/css" media="screen"> html {ldelim} background-color: #fff; Modified: branches/5.x/tiki-install.php =================================================================== --- branches/5.x/tiki-install.php 2010-04-06 21:01:14 UTC (rev 26498) +++ branches/5.x/tiki-install.php 2010-04-06 22:20:49 UTC (rev 26499) @@ -109,8 +109,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link type="text/css" rel="stylesheet" href="styles/strasa.css" /> - <link type="text/css" rel="stylesheet" href="styles/strasa/options/fixed_width.css" /> + <link type="text/css" rel="stylesheet" href="styles/fivealive.css" /> <style type="text/css" media="screen"> html { background-color: #fff; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |