#14 - Favicons

install/sql/v70.sql

@@ -3214,7 +3214,7 @@ CREATE TABLE IF NOT EXISTS `sys_transcoder_images_filters` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 INSERT INTO `sys_transcoder_images_filters` (`transcoder_object`, `filter`, `filter_params`, `order`) VALUES 
-('sys_icon_apple', 'Resize', 'a:4:{s:1:"w";s:3:"129";s:1:"h";s:3:"129";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"png";}', '0'),
+('sys_icon_apple', 'Resize', 'a:4:{s:1:"w";s:3:"152";s:1:"h";s:3:"152";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"png";}', '0'),
 ('sys_icon_facebook', 'Resize', 'a:4:{s:1:"w";s:3:"100";s:1:"h";s:3:"100";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"png";}', '0'),
 ('sys_icon_favicon', 'Resize', 'a:4:{s:1:"w";s:2:"16";s:1:"h";s:2:"16";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"png";}', '0'),
 ('sys_cmts_images_preview', 'Resize', 'a:4:{s:1:"w";s:3:"100";s:1:"h";s:3:"100";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0');

modules/boonex/english/data/langs/system.xml

@@ -1721,7 +1721,7 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
 	<string name="_adm_dsg_txt_alt_text"><![CDATA[Logo Text]]></string>
 	<string name="_adm_dsg_dsc_alt_text"><![CDATA[Serves as "ALT" text for logo image. Used as a logo when no logo image is uploaded.]]></string>
 	<string name="_adm_btn_designer_submit"><![CDATA[Submit]]></string>
-	<string name="_adm_dsg_txt_icon_apple"><![CDATA[Apple Touch Devices (129x129)]]></string>
+	<string name="_adm_dsg_txt_icon_apple"><![CDATA[Apple Touch Devices (152x152)]]></string>
 	<string name="_adm_dsg_txt_icon_facebook"><![CDATA[Facebook Share (100x100)]]></string>
 	<string name="_adm_dsg_txt_icon_favicon"><![CDATA[Favicon (16x16)]]></string>
 	<string name="_adm_dsg_txt_upload_icon"><![CDATA[Upload New Site Icon]]></string>

studio/classes/BxDolStudioTemplate.php

@@ -89,21 +89,29 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton {
             case 'page_charset':
                 $sRet = 'UTF-8';
                 break;
+            case 'page_robots':
+                if(!empty($this->aPage['robots']) && is_string($this->aPage['robots']))
+                    $sRet = '<meta name="robots" content="' . bx_html_attribute($this->aPage['robots']) . '" />';
+                break;
             case 'page_keywords':
                 if(!empty($this->aPage['keywords']) && is_array($this->aPage['keywords']))
                     $sRet = '<meta name="keywords" content="' . bx_html_attribute(implode(',', $this->aPage['keywords'])) . '" />';
                 break;
-            case 'page_description':
+			case 'page_description':
                 if(!empty($this->aPage['description']) && is_string($this->aPage['description']))
                     $sRet = '<meta name="description" content="' . bx_html_attribute($this->aPage['description']) . '" />';
                 break;
-             case 'page_header':
+            case 'page_header':
                 if(isset($this->aPage['header']))
                     $sRet = bx_process_output($this->aPage['header']);
                 break;
             case 'page_header_text':
                 if(isset($this->aPage['header_text']))
                     $sRet = bx_process_output($this->aPage['header_text']);
+                break;
+			case 'page_icons':
+                bx_import('BxTemplFunctions');
+                $sRet = BxTemplFunctions::getInstance()->getMetaIcons();
                 break;
             case 'page_breadcrumb':
             	$sRet = $this->getPageBreadcrumb();

studio/template/_header.html

@@ -4,6 +4,11 @@
         <meta http-equiv="Content-Type" content="text/html; charset=__page_charset__" />
         <title>__page_header__</title>
 
+		__page_description__
+	    __page_keywords__
+	    __page_robots__
+	    __page_icons__
+
         <bx_include_css />
 
         __dol_images__

template/_header.html

@@ -11,14 +11,6 @@
     __page_icons__
 
     <meta http-equiv="Content-Style-Type" content="text/css" />
-	<link rel="shortcut icon" href="<bx_icon_url:favicon.ico />" type="image/x-icon" />
-	<link rel="apple-touch-icon" href="<bx_icon_url:apple-touch-icon.png />" />
-	<link rel="apple-touch-icon" sizes="57x57" href="<bx_icon_url:apple-touch-icon-57x57.png />" />
-	<link rel="apple-touch-icon" sizes="72x72" href="<bx_icon_url:apple-touch-icon-72x72.png />" />
-	<link rel="apple-touch-icon" sizes="114x114" href="<bx_icon_url:apple-touch-icon-114x114.png />" />
-	<link rel="apple-touch-icon" sizes="120x120" href="<bx_icon_url:apple-touch-icon-120x120.png />" />
-	<link rel="apple-touch-icon" sizes="144x144" href="<bx_icon_url:apple-touch-icon-144x144.png />" />
-	<link rel="apple-touch-icon" sizes="152x152" href="<bx_icon_url:apple-touch-icon-152x152.png />" />    
     <style>
         .bx-def-page-width {
             width:__main_div_width__;

template/scripts/BxBaseFunctions.php

@@ -624,32 +624,40 @@ EOF;
      * Get HTML code for meta icons.
      * @return HTML string to insert into HEAD section
      */
-    function getMetaIcons() {
+    function getMetaIcons()
+    {
+    	$iId = (int)getParam('sys_site_icon');
+    	$sImageUrlFav = $sImageUrlFcb = $sImageUrlApl = '';
 
-        if (!($iId = (int)getParam('sys_site_icon')))
-            return '';
+        if(!empty($iId)) {
+        	bx_import('BxDolImageTranscoder');
+
+        	// favicon icon
+	        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_FAVICON);
+	        $sImageUrlFav = $oTranscoder->getImageUrl($iId);
+
+	        // facebook icon
+	        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_FACEBOOK);
+	        $sImageUrlFcb = $oTranscoder->getImageUrl($iId);
 
-        bx_import('BxDolImageTranscoder');
+	        //apple touch icon
+	        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_APPLE);
+	        $sImageUrlApl = $oTranscoder->getImageUrl($iId);
+        }
 
-        $sRet = '';
+        if(empty($sImageUrlFav))
+        	$sImageUrlFav = $this->_oTemplate->getIconUrl('favicon.png');
         
-        // favicon icon
-        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_FAVICON);
-        $sImageUrl = $oTranscoder->getImageUrl($iId);
-        if ($sImageUrl)
-            $sRet .= '<link rel="icon" type="image/png" href="' . $sImageUrl . '" />';
-
-        // apple icon
-        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_APPLE);
-        $sImageUrl = $oTranscoder->getImageUrl($iId);
-        if ($sImageUrl)
-            $sRet .= '<link rel="apple-touch-icon" href="' . $sImageUrl . '" />';
-
-        // facebook icon
-        $oTranscoder = BxDolImageTranscoder::getObjectInstance(BX_DOL_TRANSCODER_OBJ_ICON_FACEBOOK);
-        $sImageUrl = $oTranscoder->getImageUrl($iId);
-        if ($sImageUrl)
-            $sRet .= '<link rel="image_src" href="' . $sImageUrl . '" />';
+		if(empty($sImageUrlFcb))
+			$sImageUrlFcb = $this->_oTemplate->getIconUrl('facebook-icon.png');
+
+		if(empty($sImageUrlApl))
+			$sImageUrlApl = $this->_oTemplate->getIconUrl('apple-touch-icon.png');
+
+		$sRet = '';
+		$sRet .= '<link rel="icon" sizes="16x16" type="image/png" href="' . $sImageUrlFav . '" />';
+		$sRet .= '<link rel="image_src" sizes="100x100" href="' . $sImageUrlFcb . '" />';
+		$sRet .= '<link rel="apple-touch-icon" sizes="152x152" href="' . $sImageUrlApl . '" />';
 
         return $sRet;
     }