add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside...

diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 2d9033b1873e6b2d0ba2a2cefb2aeb0170588c42..854684a5f50ca89ea1ac5e411c2843a6a561d20d 100755 (executable)
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -10,11 +10,6 @@
 <a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</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>Connectable Services</h3>
 <div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
@@ -29,6 +24,19 @@
 </div>
 {{ 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'>

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

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

diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 289581c36a1b642f4f8c7bfb6ac9afe3e4104014..651b9647d1ab6b843d60d16cbc902176cab9d628 100644 (file)
--- 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 0fa8a27fd8382209cf8416c31eaf80800029541f..94396300fe6d39de3d6b66c58dd8d379e76d22df 100644 (file)
--- 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 f23518555ade71c545107769c93d281d0247ba2c..c35320fcfa5df37a73a0d17995ff70a945c083d6 100644 (file)
--- 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 7488c2fed5e3c8b70b0c500cd1dca733387749ac..65a019dbff76bd2fc5656d114a20fa7df64ef0a3 100644 (file)
--- 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 322e163296ae0de021eeda067f732b7881c314c0..bbda4f10303e064fe9a8a8c83547b67c58ad5423 100755 (executable)
--- 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'));