Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/cron/archive.php6
-rw-r--r--misc/internal-docs/content-tracking.md8
m---------misc/log-analytics0
-rw-r--r--misc/others/iframeWidget.htm13
4 files changed, 9 insertions, 18 deletions
diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index 0bc4daa1f1..e95e01ea8d 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -9,8 +9,12 @@
* @package Piwik
*/
+if (!defined('PIWIK_DOCUMENT_ROOT')) {
+ define('PIWIK_DOCUMENT_ROOT', realpath(dirname(__FILE__) . "/../.."));
+}
+
if (!defined('PIWIK_INCLUDE_PATH')) {
- define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . "/../.."));
+ define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
}
if (!defined('PIWIK_USER_PATH')) {
diff --git a/misc/internal-docs/content-tracking.md b/misc/internal-docs/content-tracking.md
index 7b854a3d53..903ed32c8c 100644
--- a/misc/internal-docs/content-tracking.md
+++ b/misc/internal-docs/content-tracking.md
@@ -9,7 +9,7 @@ This is the technical concept for implementing content tracking. We won't plan a
| ------------- | ------------- |
| Plugin name | Contents |
| Content block | Is a container which consists of a content name, piece, target and an interaction. |
-| Content name | A name that represents a content block. The name will be visible in reports. One name can belong to differnt content pieces. |
+| Content name | A name that represents a content block. The name will be visible in reports. One name can belong to different content pieces. |
| Content piece | This is the actual content that was displayed, eg a path to a video/image/audio file, a text, ... |
| Content target | For instance the URL of a landing page where the user was led to after interacting with the content block. |
| Content impression | Any content block that was displayed on a page, such as a banner or an ad. Optionally you can tell Piwik to track only impressions for content blocks that were actually visible. |
@@ -494,7 +494,7 @@ There would be two reports:
Nested content makes sense (users will do this). How would it work when several contents are nested?
Note: we don't need to handle this case in MVP but maybe worth thinking about it.
-6. FYI: We would probably also need an attribute like data-target="$target" and/or the possiblity for data-trackclick="$target" since not all links might be defined via href but onclick javascript links. See next section
+6. FYI: We would probably also need an attribute like data-target="$target" and/or the possibility for data-trackclick="$target" since not all links might be defined via href but onclick javascript links. See next section
+1
@@ -520,7 +520,7 @@ Yes.
Sounds good: this would make Contents plugin more generic.
- * We'd probably have to offer a mode to rescan all banners again at a certain time and only track those content pieces now that were not visibile before but are now
+ * We'd probably have to offer a mode to rescan all banners again at a certain time and only track those content pieces now that were not visible before but are now
In ticket I wrote `function trackContentPieces() that will let users re-scan the page for Content pieces when DOM has changed.` but maybe instead the function should be called `rescanPageForContents` ?
@@ -535,7 +535,7 @@ so +1
I think that should be the default mode, ie. on page load we detect impressions, and then we also attach to events like scrolling to check ie. every 500ms whether a given Contents is visible. Would that be work?
10. FYI: "you may add a CSS class or attribute to the link element to track" => It could be also a span, a div or something else
-11. FYI: There is way to much magic how content-name is found and it is neither predicatble nor understandable by users, I will simplify this and rather require users to set specific attributes! See next section
+11. FYI: There is way to much magic how content-name is found and it is neither predictable nor understandable by users, I will simplify this and rather require users to set specific attributes! See next section
OK
diff --git a/misc/log-analytics b/misc/log-analytics
-Subproject 6fd24921b3e9ce4b46861ae12528ad91e85583b
+Subproject 2878508f66c10d998c9e4e0bc276988b3755cde
diff --git a/misc/others/iframeWidget.htm b/misc/others/iframeWidget.htm
deleted file mode 100644
index 9b7c4261f1..0000000000
--- a/misc/others/iframeWidget.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js'></script>
-<h3 style="color:#143974">Embedding the Piwik Country widget in an Iframe</h3>
-
-<div id="widgetIframe">
- <iframe width="500" height="350"
- src="http://demo.piwik.org/index.php?module=Widgetize&action=iframe&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=month&date=2010-08-31&disableLink=1&token_auth=960d9a24b89ba4feb99be754c5aac15bx"
- scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe>
-</div>
-
-</body>
-</html>