From b618715fc676fce71303816c0d49d8aad8beb0b6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 27 Apr 2012 21:00:56 -0400 Subject: [PATCH 1/4] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: string update implement contact archival archive contact flag pass zrl to dfrn_request as fallback rev update another attempt to fix lower tab behaviour on small screens, community back in tab area * master: From 3bfa3f2a13f4e3b75b8e922eb3d946e1a31809b6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 27 Apr 2012 21:02:57 -0400 Subject: [PATCH 2/4] fix #search-text Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 3 +-- view/theme/dispy/dark/style.less | 8 +++----- view/theme/dispy/light/style.css | 3 +-- view/theme/dispy/light/style.less | 8 +++----- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 26a21bcf1a..de4f3a6dc6 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -73,8 +73,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;} -#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;} -.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;} +#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;} #user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index c56adf5a18..41fd2c8aa2 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -477,13 +477,11 @@ nav #nav-notifications-linkmenu { #search-text { border: 1px #eec solid; background: #2e2f2e; - color: #eec; } - -.search-box #search-text { + color: #eec; + font-size: 8pt; margin: 8px; width: 10em; - height: 14px; - color: #eec; } + height: 14px; } #scrollup { position: fixed; diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 2c95d70da9..8fc48a80fd 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -73,8 +73,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;} -#search-text{border:1px #eec solid;background:#2e3436;color:#eec;} -.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;} +#search-text{border:1px #eec solid;background:#2e3436;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("light/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;} #user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 18151bc270..57b40351be 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -478,13 +478,11 @@ nav #nav-notifications-linkmenu { #search-text { border: 1px #eec solid; background: #2e3436; - color: #eec; } - -.search-box #search-text { + color: #eec; + font-size: 8pt; margin: 8px; width: 10em; - height: 14px; - color: #eec; } + height: 14px; } #scrollup { position: fixed; From 2c577ed90f1d6a459d7c4b84db3ffd1f5d052ff8 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 1 May 2012 06:21:40 +0200 Subject: [PATCH 3/4] diabook-themes: add "community profiles"-box to right_column --- view/theme/diabook/communityhome.tpl | 13 +++++- .../diabook-aerith/style-network-wide.css | 6 +-- .../diabook/diabook-aerith/style-network.css | 6 +-- .../diabook-aerith/style-profile-wide.css | 6 +-- .../diabook/diabook-aerith/style-profile.css | 6 +-- .../diabook-blue/style-network-wide.css | 6 +-- .../diabook/diabook-blue/style-network.css | 6 +-- .../diabook-blue/style-profile-wide.css | 6 +-- .../diabook/diabook-blue/style-profile.css | 6 +-- .../diabook-green/style-network-wide.css | 6 +-- .../diabook/diabook-green/style-network.css | 6 +-- .../diabook-green/style-profile-wide.css | 6 +-- .../diabook/diabook-green/style-profile.css | 6 +-- .../diabook-pink/style-network-wide.css | 6 +-- .../diabook/diabook-pink/style-network.css | 6 +-- .../diabook-pink/style-profile-wide.css | 6 +-- .../diabook/diabook-pink/style-profile.css | 6 +-- .../diabook-red/style-network-wide.css | 6 +-- .../diabook/diabook-red/style-network.css | 6 +-- .../diabook-red/style-profile-wide.css | 6 +-- .../diabook/diabook-red/style-profile.css | 6 +-- view/theme/diabook/theme.php | 46 +++++++++++++++---- 22 files changed, 110 insertions(+), 69 deletions(-) diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 5fb6eb5e2e..982e2bd264 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -4,9 +4,20 @@ {{ endif }} +
+{{ if $comunity_profilest_title }} +

$comunity_profilest_title

+
+{{ for $comunity_profiles_items as $i }} + $i +{{ endfor }} +
+{{ endif }} +
+
{{ if $lastusers_title }} -

$helpers.title.1

+

$helpers.title.1

NewHere
Friendica Support
Let's talk
diff --git a/view/theme/diabook/diabook-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css index d5c91c9a4e..b63015c4c3 100644 --- a/view/theme/diabook/diabook-aerith/style-network-wide.css +++ b/view/theme/diabook/diabook-aerith/style-network-wide.css @@ -1182,7 +1182,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1191,14 +1191,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css index 21273c19cc..d6a2619ea9 100644 --- a/view/theme/diabook/diabook-aerith/style-network.css +++ b/view/theme/diabook/diabook-aerith/style-network.css @@ -1178,7 +1178,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1187,14 +1187,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css index 1b8e384811..d4b79d55a6 100644 --- a/view/theme/diabook/diabook-aerith/style-profile-wide.css +++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css @@ -1158,7 +1158,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1167,14 +1167,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css index e21432d4e0..77d1fe34d5 100644 --- a/view/theme/diabook/diabook-aerith/style-profile.css +++ b/view/theme/diabook/diabook-aerith/style-profile.css @@ -1154,7 +1154,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1163,14 +1163,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css index eb1cee255a..a34c00db52 100644 --- a/view/theme/diabook/diabook-blue/style-network-wide.css +++ b/view/theme/diabook/diabook-blue/style-network-wide.css @@ -1148,7 +1148,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1157,14 +1157,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css index 3a972b8327..c018967f22 100644 --- a/view/theme/diabook/diabook-blue/style-network.css +++ b/view/theme/diabook/diabook-blue/style-network.css @@ -1144,7 +1144,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1153,14 +1153,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-profile-wide.css b/view/theme/diabook/diabook-blue/style-profile-wide.css index ad6b7ca214..5cf50b1434 100644 --- a/view/theme/diabook/diabook-blue/style-profile-wide.css +++ b/view/theme/diabook/diabook-blue/style-profile-wide.css @@ -1128,7 +1128,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1137,14 +1137,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css index 50fb980d6f..e6d0fb61b6 100644 --- a/view/theme/diabook/diabook-blue/style-profile.css +++ b/view/theme/diabook/diabook-blue/style-profile.css @@ -1124,7 +1124,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1133,14 +1133,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css index 38e7e7ae05..c202146d5f 100644 --- a/view/theme/diabook/diabook-green/style-network-wide.css +++ b/view/theme/diabook/diabook-green/style-network-wide.css @@ -1158,7 +1158,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1167,14 +1167,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css index 3cd6117e13..9b11c0b17f 100644 --- a/view/theme/diabook/diabook-green/style-network.css +++ b/view/theme/diabook/diabook-green/style-network.css @@ -1155,7 +1155,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1164,14 +1164,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css index e7a0fe623a..779bc5c225 100644 --- a/view/theme/diabook/diabook-green/style-profile-wide.css +++ b/view/theme/diabook/diabook-green/style-profile-wide.css @@ -1134,7 +1134,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1143,14 +1143,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css index 051aa9a351..a955d3b9d4 100644 --- a/view/theme/diabook/diabook-green/style-profile.css +++ b/view/theme/diabook/diabook-green/style-profile.css @@ -1130,7 +1130,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1139,14 +1139,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css index 4bbab02c7b..0e6eaf2c78 100644 --- a/view/theme/diabook/diabook-pink/style-network-wide.css +++ b/view/theme/diabook/diabook-pink/style-network-wide.css @@ -1158,7 +1158,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1167,14 +1167,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css index 3acb608fc7..09e5b6f094 100644 --- a/view/theme/diabook/diabook-pink/style-network.css +++ b/view/theme/diabook/diabook-pink/style-network.css @@ -1155,7 +1155,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1164,14 +1164,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css index f4b1939ec2..15c12cf9ce 100644 --- a/view/theme/diabook/diabook-pink/style-profile-wide.css +++ b/view/theme/diabook/diabook-pink/style-profile-wide.css @@ -1134,7 +1134,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1143,14 +1143,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css index 610fffe3af..959880c250 100644 --- a/view/theme/diabook/diabook-pink/style-profile.css +++ b/view/theme/diabook/diabook-pink/style-profile.css @@ -1130,7 +1130,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1139,14 +1139,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css index 8c3b67cb6c..b40594c777 100644 --- a/view/theme/diabook/diabook-red/style-network-wide.css +++ b/view/theme/diabook/diabook-red/style-network-wide.css @@ -1182,7 +1182,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1191,14 +1191,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css index 84fd5da484..faf34560c7 100644 --- a/view/theme/diabook/diabook-red/style-network.css +++ b/view/theme/diabook/diabook-red/style-network.css @@ -1178,7 +1178,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1187,14 +1187,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-profile-wide.css b/view/theme/diabook/diabook-red/style-profile-wide.css index acb6075f74..78e37770c2 100644 --- a/view/theme/diabook/diabook-red/style-profile-wide.css +++ b/view/theme/diabook/diabook-red/style-profile-wide.css @@ -1141,7 +1141,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1150,14 +1150,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css index a29eb3eb0d..8534c4822b 100644 --- a/view/theme/diabook/diabook-red/style-profile.css +++ b/view/theme/diabook/diabook-red/style-profile.css @@ -1137,7 +1137,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1146,14 +1146,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index ffa480f3bc..945c3f36b4 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -44,6 +44,26 @@ function diabook_community_info(){ $a = get_app(); + // comunity_profiles + $aside['$comunity_profilest_title'] = t('Community Profiles'); + $aside['$comunity_profiles_items'] = array(); + $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id + where glink.cid = 0 and glink.uid = 0 order by rand() limit 9"); + $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); + if(count($r)) { + $photo = 'photo'; + foreach($r as $rr) { + $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile-link' => zrl($rr['url']), + '$photo' => $rr[$photo], + '$alt-text' => $rr['name'], + )); + $aside['$comunity_profiles_items'][] = $entry; + } + } + // last 12 users $aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_items'] = array(); @@ -175,9 +195,8 @@ function diabook_community_info(){ //Community Page if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

+ $page = '
+

'.t("Community Pages").'

    '; $pagelist = array(); @@ -266,9 +285,9 @@ if ($a->argv[0] === "network" && local_user()){ } - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; + $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - if($ccCookie != "8") { + if($ccCookie != "9") { // COMMUNITY diabook_community_info(); @@ -282,7 +301,7 @@ if ($a->argv[0] === "network" && local_user()){ //right_aside at profile pages if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "8") { + if($ccCookie != "9") { // COMMUNITY diabook_community_info(); @@ -356,7 +375,7 @@ $a->page['htmlhead'] .= ' bird: false, avatar: false, colorExterior: "#fff", - title: "Last tweets", + title: "Last Tweets", timeout: 10000 }); }); @@ -442,6 +461,7 @@ $a->page['htmlhead'] .= ' function restore_boxes(){ $.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_profiles","2", { expires: 365, path: "/" }); $.cookie("close_services","2", { expires: 365, path: "/" }); $.cookie("close_friends","2", { expires: 365, path: "/" }); $.cookie("close_twitter","2", { expires: 365, path: "/" }); @@ -464,7 +484,7 @@ $a->page['htmlhead'] .= ' '; - if($ccCookie != "8") { + if($ccCookie != "9") { $a->page['htmlhead'] .= '