aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-04-01 13:12:15 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-04-01 13:12:15 +0200
commit15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80 (patch)
treedd1b94ffba14d639f898799e192c40b73ceda67d /view
parentbc283f7c5df4b848a6a96db07450af011f03c515 (diff)
downloadvolse-hubzilla-15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80.tar.gz
volse-hubzilla-15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80.tar.bz2
volse-hubzilla-15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80.zip
various bugfixes and css-fixes
Diffstat (limited to 'view')
-rwxr-xr-xview/theme/diabook-aerith/jot.tpl2
-rw-r--r--view/theme/diabook-aerith/nav.tpl22
-rwxr-xr-xview/theme/diabook-aerith/theme.php5
-rw-r--r--view/theme/diabook-blue/nav.tpl22
-rwxr-xr-xview/theme/diabook-blue/theme.php5
-rw-r--r--view/theme/diabook-red/nav.tpl22
-rwxr-xr-xview/theme/diabook-red/theme.php5
-rw-r--r--view/theme/diabook/nav.tpl22
-rwxr-xr-xview/theme/diabook/photo-menu.jpgbin0 -> 459 bytes
-rw-r--r--view/theme/diabook/style.css2
-rwxr-xr-xview/theme/diabook/theme.php8
11 files changed, 69 insertions, 46 deletions
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index 5ef723d72..59066a19c 100755
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
@@ -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;" >
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index c34436103..f84b902d5 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -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 }}
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 132d69b47..2b135878a 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -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',
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index d73dd047a..3b78b5995 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -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 }}
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 4d9e31bfa..fb6b44a16 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -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',
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index cd0653c6e..fdf748cb2 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -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 }}
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index ba5a69d25..95af850a2 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -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',
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 99d69ab38..78eb34197 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -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 }}
diff --git a/view/theme/diabook/photo-menu.jpg b/view/theme/diabook/photo-menu.jpg
new file mode 100755
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/diabook/photo-menu.jpg
Binary files differ
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index c3f5f5598..956667faa 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -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;
}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 6973951a0..88944322e 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -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',