aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-07 00:07:27 +0100
committertommy tomson <thomas.bierey@gmx.de>2012-03-07 00:07:27 +0100
commit6a5c4bab9c4e06c65fb68b0586853f169197ab0b (patch)
tree997b542c91283df5ee1208107e49146a9af321ac
parent073241a77a678062ad01f12a1218c0cc5e7fcbaf (diff)
downloadvolse-hubzilla-6a5c4bab9c4e06c65fb68b0586853f169197ab0b.tar.gz
volse-hubzilla-6a5c4bab9c4e06c65fb68b0586853f169197ab0b.tar.bz2
volse-hubzilla-6a5c4bab9c4e06c65fb68b0586853f169197ab0b.zip
messages-menu translation, add scroll-to-top and theme-bug-report in theme
-rwxr-xr-xinclude/nav.php3
-rw-r--r--view/theme/diabook/icons/ftdevs.gifbin0 -> 1188 bytes
-rwxr-xr-xview/theme/diabook/icons/scroll_top.pngbin0 -> 296 bytes
-rw-r--r--view/theme/diabook/nav.tpl19
-rw-r--r--view/theme/diabook/style.css23
5 files changed, 24 insertions, 21 deletions
diff --git a/include/nav.php b/include/nav.php
index 511ca07fc..aadfa82fd 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -122,6 +122,9 @@ function nav(&$a) {
}
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+ $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
+ $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
+ $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
if(is_array($a->identities) && count($a->identities) > 1) {
$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/icons/ftdevs.gif
Binary files differ
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
new file mode 100755
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 1f2f64f6a..3a36e7daa 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -25,7 +25,7 @@
<span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">Kontaktanfragen</a><span id="intro-update" class="nav-notify"></span></li>
+ <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>
</ul>
</li>
@@ -38,9 +38,9 @@
<span id="mail-update" class="nav-notify"></span>
<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-inbox"><a href="$nav.messages.0">Eingang</a></li>
- <li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li>
- <li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
</li>
{{ endif }}
@@ -138,18 +138,11 @@
</nav>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div>
+<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
-<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
{#
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index ddbbc2e53..fe1d3d882 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -619,6 +619,7 @@ nav .nav-menu-search {
margin: 3px 17px;
margin-right: 0px;
height: 17px;
+ width: 205px;
}
nav .nav-menu-icon {
@@ -856,7 +857,7 @@ aside {
/* background: #F1F1F1; */
}
aside .vcard .fn {
- font-size: 16px;
+ font-size: 18px;
font-weight: bold;
margin-bottom: 5px;
}
@@ -1427,12 +1428,13 @@ section {
margin-top: 10px;
}
#profile-jot-form #jot-title {
- border: 0px;
- margin: 0px;
- height: 20px;
- width: 700px;
- font-weight: bold;
- border: 1px solid #ffffff;
+
+ border-radius: 5px 5px 5px 5px;
+ font-weight: bold;
+ height: 20px;
+ margin: 0 0 5px;
+ width: 60%;
+ border: 1px solid #ffffff;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
@@ -1883,7 +1885,12 @@ blockquote {
padding-left: 9px;
margin: 0 0 0 .8ex;
}
-
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+ color: #666666;
+ margin: 15px 0 5px;
+ padding-left: 5px;
+ }
/* ================== */
/* = Contacts Block = */
/* ================== */