add "find friends" to right_aside to diabook, fixes in css in diabook

diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 854684a5f50ca89ea1ac5e411c2843a6a561d20d..748e6d07794f79e7d0591834ef3c627fade3a5ed 100755 (executable)
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -24,7 +24,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $nv }}
 <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>

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index c35320fcfa5df37a73a0d17995ff70a945c083d6..d0bcd3209edeb7b44a544de1cbaf1f6ba872a079 100644 (file)
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -387,7 +387,7 @@
   margin-bottom: 1px;
   width: 484px;
   border-bottom: 1px solid #BDCDD4;
-  background-color: #E4EEF7;
+  background-color: #fff;
   padding: 8px;
 }
 
@@ -1324,12 +1324,11 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
   float: right;
 }
 .wall-item-container.comment {
-  margin-top: 0px;
-  margin-bottom: 0px;
+  margin-top: 5px;
+  margin-bottom: 5px;
   margin-left: 80px;
   width: 500px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
-  background-color: #E4EEF7;
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
@@ -1345,17 +1344,10 @@ 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 0px 0px 80px;
-  background-color: #E4EEF7;
+  background-color: #fff;
   width: 500px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index bbda4f10303e064fe9a8a8c83547b67c58ad5423..e12d940aa90345d35691c1116d87a8b230715f83 100755 (executable)
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -137,7 +137,7 @@ function diabook_blue_community_info(){
    $aside['$fostitJS'] = $fostitJS;
    
    //nav FIND FRIENDS
-       
+       if(local_user()) {
        $nv = array();
        $nv['directory'] = Array('directory', t('Directory'), "", "");
        $nv['match'] = Array('match', t('Similar Interests'), "", "");
@@ -145,7 +145,7 @@ function diabook_blue_community_info(){
        $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
        
        $aside['$nv'] = $nv;
-       
+       };
        //Community Page
    $page = '<div id="page-sidebar-right_aside" class="widget">
                        <div class="title tool">

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index aa150b9d0cad46e2aabb341789df13b481468162..7e50423ce2ce0f080b691baafc6085b6caefb1c3 100755 (executable)
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -24,6 +24,14 @@
 </div>
 {{ endif }}
 
+{{ if $nv }}
+<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 this Link.</span></div>

diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
new file mode 100644 (file)
index 0000000..acf857f
Binary files /dev/null and b/view/theme/diabook/icons/pscontacts.png differ

diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index acf857f32f3bfbe68a514527e995407f8c916527..6d9539610edbcc82e2ca5cbce6ec7e2aadcbd38a 100644 (file)
Binary files a/view/theme/diabook/icons/pubgroups.png and b/view/theme/diabook/icons/pubgroups.png differ

diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 0fa8a27fd8382209cf8416c31eaf80800029541f..fc949639ea2623fcc9597699bf17f12758e4f917 100644 (file)
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/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/style-network.css b/view/theme/diabook/style-network.css
index 3854adc343154e91ca9434f60aa6be5d7176acfb..20c273ec30677d147b041ede03297e37f7efcc58 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -926,6 +926,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 {

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 798eef42237f082fc76cd242482fb0c1f0658338..6eb623d9536cabe87723ba7c3dcb5b72886f34f5 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -139,6 +139,17 @@ function diabook_community_info(){
   
    $aside['$fostitJS'] = $fostitJS;
    
+   //right_aside FIND FRIENDS
+       if(local_user()) {
+       $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">
                        <div class="title tool">
@@ -200,6 +211,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'));