diff --git a/.gitattributes b/.gitattributes index f25c604..63a7566 100644 --- a/.gitattributes +++ b/.gitattributes @@ -176,6 +176,8 @@ copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php -text +copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php -text +copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php -text copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text copy_this/modules/d3/d3_googleanalytics/menu.xml -text copy_this/modules/d3/d3_googleanalytics/metadata.php -text diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php new file mode 100644 index 0000000..d644e3d --- /dev/null +++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php @@ -0,0 +1,33 @@ + + * @link http://www.oxidmodule.com + */ +class d3_cfg_googleanalyticslog extends d3_cfg_log +{ + protected $_sModId = 'd3_googleanalytics'; + + /** + * @return string + */ + public function d3getAdditionalUrlParams() + { + $sRet = parent::d3getAdditionalUrlParams(); + + if ($this->_sModId) { + $sRet .= '&sD3ModId='.$this->_sModId; + } + + return $sRet; + } +} diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php new file mode 100644 index 0000000..2200f3c --- /dev/null +++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php @@ -0,0 +1,19 @@ + + * @link http://www.oxidmodule.com + */ +class d3_cfg_googleanalyticslog_list extends d3_cfg_log_list +{ + protected $_sModId = 'd3_googleanalytics'; +} diff --git a/copy_this/modules/d3/d3_googleanalytics/menu.xml b/copy_this/modules/d3/d3_googleanalytics/menu.xml index 153d854..63beba9 100644 --- a/copy_this/modules/d3/d3_googleanalytics/menu.xml +++ b/copy_this/modules/d3/d3_googleanalytics/menu.xml @@ -8,6 +8,9 @@ + + + \ No newline at end of file diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php index db50007..520cfaa 100644 --- a/copy_this/modules/d3/d3_googleanalytics/metadata.php +++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php @@ -52,7 +52,7 @@ $aModule = array( ), 'files' => array( 'd3_cfg_googleanalytics' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php', - 'd3_cfg_googleanalytics_adwords' => + 'd3_cfg_googleanalytics_adwords' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php', 'd3_cfg_googleanalytics_campaigns' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php', @@ -60,29 +60,32 @@ $aModule = array( 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php', 'd3_cfg_googleanalytics_list' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php', 'd3_cfg_googleanalytics_main' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php', + 'd3_cfg_googleanalyticslog' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php', + 'd3_cfg_googleanalyticslog_list' => + 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php', 'd3_googleanalytics_update' => 'd3/d3_googleanalytics/setup/d3_googleanalytics_update.php', ), 'templates' => array( - 'd3_googleanalytics.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl', - 'd3ga_universal.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl', - 'd3ga_universal_custom.tpl' => + 'd3_googleanalytics.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl', + 'd3ga_universal.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl', + 'd3ga_universal_custom.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl', - 'd3ga_universal_ecommerce.tpl' => + 'd3ga_universal_ecommerce.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl', - 'd3ga_universal_adwords.tpl' => + 'd3ga_universal_adwords.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl', - 'd3ga_universal_adwordscode.tpl' => + 'd3ga_universal_adwordscode.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl', - 'd3ga_universal_remarketing.tpl' => + 'd3ga_universal_remarketing.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl', - 'd3ga_universal_campaigncode.tpl' => + 'd3ga_universal_campaigncode.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl', - 'd3_cfg_googleanalytics_main.tpl' => + 'd3_cfg_googleanalytics_main.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl', - 'd3_cfg_googleanalytics_adwords.tpl' => + 'd3_cfg_googleanalytics_adwords.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl', - 'd3_cfg_googleanalytics_campaigns.tpl' => + 'd3_cfg_googleanalytics_campaigns.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl', ), 'events' => array(