In-Portal Issue Tracker

Welcome to the In-Portal Open Source CMS Issue Tracker! This is a central management / tracking tool for all types of tasks / issues / bugs for the In-Portal Project. Before reporting any issues, please make sure to read the Guide into Issue Tracker and How to Properly Test and Report Bugs!

Viewing Issue Simple Details [ Jump to Notes ] [ Wiki ]

[ View Advanced ] [ Issue History ] [ Print ]

Tags

No tags attached.

Reference

http://groups.google.com/group/in-portal-bugs/browse_thread/thread/944f63d710fa85dc

Change Log Message

Removed deprecated "theme_StylesheetFile" tag

Estimate Points

Attached Files

remove_theme_based_stylesheets.patch [^] (4,530 bytes) 2010-03-02 08:44 [Show Content]

Index: themes_tag_processor.php
===================================================================
--- themes_tag_processor.php	(revision 13152)
+++ themes_tag_processor.php	(working copy)
@@ -18,52 +18,10 @@
 	{
 		function StylesheetFile($params)
 		{
-			$object =& $this->getObject($params);
-			if (!$object->GetDBField('StyleName')) {
-				// no stylesheet is associated with current theme
-				return '';
-			}
+			// not using theme-based stylesheets anymore
+			trigger_error('Tag "StylesheetFile" is depricated and should not be used.', E_USER_NOTICE);
 
-			$css_url = $this->Application->BaseURL(WRITEBALE_BASE . '/stylesheets');
-			$css_path = rtrim( str_replace( $this->Application->BaseURL(), FULL_PATH . '/', $css_url), '/' );
-
-			$last_compiled = $object->GetDBField('LastCompiled');
-
-			$style_name = mb_strtolower( $object->GetDBField('StyleName') );
-
-			if( file_exists($css_path.'/'.$style_name.'-'.$last_compiled.'.css') )
-			{
-				$ret = rtrim($css_url, '/').'/'.$style_name.'-'.$last_compiled.'.css';
-
-			}
-			else
-			{
-				// search for previously compiled stylesheet
-				$last_compiled = 0;
-				if( $dh = opendir($css_path) )
-				{
-					while( ($file = readdir($dh)) !== false )
-					{
-						if( preg_match('/(.*)-([\d]+).css/', $file, $rets) )
-						{
-							if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
-						}
-					}
-					closedir($dh);
-				}
-				if ($last_compiled) {
-					// found
-					$ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
-				}
-				else {
-					// not found
-					return '';
-				}
-			}
-
-			if (isset($params['file_only'])) return $ret;
-
-			return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
+			return '';
 		}
 
 		function SelectedTheme($params)
Index: themes_config.php
===================================================================
--- themes_config.php	(revision 13159)
+++ themes_config.php	(working copy)
@@ -107,27 +107,14 @@
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
 
-					'ListSQLs' => Array ('' => '	SELECT %1$s.* %2$s
-													FROM %s
-													LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId	= %1$s.StylesheetId'),
+					'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %s'),
 
-					'ItemSQLs' => Array ( '' => '	SELECT %1$s.* %2$s
-													FROM %s
-													LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId	= %1$s.StylesheetId'),
-
 					'ListSortings' => Array (
 						'' => Array(
 							'Sorting' => Array('Name' => 'asc'),
 						)
 					),
 
-					'CalculatedFields' => Array (
-						'' => Array (
-								'StyleName' => 'st.Name',
-								'LastCompiled' => 'st.LastCompiled',
-							),
-					),
-
 					'Fields' => Array(
 										'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										'Name' => Array('type' => 'string','not_null' => 1, 'required' => 1, 'default' => ''),
@@ -135,7 +122,7 @@
 										'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
 										'PrimaryTheme' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 										'CacheTimeout' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-										'StylesheetId' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+										'StylesheetId' => Array('type' => 'int', /*'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name',*/ 'not_null' => 1, 'default' => 0),
 										'LanguagePackInstalled' => Array (
 											'type' => 'int',
 											'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
@@ -144,11 +131,6 @@
 										'TemplateAliases' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => 'a:0:{}'),
 								),
 
-					'VirtualFields' => Array (
-						'StyleName' => Array ('type' => 'string', 'default' => ''),
-						'LastCompiled' => Array ('type' => 'int', 'default' => null),
-					),
-
 					'Grids'	=> Array(
 						'Default' => Array(
 							'Icons' => Array (

remove_theme_based_stylesheets_v2.patch [^] (4,911 bytes) 2010-04-06 04:04 [Show Content]

Index: units/themes/themes_config.php
===================================================================
--- units/themes/themes_config.php	(revision 13329)
+++ units/themes/themes_config.php	(working copy)
@@ -106,27 +106,14 @@
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
 
-					'ListSQLs' => Array ('' => '	SELECT %1$s.* %2$s
-													FROM %s
-													LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId	= %1$s.StylesheetId'),
+					'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %s'),
 
-					'ItemSQLs' => Array ( '' => '	SELECT %1$s.* %2$s
-													FROM %s
-													LEFT JOIN '.TABLE_PREFIX.'Stylesheets st ON st.StylesheetId	= %1$s.StylesheetId'),
-
 					'ListSortings' => Array (
 						'' => Array(
 							'Sorting' => Array('Name' => 'asc'),
 						)
 					),
 
-					'CalculatedFields' => Array (
-						'' => Array (
-								'StyleName' => 'st.Name',
-								'LastCompiled' => 'st.LastCompiled',
-							),
-					),
-
 					'Fields' => Array(
 										'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										'Name' => Array('type' => 'string','not_null' => 1, 'required' => 1, 'default' => ''),
@@ -134,7 +121,7 @@
 											'type' => 'int',
 											'formatter' => 'kOptionsFormatter',
 											'options' => Array (0 => 'la_Disabled', 1 => 'la_Enabled'),
-											'use_phrases' => 1, 'not_null' => 1, 'default' => 1, 
+											'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 										),
 										'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
 										'PrimaryTheme' => Array (
@@ -142,9 +129,9 @@
 											'formatter' => 'kOptionsFormatter',
 											'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
 											'not_null' => 1, 'default' => 0,
-										),										
+										),
 										'CacheTimeout' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-										'StylesheetId' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+										'StylesheetId' => Array('type' => 'int', /*'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Stylesheets', 'option_key_field' => 'StylesheetId', 'option_title_field' => 'Name',*/ 'not_null' => 1, 'default' => 0),
 										'LanguagePackInstalled' => Array (
 											'type' => 'int',
 											'formatter' => 'kOptionsFormatter',
@@ -154,11 +141,6 @@
 										'TemplateAliases' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => 'a:0:{}'),
 								),
 
-					'VirtualFields' => Array (
-						'StyleName' => Array ('type' => 'string', 'default' => ''),
-						'LastCompiled' => Array ('type' => 'int', 'default' => null),
-					),
-
 					'Grids'	=> Array(
 						'Default' => Array(
 							'Icons' => Array (
Index: units/themes/themes_tag_processor.php
===================================================================
--- units/themes/themes_tag_processor.php	(revision 13329)
+++ units/themes/themes_tag_processor.php	(working copy)
@@ -18,52 +18,10 @@
 	{
 		function StylesheetFile($params)
 		{
-			$object =& $this->getObject($params);
-			if (!$object->GetDBField('StyleName')) {
-				// no stylesheet is associated with current theme
-				return '';
-			}
+			// not using theme-based stylesheets anymore
+			trigger_error('Tag "StylesheetFile" is depricated and should not be used.', E_USER_NOTICE);
 
-			$css_url = $this->Application->BaseURL(WRITEBALE_BASE . '/stylesheets');
-			$css_path = rtrim( str_replace( $this->Application->BaseURL(), FULL_PATH . '/', $css_url), '/' );
-
-			$last_compiled = $object->GetDBField('LastCompiled');
-
-			$style_name = mb_strtolower( $object->GetDBField('StyleName') );
-
-			if( file_exists($css_path.'/'.$style_name.'-'.$last_compiled.'.css') )
-			{
-				$ret = rtrim($css_url, '/').'/'.$style_name.'-'.$last_compiled.'.css';
-
-			}
-			else
-			{
-				// search for previously compiled stylesheet
-				$last_compiled = 0;
-				if( $dh = opendir($css_path) )
-				{
-					while( ($file = readdir($dh)) !== false )
-					{
-						if( preg_match('/(.*)-([\d]+).css/', $file, $rets) )
-						{
-							if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
-						}
-					}
-					closedir($dh);
-				}
-				if ($last_compiled) {
-					// found
-					$ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
-				}
-				else {
-					// not found
-					return '';
-				}
-			}
-
-			if (isset($params['file_only'])) return $ret;
-
-			return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
+			return '';
 		}
 
 		function SelectedTheme($params)

Relationships [ Relation Graph ] [ Dependency Graph ]

parent of	0000688	closed (1.0.1)	Dmitry	Advanced	Check and Remove "StylesheetFile" tag in all Themes
parent of	0000689	closed (1.0.0)	Dmitry	Electronics	Check and Remove "StylesheetFile" tag in all Themes
parent of	0000691	closed (1.0.1)	Dmitry	Onlinestore	Check and Remove "StylesheetFile" tag in all Themes

Notes
(0001791) Dmitry (manager) 2010-04-04 23:14	Patch can't be applied to the latest 5.0.x branch - issues with theme_config.php Please update and re-attach.

(0001814) alex (manager) 2010-04-06 04:04	Patch "remove_theme_based_stylesheets_v2.patch" contains re-created version, that could be applied to 5.0.3 release.

(0001836) Dmitry (manager) 2010-04-09 00:50	Tested Good!

(0001855) Dmitry (manager) 2010-04-11 21:34	Reminder sent to: alex What if we move this to 5.0.3? I want to update theme too so they all up to date. Let me know.

(0001862) alex (manager) 2010-04-12 01:40	Reminder sent to: Dmitry Yes, we can do that.

(0001892) Dmitry (manager) 2010-04-16 18:05	Reminder sent to: alex Please commit into 5.0.3

(0001895) alex (manager) 2010-04-21 13:08	Fix committed to 5.0.x branch. Commit Message: Fixes 0000590: Remove deprecated "theme_StylesheetFile" tag

(0002085) alex (manager) 2010-05-11 02:59	Closing all tasks from released versions.

Related Changesets
In-Portal CMS: 5.0.x r13385 Timestamp: 2010-04-21 13:08:12 Author: alex [ Details ] [ Diff ]	Fixes 0000590: Remove deprecated "theme_StylesheetFile" tag
	mod - /in-portal/branches/5.0.x/core/units/themes/themes_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/themes/themes_tag_processor.php	[ Diff ] [ File ]

Issue History
Date Modified	Username	Field	Change
2010-05-11 02:59	alex	Note Added: 0002085
2010-05-11 02:59	alex	Status	resolved => closed
2010-04-21 13:08	alex	Note Added: 0001895
2010-04-21 13:08	alex	Status	reviewed and tested => resolved
2010-04-21 13:08	alex	Fixed in Version	=> 5.0.3-B2
2010-04-21 13:08	alex	Resolution	open => fixed
2010-04-21 13:08	alex	Assigned To	!COMMUNITY => alex
2010-04-21 13:08	alex	Changeset attached	5.0.x r13385
2010-04-18 12:04	Dmitry	Change Log Message	=> Removed deprecated "theme_StylesheetFile" tag
2010-04-16 18:05	Dmitry	Note Added: 0001892
2010-04-16 18:04	Dmitry	Target Version	5.0.4 => 5.0.3
2010-04-12 01:40	alex	Issue Monitored: Dmitry
2010-04-12 01:40	alex	Note Added: 0001862
2010-04-11 21:34	Dmitry	Note Added: 0001855
2010-04-09 01:18	Dmitry	Relationship added	parent of 0000691
2010-04-09 01:14	Dmitry	Relationship added	parent of 0000689
2010-04-09 01:12	Dmitry	Relationship added	parent of 0000688
2010-04-09 00:50	Dmitry	Note Added: 0001836
2010-04-09 00:50	Dmitry	Status	needs testing => reviewed and tested
2010-04-06 04:04	alex	Note Added: 0001814
2010-04-06 04:04	alex	Assigned To	alex => !COMMUNITY
2010-04-06 04:04	alex	Status	needs work => needs testing
2010-04-06 04:04	alex	File Added: remove_theme_based_stylesheets_v2.patch
2010-04-04 23:14	Dmitry	Note Added: 0001791
2010-04-04 23:14	Dmitry	Assigned To	!COMMUNITY => alex
2010-04-04 23:14	Dmitry	Status	needs testing => needs work
2010-03-02 08:46	alex	Assigned To	=> !COMMUNITY
2010-03-02 08:46	alex	Developer	=> alex
2010-03-02 08:46	alex	Status	active => needs testing
2010-03-02 08:45	alex	Reference	http://groups.google.com/group/in-portal-bugs/browse_thread/thread/944f63d710fa85dc[/ur; => [url]http://groups.google.com/group/in-portal-bugs/browse_thread/thread/944f63d710fa85dc
2010-03-02 08:45	alex	Reference	=> [url]http://groups.google.com/group/in-portal-bugs/browse_thread/thread/944f63d710fa85dc[/ur;
2010-03-02 08:45	alex	Target Version	=> 5.0.4
2010-03-02 08:44	alex	New Issue
2010-03-02 08:44	alex	File Added: remove_theme_based_stylesheets.patch

Web Development by Intechnic

In-Portal Open Source CMS