[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46944] trunk

[<jon...@us...>]

Revision: 46944
          http://sourceforge.net/p/tikiwiki/code/46944
Author:   jonnybradley
Date:     2013-07-31 18:36:10 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
[ENH] logo module: Expose the div id's (sitelogo and sitetitles) to parameters and change them to be classes.
CSS and DOM changes to come next.

Modified Paths:
--------------
    trunk/modules/mod-func-logo.php
    trunk/templates/modules/mod-logo.tpl

Modified: trunk/modules/mod-func-logo.php
===================================================================
--- trunk/modules/mod-func-logo.php	2013-07-31 17:51:38 UTC (rev 46943)
+++ trunk/modules/mod-func-logo.php	2013-07-31 18:36:10 UTC (rev 46944)
@@ -56,6 +56,16 @@
 				'description' => tra('Smaller text to go under the Logo Title. Defaults to sitesubtitle preference.'),
 				'filter' => 'text',
 			),
+			'class_image' => array(
+				'name' => tra('Logo Class'),
+				'description' => tra('CSS class for the image container div. Defaults to sitelogo.'),
+				'filter' => 'text',
+			),
+			'class_titles' => array(
+				'name' => tra('Title Class'),
+				'description' => tra('CSS class title text container div. Defaults to sitetitles.'),
+				'filter' => 'text',
+			),
 		),
 	);
 }
@@ -75,6 +85,7 @@
 		'alt_attr'     => $prefs['sitelogo_alt'],
 		'link'         => './',
 		'sitetitle'    => $prefs['sitetitle'],
-		'sitesubtitle' => $prefs['sitesubtitle'],
+		'class_image'  => 'sitelogo',
+		'class_titles' => 'sitetitles',
 	), $module_params);
 }

Modified: trunk/templates/modules/mod-logo.tpl
===================================================================
--- trunk/templates/modules/mod-logo.tpl	2013-07-31 17:51:38 UTC (rev 46943)
+++ trunk/templates/modules/mod-logo.tpl	2013-07-31 18:36:10 UTC (rev 46944)
@@ -1,7 +1,7 @@
 {* $Id$ *}
 {strip}
 	{tikimodule error=$module_params.error title=$tpl_module_title name="logo" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
-		<div id="sitelogo"{if $module_params.bgcolor ne ''} style="background-color: {$module_params.bgcolor};" {/if} class="floatleft">
+		<div {if $module_params.bgcolor ne ''} style="background-color: {$module_params.bgcolor};" {/if} class="floatleft {$module_params.class_image|escape}">
 			{if $module_params.src}
 				<a href="{$module_params.link}" title="{$module_params.title_attr|escape}"{if $prefs.mobile_mode eq "y"} rel="external"{/if}>
 					<img src="{$module_params.src}" alt="{$module_params.alt_attr|escape}" style="border: none">
@@ -9,15 +9,15 @@
 			{/if}
 		</div>
 		{if !empty($module_params.sitetitle) or !empty($module_params.sitetitle)}
-			<div id="sitetitles" class="floatleft">
-				<div id="sitetitle">
+			<div class="floatleft  {$module_params.class_titles|escape}">
+				<div class="sitetitle">
 					{if !empty($module_params.sitetitle)}
 						<a href="{$module_params.link}"{if $prefs.mobile_mode eq "y"} rel="external"{/if}>
 							{$module_params.sitetitle|escape}
 						</a>
 					{/if}
 				</div>
-				<div id="sitesubtitle">{if !empty($module_params.sitesubtitle)}{$module_params.sitesubtitle|escape}{/if}</div>
+				<div class="sitesubtitle">{if !empty($module_params.sitesubtitle)}{$module_params.sitesubtitle|escape}{/if}</div>
 			</div>
 		{/if}
 	{/tikimodule}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.