just tinkering and trying a few things - don't get upset. It can all be reverted it it sucks. Freedom's just another word for "nothin' left to lose" and I'm not sure it's possible to create a UI that's hated more than Friendica. So that gives us plenty of artististic license to explore some different directions and see if they lead to anything interesting.
This commit is contained in:
friendica
parent
8d442e6fc1
commit
dd22e1b582
@ -90,6 +90,11 @@ class Conversation extends BaseObject {
|
||||
return $this->profile_owner;
|
||||
}
|
||||
|
||||
public function set_profile_owner($uid) {
|
||||
$this->profile_owner = $uid;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Add a thread to the conversation
|
||||
*
|
||||
|
||||
@ -658,6 +658,12 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
|
||||
|
||||
$conv = new Conversation($mode, $preview);
|
||||
|
||||
// In the display mode we don't have a profile owner.
|
||||
|
||||
if($mode === 'display' && $items)
|
||||
$conv->set_profile_owner($items[0]['uid']);
|
||||
|
||||
|
||||
// get all the topmost parents
|
||||
// this shouldn't be needed, as we should have only them in our array
|
||||
// But for now, this array respects the old style, just in case
|
||||
|
||||
@ -71,7 +71,7 @@ EOT;
|
||||
$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
|
||||
|
||||
// user menu
|
||||
$nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Status'), "", t('Your posts and conversations'));
|
||||
$nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'));
|
||||
$nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'));
|
||||
if(feature_enabled(local_user(),'multi_profiles'))
|
||||
$nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit Profiles'));
|
||||
@ -128,7 +128,7 @@ EOT;
|
||||
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
|
||||
|
||||
|
||||
$nav['directory'] = array('directory', t('Channel Directory'), "", t('Channel Locator'));
|
||||
$nav['directory'] = array('directory', t('Directory'), "", t('Channel Locator'));
|
||||
|
||||
|
||||
/**
|
||||
@ -139,24 +139,24 @@ EOT;
|
||||
|
||||
if(local_user()) {
|
||||
|
||||
$nav['network'] = array('network', t('Network'), "", t('Conversations from your friends'));
|
||||
$nav['network']['all']=array('notifications/network', t('See all network notifications'), "", "");
|
||||
$nav['network']['mark'] = array('', t('Mark all network notifications seen'), '','');
|
||||
$nav['network'] = array('network', t('Matrix'), "", t('Conversations from your grid'));
|
||||
$nav['network']['all']=array('notifications/network', t('See all matrix notifications'), "", "");
|
||||
$nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
|
||||
|
||||
$nav['home'] = array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'));
|
||||
$nav['home']['all']=array('notifications/channel', t('See all channel notifications'), "", "");
|
||||
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');
|
||||
|
||||
|
||||
$nav['intros'] = array('connections/pending', t('Introductions'), "", t('New Connections'));
|
||||
$nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections'));
|
||||
$nav['intros']['all']=array('intro', t('See all channel introductions'), "", "");
|
||||
|
||||
|
||||
$nav['notifications'] = array('notifications/system', t('Notifications'), "", t('Notifications'));
|
||||
$nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'));
|
||||
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
|
||||
$nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '','');
|
||||
|
||||
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
|
||||
$nav['messages'] = array('message', t('Mail'), "", t('Private mail'));
|
||||
$nav['messages']['all']=array('message', t('See all private messages'), "", "");
|
||||
$nav['messages']['mark'] = array('', t('Mark all private messages seen'), '','');
|
||||
$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
|
||||
|
||||
@ -24,8 +24,6 @@ function wfinger_init(&$a) {
|
||||
|
||||
header('Content-type: application/jrd+json');
|
||||
|
||||
$pubkey = get_config('system','site_pubkey');
|
||||
|
||||
$r = null;
|
||||
|
||||
if($resource) {
|
||||
@ -82,7 +80,7 @@ function wfinger_init(&$a) {
|
||||
|
||||
array(
|
||||
'rel' => 'http://purl.org/zot/protocol',
|
||||
'href' => z_root() . '/well-known/zot-info' . '?zaddr=' . $r[0]['xchan_addr'],
|
||||
'href' => z_root() . '/.well-known/zot-info' . '?zaddr=' . $r[0]['xchan_addr'],
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
2013-03-04.242
|
||||
2013-03-05.243
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
body {
|
||||
font-family: arial,freesans,clean,sans-serif;
|
||||
font-size: 12px;
|
||||
background-color: #ffffff;
|
||||
background-color: #FFFFFF;
|
||||
color: #000000;
|
||||
margin: 0px;
|
||||
}
|
||||
@ -229,10 +229,11 @@ header #site-location {
|
||||
}
|
||||
|
||||
header #banner {
|
||||
|
||||
overflow: hidden;
|
||||
text-align: center;
|
||||
width: 100%;
|
||||
font-size: 2.2em;
|
||||
font-size: 1.4em;
|
||||
font-family: tahoma, "Lucida Sans", sans;
|
||||
color: #eec;
|
||||
font-weight: bold;
|
||||
@ -303,15 +304,16 @@ nav #nav-link-wrapper .nav-link {
|
||||
height: 28px;
|
||||
border-bottom: 1px solid #aaaaaa;
|
||||
padding:0px;
|
||||
margin-right: 10px;
|
||||
width: 90%;
|
||||
/* margin-right: 10px; */
|
||||
}
|
||||
|
||||
.tabs li { margin: 0px; list-style: none; }
|
||||
.tab {
|
||||
display:block;
|
||||
float:left;
|
||||
padding: 0.4em;
|
||||
margin-right: 3px ;
|
||||
/* padding: 0.4em; */
|
||||
margin-right: 15px ;
|
||||
}
|
||||
|
||||
.tab.active {
|
||||
@ -324,6 +326,7 @@ ul.tabs {
|
||||
margin-bottom: 0px;
|
||||
list-style-type: none;
|
||||
padding: 0px;
|
||||
padding-right: 8px;
|
||||
}
|
||||
|
||||
/* footer */
|
||||
@ -385,7 +388,7 @@ footer {
|
||||
width: 530px;
|
||||
margin-bottom: 5px;
|
||||
font-weight: bold;
|
||||
border: solid 1px #ccc;
|
||||
border: solid 1px #ffffff;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
@ -2430,6 +2433,8 @@ aside input[type='text'] {
|
||||
}
|
||||
|
||||
#nav-search-text {
|
||||
margin-top: -2px;
|
||||
font-size: 0.9em;
|
||||
border-radius: 14px;
|
||||
background-color: #AAAAAA;
|
||||
color: #eec;
|
||||
@ -2444,6 +2449,7 @@ aside input[type='text'] {
|
||||
|
||||
#nav-user-linkmenu img {
|
||||
border-radius: 5px;
|
||||
margin-top: -4px;
|
||||
}
|
||||
|
||||
.location-label, .gender-label, .marital-label, .homepage-label {
|
||||
@ -3329,14 +3335,15 @@ div.jGrowl div.info {
|
||||
|
||||
.slider {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 30px;
|
||||
margin-bottom: 45px;
|
||||
}
|
||||
|
||||
|
||||
#main-slider {
|
||||
position: relative;
|
||||
left: 5%;
|
||||
left: 5px;
|
||||
width: 90%;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -3349,7 +3356,7 @@ div.jGrowl div.info {
|
||||
/* nav */
|
||||
nav {
|
||||
width: 100%;
|
||||
height: 32px;
|
||||
height: 24px;
|
||||
position: fixed;
|
||||
// opacity: 0.6;
|
||||
// filter:alpha(opacity=60);
|
||||
@ -3401,13 +3408,17 @@ color-stop(0.82, #b00)
|
||||
nav a,
|
||||
nav a:active,
|
||||
nav a:visited,
|
||||
nav a:link,
|
||||
nav a:hover {
|
||||
nav a:link {
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
nav a:hover {
|
||||
color: #0000FF;
|
||||
}
|
||||
nav .fakelink:hover { text-decoration: none; }
|
||||
|
||||
#profiles-menu li a {
|
||||
color: #ffffff;
|
||||
}
|
||||
@ -3431,11 +3442,16 @@ nav ul li .menu-popup {
|
||||
right: auto;
|
||||
top: 33px;
|
||||
}
|
||||
|
||||
#nav-user-linkmenu {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
nav .nav-menu-icon {
|
||||
position: relative;
|
||||
height: 22px;
|
||||
padding: 5px;
|
||||
margin: 3px 10px;
|
||||
/* margin: 3px 10px; */
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
@ -3454,17 +3470,17 @@ nav .nav-menu {
|
||||
position: relative;
|
||||
height: 16px;
|
||||
padding: 5px;
|
||||
margin: 3px 15px 0px;
|
||||
font-size: 14px;
|
||||
border-bottom: 3px solid #f88;
|
||||
margin: 3px 5px 0px;
|
||||
font-size: 1.0em;
|
||||
/* border-bottom: 3px solid #f88; */
|
||||
}
|
||||
|
||||
nav:hover .nav-menu {
|
||||
border-bottom: 3px solid #f00;
|
||||
/* border-bottom: 3px solid #f00; */
|
||||
}
|
||||
|
||||
nav .nav-menu.selected {
|
||||
border-bottom: 4px solid #CCCCCC;
|
||||
color: #0000FF;
|
||||
}
|
||||
|
||||
nav .nav-notify {
|
||||
@ -3473,6 +3489,9 @@ nav .nav-notify {
|
||||
-moz-border-radius: 5px 5px 5px 5px;
|
||||
-webkit-border-radius: 5px 5px 5px 5px;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
opacity: 0.6;
|
||||
filter:alpha(opacity=60);
|
||||
|
||||
}
|
||||
nav .nav-notify.show {
|
||||
display: block;
|
||||
@ -3481,9 +3500,7 @@ nav #nav-help-link,
|
||||
nav #nav-login-link,
|
||||
nav #nav-search-link,
|
||||
nav #nav-directory-link,
|
||||
nav #nav-apps-link,
|
||||
nav #nav-user-linkmenu,
|
||||
nav #nav-site-linkmenu {
|
||||
nav #nav-apps-link {
|
||||
float: right;
|
||||
}
|
||||
nav #nav-help-link .menu-popup,
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
<input type="hidden" name="post_id_random" value="$rand_num" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
|
||||
179
view/tpl/nav.tpl
179
view/tpl/nav.tpl
@ -4,95 +4,6 @@
|
||||
</header>
|
||||
<nav>
|
||||
<ul>
|
||||
{{ if $nav.lock }}
|
||||
<li id="nav-rmagic-link" class="nav-menu-icon" >
|
||||
<a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $nav.network }}
|
||||
<li id="nav-network-link" class="nav-menu $sel.network">
|
||||
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a>
|
||||
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
|
||||
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
|
||||
<li id="nav-network-see-all"><a href="$nav.network.all.0">$nav.network.all.1</a></li>
|
||||
<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">$nav.network.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.home }}
|
||||
<li id="nav-home-link" class="nav-menu $sel.home">
|
||||
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="icon home">$nav.home.1</span></a>
|
||||
<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
|
||||
<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
|
||||
<li id="nav-home-see-all"><a href="$nav.home.all.0">$nav.home.all.1</a></li>
|
||||
<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">$nav.home.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.messages }}
|
||||
<li id="nav-mail-link" class="nav-menu $sel.messages">
|
||||
<a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="icon mail">$nav.messages.1</span></a>
|
||||
<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
|
||||
<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
|
||||
<li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li>
|
||||
<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">$nav.messages.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.all_events }}
|
||||
<li id="nav-all_events-link" class="nav-menu $sel.all_events">
|
||||
<a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a>
|
||||
<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
|
||||
<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
|
||||
<li id="nav-all_events-see-all"><a href="$nav.all_events.all.0">$nav.all_events.all.1</a></li>
|
||||
<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">$nav.all_events.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.intros }}
|
||||
<li id="nav-intros-link" class="nav-menu $sel.intros">
|
||||
<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</span></a>
|
||||
<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
|
||||
<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
|
||||
<li id="nav-intros-see-all"><a href="$nav.intros.all.0">$nav.intros.all.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.notifications }}
|
||||
<li id="nav-notify-linkmenu" class="nav-menu fakelink">
|
||||
<a href="$nav.notifications.0" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
|
||||
<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
|
||||
<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
|
||||
<li id="nav-notify-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
|
||||
<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">$nav.notifications.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.settings }}
|
||||
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">$nav.settings.1</span></a>
|
||||
<ul id="nav-site-menu" class="menu-popup">
|
||||
{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
|
||||
{{ if $nav.directory }}<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3">$nav.directory.1</a></li>{{ endif }}
|
||||
|
||||
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $userinfo }}
|
||||
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
|
||||
@ -104,15 +15,105 @@
|
||||
{{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }}
|
||||
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
|
||||
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
|
||||
{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
|
||||
|
||||
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
|
||||
|
||||
{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
|
||||
|
||||
</ul>
|
||||
{{ endif }}
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $nav.lock }}
|
||||
<li id="nav-rmagic-link" class="nav-menu-icon" >
|
||||
<a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $nav.network }}
|
||||
<li id="nav-network-link" class="nav-menu $sel.network">
|
||||
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="network">$nav.network.1</span></a>
|
||||
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
|
||||
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
|
||||
<li id="nav-network-see-all"><a href="$nav.network.all.0">$nav.network.all.1</a></li>
|
||||
<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">$nav.network.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.home }}
|
||||
<li id="nav-home-link" class="nav-menu $sel.home">
|
||||
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="home">$nav.home.1</span></a>
|
||||
<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
|
||||
<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
|
||||
<li id="nav-home-see-all"><a href="$nav.home.all.0">$nav.home.all.1</a></li>
|
||||
<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">$nav.home.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.messages }}
|
||||
<li id="nav-mail-link" class="nav-menu $sel.messages">
|
||||
<a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="mail">$nav.messages.1</span></a>
|
||||
<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
|
||||
<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
|
||||
<li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li>
|
||||
<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">$nav.messages.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.all_events }}
|
||||
<li id="nav-all_events-link" class="nav-menu $sel.all_events">
|
||||
<a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="events">$nav.all_events.1</span></a>
|
||||
<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
|
||||
<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
|
||||
<li id="nav-all_events-see-all"><a href="$nav.all_events.all.0">$nav.all_events.all.1</a></li>
|
||||
<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">$nav.all_events.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.intros }}
|
||||
<li id="nav-intros-link" class="nav-menu $sel.intros">
|
||||
<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="introductions">$nav.intros.1</span></a>
|
||||
<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
|
||||
<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
|
||||
<li id="nav-intros-see-all"><a href="$nav.intros.all.0">$nav.intros.all.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.notifications }}
|
||||
<li id="nav-notify-linkmenu" class="nav-menu fakelink">
|
||||
<a href="$nav.notifications.0" title="$nav.notifications.1"><span class="notify">$nav.notifications.1</span></a>
|
||||
<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
|
||||
<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
|
||||
<li id="nav-notify-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
|
||||
<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">$nav.notifications.mark.1</a></li>
|
||||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
|
||||
{{ if $nav.alogout }}<li id=nav-alogout-link" class="nav-menu $nav-alogout.2"><a href="$nav.alogout.0" title="$nav.alogout.3" >$nav.alogout.1</a></li>{{ endif }}
|
||||
|
||||
{{ 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.help }}
|
||||
<li id="nav-help-link" class="nav-menu $sel.help">
|
||||
<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
<input type="hidden" name="return" value="{{$return_path}}" />
|
||||
<input type="hidden" name="jsreload" value="{{$jsreload}}" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
|
||||
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
|
||||
<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
|
||||
|
||||
@ -9,95 +9,6 @@
|
||||
</header>
|
||||
<nav>
|
||||
<ul>
|
||||
{{if $nav.lock}}
|
||||
<li id="nav-rmagic-link" class="nav-menu-icon" >
|
||||
<a class="icon {{$nav.lock.2}}" href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" >{{$nav.lock.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $nav.network}}
|
||||
<li id="nav-network-link" class="nav-menu {{$sel.network}}">
|
||||
<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><span class="icon network">{{$nav.network.1}}</span></a>
|
||||
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
|
||||
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
|
||||
<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
|
||||
<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.home}}
|
||||
<li id="nav-home-link" class="nav-menu {{$sel.home}}">
|
||||
<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><span class="icon home">{{$nav.home.1}}</span></a>
|
||||
<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
|
||||
<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
|
||||
<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
|
||||
<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.messages}}
|
||||
<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
|
||||
<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><span class="icon mail">{{$nav.messages.1}}</span></a>
|
||||
<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
|
||||
<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
|
||||
<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
|
||||
<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.all_events}}
|
||||
<li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
|
||||
<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="icon events">{{$nav.all_events.1}}</span></a>
|
||||
<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
|
||||
<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
|
||||
<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
|
||||
<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.intros}}
|
||||
<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
|
||||
<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><span class="icon introductions">{{$nav.intros.1}}</span></a>
|
||||
<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
|
||||
<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
|
||||
<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.notifications}}
|
||||
<li id="nav-notify-linkmenu" class="nav-menu fakelink">
|
||||
<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
|
||||
<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
|
||||
<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
|
||||
<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
|
||||
<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.settings}}
|
||||
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">{{$nav.settings.1}}</span></a>
|
||||
<ul id="nav-site-menu" class="menu-popup">
|
||||
{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
|
||||
{{if $nav.directory}}<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a></li>{{/if}}
|
||||
|
||||
{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $userinfo}}
|
||||
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
|
||||
@ -109,15 +20,105 @@
|
||||
{{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}
|
||||
{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
|
||||
{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
|
||||
{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
|
||||
|
||||
{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
|
||||
|
||||
{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
|
||||
|
||||
</ul>
|
||||
{{/if}}
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $nav.lock}}
|
||||
<li id="nav-rmagic-link" class="nav-menu-icon" >
|
||||
<a class="icon {{$nav.lock.2}}" href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" >{{$nav.lock.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $nav.network}}
|
||||
<li id="nav-network-link" class="nav-menu {{$sel.network}}">
|
||||
<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><span class="network">{{$nav.network.1}}</span></a>
|
||||
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
|
||||
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
|
||||
<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
|
||||
<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.home}}
|
||||
<li id="nav-home-link" class="nav-menu {{$sel.home}}">
|
||||
<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><span class="home">{{$nav.home.1}}</span></a>
|
||||
<span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
|
||||
<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
|
||||
<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
|
||||
<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.messages}}
|
||||
<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
|
||||
<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><span class="mail">{{$nav.messages.1}}</span></a>
|
||||
<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
|
||||
<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
|
||||
<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
|
||||
<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.all_events}}
|
||||
<li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
|
||||
<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="events">{{$nav.all_events.1}}</span></a>
|
||||
<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
|
||||
<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
|
||||
<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
|
||||
<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.intros}}
|
||||
<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
|
||||
<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><span class="introductions">{{$nav.intros.1}}</span></a>
|
||||
<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
|
||||
<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
|
||||
<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.notifications}}
|
||||
<li id="nav-notify-linkmenu" class="nav-menu fakelink">
|
||||
<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><span class="notify">{{$nav.notifications.1}}</span></a>
|
||||
<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
|
||||
<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
|
||||
<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
|
||||
<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
|
||||
<li class="empty">{{$emptynotifications}}</li>
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
|
||||
{{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
|
||||
|
||||
{{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>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.help}}
|
||||
<li id="nav-help-link" class="nav-menu {{$sel.help}}">
|
||||
<a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
|
||||
|
||||
Reference in New Issue
Block a user