aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/diabook')
-rwxr-xr-xview/theme/diabook/communityhome.tpl16
-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-aerith/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-aerith/style.css5
-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-blue/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-blue/style.css5
-rw-r--r--view/theme/diabook/diabook-dark/style-network.css10
-rw-r--r--view/theme/diabook/diabook-dark/style-profile.css12
-rw-r--r--view/theme/diabook/diabook-dark/style.css1
-rw-r--r--view/theme/diabook/diabook-green/style-network-wide.css12
-rw-r--r--view/theme/diabook/diabook-green/style-network.css16
-rw-r--r--view/theme/diabook/diabook-green/style-profile-wide.css14
-rw-r--r--view/theme/diabook/diabook-green/style-profile.css14
-rw-r--r--view/theme/diabook/diabook-green/style-wide.css19
-rw-r--r--view/theme/diabook/diabook-green/style.css21
-rw-r--r--view/theme/diabook/diabook-pink/style-network-wide.css14
-rw-r--r--view/theme/diabook/diabook-pink/style-network.css18
-rw-r--r--view/theme/diabook/diabook-pink/style-profile-wide.css16
-rw-r--r--view/theme/diabook/diabook-pink/style-profile.css16
-rw-r--r--view/theme/diabook/diabook-pink/style-wide.css21
-rw-r--r--view/theme/diabook/diabook-pink/style.css23
-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
-rw-r--r--view/theme/diabook/diabook-red/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-red/style.css5
-rw-r--r--view/theme/diabook/footer.tpl3
-rw-r--r--view/theme/diabook/js/README5
-rw-r--r--view/theme/diabook/js/jquery.twitter.search.js289
-rw-r--r--view/theme/diabook/nav.tpl2
-rw-r--r--view/theme/diabook/style-network.css1
-rw-r--r--view/theme/diabook/style-wide.css5
-rw-r--r--view/theme/diabook/style.css5
-rwxr-xr-xview/theme/diabook/theme.php91
42 files changed, 569 insertions, 177 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 66f93c32d..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>
@@ -42,6 +53,9 @@ $nv.search
{{ endif }}
</div>
+<div id="twitter">
+</div>
+
<div id="close_lastusers">
{{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
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-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
index b8ff1fe25..5c263154f 100644
--- a/view/theme/diabook/diabook-aerith/style-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-wide.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -1014,7 +1015,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1243,7 +1244,7 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css
index 01d35b754..e0f38aff6 100644
--- a/view/theme/diabook/diabook-aerith/style.css
+++ b/view/theme/diabook/diabook-aerith/style.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -1013,7 +1014,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1241,7 +1242,7 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
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-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css
index c8c203347..189f4d559 100644
--- a/view/theme/diabook/diabook-blue/style-wide.css
+++ b/view/theme/diabook/diabook-blue/style-wide.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -983,7 +984,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1203,7 +1204,7 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index 7bf7e8eaa..2b68afc6f 100644
--- a/view/theme/diabook/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -982,7 +983,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1201,7 +1202,7 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 6ff44748f..8a7083d9d 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -1431,7 +1431,7 @@ transition: all 0.2s ease-in-out;
.wall-item-comment-wrapper {
margin: 1px 5px 5px 80px;
- background-color: #fff;
+ background-color: #444;
width: 500px;
}
.wall-item-comment-wrapper .comment-edit-photo {
@@ -1442,14 +1442,14 @@ transition: all 0.2s ease-in-out;
width: 100%;
font-size: 10px;
color: #999999;
- border: 1px solid #DDD;
+ border: 1px solid #2e2e2f;
padding: 0.3em;
font-size: 14px;
}
.wall-item-comment-wrapper .comment-edit-text-full {
font-size: 14px;
height: 4em;
- color: #2e2f2e;
+ color: #eec;
border: 1px solid #2e2f2e;
}
.comment-edit-preview {
@@ -1596,8 +1596,8 @@ transition: all 0.2s ease-in-out;
height: 2.0em;
width: 99%;
font-size: 15px;
- color: #999999;
- border: 1px solid #DDD;
+ color: #eec;
+ border: 1px solid #444;
padding: 0.3em;
margin-bottom: 10px;
}
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index b052b77ff..3ecad85af 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -540,7 +540,7 @@ header #banner a:active,
header #banner a:visited,
header #banner a:link,
header #banner a:hover {
- color: #2e2f2e;
+ color: #eec;
text-decoration: none;
outline: none;
vertical-align: middle;
@@ -661,7 +661,7 @@ nav .nav-menu-icon {
border-radius: 5px 5px 0 0;
}
nav .nav-menu-icon:hover {
- background-color: #eec;
+ background-color: #308dbf;
position: relative;
height: 22px;
padding: 5px;
@@ -776,7 +776,7 @@ nav #nav-apps-link.selected {
}
.notify-seen {
- background: none repeat scroll 0 0 #DDDDDD;
+ background: none repeat scroll 0 0 #666;
}
ul.menu-popup {
@@ -1424,7 +1424,7 @@ transition: all 0.2s ease-in-out;
.wall-item-comment-wrapper .comment-edit-text-full {
font-size: 14px;
height: 4em;
- color: #2e302;
+ color: #eec;
border: 1px solid #2e302;
}
.comment-edit-preview {
@@ -1571,10 +1571,11 @@ transition: all 0.2s ease-in-out;
height: 2.0em;
width: 99%;
font-size: 15px;
- color: #999999;
+ color: #eec;
border: 1px solid #DDD;
padding: 0.3em;
margin-bottom: 10px;
+ background: #444;
}
.grey
{
@@ -1667,6 +1668,7 @@ transition: all 0.2s ease-in-out;
margin: 0 0 5px;
width: 60%;
border: 1px solid #d2d2d2;
+ background: #444;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 638aeb455..b59ab5dc1 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -1671,6 +1671,7 @@ body .pageheader{
height: 2.0em;
width: 100%;
font-size: 10px;
+ background: #444;
color: #999999;
border: 1px solid #DDD;
padding: 0.3em;
diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css
index cc598b9fe..c202146d5 100644
--- a/view/theme/diabook/diabook-green/style-network-wide.css
+++ b/view/theme/diabook/diabook-green/style-network-wide.css
@@ -439,7 +439,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #194719;
+ color: #2c9936;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -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;
@@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #194719;
+ color: #2c9936;
}
/*marker*/
@@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out;
font-weight: bolder;
}
.button.creation2 {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css
index 786547711..9b11c0b17 100644
--- a/view/theme/diabook/diabook-green/style-network.css
+++ b/view/theme/diabook/diabook-green/style-network.css
@@ -439,7 +439,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #194719;
+ color: #2c9936;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -493,7 +493,7 @@ code {
float: right;
}
.tool a {
- color: #194719;
+ color: #2c9936;
}
.tool a:hover {
text-decoration: none;
@@ -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;
@@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #194719;
+ color: #2c9936;
}
.wall-item-decor {
@@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out;
font-weight: bolder;
}
.button.creation2 {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1964,7 +1964,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css
index 65b7f2ba3..779bc5c22 100644
--- a/view/theme/diabook/diabook-green/style-profile-wide.css
+++ b/view/theme/diabook/diabook-green/style-profile-wide.css
@@ -440,7 +440,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #194719;
+ color: #2c9936;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -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;
@@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #194719;
+ color: #2c9936;
}
/*marker*/
@@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out;
cursor: pointer;
}
.button.creation2 {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1945,7 +1945,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css
index dcc7b373a..a955d3b9d 100644
--- a/view/theme/diabook/diabook-green/style-profile.css
+++ b/view/theme/diabook/diabook-green/style-profile.css
@@ -440,7 +440,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #194719;
+ color: #2c9936;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -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;
@@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #194719;
+ color: #2c9936;
}
.wall-item-decor {
@@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out;
cursor: pointer;
}
.button.creation2 {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1933,7 +1933,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css
index d85ea23a6..d98a6c325 100644
--- a/view/theme/diabook/diabook-green/style-wide.css
+++ b/view/theme/diabook/diabook-green/style-wide.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -476,7 +477,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #194719;
+ color: #2c9936;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -614,7 +615,7 @@ header #banner #logo-text {
}
/* messages */
#message-new {
- background: #194719;
+ background: #2c9936;
border: 1px solid #333;
width: 150px;
}
@@ -991,7 +992,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1185,7 +1186,7 @@ aside #side-peoplefind-url {
height: auto;
}
aside #likes a, a:visited, a:link {
- color: #194719;
+ color: #2c9936;
text-decoration: none;
cursor: pointer;
@@ -1220,7 +1221,7 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
@@ -1422,7 +1423,7 @@ body .pageheader{
padding-top: 10px;
}
.tread-wrapper a{
- color: #194719;
+ color: #2c9936;
}
/*marker*/
@@ -2073,7 +2074,7 @@ body .pageheader{
cursor: pointer;
}
.button.creation2 {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2207,7 +2208,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2225,7 +2226,7 @@ ul.rs_tabs li {
clear: both;
}
ul.rs_tabs li .selected {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css
index c83ddd397..6a9d8f7d0 100644
--- a/view/theme/diabook/diabook-green/style.css
+++ b/view/theme/diabook/diabook-green/style.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -477,7 +478,7 @@ a:hover {
}
/*color*/
.fakelink {
- color: #194719;
+ color: #2c9936;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -550,7 +551,7 @@ code {
}
/*color*/
.tool a {
- color: #194719;
+ color: #2c9936;
}
.tool a:hover {
text-decoration: none;
@@ -617,7 +618,7 @@ header #banner #logo-text {
/*color*/
/* messages */
#message-new {
- background: #194719;
+ background: #2c9936;
border: 1px solid #333;
width: 150px;
}
@@ -994,7 +995,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1189,7 +1190,7 @@ aside #side-peoplefind-url {
}
/*color*/
aside #likes a, a:visited, a:link {
- color: #194719;
+ color: #2c9936;
text-decoration: none;
cursor: pointer;
@@ -1224,7 +1225,7 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
@@ -1425,7 +1426,7 @@ body .pageheader{
}
/*color*/
.tread-wrapper a{
- color: #194719;
+ color: #2c9936;
}
.wall-item-decor {
position: absolute;
@@ -2071,7 +2072,7 @@ body .pageheader{
}
/*color*/
.button.creation2 {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2204,7 +2205,7 @@ ul.tabs li {
}
/*color*/
ul.tabs li .active {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2223,7 +2224,7 @@ ul.rs_tabs li {
}
/*color*/
ul.rs_tabs li .selected {
- background-color: #194719;
+ background-color: #2c9936;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css
index 0a83955df..0e6eaf2c7 100644
--- a/view/theme/diabook/diabook-pink/style-network-wide.css
+++ b/view/theme/diabook/diabook-pink/style-network-wide.css
@@ -439,7 +439,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #996d73;
+ color: #D02B55;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -807,7 +807,7 @@ ul.menu-popup a {
text-decoration: none;
}
ul.menu-popup a:hover {
- background-color: #996d73; /*bdcdd4;*/
+ background-color: #D02B55; /*bdcdd4;*/
color: #fff;
}
ul.menu-popup .menu-sep {
@@ -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;
@@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #996d73;
+ color: #D02B55;
}
/*marker*/
@@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out;
font-weight: bolder;
}
.button.creation2 {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css
index 3a4f49877..09e5b6f09 100644
--- a/view/theme/diabook/diabook-pink/style-network.css
+++ b/view/theme/diabook/diabook-pink/style-network.css
@@ -439,7 +439,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #996d73;
+ color: #D02B55;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -493,7 +493,7 @@ code {
float: right;
}
.tool a {
- color: #996d73;
+ color: #D02B55;
}
.tool a:hover {
text-decoration: none;
@@ -807,7 +807,7 @@ ul.menu-popup a {
text-decoration: none;
}
ul.menu-popup a:hover {
- background-color: #996d73; /*bdcdd4;*/
+ background-color: #D02B55; /*bdcdd4;*/
color: #fff;
}
ul.menu-popup .menu-sep {
@@ -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;
@@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #996d73;
+ color: #D02B55;
}
.wall-item-decor {
@@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out;
font-weight: bolder;
}
.button.creation2 {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1964,7 +1964,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css
index 080551896..15c12cf9c 100644
--- a/view/theme/diabook/diabook-pink/style-profile-wide.css
+++ b/view/theme/diabook/diabook-pink/style-profile-wide.css
@@ -440,7 +440,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #996d73;
+ color: #D02B55;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -807,7 +807,7 @@ ul.menu-popup a {
text-decoration: none;
}
ul.menu-popup a:hover {
- background-color: #996d73; /*bdcdd4;*/
+ background-color: #D02B55; /*bdcdd4;*/
color: #fff;
}
ul.menu-popup .menu-sep {
@@ -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;
@@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #996d73;
+ color: #D02B55;
}
/*marker*/
@@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out;
cursor: pointer;
}
.button.creation2 {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1945,7 +1945,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css
index 8f3753061..959880c25 100644
--- a/view/theme/diabook/diabook-pink/style-profile.css
+++ b/view/theme/diabook/diabook-pink/style-profile.css
@@ -440,7 +440,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #996d73;
+ color: #D02B55;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -806,7 +806,7 @@ ul.menu-popup a {
text-decoration: none;
}
ul.menu-popup a:hover {
- background-color: #996d73; /*bdcdd4;*/
+ background-color: #D02B55; /*bdcdd4;*/
color: #fff;
}
ul.menu-popup .menu-sep {
@@ -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;
@@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out;
padding-top: 10px;
}
.tread-wrapper a{
- color: #996d73;
+ color: #D02B55;
}
.wall-item-decor {
@@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out;
cursor: pointer;
}
.button.creation2 {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -1933,7 +1933,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css
index a51ca49cc..849566aa0 100644
--- a/view/theme/diabook/diabook-pink/style-wide.css
+++ b/view/theme/diabook/diabook-pink/style-wide.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -476,7 +477,7 @@ a:hover {
clear: both;
}
.fakelink {
- color: #996d73;
+ color: #D02B55;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -614,7 +615,7 @@ header #banner #logo-text {
}
/* messages */
#message-new {
- background: #996d73;
+ background: #D02B55;
border: 1px solid #333;
width: 150px;
}
@@ -943,7 +944,7 @@ ul.menu-popup a {
text-decoration: none;
}
ul.menu-popup a:hover {
- background-color: #996d73; /*bdcdd4;*/
+ background-color: #D02B55; /*bdcdd4;*/
color: #fff;
}
ul.menu-popup .menu-sep {
@@ -991,7 +992,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1185,7 +1186,7 @@ aside #side-peoplefind-url {
height: auto;
}
aside #likes a, a:visited, a:link {
- color: #996d73;
+ color: #D02B55;
text-decoration: none;
cursor: pointer;
@@ -1220,7 +1221,7 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
@@ -1422,7 +1423,7 @@ body .pageheader{
padding-top: 10px;
}
.tread-wrapper a{
- color: #996d73;
+ color: #D02B55;
}
/*marker*/
@@ -2073,7 +2074,7 @@ body .pageheader{
cursor: pointer;
}
.button.creation2 {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2207,7 +2208,7 @@ ul.tabs li {
margin-left: 5px;
}
ul.tabs li .active {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2225,7 +2226,7 @@ ul.rs_tabs li {
clear: both;
}
ul.rs_tabs li .selected {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
index 833e81a5f..798d73979 100644
--- a/view/theme/diabook/diabook-pink/style.css
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -477,7 +478,7 @@ a:hover {
}
/*color*/
.fakelink {
- color: #996d73;
+ color: #D02B55;
/* color: #3e3e8c; */
text-decoration: none;
cursor: pointer;
@@ -550,7 +551,7 @@ code {
}
/*color*/
.tool a {
- color: #996d73;
+ color: #D02B55;
}
.tool a:hover {
text-decoration: none;
@@ -617,7 +618,7 @@ header #banner #logo-text {
/* messages */
/*color*/
#message-new {
- background: #996d73;
+ background: #D02B55;
border: 1px solid #333;
width: 150px;
}
@@ -946,7 +947,7 @@ ul.menu-popup a {
}
/*color*/
ul.menu-popup a:hover {
- background-color: #996d73; /*bdcdd4;*/
+ background-color: #D02B55; /*bdcdd4;*/
color: #fff;
}
ul.menu-popup .menu-sep {
@@ -994,7 +995,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1189,7 +1190,7 @@ aside #side-peoplefind-url {
}
/*color*/
aside #likes a, a:visited, a:link {
- color: #996d73;
+ color: #D02B55;
text-decoration: none;
cursor: pointer;
@@ -1224,7 +1225,7 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
@@ -1425,7 +1426,7 @@ body .pageheader{
}
/*color*/
.tread-wrapper a{
- color: #996d73;
+ color: #D02B55;
}
.wall-item-decor {
position: absolute;
@@ -2071,7 +2072,7 @@ body .pageheader{
}
/*color*/
.button.creation2 {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2204,7 +2205,7 @@ ul.tabs li {
}
/*color*/
ul.tabs li .active {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
@@ -2223,7 +2224,7 @@ ul.rs_tabs li {
}
/*color*/
ul.rs_tabs li .selected {
- background-color: #996d73;
+ background-color: #D02B55;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
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/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
index 79c5fb1cb..b9ea238e2 100644
--- a/view/theme/diabook/diabook-red/style-wide.css
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -1013,7 +1014,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1232,7 +1233,7 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index c7cb1586d..05c802102 100644
--- a/view/theme/diabook/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -1012,7 +1013,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1230,7 +1231,7 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl
index 8d3c65162..25058a7ff 100644
--- a/view/theme/diabook/footer.tpl
+++ b/view/theme/diabook/footer.tpl
@@ -1,4 +1,3 @@
-<div style="display: table-cell"></div>
-<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
+<div id="footerbox" style="display:none">
<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
</div> \ No newline at end of file
diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README
index 57ca16d02..12447afc9 100644
--- a/view/theme/diabook/js/README
+++ b/view/theme/diabook/js/README
@@ -24,3 +24,8 @@ $(function() {
_______________________________________________________________________________________________
http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html
+
+_______________________________________________________________________________________________
+
+http://jquery.malsup.com/
+http://jquery.malsup.com/twitter/
diff --git a/view/theme/diabook/js/jquery.twitter.search.js b/view/theme/diabook/js/jquery.twitter.search.js
new file mode 100644
index 000000000..18d2e091a
--- /dev/null
+++ b/view/theme/diabook/js/jquery.twitter.search.js
@@ -0,0 +1,289 @@
+/*!
+ * jQuery Twitter Search Plugin
+ * Examples and documentation at: http://jquery.malsup.com/twitter/
+ * Copyright (c) 2010 M. Alsup
+ * Version: 1.04 (15-SEP-2011)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ * Requires: jQuery v1.3.2 or later
+ */
+
+;(function($) {
+ $.fn.twitterSearch = function(options) {
+ if (typeof options == 'string')
+ options = { term: options };
+ return this.each(function() {
+ var grabFlag = false,
+ grabbing = false,
+ $frame = $(this), text, $text, $title, $bird, $cont, height, paused = false,
+ opts = $.extend(true, {}, $.fn.twitterSearch.defaults, options || {}, $.metadata ? $frame.metadata() : {});
+
+ opts.formatter = opts.formatter || $.fn.twitterSearch.formatter;
+ opts.filter = opts.filter || $.fn.twitterSearch.filter;
+
+ if (!opts.applyStyles) { // throw away all style defs
+ for (var css in opts.css)
+ opts.css[css] = {};
+ }
+
+ if (opts.title === null) // user can set to '' to suppress title
+ opts.title = opts.term;
+
+ opts.title = opts.title || '';
+ text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'<a id="close_friends_icon" onClick="close_twitter()" class="icon close_box" title="close"></a>'+ '</span>');
+ $text = $(text);
+ if (opts.titleLink)
+ $text.css(opts.css['titleLink']);
+ $title = $('<div class="twitterSearchTitle"></div>').append($text).appendTo($frame).css(opts.css['title']);
+ if (opts.bird) {
+ $bird = $('<img class="twitterSearchBird" src="'+opts.birdSrc+'" />').appendTo($title).css(opts.css['bird']);
+ if (opts.birdLink)
+ $bird.wrap('<a href="'+ opts.birdLink +'"></a>');
+ }
+ $cont = $('<div class="twitterSearchContainter"></div>').appendTo($frame).css(opts.css['container']);
+ cont = $cont[0];
+ if (opts.colorExterior)
+ $title.css('background-color',opts.colorExterior);
+ if (opts.colorInterior)
+ $cont.css('background-color',opts.colorInterior);
+
+ $frame.css(opts.css['frame']);
+ if (opts.colorExterior)
+ $frame.css('border-color',opts.colorExterior);
+
+ height = $frame.innerHeight() - $title.outerHeight();
+ $cont.height(height);
+
+ if (opts.pause)
+ $cont.hover(function(){paused = true;},function(){paused = false;});
+
+ $('<div class="twitterSearchLoading">Loading tweets..</div>').css(opts.css['loading']).appendTo($cont);
+
+ grabTweets();
+
+ function grabTweets() {
+ var url = opts.url + opts.term;
+ grabFlag = false;
+ grabbing = true;
+ // grab twitter stream
+ $.getJSONP({
+ url: url,
+ timeout: 30000,
+ error: function(xhr, status, e) {
+ failWhale(e);
+ },
+ complete: function() {
+ grabbing = false;
+ if (opts.refreshSeconds)
+ setTimeout(regrab, opts.refreshSeconds * 1000);
+ },
+ success: function(json) {
+ if (json.error) {
+ failWhale(json.error);
+ return;
+ }
+ $cont.fadeOut('fast',function() {
+ $cont.empty();
+
+ // iterate twitter results
+ $.each(json.results, function(i) {
+ if (!opts.filter.call(opts, this))
+ return; // skip this tweet
+ var $img, $text, w,
+ tweet = opts.formatter(this, opts),
+ $tweet = $(tweet);
+ $tweet.css(opts.css['tweet']);
+ $img = $tweet.find('.twitterSearchProfileImg').css(opts.css['img']);
+ $tweet.find('.twitterSearchUser').css(opts.css['user']);
+ $tweet.find('.twitterSearchTime').css(opts.css['time']);
+ $tweet.find('a').css(opts.css['a']);
+ $tweet.appendTo($cont);
+ $text = $tweet.find('.twitterSearchText').css(opts.css['text']);
+ if (opts.avatar) {
+ w = $img.outerWidth() + parseInt($tweet.css('paddingLeft'));
+ $text.css('paddingLeft', w);
+ }
+ });
+
+ $cont.fadeIn('fast');
+
+ if (json.results.length < 2) {
+ if (opts.refreshSeconds)
+ setTimeout(grabTweets, opts.refreshSeconds * 1000);
+ return;
+ }
+
+ // stage first animation
+ setTimeout(go, opts.timeout);
+ });
+ }
+ });
+ };
+
+ function regrab() {
+ grabFlag = true;
+ }
+
+ function failWhale(msg) {
+ var $fail = $('<div class="twitterSearchFail">' + msg + '</div>').css(opts.css['fail']);
+ $cont.empty().append($fail);
+ };
+
+ function go() {
+ if (paused || grabbing) {
+ setTimeout(go, 500);
+ return;
+ }
+ var h, $el = $cont.children(':first'), el = $el[0];
+ $el.animate(opts.animOut, opts.animOutSpeed, function() {
+ h = $el.outerHeight();
+ $el.animate({ marginTop: -h }, opts.animInSpeed, function() {
+ $el.css({ marginTop: 0, opacity: 1 });
+ /*@cc_on
+ try { el.style.removeAttribute('filter'); } // ie cleartype fix
+ catch(smother) {}
+ @*/
+ $el.css(opts.css['tweet']).show().appendTo($cont);
+
+ setTimeout(grabFlag ? grabTweets : go, opts.timeout);
+ });
+ });
+ }
+ });
+ };
+
+ $.fn.twitterSearch.filter = function(tweet) {
+ return true;
+ };
+
+ $.fn.twitterSearch.formatter = function(json, opts) {
+ var str, pretty,
+ text = json.text;
+ if (opts.anchors) {
+ text = json.text.replace(/(http:\/\/\S+)/g, '<a href="$1">$1</a>');
+ text = text.replace(/\@(\w+)/g, '<a href="http://twitter.com/$1">@$1</a>');
+ }
+ str = '<div class="twitterSearchTweet">';
+ if (opts.avatar)
+ str += '<img class="twitterSearchProfileImg" src="' + json.profile_image_url + '" />';
+ str += '<div><span class="twitterSearchUser"><a href="http://www.twitter.com/'+ json.from_user+'/status/'+ json.id_str +'">'
+ + json.from_user + '</a></span>';
+ pretty = prettyDate(json.created_at);
+ if (opts.time && pretty)
+ str += ' <span class="twitterSearchTime">('+ pretty +')</span>'
+ str += '<div class="twitterSearchText">' + text + '</div></div></div>';
+ return str;
+ };
+
+ $.fn.twitterSearch.defaults = {
+ url: 'http://search.twitter.com/search.json?callback=?&q=',
+ anchors: true, // true or false (enable embedded links in tweets)
+ animOutSpeed: 500, // speed of animation for top tweet when removed
+ animInSpeed: 500, // speed of scroll animation for moving tweets up
+ animOut: { opacity: 0 }, // animation of top tweet when it is removed
+ applyStyles: true, // true or false (apply default css styling or not)
+ avatar: true, // true or false (show or hide twitter profile images)
+ bird: true, // true or false (show or hide twitter bird image)
+ birdLink: false, // url that twitter bird image should like to
+ birdSrc: 'http://cloud.github.com/downloads/malsup/twitter/tweet.gif', // twitter bird image
+ colorExterior: null, // css override of frame border-color and title background-color
+ colorInterior: null, // css override of container background-color
+ filter: null, // callback fn to filter tweets: fn(tweetJson) { /* return false to skip tweet */ }
+ formatter: null, // callback fn to build tweet markup
+ pause: false, // true or false (pause on hover)
+ refreshSeconds: 0, // number of seconds to wait before polling for newer tweets
+ term: '', // twitter search term
+ time: true, // true or false (show or hide the time that the tweet was sent)
+ timeout: 4000, // delay betweet tweet scroll
+ title: null, // title text to display when frame option is true (default = 'term' text)
+ titleLink: null, // url for title link
+ css: {
+ // default styling
+ a: { textDecoration: 'none', color: '#3B5998' },
+ bird: { width: '50px', height: '20px', position: 'absolute', left: '-30px', top: '-20px', border: 'none' },
+ container: { overflow: 'hidden', backgroundColor: '', height: '360px' },
+ fail: { background: '#6cc5c3 url(http://cloud.github.com/downloads/malsup/twitter/failwhale.png) no-repeat 50% 50%', height: '100%', padding: '10px' },
+ frame: { border: '0px solid #C2CFF1', borderRadius: '0px', '-moz-border-radius': '0px', '-webkit-border-radius': '0px' },
+ tweet: { padding: '5px 10px', clear: 'left' },
+ img: { 'float': 'left', margin: '5px', width: '48px', height: '48px' },
+ loading: { padding: '20px', textAlign: 'center', color: '#888' },
+ text: {},
+ time: { fontSize: 'smaller', color: '#888' },
+ title: { 'border-bottom': '1px solid #D2D2D2', 'padding-top': '5px', 'padding-bottom': '0px', 'padding-left': '9px', 'margin-bottom': '0px', 'margin-top': '30px' , 'display': 'block', 'font-size': '1.17em', 'font-weight': 'bold'},
+ titleLink: { textDecoration: 'none', color: '#3B5998' },
+ user: { fontWeight: 'bold' }
+ }
+ };
+
+ // fn to handle jsonp with timeouts and errors
+ // hat tip to Ricardo Tomasi for the timeout logic
+ $.getJSONP = function(s) {
+ s.dataType = 'jsonp';
+ $.ajax(s);
+
+ // figure out what the callback fn is
+ var $script = $(document.getElementsByTagName('head')[0].firstChild);
+ var url = $script.attr('src') || '';
+ var cb = (url.match(/callback=(\w+)/)||[])[1];
+ if (!cb)
+ return; // bail
+ var t = 0, cbFn = window[cb];
+
+ $script[0].onerror = function(e) {
+ $script.remove();
+ handleError(s, {}, "error", e);
+ clearTimeout(t);
+ };
+
+ if (!s.timeout)
+ return;
+
+ window[cb] = function(json) {
+ clearTimeout(t);
+ cbFn(json);
+ cbFn = null;
+ };
+
+ t = setTimeout(function() {
+ $script.remove();
+ handleError(s, {}, "timeout");
+ if (cbFn)
+ window[cb] = function(){};
+ }, s.timeout);
+
+ function handleError(s, xhr, msg, e) {
+ s.error && s.error.call(s.context, xhr, msg, e);
+ s.global && $.event.trigger("ajaxError", [xhr, s, e || msg]);
+ s.complete && s.complete.call(s.context, xhr, e || msg);
+ }
+ };
+
+ /*
+ * JavaScript Pretty Date
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Licensed under the MIT license.
+ */
+ // converts ISO time to casual time
+ function prettyDate(time){
+ var date = new Date((time || "").replace(/-/g,"/").replace(/TZ/g," ")),
+ diff = (((new Date()).getTime() - date.getTime()) / 1000),
+ day_diff = Math.floor(diff / 86400);
+
+ if ( isNaN(day_diff) || day_diff < 0 || day_diff >= 31 )
+ return;
+ var v = day_diff == 0 && (
+ diff < 60 && "just now" ||
+ diff < 120 && "1 minute ago" ||
+ diff < 3600 && Math.floor( diff / 60 ) + " minutes ago" ||
+ diff < 7200 && "1 hour ago" ||
+ diff < 86400 && Math.floor( diff / 3600 ) + " hours ago") ||
+ day_diff == 1 && "Yesterday" ||
+ day_diff < 7 && day_diff + " days ago" ||
+ day_diff < 31 && Math.ceil( day_diff / 7 ) + " weeks ago";
+ if (!v)
+ window.console && console.log(time);
+ return v ? v : '';
+ }
+
+})(jQuery);
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index ce27400f6..f611de004 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
</nav>
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index a8ed1e9a2..2ba8d1b07 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1252,6 +1252,7 @@ right_aside .icon {width: 10px; height: 10px;}
transition: all 0.2s ease-in-out;
}
+
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index f8dced3e6..71ed4e472 100644
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -974,7 +975,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1195,7 +1196,7 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 9150ea8cf..e70c72cb2 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -21,6 +21,7 @@
.admin.linklist {
border: 0px; padding: 0px;
+ list-style: none;
}
.admin.link {
@@ -974,7 +975,7 @@ ul.menu-popup .empty {
background-color: #bdcdd4;
}
#nav-notifications-menu {
- width: 400px;
+ width: 425px !important;
max-height: 550px;
overflow: auto;
}
@@ -1198,7 +1199,7 @@ aside #side-peoplefind-url {
margin-right: 20px;
}
#login-submit-wrapper{
- padding-top: 120px;
+
margin-bottom: 12px;
}
aside #login-submit-button{
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index c45db9884..945c3f36b 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.022)
+ * Version: (Version: 1.024)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.022)";
+$diabook_version = "Diabook (Version: 1.024)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -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_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 != "7") {
+ 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 != "7") {
+ if($ccCookie != "9") {
// COMMUNITY
diabook_community_info();
@@ -312,7 +331,25 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
+//load jquery.twitter.search.js
+$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
+
//js scripts
+
+//check if community_home-plugin is activated and change css
+$nametocheck = "communityhome";
+$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
+if(count($r) == "1") {
+
+$a->page['htmlhead'] .= '
+<script>
+$(document).ready(function() {
+ $("div#login-submit-wrapper").attr("style","padding-top: 120px;");
+ });
+</script>';
+}
+
//comment-edit-wrapper on photo_view
if ($a->argv[0].$a->argv[2] === "photos"."image"){
@@ -324,16 +361,28 @@ $a->page['htmlhead'] .= '
});
</script>';
-
}
$a->page['htmlhead'] .= '
<script>
+
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
+ $("#twitter").twitterSearch({
+ term: "friendica",
+ animInSpeed: 250,
+ bird: false,
+ avatar: false,
+ colorExterior: "#fff",
+ title: "Last Tweets",
+ timeout: 10000 });
});
+$(window).load(function() {
+ var footer_top = $(document).height() - 30;
+ $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
+ });
</script>';
@@ -412,8 +461,10 @@ $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: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
@@ -433,7 +484,7 @@ $a->page['htmlhead'] .= '
</script>';
- if($ccCookie != "7") {
+ if($ccCookie != "9") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@@ -442,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")
{
@@ -458,6 +514,10 @@ $("right_aside").ready(function(){
document.getElementById( "close_friends" ).style.display = "none";
};
+ if($.cookie("close_twitter") == "1")
+ {
+ document.getElementById( "twitter" ).style.display = "none";
+ };
if($.cookie("close_lastusers") == "1")
{
@@ -481,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: "/" });
@@ -495,7 +560,11 @@ function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
-
+
+function close_twitter(){
+ document.getElementById( "twitter" ).style.display = "none";
+ $.cookie("close_twitter","1", { expires: 365, path: "/" });
+ };
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";