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

Merge pull request #62 from tomtom84/master

Browse source 
fixes in diabook theme
This commit is contained in:
friendica 2012-03-02 19:32:34 -08:00
commit 2ae82ae3c2
5 changed files with 51 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 365 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 313 B

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

@ -1,5 +1,5 @@
<header> <header>
{# $langselector #} {# $langselector version 0.01#}
<div id="site-location">$sitelocation</div> <div id="site-location">$sitelocation</div>
<div id="banner">$banner</div> <div id="banner">$banner</div>
@ -18,7 +18,7 @@
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.contacts }}
<li class="nav-menu-icon" id="nav-contacts-linkmenu"> <li class="nav-menu-icon" id="nav-contacts-linkmenu">
<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1"> <a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
<span class="icon contacts">$nav.contacts.1</span></a> <span class="icon contacts">$nav.contacts.1</span></a>
@ -28,9 +28,9 @@
<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>
{{ endif }}
{{ if $nav.messages }}
<li id="nav-messages-linkmenu" class="nav-menu-icon"> <li id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1"> <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
<span class="icon messages">$nav.messages.1</span></a> <span class="icon messages">$nav.messages.1</span></a>
@ -42,9 +42,8 @@
<li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li> <li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li>
</ul> </ul>
</li> </li>
{{ endif }}
{{ if $nav.notifications }} {{ 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> <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> <span id="notify-update" class="nav-notify"></span>
@ -54,9 +53,7 @@
<li class="empty">$emptynotifications</li> <li class="empty">$emptynotifications</li>
</ul> </ul>
</li> </li>
{{ endif }} {{ endif }}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
<ul id="nav-site-menu" class="menu-popup"> <ul id="nav-site-menu" class="menu-popup">
@ -70,16 +67,17 @@
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
</ul> </ul>
</li> </li>
{{ if $nav.directory }}
<li id="nav-directory-link" class="nav-menu $sel.directory"> <li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
</li> </li>
{{ endif }}
{{ if $nav.apps }} {{ if $nav.apps }}
<li id="nav-apps-link" class="nav-menu $sel.apps"> <li id="nav-apps-link" class="nav-menu $sel.apps">
@ -113,14 +111,22 @@
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.login }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
<li>
{{ endif }}
</ul>
</div> </ul>
</nav> </nav>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>
{# {#

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

@ -102,6 +102,8 @@
.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} .icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
.icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} .icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");}
.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");}
.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");}
.article { background-position: -50px 0px;} .article { background-position: -50px 0px;}
.audio { background-position: -70px 0px;} .audio { background-position: -70px 0px;}
@ -112,7 +114,7 @@
.camera { background-position: -170px 0px;} .camera { background-position: -170px 0px;}
/*.dislike { background-position: -190px 0px;}*/ /*.dislike { background-position: -190px 0px;}*/
/*.like { background-position: -210px 0px;}*/ /*.like { background-position: -210px 0px;}*/
.link { background-position: -230px 0px;} /*.link { background-position: -230px 0px;}*/
.globe { background-position: -50px -20px;} .globe { background-position: -50px -20px;}
.noglobe { background-position: -70px -20px;} .noglobe { background-position: -70px -20px;}
@ -126,7 +128,7 @@
.share { background-position: -230px -20px;} .share { background-position: -230px -20px;}
.tools { background-position: -50px -40px;} .tools { background-position: -50px -40px;}
.lock { background-position: -70px -40px;} /*.lock { background-position: -70px -40px;}*/
.video { background-position: -110px -40px;} .video { background-position: -110px -40px;}
.youtube { background-position: -130px -40px;} .youtube { background-position: -130px -40px;}
@ -160,7 +162,7 @@
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
background-image: url('icons.png'); /*background-image: url('icons.png');*/
} }
.icon { .icon {
@ -613,7 +615,7 @@ nav .nav-notify {
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
font-size: 10px; font-size: 10px;
font-weight: 900; font-weight: 900;
padding: 1px 3px; padding: 1px 4px;
top: 0px; top: 0px;
right: -6px; right: -6px;
min-width: 10px; min-width: 10px;
@ -673,6 +675,10 @@ nav #nav-apps-link.selected {
padding: 5px 10px; */ padding: 5px 10px; */
} }
.notify-seen {
background: none repeat scroll 0 0 #DDDDDD;
}
ul.menu-popup { ul.menu-popup {
position: absolute; position: absolute;
display: none; display: none;
@ -1162,15 +1168,15 @@ section {
padding-bottom: 2px; padding-bottom: 2px;
} }
.tag { .tag {
background: url("../../../images/tag_b.png") repeat-x center left; /*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #ffffff; color: #3465A4;
padding-left: 3px; padding-left: 3px;
font-size: 10px; font-size: 12px;
} }
.tag a { .tag a {
padding-right: 8px; padding-right: 5px;
background: url("../../../images/tag.png") no-repeat center right; /*background: url("../../../images/tag.png") no-repeat center right;*/
color: #ffffff; color: #3465A4;
} }
.wwto { .wwto {
position: absolute !important; position: absolute !important;

25
view/theme/diabook/wall_item.tpl
View file

@ -5,6 +5,9 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
{{ endif }} {{ endif }}
<div class="wall-item-container $item.indent"> <div class="wall-item-container $item.indent">
<div class="wall-item-item"> <div class="wall-item-item">
<div class="wall-item-info"> <div class="wall-item-info">
@ -36,26 +39,21 @@
</div> </div>
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class="wall-item-links"> <div class="wall-item-links">
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div> </div>
<div class="wall-item-tags"> <div class="wall-item-tags">
{{ for $item.tags as $item.tag }} {{ for $item.tags as $tag }}
<span class='tag'>$item.tag</span> <span class='tag'>$tag</span>
{{ endfor }} {{ endfor }}
</div> </div>
</div> </div>
<div class="wall-item-bottom"> <div class="wall-item-bottom">
<div class=""> <div class="">
{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div> </div>
<div class="wall-item-actions"> <div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div> <div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social"> <div class="wall-item-actions-social">
{{ if $item.star }}
<a href="#" id="star-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
<a href="#" id="unstar-$item.id" class="icon star" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
{{ endif }}
{{ if $item.vote }} {{ if $item.vote }}
<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
@ -64,7 +62,14 @@
{{ if $item.vote.share }} {{ if $item.vote.share }}
<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
{{ endif }} {{ endif }}
{{ if $item.star }}
<a href="#" id="star-$item.id" class="icon star" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
<a href="#" id="unstar-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
{{ endif }}
</div> </div>
<div class="wall-item-actions-tools"> <div class="wall-item-actions-tools">