Merge branch 'pull'
This commit is contained in:
friendica
commit
b58dc43148
|
|
@ -1300,6 +1300,7 @@ function file_tag_save_file($uid,$item,$file) {
|
|||
$saved = get_pconfig($uid,'system','filetags');
|
||||
if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
|
||||
set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
|
||||
info( t('Item filed') );
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,20 @@ function filer_content(&$a) {
|
|||
|
||||
logger('filer: tag ' . $term . ' item ' . $item_id);
|
||||
|
||||
if($item_id && strlen($term))
|
||||
if($item_id && strlen($term)){
|
||||
// file item
|
||||
file_tag_save_file(local_user(),$item_id,$term);
|
||||
|
||||
} else {
|
||||
// return filer dialog
|
||||
$filetags = get_pconfig(local_user(),'system','filetags');
|
||||
$filetags = explode("][", trim($filetags,"[]"));
|
||||
$tpl = get_markup_template("filer_dialog.tpl");
|
||||
$o = replace_macros($tpl, array(
|
||||
'$field' => array('term', t("File as:"), '', '', $filetags, t('- select -')),
|
||||
'$submit' => t('Save'),
|
||||
));
|
||||
|
||||
echo $o;
|
||||
}
|
||||
killme();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
|
||||
<div class='field combobox'>
|
||||
<label for='id_$field.0'>$field.1</label>
|
||||
{# html5 don't work on Chrome, Safari and IE9
|
||||
<input id="id_$field.0" type="text" list="data_$field.0" >
|
||||
<datalist id="data_$field.0" >
|
||||
{{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
|
||||
</datalist> #}
|
||||
|
||||
<input id="id_$field.0" type="text" value="$field.2">
|
||||
<select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())">
|
||||
<option value="">$field.5</option>
|
||||
{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
|
||||
</select>
|
||||
|
||||
<span class='field_help'>$field.3</span>
|
||||
</div>
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
{{ inc field_combobox.tpl }}{{ endinc }}
|
||||
<div class="settings-submit-wrapper" >
|
||||
<input id="filer_save" type="button" class="settings-submit" value="$submit" />
|
||||
</div>
|
||||
|
|
@ -264,15 +264,36 @@ function enableOnUser(){
|
|||
}
|
||||
|
||||
function itemFiler(id) {
|
||||
reply = prompt("$fileas");
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
}
|
||||
|
||||
var bordercolor = $("input").css("border-color");
|
||||
|
||||
$.get('filer/', function(data){
|
||||
$.fancybox(data);
|
||||
$("#id_term").keypress(function(){
|
||||
$(this).css("border-color",bordercolor);
|
||||
})
|
||||
$("#select_term").change(function(){
|
||||
$("#id_term").css("border-color",bordercolor);
|
||||
})
|
||||
|
||||
$("#filer_save").click(function(e){
|
||||
e.preventDefault();
|
||||
reply = $("#id_term").val();
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
$.fancybox.close();
|
||||
} else {
|
||||
$("#id_term").css("border-color","#FF0000");
|
||||
}
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
function jotClearLocation() {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,43 @@
|
|||
<div>$page</div>
|
||||
{{ endif }}
|
||||
|
||||
<h3>PostIt to Friendica</h3>
|
||||
<div style="padding-left: 8px;">
|
||||
<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span>
|
||||
{{ if $lastusers_title }}
|
||||
<h3 id="extra-help-header">Help or '@NewHere'?</h3>
|
||||
<div id="extra-help">
|
||||
<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
|
||||
title="Friendica Support" target="_blank">Friendica Support</a><br />
|
||||
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
|
||||
title="Let's talk" target="_blank">Let's talk</a><br />
|
||||
<a href="http://newzot.hydra.uberspace.de/profile/newzot"
|
||||
title="Local Friendica" target="_blank">Local Friendica</a><br />
|
||||
<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3 id="connect-services-header">Connectable Services</h3>
|
||||
<div id="connect-services">
|
||||
<a href="$url/facebook"><img alt="Facebook"
|
||||
src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
<h3 id="postit-header">PostIt to Friendica</h3>
|
||||
<div id="postit">
|
||||
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<aside>
|
||||
<?php if(x($page,'aside')) echo $page['aside']; ?>
|
||||
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
|
||||
</aside>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
@ -264,17 +264,39 @@ function enableOnUser(){
|
|||
}
|
||||
|
||||
function itemFiler(id) {
|
||||
reply = prompt("$fileas");
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
}
|
||||
|
||||
var bordercolor = $("input").css("border-color");
|
||||
|
||||
$.get('filer/', function(data){
|
||||
$.fancybox(data);
|
||||
$("#id_term").keypress(function(){
|
||||
$(this).css("border-color",bordercolor);
|
||||
})
|
||||
$("#select_term").change(function(){
|
||||
$("#id_term").css("border-color",bordercolor);
|
||||
})
|
||||
|
||||
$("#filer_save").click(function(e){
|
||||
e.preventDefault();
|
||||
reply = $("#id_term").val();
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
$.fancybox.close();
|
||||
} else {
|
||||
$("#id_term").css("border-color","#FF0000");
|
||||
}
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
function jotClearLocation() {
|
||||
$('#jot-coord').val('');
|
||||
$('#profile-nolocation-wrapper').hide();
|
||||
|
|
|
|||
|
|
@ -45,13 +45,7 @@ works -->
|
|||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="search-box">
|
||||
<form method="get" action="$nav.search.0">
|
||||
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="user-menu">
|
||||
<div id="user-menu">
|
||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
|
||||
<ul id="user-menu-popup"
|
||||
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
||||
|
|
@ -125,6 +119,12 @@ works -->
|
|||
$langselector
|
||||
</div>
|
||||
|
||||
<div class="search-box">
|
||||
<form method="get" action="$nav.search.0">
|
||||
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<ul id="nav-notifications-template" style="display:none;" rel="template">
|
||||
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ input[type=submit] {
|
|||
* nav
|
||||
*/
|
||||
nav {
|
||||
height: 85px;
|
||||
height: 60px;
|
||||
display: block;
|
||||
background-color: #1d1f1d;
|
||||
color: #eeeeec;
|
||||
|
|
@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
width: 170px;
|
||||
position: absolute;
|
||||
top: -19px;
|
||||
left: 15px;
|
||||
left: 7px;
|
||||
}
|
||||
#nav-floater {
|
||||
position: fixed;
|
||||
|
|
@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
color: transparent;
|
||||
border-radius: 5px;
|
||||
z-index: 100;
|
||||
width: 28%;
|
||||
height: 80px;
|
||||
width: 300px;
|
||||
height: 60px;
|
||||
}
|
||||
#nav-buttons {
|
||||
clear: both;
|
||||
list-style: none;
|
||||
padding: 0px;
|
||||
margin: 0 7px 0 0;
|
||||
height: 25px;
|
||||
}
|
||||
#nav-buttons li {
|
||||
|
|
@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
}
|
||||
.search-box {
|
||||
display: inline-block;
|
||||
height: 20px;
|
||||
margin: 0;
|
||||
position: relative;
|
||||
left: 7px;
|
||||
top: 5px;
|
||||
/*width: 210px;*/
|
||||
margin: 5px;
|
||||
position: fixed;
|
||||
right: 0px;
|
||||
bottom: 0px;
|
||||
z-index: 100;
|
||||
background: #1d1f1d;
|
||||
border-radius: 5px;
|
||||
}
|
||||
#search-text {
|
||||
border: 1px #eec solid;
|
||||
background: #2e2f2e;
|
||||
color: #eec;
|
||||
}
|
||||
.search-box #search-text {
|
||||
margin: 8px;
|
||||
width: 10em;
|
||||
color: #eec;
|
||||
}
|
||||
nav #user-menu {
|
||||
display: block;
|
||||
width: 75%;
|
||||
|
|
@ -529,8 +536,8 @@ nav #user-menu {
|
|||
border-radius: 5px;
|
||||
background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
|
||||
clear: both;
|
||||
top: 12px;
|
||||
left: 7px;
|
||||
top: 4px;
|
||||
left: 10px;
|
||||
}
|
||||
nav #user-menu-label {
|
||||
font-size: 12px;
|
||||
|
|
@ -641,6 +648,7 @@ nav #user-menu-label {
|
|||
background: #ddd;
|
||||
}
|
||||
|
||||
|
||||
/** sysmsg **/
|
||||
#sysmsg_info {
|
||||
position: fixed;
|
||||
|
|
@ -752,6 +760,7 @@ aside #viewcontacts {
|
|||
margin: 0px 0px 0px 0px;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* contacts block
|
||||
*/
|
||||
|
|
@ -1018,7 +1027,7 @@ aside #viewcontacts {
|
|||
* section
|
||||
*/
|
||||
section {
|
||||
margin: 20px 8% 0 4%;
|
||||
margin: 20px 9% 0 4%;
|
||||
font-size: 0.8em;
|
||||
padding-right: 230px;
|
||||
min-width: 475px;
|
||||
|
|
@ -1057,6 +1066,7 @@ section {
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* items
|
||||
*/
|
||||
|
|
@ -1129,7 +1139,7 @@ section {
|
|||
border-radius: 5px;
|
||||
}
|
||||
[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
|
||||
margin: 0 0 5px 0;
|
||||
/*margin: 0 0 5px 0;*/
|
||||
}
|
||||
.wall-item-tools {
|
||||
float: right;
|
||||
|
|
@ -1150,6 +1160,12 @@ section {
|
|||
-ms-transition: all 1s ease-in-out;
|
||||
transition: all 1s ease-in-out;
|
||||
}
|
||||
.wall-item-subtools1 {
|
||||
list-style: none;
|
||||
}
|
||||
.wall-item-subtools2 {
|
||||
list-style: none;
|
||||
}
|
||||
.wall-item-title {
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
|
|
@ -1260,6 +1276,24 @@ section {
|
|||
overflow: auto;
|
||||
width: 100%;
|
||||
}
|
||||
#connect-services-header {
|
||||
|
||||
}
|
||||
#connect-services {
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
#extra-help-header {
|
||||
|
||||
}
|
||||
#extra-help {
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
#postit-header {
|
||||
|
||||
}
|
||||
#postit {
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -91,11 +91,13 @@ $(document).ready(function() {
|
|||
$('.floaterflip').css({
|
||||
backgroundPosition: '-210px -60px'
|
||||
});
|
||||
$('.search-box').slideDown('fast');
|
||||
} else {
|
||||
$('#nav-floater').slideDown('fast');
|
||||
$('.floaterflip').css({
|
||||
backgroundPosition: '-190px -60px'
|
||||
});
|
||||
$('.search-box').slideUp('fast');
|
||||
}
|
||||
};
|
||||
// our trigger for the toolbar button
|
||||
|
|
@ -144,13 +146,20 @@ function dispydark_community_info() {
|
|||
} else {
|
||||
a_funct();
|
||||
}
|
||||
})();" ;
|
||||
})();";
|
||||
|
||||
$aside['$fostitJS'] = $fostitJS;
|
||||
$url = $a->get_baseurl($ssl_state);
|
||||
$aside['$url'] = $url;
|
||||
|
||||
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
|
||||
$a->page['aside'] = replace_macros($tpl, $aside);
|
||||
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
|
||||
}
|
||||
|
||||
// use our 'default.php' instead of the system-wide one
|
||||
$a->page['template'] = "theme/dispy-dark/default";
|
||||
|
||||
// aside on profile page
|
||||
if ($a->argv[0] === "profile") {
|
||||
dispydark_community_info();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,44 +15,45 @@
|
|||
<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>
|
||||
<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 }}
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ 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 }}
|
||||
|
||||
{{ 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="#" id="share-$item.id"
|
||||
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.filer }}
|
||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
|
||||
{{ 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>
|
||||
{{ 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 }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
<ul class="wall-item-subtools1">
|
||||
<li 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 }}
|
||||
</li>
|
||||
{{ if $item.star }}
|
||||
<li>
|
||||
<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>
|
||||
</li>
|
||||
{{ endif }}
|
||||
{{ if $item.vote }}
|
||||
<li 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="#" id="share-$item.id"
|
||||
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;" />
|
||||
</li>
|
||||
{{ endif }}
|
||||
</ul>
|
||||
<ul class="wall-item-subtools2">
|
||||
{{ if $item.filer }}
|
||||
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
|
||||
{{ endif }}
|
||||
{{ if $item.plink }}
|
||||
<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
|
||||
{{ endif }}
|
||||
<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
|
||||
{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
|
||||
{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
|
||||
</li>
|
||||
</ul>
|
||||
<div class="wall-item-delete-end"></div>
|
||||
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,43 @@
|
|||
<div>$page</div>
|
||||
{{ endif }}
|
||||
|
||||
<h3>PostIt to Friendica</h3>
|
||||
<div style="padding-left: 8px;">
|
||||
<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span>
|
||||
{{ if $lastusers_title }}
|
||||
<h3 id="extra-help-header">Help or '@NewHere'?</h3>
|
||||
<div id="extra-help">
|
||||
<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
|
||||
title="Friendica Support" target="_blank">Friendica Support</a><br />
|
||||
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
|
||||
title="Let's talk" target="_blank">Let's talk</a><br />
|
||||
<a href="http://newzot.hydra.uberspace.de/profile/newzot"
|
||||
title="Local Friendica" target="_blank">Local Friendica</a><br />
|
||||
<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3 id="connect-services-header">Connectable Services</h3>
|
||||
<div id="connect-services">
|
||||
<a href="$url/facebook"><img alt="Facebook"
|
||||
src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
|
||||
<a href="$url/settings/connectors"><img
|
||||
alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
<h3 id="postit-header">PostIt to Friendica</h3>
|
||||
<div id="postit">
|
||||
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<aside>
|
||||
<?php if(x($page,'aside')) echo $page['aside']; ?>
|
||||
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
|
||||
</aside>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 853 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 843 B |
Binary file not shown.
|
After Width: | Height: | Size: 967 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -264,17 +264,39 @@ function enableOnUser(){
|
|||
}
|
||||
|
||||
function itemFiler(id) {
|
||||
reply = prompt("$fileas");
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
}
|
||||
|
||||
var bordercolor = $("input").css("border-color");
|
||||
|
||||
$.get('filer/', function(data){
|
||||
$.fancybox(data);
|
||||
$("#id_term").keypress(function(){
|
||||
$(this).css("border-color",bordercolor);
|
||||
})
|
||||
$("#select_term").change(function(){
|
||||
$("#id_term").css("border-color",bordercolor);
|
||||
})
|
||||
|
||||
$("#filer_save").click(function(e){
|
||||
e.preventDefault();
|
||||
reply = $("#id_term").val();
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
$.fancybox.close();
|
||||
} else {
|
||||
$("#id_term").css("border-color","#FF0000");
|
||||
}
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
function jotClearLocation() {
|
||||
$('#jot-coord').val('');
|
||||
$('#profile-nolocation-wrapper').hide();
|
||||
|
|
|
|||
|
|
@ -45,13 +45,7 @@ works -->
|
|||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="search-box">
|
||||
<form method="get" action="$nav.search.0">
|
||||
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="user-menu">
|
||||
<div id="user-menu">
|
||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
|
||||
<ul id="user-menu-popup"
|
||||
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
||||
|
|
@ -125,6 +119,12 @@ works -->
|
|||
$langselector
|
||||
</div>
|
||||
|
||||
<div class="search-box">
|
||||
<form method="get" action="$nav.search.0">
|
||||
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<ul id="nav-notifications-template" style="display:none;" rel="template">
|
||||
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ input[type=submit] {
|
|||
* nav
|
||||
*/
|
||||
nav {
|
||||
height: 85px;
|
||||
height: 60px;
|
||||
display: block;
|
||||
background-color: #2e3436;
|
||||
color: #eeeeec;
|
||||
|
|
@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
width: 170px;
|
||||
position: absolute;
|
||||
top: -19px;
|
||||
left: 15px;
|
||||
left: 7px;
|
||||
}
|
||||
#nav-floater {
|
||||
position: fixed;
|
||||
|
|
@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
color: transparent;
|
||||
border-radius: 5px;
|
||||
z-index: 100;
|
||||
width: 28%;
|
||||
height: 80px;
|
||||
width: 300px;
|
||||
height: 60px;
|
||||
}
|
||||
#nav-buttons {
|
||||
clear: both;
|
||||
list-style: none;
|
||||
padding: 0px;
|
||||
margin: 0 7px 0 0;
|
||||
height: 25px;
|
||||
}
|
||||
#nav-buttons li {
|
||||
|
|
@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
}
|
||||
.search-box {
|
||||
display: inline-block;
|
||||
height: 20px;
|
||||
margin: 0;
|
||||
position: relative;
|
||||
left: 7px;
|
||||
top: 5px;
|
||||
/*width: 210px;*/
|
||||
margin: 5px;
|
||||
position: fixed;
|
||||
right: 0px;
|
||||
bottom: 0px;
|
||||
z-index: 100;
|
||||
background: #1d1f1d;
|
||||
border-radius: 5px;
|
||||
}
|
||||
#search-text {
|
||||
border: 1px #eec solid;
|
||||
background: #2e3436;
|
||||
color: #eec;
|
||||
}
|
||||
.search-box #search-text {
|
||||
margin: 8px;
|
||||
width: 10em;
|
||||
color: #eec;
|
||||
}
|
||||
nav #user-menu {
|
||||
display: block;
|
||||
width: 75%;
|
||||
|
|
@ -529,8 +536,8 @@ nav #user-menu {
|
|||
border-radius: 5px;
|
||||
background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
|
||||
clear: both;
|
||||
top: 12px;
|
||||
left: 7px;
|
||||
top: 4px;
|
||||
left: 10px;
|
||||
}
|
||||
nav #user-menu-label {
|
||||
font-size: 12px;
|
||||
|
|
@ -641,6 +648,7 @@ nav #user-menu-label {
|
|||
background: #ddd;
|
||||
}
|
||||
|
||||
|
||||
/** sysmsg **/
|
||||
#sysmsg_info {
|
||||
position: fixed;
|
||||
|
|
@ -752,6 +760,7 @@ aside #viewcontacts {
|
|||
margin: 0px 0px 0px 0px;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* contacts block
|
||||
*/
|
||||
|
|
@ -1018,7 +1027,7 @@ aside #viewcontacts {
|
|||
* section
|
||||
*/
|
||||
section {
|
||||
margin: 20px 8% 0 4%;
|
||||
margin: 20px 9% 0 4%;
|
||||
font-size: 0.8em;
|
||||
padding-right: 230px;
|
||||
min-width: 475px;
|
||||
|
|
@ -1057,6 +1066,7 @@ section {
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* items
|
||||
*/
|
||||
|
|
@ -1129,7 +1139,7 @@ section {
|
|||
border-radius: 5px;
|
||||
}
|
||||
[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
|
||||
margin: 0 0 5px 0;
|
||||
/*margin: 0 0 5px 0;*/
|
||||
}
|
||||
.wall-item-tools {
|
||||
float: right;
|
||||
|
|
@ -1150,6 +1160,12 @@ section {
|
|||
-ms-transition: all 1s ease-in-out;
|
||||
transition: all 1s ease-in-out;
|
||||
}
|
||||
.wall-item-subtools1 {
|
||||
list-style: none;
|
||||
}
|
||||
.wall-item-subtools2 {
|
||||
list-style: none;
|
||||
}
|
||||
.wall-item-title {
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
|
|
@ -1260,6 +1276,24 @@ section {
|
|||
overflow: auto;
|
||||
width: 100%;
|
||||
}
|
||||
#connect-services-header {
|
||||
|
||||
}
|
||||
#connect-services {
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
#extra-help-header {
|
||||
|
||||
}
|
||||
#extra-help {
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
#postit-header {
|
||||
|
||||
}
|
||||
#postit {
|
||||
margin: 5px 0 0 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -2328,7 +2362,7 @@ div[id$="wrapper"] br {
|
|||
.field {
|
||||
/*margin-bottom: 10px;*/
|
||||
/*padding-bottom: 10px;*/
|
||||
/*overflow: auto;*/
|
||||
overflow: auto;
|
||||
width: 100%;
|
||||
}
|
||||
.field label, label {
|
||||
|
|
|
|||
|
|
@ -91,11 +91,13 @@ $(document).ready(function() {
|
|||
$('.floaterflip').css({
|
||||
backgroundPosition: '-210px -60px'
|
||||
});
|
||||
$('.search-box').slideDown('fast');
|
||||
} else {
|
||||
$('#nav-floater').slideDown('fast');
|
||||
$('.floaterflip').css({
|
||||
backgroundPosition: '-190px -60px'
|
||||
});
|
||||
$('.search-box').slideUp('fast');
|
||||
}
|
||||
};
|
||||
// our trigger for the toolbar button
|
||||
|
|
@ -131,7 +133,7 @@ function dispy_community_info() {
|
|||
$a = get_app();
|
||||
|
||||
$fostitJS = "javascript: (function() {
|
||||
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' +
|
||||
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
|
||||
encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
|
||||
encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
|
||||
document.getSelection() : document.selection.createRange().text));
|
||||
|
|
@ -144,18 +146,20 @@ function dispy_community_info() {
|
|||
} else {
|
||||
a_funct();
|
||||
}
|
||||
})();" ;
|
||||
})();";
|
||||
|
||||
$aside['$fostitJS'] = $fostitJS;
|
||||
$url = $a->get_baseurl($ssl_state);
|
||||
$aside['$url'] = $url;
|
||||
|
||||
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
|
||||
$a->page['aside'] = replace_macros($tpl, $aside);
|
||||
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
|
||||
}
|
||||
|
||||
//right_aside at profile pages
|
||||
// use our 'default.php' instead of the system-wide one
|
||||
$a->page['template'] = "theme/dispy-dark/default";
|
||||
|
||||
// aside on profile page
|
||||
if ($a->argv[0] === "profile") {
|
||||
// COMMUNITY
|
||||
dispy_community_info();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,44 +15,45 @@
|
|||
<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>
|
||||
<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 }}
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ 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 }}
|
||||
|
||||
{{ 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="#" id="share-$item.id"
|
||||
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.filer }}
|
||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
|
||||
{{ 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>
|
||||
{{ 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 }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
<ul class="wall-item-subtools1">
|
||||
<li 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 }}
|
||||
</li>
|
||||
{{ if $item.star }}
|
||||
<li>
|
||||
<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>
|
||||
</li>
|
||||
{{ endif }}
|
||||
{{ if $item.vote }}
|
||||
<li 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="#" id="share-$item.id"
|
||||
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;" />
|
||||
</li>
|
||||
{{ endif }}
|
||||
</ul>
|
||||
<ul class="wall-item-subtools2">
|
||||
{{ if $item.filer }}
|
||||
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
|
||||
{{ endif }}
|
||||
{{ if $item.plink }}
|
||||
<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
|
||||
{{ endif }}
|
||||
<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
|
||||
{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
|
||||
{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
|
||||
</li>
|
||||
</ul>
|
||||
<div class="wall-item-delete-end"></div>
|
||||
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -304,6 +304,41 @@ function initEditor(cb) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
function itemFiler(id) {
|
||||
|
||||
var bordercolor = $("input").css("border-color");
|
||||
|
||||
$.get('filer/', function(data){
|
||||
$.fancybox(data);
|
||||
$("#id_term").keypress(function(){
|
||||
$(this).css("border-color",bordercolor);
|
||||
})
|
||||
$("#select_term").change(function(){
|
||||
$("#id_term").css("border-color",bordercolor);
|
||||
})
|
||||
|
||||
$("#filer_save").click(function(e){
|
||||
e.preventDefault();
|
||||
reply = $("#id_term").val();
|
||||
if(reply && reply.length) {
|
||||
commentBusy = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply);
|
||||
if(timer) clearTimeout(timer);
|
||||
timer = setTimeout(NavUpdate,3000);
|
||||
liking = 1;
|
||||
$.fancybox.close();
|
||||
} else {
|
||||
$("#id_term").css("border-color","#FF0000");
|
||||
}
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
function jotClearLocation() {
|
||||
$('#jot-coord').val('');
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user