keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-04-01 04:13:58 -07:00
commit bb67ca9f1c
11 changed files with 69 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/diabook-aerith/jot.tpl
View file

@ -34,7 +34,7 @@
<div id="profile-video-wrapper" style="display: $visitor;" >
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
</div>
<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
<div id="profile-audio-wrapper" style="display: $visitor;" >
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
</div>
<div id="profile-location-wrapper" style="display: $visitor;" >

22
view/theme/diabook-aerith/nav.tpl
View file

@ -11,16 +11,16 @@
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu-icon">
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
<span class="icon notifications">Benachrichtigungen</span></a>
<span id="net-update" class="nav-notify"></span>
<span class="icon notifications">Benachrichtigungen</span>
<span id="net-update" class="nav-notify"></span></a>
</li>
{{ endif }}
{{ if $nav.contacts }}
<li class="nav-menu-icon" id="nav-contacts-linkmenu">
<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
<span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span>
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
@ -31,8 +31,8 @@
{{ if $nav.messages }}
<li id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
<span class="icon messages">$nav.messages.1</span></a>
<span id="mail-update" class="nav-notify"></span>
<span class="icon messages">$nav.messages.1</span>
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@ -43,8 +43,10 @@
{{ endif }}
{{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span>
<li id="nav-notifications-linkmenu" class="nav-menu-icon">
<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
<span class="icon notify">$nav.notifications.1</span>
<span id="notify-update" class="nav-notify"></span></a>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@ -100,8 +102,8 @@
{{ if $nav.settings }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span>
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
<span id="home-update" class="nav-notify"></span></a>
</li>
{{ endif }}

5
view/theme/diabook-aerith/theme.php
View file

@ -267,8 +267,11 @@ if ($a->argv[0] === "settings"){
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',

22
view/theme/diabook-blue/nav.tpl
View file

@ -11,16 +11,16 @@
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu-icon">
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
<span class="icon notifications">Benachrichtigungen</span></a>
<span id="net-update" class="nav-notify"></span>
<span class="icon notifications">Benachrichtigungen</span>
<span id="net-update" class="nav-notify"></span></a>
</li>
{{ endif }}
{{ if $nav.contacts }}
<li class="nav-menu-icon" id="nav-contacts-linkmenu">
<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
<span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span>
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
@ -31,8 +31,8 @@
{{ if $nav.messages }}
<li id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
<span class="icon messages">$nav.messages.1</span></a>
<span id="mail-update" class="nav-notify"></span>
<span class="icon messages">$nav.messages.1</span>
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@ -43,8 +43,10 @@
{{ endif }}
{{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span>
<li id="nav-notifications-linkmenu" class="nav-menu-icon">
<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
<span class="icon notify">$nav.notifications.1</span>
<span id="notify-update" class="nav-notify"></span></a>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@ -100,8 +102,8 @@
{{ if $nav.settings }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span>
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
<span id="home-update" class="nav-notify"></span></a>
</li>
{{ endif }}

5
view/theme/diabook-blue/theme.php
View file

@ -268,7 +268,10 @@ if ($a->argv[0] === "settings"){
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',

22
view/theme/diabook-red/nav.tpl
View file

@ -11,16 +11,16 @@
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu-icon">
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
<span class="icon notifications">Benachrichtigungen</span></a>
<span id="net-update" class="nav-notify"></span>
<span class="icon notifications">Benachrichtigungen</span>
<span id="net-update" class="nav-notify"></span></a>
</li>
{{ endif }}
{{ if $nav.contacts }}
<li class="nav-menu-icon" id="nav-contacts-linkmenu">
<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
<span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span>
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
@ -31,8 +31,8 @@
{{ if $nav.messages }}
<li id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
<span class="icon messages">$nav.messages.1</span></a>
<span id="mail-update" class="nav-notify"></span>
<span class="icon messages">$nav.messages.1</span>
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@ -43,8 +43,10 @@
{{ endif }}
{{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span>
<li id="nav-notifications-linkmenu" class="nav-menu-icon">
<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
<span class="icon notify">$nav.notifications.1</span>
<span id="notify-update" class="nav-notify"></span></a>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@ -100,8 +102,8 @@
{{ if $nav.settings }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span>
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
<span id="home-update" class="nav-notify"></span></a>
</li>
{{ endif }}

5
view/theme/diabook-red/theme.php
View file

@ -269,7 +269,10 @@ if ($a->argv[0] === "settings"){
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',

22
view/theme/diabook/nav.tpl
View file

@ -11,16 +11,16 @@
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu-icon">
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
<span class="icon notifications">Benachrichtigungen</span></a>
<span id="net-update" class="nav-notify"></span>
<span class="icon notifications">Benachrichtigungen</span>
<span id="net-update" class="nav-notify"></span></a>
</li>
{{ endif }}
{{ if $nav.contacts }}
<li class="nav-menu-icon" id="nav-contacts-linkmenu">
<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
<span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span>
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
@ -32,8 +32,8 @@
{{ if $nav.messages }}
<li id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
<span class="icon messages">$nav.messages.1</span></a>
<span id="mail-update" class="nav-notify"></span>
<span class="icon messages">$nav.messages.1</span>
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
@ -44,8 +44,10 @@
{{ endif }}
{{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span>
<li id="nav-notifications-linkmenu" class="nav-menu-icon">
<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
<span class="icon notify">$nav.notifications.1</span>
<span id="notify-update" class="nav-notify"></span></a>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@ -101,8 +103,8 @@
{{ if $nav.settings }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span>
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
<span id="home-update" class="nav-notify"></span></a>
</li>
{{ endif }}

BIN
view/theme/diabook/photo-menu.jpg Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 459 B

2
view/theme/diabook/style.css
View file

@ -1161,6 +1161,7 @@ body .pageheader{
margin-bottom: 0px;
width: 775px;
}
.wall-item-decor {
position: absolute;
left: 790px;
@ -1173,7 +1174,6 @@ body .pageheader{
width: 780px;
}
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}

8
view/theme/diabook/theme.php
View file

@ -7,6 +7,9 @@
* Author:
*/
$a->theme_info = array(
'extends' => 'duepuntozero',
);
//change css on network and profilepages
$cssFile = null;
@ -276,7 +279,10 @@ if ($a->argv[0] === "settings"){
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',