aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-26 18:54:57 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-03-26 18:54:57 +0200
commit2d834d0f45125650a40363a4fb41afd05fc8de1e (patch)
tree25abf9edc4c47c4ee468627eb75a3a0dc6508ded
parentf1d15d8884828bc491acb0c79d1fa73d5998449f (diff)
downloadvolse-hubzilla-2d834d0f45125650a40363a4fb41afd05fc8de1e.tar.gz
volse-hubzilla-2d834d0f45125650a40363a4fb41afd05fc8de1e.tar.bz2
volse-hubzilla-2d834d0f45125650a40363a4fb41afd05fc8de1e.zip
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
-rwxr-xr-xview/theme/diabook-blue/communityhome.tpl18
-rw-r--r--view/theme/diabook-blue/icons/pscontacts.pngbin0 -> 710 bytes
-rw-r--r--view/theme/diabook-blue/icons/pubgroups.pngbin710 -> 781 bytes
-rw-r--r--view/theme/diabook-blue/nav.tpl6
-rw-r--r--view/theme/diabook-blue/profile_side.tpl1
-rw-r--r--view/theme/diabook-blue/style-network.css29
-rw-r--r--view/theme/diabook-blue/style.css5
-rwxr-xr-xview/theme/diabook-blue/theme.php11
8 files changed, 50 insertions, 20 deletions
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 2d9033b18..854684a5f 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -11,11 +11,6 @@
{{ endif }}
{{ if $lastusers_title }}
-<h3>PostIt to Friendica</h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
-{{ endif }}
-
-{{ if $lastusers_title }}
<h3>Connectable Services</h3>
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
@@ -30,6 +25,19 @@
{{ endif }}
{{ if $lastusers_title }}
+<h3>Find Friends</h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+{{ endif }}
+
+{{ if $lastusers_title }}
<h3>$lastusers_title</h3>
<div id='lastusers-wrapper' class='items-wrapper'>
{{ for $lastusers_items as $i }}
diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
index acf857f32..6d9539610 100644
--- a/view/theme/diabook-blue/icons/pubgroups.png
+++ b/view/theme/diabook-blue/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 289581c36..651b9647d 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -85,11 +85,7 @@
</li>
- {{ if $nav.directory }}
- <li id="nav-directory-link" class="nav-menu $sel.directory">
- <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
- </li>
- {{ endif }}
+
{{ if $nav.apps }}
<li id="nav-apps-link" class="nav-menu $sel.apps">
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index 0fa8a27fd..94396300f 100644
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -9,6 +9,7 @@
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index f23518555..c35320fcf 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -384,11 +384,10 @@
.hide-comments-outer {
margin-left: 80px;
- margin-bottom: 5px;
+ margin-bottom: 1px;
width: 484px;
border-bottom: 1px solid #BDCDD4;
- border-top: 1px solid #BDCDD4;
-
+ background-color: #E4EEF7;
padding: 8px;
}
@@ -936,7 +935,9 @@ ul.menu-popup .empty {
.menu-profile-list.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
}
-
+.menu-profile-list.pscontacts{
+ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+ }
/* aside */
aside {
display: table-cell;
@@ -1323,11 +1324,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
float: right;
}
.wall-item-container.comment {
- margin-top: 5px;
- margin-bottom: 5px;
+ margin-top: 0px;
+ margin-bottom: 0px;
margin-left: 80px;
width: 500px;
border-bottom: 1px solid hsl(198, 21%, 79%);
+ background-color: #E4EEF7;
}
.wall-item-container.comment .contact-photo {
width: 32px;
@@ -1343,20 +1345,31 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
+.wall-item-like {
+ background-color: #E4EEF7;
+
+ }
+.wall-item-dislike{
+ background-color: #E4EEF7;
+ border-bottom: 1px solid #BECED5;
+ }
.wall-item-comment-wrapper {
- margin: 1px 5px 1px 80px;
+ margin: 1px 0px 0px 80px;
+ background-color: #E4EEF7;
+ width: 500px;
}
.wall-item-comment-wrapper .comment-edit-photo {
display: none;
}
.wall-item-comment-wrapper textarea {
height: 2.0em;
- width: 100%;
+ width: 93%;
font-size: 10px;
color: #999999;
border: 1px solid #DDD;
padding: 0.3em;
font-size: 14px;
+ margin-left: 20px;
}
.wall-item-comment-wrapper .comment-edit-text-full {
font-size: 14px;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 7488c2fed..65a019dbf 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -387,8 +387,6 @@
margin-bottom: 5px;
width: 684px;
border-bottom: 1px solid #BDCDD4;
- border-top: 1px solid #BDCDD4;
-
padding: 8px;
}
@@ -935,6 +933,9 @@ ul.menu-popup .empty {
.menu-profile-list.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
}
+.menu-profile-list.pscontacts{
+ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+ }
/* aside */
aside {
display: table-cell;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 322e16329..bbda4f103 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -135,6 +135,16 @@ function diabook_blue_community_info(){
else {a_funct()}})()" ;
$aside['$fostitJS'] = $fostitJS;
+
+ //nav FIND FRIENDS
+
+ $nv = array();
+ $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['match'] = Array('match', t('Similar Interests'), "", "");
+ $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+ $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+
+ $aside['$nv'] = $nv;
//Community Page
$page = '<div id="page-sidebar-right_aside" class="widget">
@@ -196,6 +206,7 @@ if ($a->argv[0] === "network" && local_user()){
$ps = array('usermenu'=>array());
$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+ $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));
$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));