Merge pull request #261 from fabrixxm/eventspage

Some tweak on events page and events/bitrhdays reminder

diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
index e5c6485de94ba880409727a74d9b575520d7b09a..40f016747f8a93ea8a971238e958a9904fdd8682 100644 (file)
--- a/tests/get_tags_test.php
+++ b/tests/get_tags_test.php
@@ -202,8 +202,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
                }
                \r
                $this->assertEquals("cid:15", $inform); 
-               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?search=test%20case]test case[/url]", $str_tags);
-               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?search=test%20case]test case[/url]", $text); 
+               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags);
+               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); 
                \r
        }\r
 

diff --git a/view/theme/diabook/diabook-dark/icons/pencil.png b/view/theme/diabook/diabook-dark/icons/pencil.png
index 772e49b175e0674443262034180b5ff789715107..cc316a7de9db50749045cc02b43962dfcb6229f1 100644 (file)
Binary files a/view/theme/diabook/diabook-dark/icons/pencil.png and b/view/theme/diabook/diabook-dark/icons/pencil.png differ

diff --git a/view/theme/diabook/diabook-dark/icons/pencil2.png b/view/theme/diabook/diabook-dark/icons/pencil2.png
index 3b47d1864bbf50c59b237f8aa18d90c350b53339..791433db7a2c79aff1b2dcd19ab1bd1ea7454e8a 100644 (file)
Binary files a/view/theme/diabook/diabook-dark/icons/pencil2.png and b/view/theme/diabook/diabook-dark/icons/pencil2.png differ

diff --git a/view/theme/diabook/diabook-dark/icons/scroll_top.png b/view/theme/diabook/diabook-dark/icons/scroll_top.png
index 0e7f7ae6a61ddfe1d1a9aa67b26a3e3c2d41b88e..fe20d1c4ce9f85c1eabd431cba1eed4a9af42538 100644 (file)
Binary files a/view/theme/diabook/diabook-dark/icons/scroll_top.png and b/view/theme/diabook/diabook-dark/icons/scroll_top.png differ

diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index d236297b77c8b9d726484027c4a69ad9cfb08d74..7ddedb320b04aab59cce2ad57962c1d6a5b122ac 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: #3465a4;
+  color: #88a9d2;
 }
 .tool a:hover {
   text-decoration: none;

diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index 8824d18fe3c5fade99f267acf70a7075785dfb95..b052b77ff448453ef50a09895d0424a18b7cef4b 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -440,7 +440,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #88a9d2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: ##3F8FBA;
+  color: ##3465a4;
 }
 .tool a:hover {
   text-decoration: none;
@@ -1261,7 +1261,7 @@ transition: all 0.2s ease-in-out;
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+  color: #88a9d2;
 }
 
 .wall-item-decor {