Merge https://github.com/friendica/friendica into pull
Conflicts: view/theme/smoothly/follow.tpl
This commit is contained in:
friendica
commit
51bee79b21
|
|
@ -14,11 +14,18 @@
|
|||
<input type="hidden" name="coord" id="jot-coord" value="" />
|
||||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
|
||||
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
|
||||
<div id="jot-title-wrap">
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
</div>
|
||||
<div id="jot-category-wrap">
|
||||
<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
|
||||
</div>
|
||||
<div id="jot-text-wrap">
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="88" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /><br>
|
||||
<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
|
||||
{{ if $content }}$content{{ else }}$share
|
||||
{{ endif }}
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
<div id="peoplefind-sidebar" class="widget">
|
||||
<h3>$findpeople</h3>
|
||||
<div id="peoplefind-desc">$desc</div>
|
||||
<form action="dirfind" method="post" />
|
||||
<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
|
||||
<form action="dirfind" method="post" >
|
||||
<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" />
|
||||
<input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
|
||||
</form>
|
||||
<div class="side-link" id="side-invite-link"><a href="match" >$similar</a></div>
|
||||
<div class="side-link" id="side-invite-link"><a href="suggest" >$suggest</a></div>
|
||||
<div class="side-link" id="side-invite-link" ><a href="randprof" target="extlink" >$random</a></div>
|
||||
<div class="side-link" id="side-invite-link"><a href="randprof" target="extlink" >$random</a></div>
|
||||
{{ if $inv }}
|
||||
<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
|
||||
<div class="side-link" id="side-invite-link"><a href="invite" >$inv</a></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -109,10 +109,11 @@ li.widget-list {
|
|||
|
||||
|
||||
input[type=text] {
|
||||
float: left;
|
||||
border: 1px solid #b0b0b0;
|
||||
padding: 2px;
|
||||
width: 466px;
|
||||
margin-left: 0px;
|
||||
width: 575px;
|
||||
margin-top: 10px;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
-webkit-border-radius: 3px 3px 3px 3px;
|
||||
-moz-border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -647,7 +648,7 @@ aside h4 {
|
|||
padding: 5px 5px 5px 5px;
|
||||
}
|
||||
#netsearch-box input[type="text"] {
|
||||
width: 97%;
|
||||
width: 90%;
|
||||
}
|
||||
#netsearch-box input[type="submit"] {
|
||||
width: auto;
|
||||
|
|
@ -869,6 +870,7 @@ ul .sidebar-group-li .icon {
|
|||
|
||||
#profile-jot-text_tbl {
|
||||
margin-bottom: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#profile-jot-text_ifr {
|
||||
|
|
@ -882,7 +884,7 @@ ul .sidebar-group-li .icon {
|
|||
#jot-title {
|
||||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 466px;
|
||||
width: 575px;
|
||||
font-weight: bold;
|
||||
border: 1px solid #cccccc;
|
||||
}
|
||||
|
|
@ -955,7 +957,7 @@ ul .sidebar-group-li .icon {
|
|||
#profile-jot-submit {
|
||||
width: 80px;
|
||||
float: right;
|
||||
margin-right: 90px;
|
||||
margin-right: 145px;
|
||||
margin-top: -20px;
|
||||
margin-left: 10px;
|
||||
padding: 5px 5px;
|
||||
|
|
@ -1073,7 +1075,7 @@ ul .sidebar-group-li .icon {
|
|||
}
|
||||
|
||||
#profile-jot-wrapper {
|
||||
margin-top: 0px;
|
||||
margin-top: -15px;
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
|
|
@ -1177,10 +1179,9 @@ profile-jot-banner-wrapper {
|
|||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
margin-top: 20px;
|
||||
margin-left: 100px;
|
||||
padding-bottom: 5px;
|
||||
float: right;
|
||||
width: 100%;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.wall-item-tools:hover {
|
||||
|
|
@ -1189,11 +1190,30 @@ profile-jot-banner-wrapper {
|
|||
transition: all 0.25s ease-in-out;
|
||||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
margin-left: 140px;
|
||||
}
|
||||
|
||||
.wall-item-social {
|
||||
filter: alpha(opacity=60);
|
||||
opacity: 0.7;
|
||||
transition: all 0.25s ease-in-out;
|
||||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
margin-top: 20px;
|
||||
margin-left: 0px;
|
||||
padding-bottom: 5px;
|
||||
float: left;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.wall-item-social:hover {
|
||||
filter: alpha(opacity=100);
|
||||
opacity: 1;
|
||||
transition: all 0.25s ease-in-out;
|
||||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
}
|
||||
|
||||
.wall-item-outside-wrapper.comment .wall-item-tools {
|
||||
/*margin: 5px 5px 0px 70px;*/
|
||||
float: right;
|
||||
}
|
||||
|
||||
|
|
@ -1213,7 +1233,8 @@ profile-jot-banner-wrapper {
|
|||
}
|
||||
|
||||
.wall-item-delete-wrapper {
|
||||
float: right;
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.wall-item-links-wrapper a.icon {
|
||||
|
|
@ -1224,6 +1245,7 @@ profile-jot-banner-wrapper {
|
|||
|
||||
.pencil {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.star-item {
|
||||
|
|
@ -1912,6 +1934,7 @@ select[size],
|
|||
select[multiple],
|
||||
select[size][multiple] {
|
||||
-webkit-appearance: listbox;
|
||||
margin: 5px 0px 10px 30px;
|
||||
}
|
||||
|
||||
select {
|
||||
|
|
@ -1925,7 +1948,7 @@ keygen, select {
|
|||
/*-webkit-border-radius: ;*/
|
||||
}
|
||||
|
||||
input, textarea, keygen {
|
||||
textarea, keygen {
|
||||
margin-top: 3px;
|
||||
font-size: 0.9em;
|
||||
letter-spacing: normal;
|
||||
|
|
@ -1938,6 +1961,20 @@ input, textarea, keygen {
|
|||
text-align: -webkit-auto;
|
||||
}
|
||||
|
||||
input {
|
||||
margin-top: 3px;
|
||||
margin-right: 10px;
|
||||
/*font-size: 0.9em;
|
||||
letter-spacing: normal;
|
||||
word-spacing: normal;
|
||||
line-height: 1.2em;
|
||||
text-transform: none;
|
||||
text-indent: 0px;
|
||||
text-shadow: none;
|
||||
display: inline-block;
|
||||
text-align: -webkit-auto;*/
|
||||
}
|
||||
|
||||
.qq-upload-button {
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
|
|
@ -2423,7 +2460,7 @@ margin-left: 0px;
|
|||
}
|
||||
|
||||
#follow-sidebar {
|
||||
margin-bottom: 20px;
|
||||
margin-bottom: 80px;
|
||||
}
|
||||
|
||||
#follow-sidebar h3:before {
|
||||
|
|
@ -3389,7 +3426,7 @@ tr {
|
|||
.no { background-position: -90px -20px;}
|
||||
.pause { background-position: -110px -20px;}
|
||||
.play { background-position: -130px -20px;}
|
||||
.pencil { background-position: -150px -20px; margin-right: 10px;}
|
||||
.pencil { background-position: -150px -20px; margin-right: 12px;}
|
||||
.small-pencil { background-position: -170px -20px;}
|
||||
.recycle { background-position: -190px -20px;}
|
||||
.remote-link { background-position: -210px -20px; margin-right: 10px;}
|
||||
|
|
@ -3497,7 +3534,7 @@ footer {
|
|||
}
|
||||
|
||||
#acl-list {
|
||||
height: auto;
|
||||
height: 400px;
|
||||
border: 1px solid #cccccc;
|
||||
background-color: #efefef;
|
||||
clear: both;
|
||||
|
|
@ -3506,7 +3543,6 @@ footer {
|
|||
}
|
||||
|
||||
#acl-list-content {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
.acl-list-item {
|
||||
|
|
@ -3807,4 +3843,3 @@ div.wall-item-content-wrapper.shiny {
|
|||
background-image: url("shiny.png");
|
||||
background-repeat: repeat-x;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Smoothly
|
||||
* Description: Like coffee with milk. Theme works fine with iPad[2].
|
||||
* Version: 0.8.2
|
||||
* Version: Version 0.9.19-4
|
||||
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
|
||||
<div class="wall-item-info" id="wall-item-info-$item.id">
|
||||
<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id"
|
||||
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" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
|
||||
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
|
||||
</a>
|
||||
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
|
||||
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" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
|
||||
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
|
||||
</a>
|
||||
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
|
||||
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||
<ul>
|
||||
$item.item_photo_menu
|
||||
|
|
@ -15,63 +15,83 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">
|
||||
{{ if $item.location }}
|
||||
<span class="icon globe"></span>$item.location
|
||||
{{ endif }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
|
||||
<div class="wall-item-title-end"></div>
|
||||
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ 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 }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $item.star }}
|
||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-author">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-wrapper-end"></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 class="wall-item-comment-wrapper" >
|
||||
$item.comment
|
||||
</div>
|
||||
<div class="wall-item-comment-wrapper" >$item.comment</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-outside-wrapper-end $item.indent" ></div>
|
||||
|
|
|
|||
|
|
@ -24,11 +24,21 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">
|
||||
{{ if $item.location }}
|
||||
<span class="icon globe"></span>$item.location
|
||||
{{ endif }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> {{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
|
||||
|
|
@ -58,34 +68,45 @@
|
|||
<hr class="line-dots">
|
||||
</div>
|
||||
-->
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ 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 }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.star }}
|
||||
{{ if $item.star }}
|
||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="wall-item-wrapper-end"></div>
|
||||
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
|
||||
|
|
|
|||
|
|
@ -12,45 +12,59 @@
|
|||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
|
||||
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
|
||||
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
|
||||
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||
<ul>
|
||||
$item.item_photo_menu
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||
<ul>
|
||||
$item.item_photo_menu
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">
|
||||
{{ if $item.location }}
|
||||
<span class="icon globe"></span>$item.location
|
||||
{{ endif }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
|
||||
<div class="wall-item-title-end"></div>
|
||||
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ 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 }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.star }}
|
||||
|
|
@ -58,24 +72,36 @@
|
|||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-author">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
|
||||
<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
|
||||
</a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-wrapper-end"></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 class="wall-item-comment-wrapper" >
|
||||
$item.comment
|
||||
</div>
|
||||
<div class="wall-item-comment-wrapper" >$item.comment</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-outside-wrapper-end $item.indent" ></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{{if $item.comment_firstcollapsed}}
|
||||
<div class="hide-comments-outer">
|
||||
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
|
||||
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span>
|
||||
<span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
|
||||
</div>
|
||||
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
|
||||
{{endif}}
|
||||
|
||||
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
|
||||
<div class="wall-item-outside-wrapper $item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
|
||||
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
|
||||
|
|
@ -30,8 +32,13 @@
|
|||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
</div>
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
<div class="wall-item-author">
|
||||
|
|
@ -54,31 +61,43 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ 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 }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $item.star }}
|
||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue