friendica/friendica
6
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-21 10:53:03 +01:00
Code Issues Projects Releases 2 Packages Wiki Activity

Vier: Fixing "vier" so that it looks again like it was intended.

Browse source
This commit is contained in:
Michael Vogel 2012-11-09 01:19:24 +01:00
parent 5d2d306d9f
commit b14e557575
3 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
object/Item.php
View file

@ -253,6 +253,7 @@ class Item extends BaseObject {
'vote' => $buttons,
'like' => $like,
'dislike' => $dislike,
'switchcomment' => t('Comment'),
'comment' => $this->get_comment_box($indent),
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
'wait' => t('Please wait'),

24
view/theme/vier/style.css
View file

@ -722,7 +722,7 @@ ul.menu-popup .empty {
aside {
display: table-cell;
vertical-align: top;
width: 200px;
width: 185px;
padding: 0px 10px 0px 20px;
border-right: 1px solid #D2D2D2;
/* background: #F1F1F1; */
@ -779,6 +779,28 @@ aside #dfrn-request-link:hover {
aside #profiles-menu {
width: 20em;
}
aside #search-text {
width: 150px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
-moz-border-bottom-colors: #dbdbdb;
-moz-border-top-colors: #999;
-moz-border-left-colors: #999;
-moz-border-right-colors: #dbdbdb;
}
.nets-ul {
margin-top: 0px;
}
.nets-all {
margin-left: 16px;
}
#contact-block {
overflow: auto;
height: auto;

26
view/theme/vier/wall_thread.tpl
View file

@ -49,8 +49,16 @@
</a>
</div>
{{ endif }}
<div class="wall-item-location">$item.location</div>
</div>
<div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
{{ if $item.owner_url }}$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> <!-- $item.vwall -->{{ endif }}
<span class="wall-item-ago">-
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
</span>
</div>
<div class="wall-item-content">
{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
$item.body
@ -79,7 +87,8 @@
{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div>
<div class="wall-item-actions">
<div class="wall-item-actions-author">
<div class="wall-item-location">$item.location</div>
<!-- <div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir"
title="$item.linktitle"
class="wall-item-name-link"><span
@ -87,14 +96,16 @@
<span class="wall-item-ago" title="$item.localtime">$item.ago</span>
{{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
{{ endif }}
</div>
</div> -->
<div class="wall-item-actions-social">
<!-- {{ if $item.comment }}
<span id="comment-$item.id" class="fakelink" onclick="showHideComments(bar$item.id);">$item.switchcomment</span>
{{ endif }} -->
{{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
@ -134,7 +145,7 @@
{{ if $item.threaded }}{{ if $item.comment }}
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper">
<div class="wall-item-comment-wrapper" id="total-comments-$item.id">
$item.comment
</div>
</div>
@ -159,10 +170,11 @@
{{ endif }}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >$item.comment</div>
<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
{{ endif }}{{ endif }}{{ endif }}
{{ if $item.flatten }}
<div class="wall-item-comment-wrapper" >$item.comment</div>
<!-- <div class="wall-item-comment-wrapper" id="collapsed-comments-bar$item.id" style="display: none;">$item.comment</div> -->
<div class="wall-item-comment-wrapper" id="collapsed-comments-bar$item.id">$item.comment</div>
{{ endif }}