From: <se...@us...> - 2010-01-29 17:16:55
|
Revision: 24746 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24746&view=rev Author: sept_7 Date: 2010-01-29 17:16:46 +0000 (Fri, 29 Jan 2010) Log Message: ----------- [FIX] Better solution for CSS minifying pb than 24743 and 24740 so rollback the two... It now work for me... Modified Paths: -------------- trunk/lib/headerlib.php trunk/styles/coelesce.css trunk/styles/darkroom.css trunk/styles/empty.css trunk/styles/feb12.css trunk/styles/strasa.css trunk/styles/thenews.css trunk/styles/tikinewt.css trunk/tiki-setup.php Modified: trunk/lib/headerlib.php =================================================================== --- trunk/lib/headerlib.php 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/lib/headerlib.php 2010-01-29 17:16:46 UTC (rev 24746) @@ -420,7 +420,6 @@ $pre = ''; foreach( $parts[1] as $f ) { - $f = substr( $f, strlen($tikiroot) ); $pre .= $this->minify_css( $f ); } @@ -431,11 +430,24 @@ } private function minify_css( $file ) { - $content = file_get_contents( $file ); + global $tikipath, $tikiroot; + if (strpos($file, $tikiroot) === 0) { + $currentdir = dirname( $file ); + $content = file_get_contents( str_replace( $tikiroot, $tikipath, $file)) ; + } else { + if ( $file[0] == '/' ) { + $file = $tikipath.$file; + } + $currentdir = addslashes(str_replace($tikipath, $tikiroot, dirname(realpath( $file )))); + $content = file_get_contents( $file ); + } return Minify_CSS::minify( $content, array( - 'currentDir' => dirname( $file ), + 'currentDir' => $currentdir, + 'prependRelativePath', $currentdir, + 'docRoot' => '/', 'bubbleCssImports' => true, +// 'symlinks' => array ('/styles', $tikiroot.'/styles'), ) ); } Modified: trunk/styles/coelesce.css =================================================================== --- trunk/styles/coelesce.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/coelesce.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -3,6 +3,15 @@ * original design by Patrick Allard. Distributed under the LGPL license. */ +/* Import *lite as the base: */ +@import url("lite/lite.css"); + +/* Then import the default layout properties file: */ +@import url("layout/layout.css"); + +/* And design defaults: */ +@import url("layout/design.css"); + /***** XHTML Elements ******/ body { text-align: left; Modified: trunk/styles/darkroom.css =================================================================== --- trunk/styles/darkroom.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/darkroom.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -5,6 +5,15 @@ * For more information on Darkroom, please visit http://themes.tikiwiki.org. */ + /* import *lite as the base: */ +@import url("lite/lite.css"); + +/* Then import the default layout properties file: */ +@import url("layout/layout.css"); + +/* And design defaults: */ +@import url("layout/design.css"); + /***** XHTML Elements ******/ html { Modified: trunk/styles/empty.css =================================================================== --- trunk/styles/empty.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/empty.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -2,3 +2,12 @@ (imports lite.css and layout.css and does nothing else) +/* Import layout foundation CSS file. */ +@import url("lite/lite.css"); + +/* Then import the default layout properties file: */ + @import url("layout/layout.css"); + + /* Import design defaults. */ +@import url("layout/design.css)"; + Modified: trunk/styles/feb12.css =================================================================== --- trunk/styles/feb12.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/feb12.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -1,6 +1,15 @@ /* Feb12 theme for TikiWiki CMS/Groupware, released under LGPL license. * See http://themes.tikwiki.org for more information. -- */ +/* import *lite as the base: */ +@import url("lite/lite.css"); + +/* Then import the default layout properties file: */ +@import url("layout/layout.css"); + +/* And design defaults: */ +@import url("layout/design.css"); + /* XHTML Elements */ body { font: normal 75%/1.5em 'Trebuchet MS', sans-serif; Modified: trunk/styles/strasa.css =================================================================== --- trunk/styles/strasa.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/strasa.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -3,6 +3,15 @@ $Id$ */ +/* import *lite as the base: */ +@import url("lite/lite.css"); + +/* Then import the default layout properties file: */ +@import url("layout/layout.css"); + +/* And design defaults: */ +@import url("layout/design.css"); + /***** XHTML Elements ******/ html { display: block; Modified: trunk/styles/thenews.css =================================================================== --- trunk/styles/thenews.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/thenews.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -4,6 +4,15 @@ * For more information, please visit http://themes.tikiwiki.org or http://zukakakina.com. * Released under LPGL license. */ +/* Import *lite as the base: */ +@import url("lite/lite.css"); + +/* Then import the default layout properties file: */ +@import url("layout/layout.css"); + +/* And design defaults: */ +@import url("layout/design.css"); + /***** XHTML Elements ******/ body { background: white; Modified: trunk/styles/tikinewt.css =================================================================== --- trunk/styles/tikinewt.css 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/styles/tikinewt.css 2010-01-29 17:16:46 UTC (rev 24746) @@ -8,7 +8,15 @@ Galleries; Trackers; Categories, Tags; Polls; FAQs; Quizzes; Shoutbox; Directory; Messages; TikiSheets; Calendar; Admin; and Ajax, jquery, etc. */ +/* Import layout foundation CSS file. */ +@import url("lite/lite.css"); +/* Then import the default layout properties file: */ +@import url("layout/layout.css"); + +/* And design defaults: */ +@import url("layout/design.css"); + /***** XHTML Elements (body tag here, others follow Layout) *****/ body { Modified: trunk/tiki-setup.php =================================================================== --- trunk/tiki-setup.php 2010-01-29 17:07:46 UTC (rev 24745) +++ trunk/tiki-setup.php 2010-01-29 17:16:46 UTC (rev 24746) @@ -132,10 +132,6 @@ $smarty->assign( 'display_msg', '' ); } -$headerlib->add_cssfile( 'styles/lite/lite.css' ); -$headerlib->add_cssfile( 'styles/layout/layout.css' ); -$headerlib->add_cssfile( 'styles/layout/design.css' ); - $headerlib->add_jsfile( 'lib/tiki-js.js' ); // tiki-js.js gets included even if javascript_enabled==n for the js test if( $prefs['feature_cssmenus'] == 'y' ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |