mirror of
https://github.com/friendica/friendica
synced 2024-11-10 03:02:54 +00:00
add links to home, profile, photos, events, notes to aside in network-stream
This commit is contained in:
tommy tomson
parent
8358b9247f
commit
42462cc1f0
6 changed files with 189 additions and 3 deletions
19
view/theme/diabook-blue/profile_side.tpl
Normal file
19
view/theme/diabook-blue/profile_side.tpl
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<div id="profile_side">
|
||||
<div id="ps-usernameicon">
|
||||
<a href="$ps.usermenu.status.0" title="$userinfo.name">
|
||||
<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
|
||||
</a>
|
||||
<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
|
||||
</div>
|
||||
|
||||
<ul id="profile-side-menu" class="menu-profile-side">
|
||||
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
|
||||
<li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li>
|
||||
<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
|
||||
<li id="profile-side-events" class="menu-profile-list"><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"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -874,6 +874,41 @@ ul.menu-popup .empty {
|
|||
padding: 7px 7px 0px 0px;
|
||||
}
|
||||
|
||||
/*profile_side*/
|
||||
#profile_side {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
#ps-usericon{
|
||||
height: 25px
|
||||
}
|
||||
#ps-username{
|
||||
font-size: 1.17em;
|
||||
font-weight: bold;
|
||||
vertical-align: top;
|
||||
position: absolute;
|
||||
padding-top: 4px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
#ps-username:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
.menu-profile-side{
|
||||
list-style: none;
|
||||
padding-left: 16px;
|
||||
min-height: 16px;
|
||||
}
|
||||
.menu-profile-list{
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
}
|
||||
.menu-profile-list:hover{
|
||||
background: #EEE;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
@ -1879,6 +1914,12 @@ ul.tabs li .active {
|
|||
float: left;
|
||||
}
|
||||
/* photo */
|
||||
.photo {
|
||||
box-shadow: 2px 2px 5px 0px #000000;
|
||||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
margin: 0px 10px 10px 0px;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,42 @@ $a->theme_info = array(
|
|||
'extends' => 'diabook',
|
||||
);
|
||||
|
||||
//profile_side
|
||||
|
||||
|
||||
|
||||
$nav['usermenu']=array();
|
||||
$userinfo = null;
|
||||
|
||||
if(local_user()) {
|
||||
|
||||
|
||||
|
||||
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
|
||||
|
||||
$userinfo = array(
|
||||
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
|
||||
'name' => $a->user['username'],
|
||||
);
|
||||
|
||||
$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'][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'));
|
||||
|
||||
|
||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
||||
$tpl = get_markup_template('profile_side.tpl');
|
||||
|
||||
$a->page['aside'] .= replace_macros($tpl, array(
|
||||
'$userinfo' => $userinfo,
|
||||
'$ps' => $ps,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
//js scripts
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
|
|
|
|||
19
view/theme/diabook/profile_side.tpl
Normal file
19
view/theme/diabook/profile_side.tpl
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<div id="profile_side">
|
||||
<div id="ps-usernameicon">
|
||||
<a href="$ps.usermenu.status.0" title="$userinfo.name">
|
||||
<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
|
||||
</a>
|
||||
<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
|
||||
</div>
|
||||
|
||||
<ul id="profile-side-menu" class="menu-profile-side">
|
||||
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
|
||||
<li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li>
|
||||
<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
|
||||
<li id="profile-side-events" class="menu-profile-list"><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"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -863,7 +863,42 @@ ul.menu-popup .empty {
|
|||
padding: 7px 7px 0px 0px;
|
||||
}
|
||||
|
||||
|
||||
/*profile_side*/
|
||||
#profile_side {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
#ps-usericon{
|
||||
height: 25px
|
||||
}
|
||||
#ps-username{
|
||||
font-size: 1.17em;
|
||||
font-weight: bold;
|
||||
vertical-align: top;
|
||||
position: absolute;
|
||||
padding-top: 4px;
|
||||
padding-left: 5px;
|
||||
color: #2D2D2D;
|
||||
}
|
||||
#ps-username:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
.menu-profile-side{
|
||||
list-style: none;
|
||||
padding-left: 16px;
|
||||
min-height: 16px;
|
||||
}
|
||||
.menu-profile-list{
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
}
|
||||
.menu-profile-list:hover{
|
||||
background: #EEE;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
/* aside */
|
||||
aside {
|
||||
|
|
@ -2346,5 +2381,4 @@ float: left;
|
|||
#photos-upload-newalbum-div {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -11,6 +11,43 @@ $a->theme_info = array(
|
|||
'extends' => 'diabook',
|
||||
);
|
||||
|
||||
//profile_side
|
||||
|
||||
|
||||
|
||||
$nav['usermenu']=array();
|
||||
$userinfo = null;
|
||||
|
||||
if(local_user()) {
|
||||
|
||||
|
||||
|
||||
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
|
||||
|
||||
$userinfo = array(
|
||||
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
|
||||
'name' => $a->user['username'],
|
||||
);
|
||||
|
||||
$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'][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'));
|
||||
|
||||
|
||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
||||
$tpl = get_markup_template('profile_side.tpl');
|
||||
|
||||
$a->page['aside'] .= replace_macros($tpl, array(
|
||||
'$userinfo' => $userinfo,
|
||||
'$ps' => $ps,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
//js script
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
|
|
|
|||
Loading…
Reference in a new issue