Fix ThemeMagic color transparent filter

Add tooltip for Compile Less and ThemeMagic toolbar button
t3framework · Jan 31, 2013 · 4300bb6 · 4300bb6
1 parent c69f048
commit 4300bb6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/source/plg_system_t3/admin/thememagic/js/thememagic.js b/source/plg_system_t3/admin/thememagic/js/thememagic.js
@@ -387,7 +387,7 @@ var T3Theme = window.T3Theme || {};
 		},
 
 		filtercolor: function(hex){
-			if(hex.charAt(0) === '@' || hex.toLowerCase() == 'inherit' || T3Theme.colors[hex.toLowerCase()]){
+			if(hex.charAt(0) === '@' || hex.toLowerCase() == 'inherit' || hex.toLowerCase() == 'transparent' || T3Theme.colors[hex.toLowerCase()]){
 				return hex;
 			}
 

diff --git a/source/plg_system_t3/admin/thememagic/thememagic.tpl.php b/source/plg_system_t3/admin/thememagic/thememagic.tpl.php
@@ -28,9 +28,9 @@
 		<script type="text/javascript" src="<?php echo T3_ADMIN_URL; ?>/admin/bootstrap/js/bootstrap.js"></script>
 	</head>
 
-	<body<?php echo $tplparams->get('themermode', 0) == 0 ? ' class="no-magic"' : ''?>>
+	<body<?php echo $tplparams->get('themermode', 1) == 0 ? ' class="no-magic"' : ''?>>
 		<div id="wrapper">
-			<?php if($tplparams->get('themermode', 0)): ?>
+			<?php if($tplparams->get('themermode', 1)): ?>
 			<div id="t3-admin-thememagic">
 				<a href="<?php echo JURI::base(true); ?>" class="themer-minimize"><i class="icon-remove-sign"></i><i class="icon-magic"></i>  <span><?php echo JText::_('T3_TM_MINIMIZE') ; ?></span></a>
 				<a href="<?php echo $backurl; ?>" class="themer-close" title="<?php echo JText::_($isadmin ? 'T3_TM_BACK_TO_ADMIN' : 'T3_TM_EXIT'); ?>"><i class="icon-arrow-left"></i><?php echo JText::_($isadmin ? 'T3_TM_BACK_TO_ADMIN' : 'T3_TM_EXIT'); ?></a>
@@ -162,7 +162,7 @@
 
 		</div>
 
-		<?php if($tplparams->get('themermode', 0)): ?>
+		<?php if($tplparams->get('themermode', 1)): ?>
 		<div id="t3-admin-thememagic-dlg" class="modal hide fade">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

diff --git a/source/plg_system_t3/admin/tpls/toolbar.php b/source/plg_system_t3/admin/tpls/toolbar.php
@@ -35,11 +35,11 @@
   ?>
 
 	<div id="t3-admin-tb-recompile" class="btn-group">
-		<button class="btn"><i class="icon-check"></i><i class="icon-loading"></i><?php echo JText::_('T3_TOOLBAR_COMPILE_LESS_CSS') ?></button>
+		<button class="btn hasTip" title="<?php echo JText::_('T3_TOOLBAR_COMPILE_LESS_CSS') ?>::<?php echo JText::_('T3_TOOLBAR_COMPILE_LESS_CSS_DESC') ?>"><i class="icon-check"></i><i class="icon-loading"></i><?php echo JText::_('T3_TOOLBAR_COMPILE_LESS_CSS') ?></button>
 	</div>
 
 	<div id="t3-admin-tb-themer" class="btn-group">
-		<button class="btn"><i class="icon-magic"></i><?php echo JText::_('T3_TOOLBAR_THEMER') ?></button>
+		<button class="btn hasTip" title="<?php echo JText::_('T3_TOOLBAR_THEMER') ?>::<?php echo JText::_('T3_TOOLBAR_THEMER_DESC') ?>"><i class="icon-magic"></i><?php echo JText::_('T3_TOOLBAR_THEMER') ?></button>
 	</div>
 
 	<div id="t3-admin-tb-close" class="btn-group <?php echo $input->getCmd('view') ?>">

diff --git a/source/plg_system_t3/includes/admin/theme.php b/source/plg_system_t3/includes/admin/theme.php
@@ -282,7 +282,7 @@ public static function addAssets(){
 		$japp = JFactory::getApplication();
 		$jdoc = JFactory::getDocument();
 		$params = $japp->getTemplate(true)->params;
-		if(defined('T3_THEMER') && $params->get('themermode', 0)){
+		if(defined('T3_THEMER') && $params->get('themermode', 1)){
 
 			$jdoc->addStyleSheet(T3_URL.'/css/thememagic.css');
 			$jdoc->addScript(T3_URL.'/js/thememagic.js');

diff --git a/source/plg_system_t3/includes/core/admin.php b/source/plg_system_t3/includes/core/admin.php
@@ -206,7 +206,7 @@ public function addAssets(){
 			T3Admin.template = \'' . T3_TEMPLATE . '\';
 			T3Admin.langs = ' . json_encode($langs) . ';
 			T3Admin.devmode = ' . $params->get('devmode', 0) . ';
-			T3Admin.themermode = ' . $params->get('themermode', 0) . ';
+			T3Admin.themermode = ' . $params->get('themermode', 1) . ';
 			T3Admin.eids = [' . implode($eids, ',') .'];
 			T3Admin.telement = \'' . T3_TEMPLATE . '\';
 			T3Admin.felement = \'' . T3_ADMIN . '\';

diff --git a/source/plg_system_t3/languages/en-GB.plg_system_t3.ini b/source/plg_system_t3/languages/en-GB.plg_system_t3.ini
@@ -339,12 +339,14 @@ T3_TOUR_QUICK_HELP			="Click here to get more help"
 
 
 /* MISC */
-T3_TOOLBAR_SAVECLOSE			="Save &amp; Close"
-T3_TOOLBAR_SAVE_AS_CLONE		="Save as Copy"
-T3_TOOLBAR_COMPILE_LESS_CSS		="Compile LESS to CSS"
-T3_TOOLBAR_THEMER				="ThemeMagic"
-T3_TOOLBAR_CLOSE 				="Close"
-T3_TOOLBAR_HELP					="Help"
+T3_TOOLBAR_SAVECLOSE				="Save &amp; Close"
+T3_TOOLBAR_SAVE_AS_CLONE			="Save as Copy"
+T3_TOOLBAR_COMPILE_LESS_CSS			="Compile LESS to CSS"
+T3_TOOLBAR_COMPILE_LESS_CSS_DESC	="Compile LESS to CSS"
+T3_TOOLBAR_THEMER					="ThemeMagic"
+T3_TOOLBAR_THEMER_DESC				="ThemeMagic"
+T3_TOOLBAR_CLOSE 					="Close"
+T3_TOOLBAR_HELP						="Help"
 
 T3_SELECT_STYLE_LABEL			="Current Style"
 T3_SELECT_STYLE_DESC			="Select the a style from the same template"