update diabook-theme

-- fixed contact-edit-page
-- some css-fixes

diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css
index ce8723d7a97fedaede1e1bb6b24f7d0f87030997..fbebf6a75e574ec9dd3de693819eef4ad5e892c9 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style.css
+++ b/view/theme/diabook/diabook-aerith/style.css
@@ -229,7 +229,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -1263,6 +1263,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1398,6 +1401,9 @@ body .pageheader{
 #id_openid_url {
   width: 173px;        
        }
+.contact-edit-submit{
+       display: block;
+       }
 #contact-edit-end {
        }
 .pager {
@@ -1762,6 +1768,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;

diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index 926ba34db610a44c14334d2b5b0ad17a417362a6..d6d6a85db337665cf9ef2e8ddfaa8ce016881c9a 100644 (file)
--- a/view/theme/diabook/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -228,7 +228,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -1223,6 +1223,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1358,6 +1361,9 @@ body .pageheader{
 #id_openid_url {
   width: 173px;        
        }
+.contact-edit-submit{
+       display: block;
+       }
 #contact-edit-end {
        }
 .pager {
@@ -1720,6 +1726,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;

diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 5ef9398ec53b10425b0cd359bd56acf2b4543e64..b7ff104af66d995a68b94c66fcef401eb961f3f0 100644 (file)
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -240,7 +240,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -1234,6 +1234,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1371,6 +1374,9 @@ body .pageheader{
        }
 #contact-edit-end {
        }
+.contact-edit-submit{
+       display: block;
+       }
 .pager {
    padding: 10px;
        text-align: center;
@@ -1732,6 +1738,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;

diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css
index c3ed65951c23ec93aeeaa94bc75eb57451b298fc..05244c1ae3f8d4ee643df5968fd2a2ace72aaa1b 100644 (file)
--- a/view/theme/diabook/diabook-green/style.css
+++ b/view/theme/diabook/diabook-green/style.css
@@ -229,7 +229,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -1246,6 +1246,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1383,6 +1386,9 @@ body .pageheader{
        }
 #contact-edit-end {
        }
+.contact-edit-submit{
+       display: block;
+       }
 .pager {
    padding: 10px;
        text-align: center;
@@ -1746,6 +1752,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;

diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
index e9bcd53d042c414a11d907437239a22e8a54b5c1..fbabb08daadde933c9f667433f65efeb1f3824ba 100644 (file)
--- a/view/theme/diabook/diabook-pink/style.css
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -228,7 +228,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -1245,6 +1245,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1382,6 +1385,9 @@ body .pageheader{
        }
 #contact-edit-end {
        }
+.contact-edit-submit{
+       display: block;
+       }
 .pager {
    padding: 10px;
        text-align: center;
@@ -1745,6 +1751,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;

diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index 72592168b50a3bd316e7ee9b874e7bcc8bddb5d3..b04c43efe480a1b0988649a501106f3accacb3fc 100644 (file)
--- a/view/theme/diabook/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -227,7 +227,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -1250,6 +1250,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1385,6 +1388,9 @@ body .pageheader{
 #id_openid_url {
   width: 173px;        
        }
+.contact-edit-submit{
+       display: block;
+       }
 #contact-edit-end {
        }
 .pager {
@@ -1746,6 +1752,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;

diff --git a/view/theme/diabook/icons/preview.png b/view/theme/diabook/icons/preview.png
deleted file mode 100644 (file)
index 3c56bf9..0000000
Binary files a/view/theme/diabook/icons/preview.png and /dev/null differ

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 0d85436c227881965a0dbbcd6d3fe561b8aa8f2f..24612b87ffd5e8871432b9ad2f5e735ffa7c141a 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1769,14 +1769,7 @@ transition: all 0.2s ease-in-out;
        margin-left: 45px;
        margin-top: 2px;
 }
-#jot-preview-link {
-       float: right;
-       margin-left: 10px;
-       margin-top: 2px;
-       font-size: 9px;
-       font-weight: bolder;
-       cursor: pointer;
-}
+
 #profile-jot-perms{
    float: right;
        margin-left: 10px;

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 655e8e8a73111db5008f82b469237c0b517e25c6..f9b92a76168a6ae491186f23e9b06a6105286342 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -168,11 +168,7 @@
                          }
 .unglobe       { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
-                         }
-#jot-preview-link .tab         { background-image: url("../../../view/theme/diabook/icons/preview.png"); 
-                         display: block; width: 28px; height: 28px; background-repeat: no-repeat;
-                         }
-               
+                         }             
 .edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 .icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
@@ -1048,6 +1044,12 @@ ul.menu-popup .empty {
        background: #E7F2F7;
        }
 .menu-profile-list-item{
+       padding-left: 5px;
+       padding-top: 0.5em;
+       display: inline;
+       vertical-align: middle;
+       }       
+#profile-side-status .menu-profile-list-item{
        padding-left: 5px;
        padding-top: 0.6em;
        display: inline;
@@ -1286,6 +1288,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1350,6 +1355,9 @@ body .pageheader{
 #id_openid_url {
   width: 173px;        
        }
+.contact-edit-submit{
+       display: block;
+       }
 #contact-edit-end {
        }
 .pager {
@@ -1706,6 +1714,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;
@@ -2007,11 +2026,6 @@ body .pageheader{
        margin-left: 45px;
        margin-top: 2px;
 }
-#jot-preview-link {
-       float: right;
-       background-image: url("../../../view/theme/diabook/icons/preview.png"); 
-       display: block; width: 12px; height: 12px; background-repeat: no-repeat;
-}
 #profile-jot-perms{
    float: right;
        margin-left: 10px;

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index bd7553d9ead06357eceae6697dbf0dd95b898c5f..b5fd4cc438b6b75e39bb8a4df7141a8e59070cb5 100644 (file)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -2,7 +2,7 @@
 
 /*
  * Name: Diabook
- * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or http://bugs.friendica.com/view_all_bug_page.php
  * Version: (Version: 1.027)
  * Author:
  */
@@ -69,6 +69,18 @@ if ($color=="pink") $color_path = "/diabook-pink/";
 if ($color=="green") $color_path = "/diabook-green/";
 if ($color=="dark") $color_path = "/diabook-dark/";
 
+       // remove doubled checkboxes at contacts-edit-page
+       if ($a->argv[0] === "contacts" && $a->argv[1] != NULL && local_user()){
+       $a->page['htmlhead'] .= '
+       <script>
+        $(document).ready(function() {
+               $("span.group_unselected").attr("style","display: none;");
+               $("span.group_selected").attr("style","display: none;");
+               $("input.unticked.action").attr("style","float: left; margin-top: 5px;");
+               $("li.menu-profile-list").attr("style","min-height: 22px;");
+       });
+       </script>';
+       }
 
        //build personal menue at lefthand-col (id="profile_side") and boxes at right-hand-col at networkpages
        if ($a->argv[0] === "network" && local_user()){