diabok-themes: fixed bug in green-wide and dark-wide

diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index 13801b6ba15b5077638d85f41e4e5eb14fd43165..06e9718fce554e88b335e65b33b7152cd578e7a4 100644 (file)
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -1242,12 +1242,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box             { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                opacity: 0.1;
                }
 .close_box:hover       { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                cursor: pointer;
                opacity: 1;

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 502e46f233d1de207d3a6060008f7eed9bc828fa..a8ed1e9a2544dd3aba1800fc0604fcf7a03b887d 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1236,12 +1236,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box             { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                opacity: 0.1;
                }
 .close_box:hover       { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                cursor: pointer;
                opacity: 1;

diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css
index 1c8257b7ee3a44d80204a5b839c5a281b724dd91..c4c72fb68a881799072f4adaac3ece7b61cb4783 100644 (file)
--- a/view/theme/diabook/style-profile-wide.css
+++ b/view/theme/diabook/style-profile-wide.css
@@ -1217,13 +1217,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box             { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                cursor: pointer;
                opacity: 0.1;
                }
 .close_box:hover       { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                cursor: pointer;
                opacity: 1;

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index cb7f1df6902e9b002ffe7f0dabfda73069cf14c8..a0a2adb53b06b71df29425bacea6c4cb080e75c1 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1212,13 +1212,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box             { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                cursor: pointer;
                opacity: 0.1;
                }
 .close_box:hover       { 
-               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               background-image: url("../../../view/theme/diabook/icons/close_box.png");
                float: right;
                cursor: pointer;
                opacity: 1;

diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php
index 12ffa7159897be3be4ba6e64293b278a8aa44b94..d926579da79ae5ba2c208134199bb3d5932fe195 100644 (file)
--- a/view/theme/diabook/style.php
+++ b/view/theme/diabook/style.php
@@ -1556,9 +1556,9 @@
        }
        }
        
-       if($resolution == "green") {    
+       if($resolution == "wide") {     
        if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){
-               echo file_get_contents("$THEMEPATH/diabook-pink/style-green.css");
+               echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css");
        }
        if($diabook_font_size == "16"){
                echo "
@@ -1834,9 +1834,9 @@
        }
        }
        
-       if($resolution == "dark") {     
+       if($resolution == "wide") {     
        if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){
-               echo file_get_contents("$THEMEPATH/diabook-dark/style-green.css");
+               echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css");
        }
        if($diabook_font_size == "16"){
                echo "