aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-30 23:08:31 -0700
committerfriendica <info@friendica.com>2012-04-30 23:08:31 -0700
commitf175af05f92384fab7adb75390a8aa52dc1bd7e1 (patch)
tree2ca4af49655a3cf4f1a2d2cf4ea7b5936b8d9a17
parentd48cd0f9a3210c14bb98a502188358982261d9df (diff)
parentb8b0b3a87d90a00d43d887d6bbd76e4c1d918d06 (diff)
downloadvolse-hubzilla-f175af05f92384fab7adb75390a8aa52dc1bd7e1.tar.gz
volse-hubzilla-f175af05f92384fab7adb75390a8aa52dc1bd7e1.tar.bz2
volse-hubzilla-f175af05f92384fab7adb75390a8aa52dc1bd7e1.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/head.tpl2
-rwxr-xr-xview/theme/diabook/communityhome.tpl13
-rw-r--r--view/theme/diabook/diabook-aerith/style-network-wide.css6
-rw-r--r--view/theme/diabook/diabook-aerith/style-network.css6
-rw-r--r--view/theme/diabook/diabook-aerith/style-profile-wide.css6
-rw-r--r--view/theme/diabook/diabook-aerith/style-profile.css6
-rw-r--r--view/theme/diabook/diabook-blue/style-network-wide.css6
-rw-r--r--view/theme/diabook/diabook-blue/style-network.css6
-rw-r--r--view/theme/diabook/diabook-blue/style-profile-wide.css6
-rw-r--r--view/theme/diabook/diabook-blue/style-profile.css6
-rw-r--r--view/theme/diabook/diabook-green/style-network-wide.css6
-rw-r--r--view/theme/diabook/diabook-green/style-network.css6
-rw-r--r--view/theme/diabook/diabook-green/style-profile-wide.css6
-rw-r--r--view/theme/diabook/diabook-green/style-profile.css6
-rw-r--r--view/theme/diabook/diabook-pink/style-network-wide.css6
-rw-r--r--view/theme/diabook/diabook-pink/style-network.css6
-rw-r--r--view/theme/diabook/diabook-pink/style-profile-wide.css6
-rw-r--r--view/theme/diabook/diabook-pink/style-profile.css6
-rw-r--r--view/theme/diabook/diabook-red/style-network-wide.css6
-rw-r--r--view/theme/diabook/diabook-red/style-network.css6
-rw-r--r--view/theme/diabook/diabook-red/style-profile-wide.css6
-rw-r--r--view/theme/diabook/diabook-red/style-profile.css6
-rwxr-xr-xview/theme/diabook/theme.php46
-rw-r--r--view/theme/dispy/dark/style.css3
-rw-r--r--view/theme/dispy/dark/style.less8
-rw-r--r--view/theme/dispy/light/style.css3
-rw-r--r--view/theme/dispy/light/style.less8
27 files changed, 119 insertions, 84 deletions
diff --git a/view/head.tpl b/view/head.tpl
index 7e8369bdd..7b1541242 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3">
+<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3" />
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search"
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 5fb6eb5e2..982e2bd26 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -4,9 +4,20 @@
{{ endif }}
</div>
+<div id="close_profiles">
+{{ if $comunity_profilest_title }}
+<h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="close"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{ for $comunity_profiles_items as $i }}
+ $i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
<div id="close_helpers">
{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
diff --git a/view/theme/diabook/diabook-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css
index d5c91c9a4..b63015c4c 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 21273c19c..d6a2619ea 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 1b8e38481..d4b79d55a 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 e21432d4e..77d1fe34d 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 eb1cee255..a34c00db5 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 3a972b832..c018967f2 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 ad6b7ca21..5cf50b143 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 50fb980d6..e6d0fb61b 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 38e7e7ae0..c202146d5 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 3cd6117e1..9b11c0b17 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 e7a0fe623..779bc5c22 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 051aa9a35..a955d3b9d 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 4bbab02c7..0e6eaf2c7 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 3acb608fc..09e5b6f09 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 f4b1939ec..15c12cf9c 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 610fffe3a..959880c25 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 8c3b67cb6..b40594c77 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 84fd5da48..faf34560c 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 acb6075f7..78e37770c 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 a29eb3eb0..8534c4822 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 ffa480f3b..945c3f36b 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 = '<div id="page-sidebar-right_aside" class="widget">
- <div class="title tool">
- <h3>'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+ $page = '<div id="page-sidebar-right_aside" >
+ <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
<div id="sidebar-page-list"><ul>';
$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'] .= '
</script>';
- if($ccCookie != "8") {
+ if($ccCookie != "9") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@@ -473,6 +493,11 @@ $("right_aside").ready(function(){
{
document.getElementById( "close_pages" ).style.display = "none";
};
+
+ if($.cookie("close_profiles") == "1")
+ {
+ document.getElementById( "close_profiles" ).style.display = "none";
+ };
if($.cookie("close_helpers") == "1")
{
@@ -516,6 +541,11 @@ function close_pages(){
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
+function close_profiles(){
+ document.getElementById( "close_profiles" ).style.display = "none";
+ $.cookie("close_profiles","1", { expires: 365, path: "/" });
+ };
+
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
$.cookie("close_helpers","1", { expires: 365, path: "/" });
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 26a21bcf1..de4f3a6dc 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 c56adf5a1..41fd2c8aa 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 2c95d70da..8fc48a80f 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 18151bc27..57b40351b 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;