D3Public/GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

optical changes for mobile theme use (#2998)

Browse Source
This commit is contained in:
Daniel Seifert 2014-10-20 11:39:32 +00:00
parent 5fb9ab1402
commit cff6d31ce6
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -45,6 +45,7 @@ copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalyti
copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics.php -text copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics.php -text
copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php -text copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php -text
copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css -text copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css -text
copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css -text
copy_this/modules/d3/d3_googleanalytics/picture.png -text copy_this/modules/d3/d3_googleanalytics/picture.png -text
copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php -text copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php -text
copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php -text copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php -text

3
changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
View File

@ -8,4 +8,7 @@
Because of this reason, it can't included in d3modcfgcheck block. *}] Because of this reason, it can't included in d3modcfgcheck block. *}]
[{include file=$sD3GATTpl}] [{include file=$sD3GATTpl}]
[{oxstyle include=$oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics.css')}] [{oxstyle include=$oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics.css')}]
[{if $blD3GAIsMobile}]
[{oxstyle include=$oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics_mobile.css')}]
[{/if}]
[{/if}] [{/if}]

4
copy_this/modules/d3/d3_googleanalytics/metadata.php
View File

@ -34,8 +34,8 @@ $aModule = array(
'de' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'. 'de' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'.
'Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die '. 'Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die '.
'Besucherdaten und eCommerce-Daten zu Google übertragen. Ebenfalls übermittelt werden Daten '. 'Besucherdaten und eCommerce-Daten zu Google übertragen. Ebenfalls übermittelt werden Daten '.
'der Website-Suche. Weiterhin können über das Modul Shopdaten an Google Adwords und Google Trusted '. 'der Website-Suche. Weiterhin können über das Modul Shopdaten an Google Adwords und Google '.
'Shops übertragen werden.', 'Trusted Shops übertragen werden.',
'en' => 'Provides a quick and easy integration with your Google Analytics, Google Adwords and Google '. 'en' => 'Provides a quick and easy integration with your Google Analytics, Google Adwords and Google '.
'Trusted Shops account to your shop.', 'Trusted Shops account to your shop.',
), ),

11
copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
View File

@ -52,6 +52,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
$oParentView->addTplParam('sAFEGetMoreUrls', $this->afGetMoreUrls()); $oParentView->addTplParam('sAFEGetMoreUrls', $this->afGetMoreUrls());
$oParentView->addTplParam('sD3GASendPageViewParameter', $this->d3getSendPageViewParameters()); $oParentView->addTplParam('sD3GASendPageViewParameter', $this->d3getSendPageViewParameters());
$oParentView->addTplParam('sD3CurrentShopUrl', $this->d3GetCreateCurrentShopUrl()); $oParentView->addTplParam('sD3CurrentShopUrl', $this->d3GetCreateCurrentShopUrl());
$oParentView->addTplParam('blD3GAIsMobile', $this->d3isMobile());
if ($oSet->getValue('sD3GATSActive') && $oSet->getValue('sD3GATSShoppingActive')) { if ($oSet->getValue('sD3GATSActive') && $oSet->getValue('sD3GATSShoppingActive')) {
$aInfos = $this->d3GATSGetProdInfos(); $aInfos = $this->d3GATSGetProdInfos();
@ -524,4 +525,14 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
return $aParameter; return $aParameter;
} }
/**
* @return bool
*/
public function d3isMobile()
{
/** @var oeThemeSwitcherThemeManager $oThemeManager */
$oThemeManager = oxNew('oeThemeSwitcherThemeManager');
return $oThemeManager->isMobileThemeRequested();
}
} }

3
copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css Normal file
View File

@ -0,0 +1,3 @@
#d3GAOptOut {
font-size : 14px;
}