nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #107 from tomtom84/master

Browse source 
fixes in theme diabook
This commit is contained in:
tomtom84 2012-03-08 05:52:14 -08:00
commit 08b5ede5a1
5 changed files with 101 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
view/theme/diabook/icons/bluebug.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
view/theme/diabook/icons/lupe.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 697 B

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

@ -119,7 +119,8 @@
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
{{ endfor }}
{{ if $nav.notifications }}<li><a class="menu-sep $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.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 }}
</ul>
@ -141,6 +142,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: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>

64
view/theme/diabook/profile_vcard.tpl Normal file
View file

@ -0,0 +1,64 @@
<div class="vcard">
<div class="tool">
<div class="fn label">$profile.name</div>
{{ if $profile.edit }}
<div class="action">
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
<ul id="profiles-menu" class="menu-popup">
{{ for $profile.menu.entries as $e }}
<li>
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
</li>
{{ endfor }}
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
<li><a href="profiles" >$profile.edit.3</a></li>
</ul>
</div>
{{ endif }}
</div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $location }}
<dl class="location"><dt class="location-label">$location</dt><br>
<dd class="adr">
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
<span class="city-state-zip">
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
<span class="region">$profile.region</span>
<span class="postal-code">$profile.postal-code</span>
</span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
</dd>
</dl>
{{ endif }}
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links">
<ul>
{{ if $connect }}
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
{{ endif }}
</ul>
</div>
</div>
$contact_block

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

@ -214,6 +214,17 @@
padding: 1px;
}
.icon.border.camera{
background-image: url("../../../view/theme/diabook/icons/camera.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.icon.border.link{
background-image: url("../../../view/theme/diabook/icons/weblink.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
margin-left: 10px;
}
.icon.text {
text-indent: 0px;
}
@ -615,13 +626,21 @@ nav #logo-text {
}
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin-right: 0px;
height: 17px;
width: 205px;
width: 180px;
}
nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
}
nav .nav-menu-icon {
position: relative;
height: 22px;
@ -871,14 +890,14 @@ aside .vcard dl {
aside .vcard dt {
float: left;
margin-left: 0px;
width: 35%;
/*width: 35%;*/
text-align: right;
color: #999999;
}
aside .vcard dd {
float: left;
margin-left: 4px;
width: 60%;
margin-left: 5px;
/*width: 60%;*/
}
aside #profile-extra-links ul {
padding: 0px;
@ -1016,6 +1035,12 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
}
.tabs {
background-position: 0 -20px;