MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-03-28 03:19:42 -07:00
commit b58dc43148
28 changed files with 485 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/text.php
View file

@ -1300,6 +1300,7 @@ function file_tag_save_file($uid,$item,$file) {
$saved = get_pconfig($uid,'system','filetags'); $saved = get_pconfig($uid,'system','filetags');
if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']'))) if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']'); set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
info( t('Item filed') );
} }
return true; return true;
} }

14
mod/filer.php
View file

@ -16,8 +16,20 @@ function filer_content(&$a) {
logger('filer: tag ' . $term . ' item ' . $item_id); 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); 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(); killme();
} }

18
view/field_combobox.tpl Normal file
View file

@ -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>

4
view/filer_dialog.tpl Normal file
View file

@ -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>

39
view/jot-header.tpl
View file

@ -264,15 +264,36 @@ function enableOnUser(){
} }
function itemFiler(id) { function itemFiler(id) {
reply = prompt("$fileas");
if(reply && reply.length) { var bordercolor = $("input").css("border-color");
commentBusy = true;
$('body').css('cursor', 'wait'); $.get('filer/', function(data){
$.get('filer/' + id + '?term=' + reply); $.fancybox(data);
if(timer) clearTimeout(timer); $("#id_term").keypress(function(){
timer = setTimeout(NavUpdate,3000); $(this).css("border-color",bordercolor);
liking = 1; })
} $("#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() { function jotClearLocation() {

41
view/theme/dispy-dark/communityhome.tpl
View file

@ -2,8 +2,43 @@
<div>$page</div> <div>$page</div>
{{ endif }} {{ endif }}
<h3>PostIt to Friendica</h3> {{ if $lastusers_title }}
<div style="padding-left: 8px;"> <h3 id="extra-help-header">Help or '@NewHere'?</h3>
<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span> <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> </div>
{{ endif }} {{ 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>

20
view/theme/dispy-dark/default.php Normal file
View file

@ -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>

40
view/theme/dispy-dark/jot-header.tpl
View file

@ -264,17 +264,39 @@ function enableOnUser(){
} }
function itemFiler(id) { function itemFiler(id) {
reply = prompt("$fileas");
if(reply && reply.length) { var bordercolor = $("input").css("border-color");
commentBusy = true;
$('body').css('cursor', 'wait'); $.get('filer/', function(data){
$.get('filer/' + id + '?term=' + reply); $.fancybox(data);
if(timer) clearTimeout(timer); $("#id_term").keypress(function(){
timer = setTimeout(NavUpdate,3000); $(this).css("border-color",bordercolor);
liking = 1; })
} $("#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() { function jotClearLocation() {
$('#jot-coord').val(''); $('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').hide();

14
view/theme/dispy-dark/nav.tpl
View file

@ -45,13 +45,7 @@ works -->
{{ endif }} {{ endif }}
</div> </div>
<div class="search-box"> <div id="user-menu">
<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">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
<ul id="user-menu-popup" <ul id="user-menu-popup"
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@ -125,6 +119,12 @@ works -->
$langselector $langselector
</div> </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"> <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> <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>

62
view/theme/dispy-dark/style.css
View file

@ -251,7 +251,7 @@ input[type=submit] {
* nav * nav
*/ */
nav { nav {
height: 85px; height: 60px;
display: block; display: block;
background-color: #1d1f1d; background-color: #1d1f1d;
color: #eeeeec; color: #eeeeec;
@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 170px; width: 170px;
position: absolute; position: absolute;
top: -19px; top: -19px;
left: 15px; left: 7px;
} }
#nav-floater { #nav-floater {
position: fixed; position: fixed;
@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: transparent; color: transparent;
border-radius: 5px; border-radius: 5px;
z-index: 100; z-index: 100;
width: 28%; width: 300px;
height: 80px; height: 60px;
} }
#nav-buttons { #nav-buttons {
clear: both; clear: both;
list-style: none; list-style: none;
padding: 0px; padding: 0px;
margin: 0 7px 0 0;
height: 25px; height: 25px;
} }
#nav-buttons li { #nav-buttons li {
@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
} }
.search-box { .search-box {
display: inline-block; display: inline-block;
height: 20px; margin: 5px;
margin: 0; position: fixed;
position: relative; right: 0px;
left: 7px; bottom: 0px;
top: 5px; z-index: 100;
/*width: 210px;*/ background: #1d1f1d;
border-radius: 5px;
} }
#search-text { #search-text {
border: 1px #eec solid; border: 1px #eec solid;
background: #2e2f2e; background: #2e2f2e;
color: #eec; color: #eec;
} }
.search-box #search-text {
margin: 8px;
width: 10em;
color: #eec;
}
nav #user-menu { nav #user-menu {
display: block; display: block;
width: 75%; width: 75%;
@ -529,8 +536,8 @@ nav #user-menu {
border-radius: 5px; border-radius: 5px;
background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
clear: both; clear: both;
top: 12px; top: 4px;
left: 7px; left: 10px;
} }
nav #user-menu-label { nav #user-menu-label {
font-size: 12px; font-size: 12px;
@ -641,6 +648,7 @@ nav #user-menu-label {
background: #ddd; background: #ddd;
} }
/** sysmsg **/ /** sysmsg **/
#sysmsg_info { #sysmsg_info {
position: fixed; position: fixed;
@ -752,6 +760,7 @@ aside #viewcontacts {
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
/** /**
* contacts block * contacts block
*/ */
@ -1018,7 +1027,7 @@ aside #viewcontacts {
* section * section
*/ */
section { section {
margin: 20px 8% 0 4%; margin: 20px 9% 0 4%;
font-size: 0.8em; font-size: 0.8em;
padding-right: 230px; padding-right: 230px;
min-width: 475px; min-width: 475px;
@ -1057,6 +1066,7 @@ section {
text-decoration: none; text-decoration: none;
} }
/** /**
* items * items
*/ */
@ -1129,7 +1139,7 @@ section {
border-radius: 5px; border-radius: 5px;
} }
[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
margin: 0 0 5px 0; /*margin: 0 0 5px 0;*/
} }
.wall-item-tools { .wall-item-tools {
float: right; float: right;
@ -1150,6 +1160,12 @@ section {
-ms-transition: all 1s ease-in-out; -ms-transition: all 1s ease-in-out;
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 { .wall-item-title {
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
@ -1260,6 +1276,24 @@ section {
overflow: auto; overflow: auto;
width: 100%; 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;
}
/** /**

13
view/theme/dispy-dark/theme.php
View file

@ -91,11 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-210px -60px' backgroundPosition: '-210px -60px'
}); });
$('.search-box').slideDown('fast');
} else { } else {
$('#nav-floater').slideDown('fast'); $('#nav-floater').slideDown('fast');
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-190px -60px' backgroundPosition: '-190px -60px'
}); });
$('.search-box').slideUp('fast');
} }
}; };
// our trigger for the toolbar button // our trigger for the toolbar button
@ -144,13 +146,20 @@ function dispydark_community_info() {
} else { } else {
a_funct(); a_funct();
} }
})();" ; })();";
$aside['$fostitJS'] = $fostitJS; $aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state); $url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url; $aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); $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();
}

73
view/theme/dispy-dark/wall_item.tpl
View file

@ -15,44 +15,45 @@
<div class="wall-item-photo-end"></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>
<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"> <div class="wall-item-tools" id="wall-item-tools-$item.id">
{{ if $item.star }} <ul class="wall-item-subtools1">
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> <li class="wall-item-lock-wrapper">
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ 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>
{{ endif }} {{ else }}<div class="wall-item-lock"></div>{{ endif }}
</li>
{{ if $item.vote }} {{ if $item.star }}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> <li>
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> <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="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ if $item.vote.share }} </li>
<a href="#" id="share-$item.id" {{ endif }}
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} {{ if $item.vote }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
</div> <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
{{ endif }} <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ if $item.vote.share }}
{{ if $item.filer }} <a href="#" id="share-$item.id"
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li>
{{ if $item.plink }} {{ endif }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div> </ul>
{{ endif }} <ul class="wall-item-subtools2">
{{ if $item.edpost }} {{ if $item.filer }}
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> <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 }} {{ endif }}
{{ if $item.plink }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ 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 }} {{ endif }}
</div> {{ if $item.edpost }}
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} <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 class="wall-item-delete-end"></div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-$item.id" > <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" id="wall-item-title-$item.id">$item.title</div>

41
view/theme/dispy/communityhome.tpl
View file

@ -2,8 +2,43 @@
<div>$page</div> <div>$page</div>
{{ endif }} {{ endif }}
<h3>PostIt to Friendica</h3> {{ if $lastusers_title }}
<div style="padding-left: 8px;"> <h3 id="extra-help-header">Help or '@NewHere'?</h3>
<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span> <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> </div>
{{ endif }} {{ 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>

20
view/theme/dispy/default.php Normal file
View file

@ -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>

BIN
view/theme/dispy/icons/StatusNet.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
view/theme/dispy/icons/email.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 853 B

BIN
view/theme/dispy/icons/facebook.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
view/theme/dispy/icons/livejournal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
view/theme/dispy/icons/posterous.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
view/theme/dispy/icons/tumblr.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 843 B

BIN
view/theme/dispy/icons/twitter.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 967 B

BIN
view/theme/dispy/icons/wordpress.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

40
view/theme/dispy/jot-header.tpl
View file

@ -264,17 +264,39 @@ function enableOnUser(){
} }
function itemFiler(id) { function itemFiler(id) {
reply = prompt("$fileas");
if(reply && reply.length) { var bordercolor = $("input").css("border-color");
commentBusy = true;
$('body').css('cursor', 'wait'); $.get('filer/', function(data){
$.get('filer/' + id + '?term=' + reply); $.fancybox(data);
if(timer) clearTimeout(timer); $("#id_term").keypress(function(){
timer = setTimeout(NavUpdate,3000); $(this).css("border-color",bordercolor);
liking = 1; })
} $("#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() { function jotClearLocation() {
$('#jot-coord').val(''); $('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').hide();

14
view/theme/dispy/nav.tpl
View file

@ -45,13 +45,7 @@ works -->
{{ endif }} {{ endif }}
</div> </div>
<div class="search-box"> <div id="user-menu">
<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">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
<ul id="user-menu-popup" <ul id="user-menu-popup"
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@ -125,6 +119,12 @@ works -->
$langselector $langselector
</div> </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"> <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> <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>

64
view/theme/dispy/style.css
View file

@ -251,7 +251,7 @@ input[type=submit] {
* nav * nav
*/ */
nav { nav {
height: 85px; height: 60px;
display: block; display: block;
background-color: #2e3436; background-color: #2e3436;
color: #eeeeec; color: #eeeeec;
@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 170px; width: 170px;
position: absolute; position: absolute;
top: -19px; top: -19px;
left: 15px; left: 7px;
} }
#nav-floater { #nav-floater {
position: fixed; position: fixed;
@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: transparent; color: transparent;
border-radius: 5px; border-radius: 5px;
z-index: 100; z-index: 100;
width: 28%; width: 300px;
height: 80px; height: 60px;
} }
#nav-buttons { #nav-buttons {
clear: both; clear: both;
list-style: none; list-style: none;
padding: 0px; padding: 0px;
margin: 0 7px 0 0;
height: 25px; height: 25px;
} }
#nav-buttons li { #nav-buttons li {
@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
} }
.search-box { .search-box {
display: inline-block; display: inline-block;
height: 20px; margin: 5px;
margin: 0; position: fixed;
position: relative; right: 0px;
left: 7px; bottom: 0px;
top: 5px; z-index: 100;
/*width: 210px;*/ background: #1d1f1d;
border-radius: 5px;
} }
#search-text { #search-text {
border: 1px #eec solid; border: 1px #eec solid;
background: #2e3436; background: #2e3436;
color: #eec; color: #eec;
} }
.search-box #search-text {
margin: 8px;
width: 10em;
color: #eec;
}
nav #user-menu { nav #user-menu {
display: block; display: block;
width: 75%; width: 75%;
@ -529,8 +536,8 @@ nav #user-menu {
border-radius: 5px; border-radius: 5px;
background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
clear: both; clear: both;
top: 12px; top: 4px;
left: 7px; left: 10px;
} }
nav #user-menu-label { nav #user-menu-label {
font-size: 12px; font-size: 12px;
@ -641,6 +648,7 @@ nav #user-menu-label {
background: #ddd; background: #ddd;
} }
/** sysmsg **/ /** sysmsg **/
#sysmsg_info { #sysmsg_info {
position: fixed; position: fixed;
@ -752,6 +760,7 @@ aside #viewcontacts {
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
/** /**
* contacts block * contacts block
*/ */
@ -1018,7 +1027,7 @@ aside #viewcontacts {
* section * section
*/ */
section { section {
margin: 20px 8% 0 4%; margin: 20px 9% 0 4%;
font-size: 0.8em; font-size: 0.8em;
padding-right: 230px; padding-right: 230px;
min-width: 475px; min-width: 475px;
@ -1057,6 +1066,7 @@ section {
text-decoration: none; text-decoration: none;
} }
/** /**
* items * items
*/ */
@ -1129,7 +1139,7 @@ section {
border-radius: 5px; border-radius: 5px;
} }
[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
margin: 0 0 5px 0; /*margin: 0 0 5px 0;*/
} }
.wall-item-tools { .wall-item-tools {
float: right; float: right;
@ -1150,6 +1160,12 @@ section {
-ms-transition: all 1s ease-in-out; -ms-transition: all 1s ease-in-out;
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 { .wall-item-title {
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
@ -1260,6 +1276,24 @@ section {
overflow: auto; overflow: auto;
width: 100%; 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 { .field {
/*margin-bottom: 10px;*/ /*margin-bottom: 10px;*/
/*padding-bottom: 10px;*/ /*padding-bottom: 10px;*/
/*overflow: auto;*/ overflow: auto;
width: 100%; width: 100%;
} }
.field label, label { .field label, label {

14
view/theme/dispy/theme.php
View file

@ -91,11 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-210px -60px' backgroundPosition: '-210px -60px'
}); });
$('.search-box').slideDown('fast');
} else { } else {
$('#nav-floater').slideDown('fast'); $('#nav-floater').slideDown('fast');
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-190px -60px' backgroundPosition: '-190px -60px'
}); });
$('.search-box').slideUp('fast');
} }
}; };
// our trigger for the toolbar button // our trigger for the toolbar button
@ -131,7 +133,7 @@ function dispy_community_info() {
$a = get_app(); $a = get_app();
$fostitJS = "javascript: (function() { $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.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
document.getSelection() : document.selection.createRange().text)); document.getSelection() : document.selection.createRange().text));
@ -144,18 +146,20 @@ function dispy_community_info() {
} else { } else {
a_funct(); a_funct();
} }
})();" ; })();";
$aside['$fostitJS'] = $fostitJS; $aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state); $url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url; $aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); $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") { if ($a->argv[0] === "profile") {
// COMMUNITY
dispy_community_info(); dispy_community_info();
} }

73
view/theme/dispy/wall_item.tpl
View file

@ -15,44 +15,45 @@
<div class="wall-item-photo-end"></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>
<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"> <div class="wall-item-tools" id="wall-item-tools-$item.id">
{{ if $item.star }} <ul class="wall-item-subtools1">
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> <li class="wall-item-lock-wrapper">
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> {{ 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>
{{ endif }} {{ else }}<div class="wall-item-lock"></div>{{ endif }}
</li>
{{ if $item.vote }} {{ if $item.star }}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> <li>
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> <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="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ if $item.vote.share }} </li>
<a href="#" id="share-$item.id" {{ endif }}
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} {{ if $item.vote }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
</div> <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
{{ endif }} <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ if $item.vote.share }}
{{ if $item.filer }} <a href="#" id="share-$item.id"
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a> class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li>
{{ if $item.plink }} {{ endif }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div> </ul>
{{ endif }} <ul class="wall-item-subtools2">
{{ if $item.edpost }} {{ if $item.filer }}
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> <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 }} {{ endif }}
{{ if $item.plink }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ 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 }} {{ endif }}
</div> {{ if $item.edpost }}
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} <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 class="wall-item-delete-end"></div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-$item.id" > <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" id="wall-item-title-$item.id">$item.title</div>

35
view/theme/testbubble/jot-header.tpl
View file

@ -305,6 +305,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() { function jotClearLocation() {
$('#jot-coord').val(''); $('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide(); $('#profile-nolocation-wrapper').hide();