friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  some fixes in diabook

* master:
This commit is contained in:
Simon L'nu 2012-03-04 04:58:12 -05:00
parent eae6418074 dfa056bb1b
commit a6d08ec852
5 changed files with 137 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
view/theme/diabook/icons/pencil2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 384 B

4
view/theme/diabook/jot.tpl
View File

@ -32,10 +32,10 @@
<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
<div id="profile-video-wrapper" style="display: $visitor;" >
<a id="profile-video" class="video" title="$video" onclick="jotVideoURL();return false;"></a>
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
</div>
<div id="profile-audio-wrapper" style="display: $visitor;" >
<a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;"></a>
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
</div>
<div id="profile-location-wrapper" style="display: $visitor;" >
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>

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

@ -114,9 +114,15 @@
.attach { background-image: url("../../../view/theme/diabook/icons/attach.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/icons/video.png");
.video2 { background-image: url("../../../view/theme/diabook/icons/video.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.audio { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
@ -129,6 +135,8 @@
.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
@ -138,7 +146,7 @@
.block { background-position: -90px 0px;}
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
.edit { background-position: -150px 0px;}
/*.edit { background-position: -150px 0px;}*/
/*.camera { background-position: -170px 0px;}*/
/*.dislike { background-position: -190px 0px;}*/
/*.like { background-position: -210px 0px;}*/
@ -1000,16 +1008,21 @@ section {
padding: 0px 0px 0px 10px;
}
.tabs {
background-image: url("../../../view/theme/diabook/icons/head.jpg");
background-position: 0 -20px;
background-repeat: repeat-x;
border-bottom: 1px solid #BABDB6;
height: 27px;
padding: 0;
}
.tab.button {
margin-right: 15px;
margin-left: 15px;
background: none repeat scroll 0 0 #F8F8F8;
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
font-weight: bold;
padding: 3px;
}
/* wall item */
.tread-wrapper {
@ -1162,7 +1175,7 @@ section {
display: none;
}
.wall-item-comment-wrapper textarea {
height: 1.2em;
height: 2.0em;
width: 100%;
font-size: 10px;
color: #999999;
@ -1312,13 +1325,12 @@ section {
margin: 0px 2em 20px 0px;
}
#profile-jot-form #profile-jot-text {
height: 1.2em;
height: 3.0em;
width: 99%;
font-size: 10px;
color: #999999;
border: 1px solid #DDD;
padding: 0.3em;
margin-top: 30px;
margin-bottom: 10px;
}
#jot #jot-tools {
@ -1658,7 +1670,13 @@ ul.tabs li {
margin-left: 7px;
}
ul.tabs li .active {
border-bottom: 1px solid #3465A4;
background-color: #33ACFF;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
}
/**
* Form fields

7
view/theme/diabook/wall_item.tpl
View File

@ -5,9 +5,6 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
<div class="wall-item-container $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
@ -32,7 +29,6 @@
</span>
</div>
<div class="wall-item-content">
{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
$item.body
</div>
@ -63,7 +59,8 @@
{{ 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>
{{ endif }}
{{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" >
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>

107
view/theme/diabook/wallwall_item.tpl Normal file
View File

@ -0,0 +1,107 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
<span class="icon isstar $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
<div class="wall-item-container $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
</a>
</div>
<div class="contact-photo-wrapper mframe wwfrom"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
</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>
$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 <span class="wall-item-ago">- &nbsp;
{{ 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">$item.title</a></h2>{{ endif }}
$item.body
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">
<div class="">
</div>
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
{{ 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="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ endif }}
{{ 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>
{{ endif }}
{{ if $item.star }}
<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do" >
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">
<img src="images/star_dummy.png" class="icon star" alt="$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.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div>
<div class="wall-item-actions-tools">
{{ if $item.drop.dropping }}
<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
{{ endif }}
{{ if $item.edpost }}
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
</div>
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
tb