Skip to content
Extraits de code Groupes Projets
Valider 4c1b27e1 rédigé par mattpiwik's avatar mattpiwik
Parcourir les fichiers

Build 

git-svn-id: http://dev.piwik.org/svn/trunk@5397 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent e8f52302
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 73 ajouts et 26 suppressions
plugins/PDFReports/Controller.php
+ 1
− 1
Voir le fichier @ 4c1b27e1
......@@ -40,7 +40,7 @@ class Piwik_PDFReports_Controller extends Piwik_Controller
$view->downloadOutputType = Piwik_PDFReports_API::OUTPUT_DOWNLOAD;
$columnsCount = 2;
$view->newColumnAfter = round(count($availableReports) / $columnsCount);
$view->newColumnAfter = ceil(count($reportsByCategory) / $columnsCount);
$view->reportsByCategory = $reportsByCategory;
$view->reportsJSON = json_encode($reportsById);
$view->periods = array_merge(array('never' => Piwik_Translate('General_Never')),
......
plugins/PDFReports/templates/add.tpl
+ 1
− 1
Voir le fichier @ 4c1b27e1
......@@ -78,8 +78,8 @@
<div class='reportCategory'>{$category}</div><ul class='listReports'>
{foreach from=$reports item=report}
<li><input type="checkbox" id="{$report.uniqueId}" /><label for="{$report.uniqueId}">{$report.name|escape:"html"}</label></li>
{assign var=countReports value=$countReports+1}
{/foreach}
{assign var=countReports value=$countReports+1}
</ul>
<br/>
{/foreach}
......
tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml 0 → 100644
+ 9
− 0
Voir le fichier @ 4c1b27e1
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_pageviews>4</nb_pageviews>
<nb_uniq_pageviews>4</nb_uniq_pageviews>
<nb_downloads>1</nb_downloads>
<nb_uniq_downloads>1</nb_uniq_downloads>
<nb_outlinks>1</nb_outlinks>
<nb_uniq_outlinks>1</nb_uniq_outlinks>
</result>
\ No newline at end of file
tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml 0 → 100644
+ 9
− 0
Voir le fichier @ 4c1b27e1
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_pageviews>4</nb_pageviews>
<nb_uniq_pageviews>4</nb_uniq_pageviews>
<nb_downloads>1</nb_downloads>
<nb_uniq_downloads>1</nb_uniq_downloads>
<nb_outlinks>1</nb_outlinks>
<nb_uniq_outlinks>1</nb_uniq_outlinks>
</result>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.get_day.xml 0 → 100644
+ 10
− 0
Voir le fichier @ 4c1b27e1
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2009-01-04" />
<result date="2009-01-05" />
<result date="2009-01-06" />
<result date="2009-01-07" />
<result date="2009-01-08" />
<result date="2009-01-09" />
<result date="2009-01-10" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit_PeriodIsLast__Actions.get_week.xml 0 → 100644
+ 10
− 0
Voir le fichier @ 4c1b27e1
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2008-12-29 to 2009-01-04" />
<result date="2009-01-05 to 2009-01-11" />
<result date="2009-01-12 to 2009-01-18" />
<result date="2009-01-19 to 2009-01-25" />
<result date="2009-01-26 to 2009-02-01" />
<result date="2009-02-02 to 2009-02-08" />
<result date="2009-02-09 to 2009-02-15" />
</results>
\ No newline at end of file
tests/integration/expected/test_noVisit__Actions.get_day.xml 0 → 100644
+ 9
− 0
Voir le fichier @ 4c1b27e1
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_pageviews>0</nb_pageviews>
<nb_uniq_pageviews>0</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
<nb_uniq_downloads>0</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
<nb_uniq_outlinks>0</nb_uniq_outlinks>
</result>
\ No newline at end of file
tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+ 24
− 24
Voir le fichier @ 4c1b27e1
......@@ -10,18 +10,18 @@
<goals>
<row idgoal='1'>
<nb_conversions>2</nb_conversions>
<nb_visits_converted>2</nb_visits_converted>
<revenue>1000</revenue>
</row>
<row idgoal='2'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>3</nb_conversions>
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>LoggedOut</label>
......@@ -33,18 +33,18 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
<row idgoal='2'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>2</nb_conversions>
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>LoggedIn</label>
......@@ -56,13 +56,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......@@ -76,13 +76,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
......@@ -94,13 +94,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......@@ -114,13 +114,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>Value not defined</label>
......@@ -132,13 +132,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......@@ -152,13 +152,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
......@@ -170,13 +170,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......@@ -188,13 +188,13 @@
<label>looking at profile page</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>Loggedin</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......@@ -206,7 +206,7 @@
<label>Value not defined</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......@@ -218,7 +218,7 @@
<label>FR</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter