clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #99 from tomtom84/master 

fixes in theme diabook
This commit is contained in:
Simon 2012-03-06 15:22:55 -08:00
parent a464e4d33f 6a5c4bab9c
commit decc9e5798
5 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nav.php
View File

@ -122,6 +122,9 @@ function nav(&$a) {
} }
$nav['messages'] = array('message', t('Messages'), "", t('Private mail')); $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) { if(is_array($a->identities) && count($a->identities) > 1) {
$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages')); $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));

BIN
view/theme/diabook/icons/ftdevs.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
view/theme/diabook/icons/scroll_top.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 296 B

19
view/theme/diabook/nav.tpl
View File

@ -25,7 +25,7 @@
<span class="icon contacts">$nav.contacts.1</span></a> <span class="icon contacts">$nav.contacts.1</span></a>
<span id="intro-update" class="nav-notify"></span> <span id="intro-update" class="nav-notify"></span>
<ul id="nav-contacts-menu" class="menu-popup"> <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> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul> </ul>
</li> </li>
@ -38,9 +38,9 @@
<span id="mail-update" class="nav-notify"></span> <span id="mail-update" class="nav-notify"></span>
<ul id="nav-messages-menu" class="menu-popup"> <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.0">$nav.messages.1</a></li>
<li id="nav-messages-inbox"><a href="$nav.messages.0">Eingang</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
<li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</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.new.0">$nav.messages.new.1</a></li>
</ul> </ul>
</li> </li>
{{ endif }} {{ endif }}
@ -138,18 +138,11 @@
</nav> </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: 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 }} {{ 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 }}

23
view/theme/diabook/style.css
View File

@ -619,6 +619,7 @@ nav .nav-menu-search {
margin: 3px 17px; margin: 3px 17px;
margin-right: 0px; margin-right: 0px;
height: 17px; height: 17px;
width: 205px;
} }
nav .nav-menu-icon { nav .nav-menu-icon {
@ -856,7 +857,7 @@ aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard .fn {
font-size: 16px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 5px; margin-bottom: 5px;
} }
@ -1427,12 +1428,13 @@ section {
margin-top: 10px; margin-top: 10px;
} }
#profile-jot-form #jot-title { #profile-jot-form #jot-title {
border: 0px;
margin: 0px; border-radius: 5px 5px 5px 5px;
height: 20px; font-weight: bold;
width: 700px; height: 20px;
font-weight: bold; margin: 0 0 5px;
border: 1px solid #ffffff; width: 60%;
border: 1px solid #ffffff;
} }
#profile-jot-form #jot-title:-webkit-input-placeholder { #profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal; font-weight: normal;
@ -1883,7 +1885,12 @@ blockquote {
padding-left: 9px; padding-left: 9px;
margin: 0 0 0 .8ex; margin: 0 0 0 .8ex;
} }
.aprofile dt{
box-shadow: 1px 1px 5px 0;
color: #666666;
margin: 15px 0 5px;
padding-left: 5px;
}
/* ================== */ /* ================== */
/* = Contacts Block = */ /* = Contacts Block = */
/* ================== */ /* ================== */