diabook-themes: bugfixes / css-fixes

diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
index 918cfc97cbaaafcdc3c5918e829467125c367648..e28ec290972e814e8522e13a00acd6ad03b365a1 100644 (file)
--- a/view/theme/diabook-aerith/profile_vcard.tpl
+++ b/view/theme/diabook-aerith/profile_vcard.tpl
@@ -21,9 +21,9 @@
        </div>
                                
        
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
        {{ if $location }}

diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index f6c7bc69a0811cb0a68e82e0a6a35f5b675130e4..79ab1d04fcda9017c7aa79067a12bdd51b8ff44a 100644 (file)
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1256,7 +1256,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }

diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index c4f89359a9cf3db9d9c6dfe780266b599821c86e..74f2a48d1cf4129966451641276acbf323f0782e 100644 (file)
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1251,7 +1251,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -2076,6 +2076,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;

diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 796af62edaadc22e256f076a40088e29e93f8459..189d6252b768ab38db2a0d343c3a0669b50d58c7 100644 (file)
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -2096,6 +2096,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;

diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index 918cfc97cbaaafcdc3c5918e829467125c367648..e28ec290972e814e8522e13a00acd6ad03b365a1 100644 (file)
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -21,9 +21,9 @@
        </div>
                                
        
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
        {{ if $location }}

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 5d16cde9ee4b892b5ead8808dd692d5718cf70d7..224e6a93138d2b6f18b769872f9f1fe6f219edd7 100644 (file)
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1215,7 +1215,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }

diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 528327ac3b79c0256c046389420d4f61a2dc43d7..a84b2df34999c0f1adf0b089897bc6d337297d63 100644 (file)
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1214,7 +1214,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -2035,6 +2035,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;

diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index b4289dc0f0d52acc2ef7245680cbf631720a60da..867d5b88f853b8ef8006db52690f6b3e58499042 100644 (file)
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -2044,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;

diff --git a/view/theme/diabook-red/profile_vcard.tpl b/view/theme/diabook-red/profile_vcard.tpl
index 918cfc97cbaaafcdc3c5918e829467125c367648..e28ec290972e814e8522e13a00acd6ad03b365a1 100644 (file)
--- a/view/theme/diabook-red/profile_vcard.tpl
+++ b/view/theme/diabook-red/profile_vcard.tpl
@@ -21,9 +21,9 @@
        </div>
                                
        
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
        {{ if $location }}

diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index c7063860f297bdd22e2303c815a743911bb4d0cd..145852d96837c4c3d828d4c21cafbbf6a6b1bb4b 100644 (file)
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1253,7 +1253,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }

diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 5124ed8c0d0cdd39be337a7fce8200b6d7f9d3ba..37790584d962c480f8bd5cd7d61c3ef2df560116 100644 (file)
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1231,7 +1231,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -2057,6 +2057,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;

diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 578a5473a8f4549ef704cc172a5f675dd5ee05d5..92ede79be42ea2f2d1db3a305d8a21df37984435 100644 (file)
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -2081,6 +2081,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;

diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index 918cfc97cbaaafcdc3c5918e829467125c367648..e28ec290972e814e8522e13a00acd6ad03b365a1 100644 (file)
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -21,9 +21,9 @@
        </div>
                                
        
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+       <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
        {{ if $location }}

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 518e7b88d7d7249680987b124ae9921e383a8dc7..641d35b39241ee2de46103f56cb4c3721a298bdb 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1196,7 +1196,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 0077510a1d6b8719abbd5ff3395b93a86afb29b5..54b282310d077313a178fa5d286124cec3bee0bd 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1191,7 +1191,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -2003,6 +2003,9 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;   
+       }
 .lframe {
   float: left;
 }

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 97a26a41d93fa26fcf03afd73e23b8da5e5de581..99bf1b3357b92692ebadf7c6a9ca50e639c7d26c 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -2014,6 +2014,9 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;   
+       }
 .lframe {
   float: left;
 }

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index d6ee57316a8f44c32b993ce16cc68de481989286..a535ed07e3e012191516fb2c4455b4fe822742d1 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -169,7 +169,8 @@ function diabook_community_info(){
        $pagelist = array();
 
        $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-                       WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+                       WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+                       ORDER BY `name` ASC",
                        intval($a->user['uid'])
        );