diff options
author | mattpiwik <matthieu.aubry@gmail.com> | 2012-08-02 16:17:49 +0400 |
---|---|---|
committer | mattpiwik <matthieu.aubry@gmail.com> | 2012-08-02 16:17:49 +0400 |
commit | 216c89fa62e4b95b9c87b658ae9bf890d89037ba (patch) | |
tree | 2dcc00f1e2dd0b4001854dc558130fff18efbdd7 | |
parent | 89f58baea093d6e9792e186fc04abd620fcc0e08 (diff) |
Small changes
git-svn-id: http://dev.piwik.org/svn/trunk@6647 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r-- | core/DataTable/Row.php | 5 | ||||
-rw-r--r-- | plugins/CoreHome/templates/datatable.css | 2 | ||||
-rw-r--r-- | plugins/Dashboard/templates/dashboard.css | 2 | ||||
-rw-r--r-- | plugins/Installation/templates/install.css | 1 | ||||
-rw-r--r-- | plugins/Login/templates/login.css | 2 | ||||
-rw-r--r-- | tests/core/Period/Range.test.php | 8 | ||||
-rwxr-xr-x | tests/integration/NoVisit.test.php | 2 |
7 files changed, 13 insertions, 9 deletions
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index f0fc57e658..cad66314a6 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -93,9 +93,10 @@ class Piwik_DataTable_Row */ public function __sleep() { - if(!empty($this->c[self::DATATABLE_ASSOCIATED]) && $this->c[self::DATATABLE_ASSOCIATED] < 0) + if(!empty($this->c[self::DATATABLE_ASSOCIATED]) + && $this->c[self::DATATABLE_ASSOCIATED] < 0) { - $this->c[self::DATATABLE_ASSOCIATED] = abs($this->c[self::DATATABLE_ASSOCIATED]); + $this->c[self::DATATABLE_ASSOCIATED] = -1 * $this->c[self::DATATABLE_ASSOCIATED]; } return array('c'); } diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index 8fd69893f5..452ab372ea 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -746,8 +746,8 @@ a.tableConfigurationIcon.highlighted { .tableConfiguration ul li.last { border-top: 1px solid #DFDFDF; border-radius: 4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; } .tableConfiguration div.configItem { diff --git a/plugins/Dashboard/templates/dashboard.css b/plugins/Dashboard/templates/dashboard.css index d3c9c0b5e7..f908861bc4 100644 --- a/plugins/Dashboard/templates/dashboard.css +++ b/plugins/Dashboard/templates/dashboard.css @@ -55,6 +55,7 @@ overflow: hidden; border-radius:4px; font-size:14px; + border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; } @@ -117,6 +118,7 @@ font-family:Arial,Verdana,Arial,Helvetica,sans-serif; border-radius:4px; padding:20px 10px; + border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; min-height:0!important; diff --git a/plugins/Installation/templates/install.css b/plugins/Installation/templates/install.css index 7b90120b22..dbce68607c 100644 --- a/plugins/Installation/templates/install.css +++ b/plugins/Installation/templates/install.css @@ -102,6 +102,7 @@ h3 { margin: auto; background: #FFFFFF; padding: 0.2em 2em 2em 2em; + border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; } diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css index 1123898e87..7a80a3733c 100644 --- a/plugins/Login/templates/login.css +++ b/plugins/Login/templates/login.css @@ -13,9 +13,9 @@ form { margin-left: 8px; padding: 16px 16px 40px 16px; font-weight: bold; + border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; - border-radius: 5px; } form .forgetmenot { diff --git a/tests/core/Period/Range.test.php b/tests/core/Period/Range.test.php index 69d5441d31..0a5cb21e65 100644 --- a/tests/core/Period/Range.test.php +++ b/tests/core/Period/Range.test.php @@ -232,7 +232,7 @@ class Test_Piwik_Period_Range extends UnitTestCase Piwik_Date::factory('2011-11-01'), Piwik_Date::factory('2011-11-30'), Piwik_Date::factory('2011-12-31'), - Piwik_Date::factory('2012-10-18') + Piwik_Date::factory('2021-10-18') ); foreach($todays as $today) { @@ -331,7 +331,7 @@ class Test_Piwik_Period_Range extends UnitTestCase // var_dump( $range->toString() ); $this->assertEqual( $range->getNumberOfSubperiods(), count($correct)); - $this->assertEqual( $range->toString(), $correct); + $this->assertEqual( $range->toString(), $correct, "Fail for Today = " . $today); } } @@ -425,8 +425,8 @@ class Test_Piwik_Period_Range extends UnitTestCase "2011-08-31", ), ); - //var_dump($range->toString()); - //var_dump($correct); +//var_dump($range->toString()); +//var_dump($correct); $this->assertEqual( $range->getNumberOfSubperiods(), count($correct)); $this->assertEqual( $range->toString(), $correct); } diff --git a/tests/integration/NoVisit.test.php b/tests/integration/NoVisit.test.php index 3a0bc1bfc4..bf2d623903 100755 --- a/tests/integration/NoVisit.test.php +++ b/tests/integration/NoVisit.test.php @@ -65,7 +65,7 @@ class Test_Piwik_Integration_NoVisit extends Test_Integration_Facade // Trigger empty request $trackerUrl = $this->getTrackerUrl(); $response = Piwik_Http::fetchRemoteFile($trackerUrl); - $this->assertTrue(strpos($response, 'web analytics') !== false, 'Piwik empty request response not correct: ' . $response); + $this->assertTrue(strpos($response, 'is a free open source web') !== false, 'Piwik empty request response not correct: ' . $response); $t = $this->getTracker($idSite, $dateTime, $defaultInit = true); |