mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2012-05-05 17:54:19 -07:00
parent 49ccefd6c7 e1ab3a93cc
commit 47c3b43afd
8 changed files with 4046 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
view/theme/diabook/communityhome.tpl
View file

@ -8,10 +8,9 @@
<div>$page</div>
{{ endif }}
<div id="close_profiles">
{{ if $comunity_profilest_title }}
<h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="close"></a></h3>
<h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="$close"></a></h3>
<div id='lastusers-wrapper' class='items-wrapper'>
{{ for $comunity_profiles_items as $i }}
$i
@ -22,7 +21,7 @@
<div id="close_helpers">
{{ if $helpers }}
<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="$close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@ -32,7 +31,7 @@
<div id="close_services">
{{ if $con_services }}
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="$close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
@ -48,7 +47,7 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="$close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
@ -60,7 +59,7 @@ $nv.search
<div id="close_lastusers">
{{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="$close"></a></h3>
<div id='lastusers-wrapper' class='items-wrapper'>
{{ for $lastusers_items as $i }}
$i
@ -80,7 +79,7 @@ $nv.search
<div id="close_lastphotos">
{{ if $photos_title }}
<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box" title="close"></a></h3>
<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box" title="$close"></a></h3>
<div id='ra-photos-wrapper' class='items-wrapper'>
{{ for $photos_items as $i }}
$i
@ -91,7 +90,7 @@ $nv.search
<div id="close_lastlikes">
{{ if $like_title }}
<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="$close"></a></h3>
<ul id='likes'>
{{ for $like_items as $i }}
<li id='ra-photos-wrapper'>$i</li>
@ -100,6 +99,31 @@ $nv.search
{{ endif }}
</div>
<div id="close_twitter">
<h3 style="height:1.17em">$twitter.title.1<a id="close_twitter_icon" onClick="close_twitter()" class="icon close_box" title="$close"></a></h3>
<div id="twitter">
</div>
<div id="twittersettings" style="display:none;">
<form id="twittersettings-form" action="network" method="post" autocomplete="off">
{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
</div>
</form>
</div>
</div>
<div id="close_mapquery">
{{ if $mapquery }}
<h3>$mapquery.title.1<a id="close_mapquery_icon" onClick="close_mapquery()" class="icon close_box" title="$close"></a></h3>
<div id="map" style="height:170px;width:170px;margin-top:3px;margin-bottom:1px;">
</div>
<div style="font-size:9px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
<div id="#mapcontrol" style="display:none;" class="lightbox">
hallo welt
<div id="map2" style="height:370px;width:370px;margin-top:3px;margin-bottom:1px;">
</div>
</div>
{{ endif }}
</div>
</div>

11
view/theme/diabook/config.php
View file

@ -13,8 +13,9 @@ function theme_content(&$a){
$line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
$resolution = get_pconfig(local_user(), 'diabook', 'resolution' );
$color = get_pconfig(local_user(), 'diabook', 'color' );
$TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' );
return diabook_form($a,$font_size, $line_height, $resolution, $color);
return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm);
}
function theme_post(&$a){
@ -26,6 +27,7 @@ function theme_post(&$a){
set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']);
set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']);
set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
}
}
@ -35,8 +37,9 @@ function theme_admin(&$a){
$line_height = get_config('diabook', 'line_height' );
$resolution = get_config('diabook', 'resolution' );
$color = get_config('diabook', 'color' );
$TSearchTerm = get_config('diabook', 'TSearchTerm' );
return diabook_form($a,$font_size, $line_height, $resolution, $color);
return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm);
}
function theme_admin_post(&$a){
@ -45,11 +48,12 @@ function theme_admin_post(&$a){
set_config('diabook', 'line_height', $_POST['diabook_line_height']);
set_config('diabook', 'resolution', $_POST['diabook_resolution']);
set_config('diabook', 'color', $_POST['diabook_color']);
set_config('diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
}
}
function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm){
$line_heights = array(
"1.3"=>"1.3",
"---"=>"---",
@ -95,6 +99,7 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
'$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),
'$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm),
));
return $o;
}

2885
view/theme/diabook/js/OpenLayers.js Normal file
View file

File diff suppressed because one or more lines are too long

1028
view/theme/diabook/js/jquery.mapquery.core.js Normal file
View file

File diff suppressed because it is too large Load diff

4
view/theme/diabook/js/jquery.twitter.search.js
View file

@ -31,7 +31,7 @@
opts.title = opts.term;
opts.title = opts.title || '';
text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'<a id="close_friends_icon" onClick="close_twitter()" class="icon close_box" title="close"></a>'+ '</span>');
text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'</span>');
$text = $(text);
if (opts.titleLink)
$text.css(opts.css['titleLink']);
@ -210,7 +210,7 @@
loading: { padding: '20px', textAlign: 'center', color: '#888' },
text: {},
time: { fontSize: 'smaller', color: '#888' },
title: { 'border-bottom': '1px solid #D2D2D2', 'padding-top': '5px', 'padding-bottom': '0px', 'padding-left': '9px', 'margin-bottom': '0px', 'margin-top': '30px' , 'display': 'block', 'font-size': '1.17em', 'font-weight': 'bold'},
title: { 'display': 'none'},
titleLink: { textDecoration: 'none', color: '#3B5998' },
user: { fontWeight: 'bold' }
}

2
view/theme/diabook/oembed_video.tpl
View file

@ -1,4 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'>
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "450px"); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

101
view/theme/diabook/theme.php
View file

@ -80,9 +80,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_mapquery'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "9") {
if($ccCookie != "10") {
// COMMUNITY
diabook_community_info();
@ -96,7 +96,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "9") {
if($ccCookie != "10") {
// COMMUNITY
diabook_community_info();
@ -128,36 +128,74 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
}
//load jquery.mapquery.js
$_COOKIE['close_mapquery'] = "1";
if($_COOKIE['close_mapquery'] != "1") {
$mapqueryJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.core.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mapqueryJS);
$openlayersJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/OpenLayers.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $openlayersJS);
$qlayersJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqLayerControl.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqlayersJS);
}
$a->page['htmlhead'] .= '
<script>
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
$("a.#twittersettings-link").fancybox({onClosed: function() { $("#twittersettings").attr("style","display: none;");}} );
});
$(window).load(function() {
var footer_top = $(document).height() - 30;
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
});
</script>';
//check if mapquerybox is active and print
$_COOKIE['close_mapquery'] = "1";
if($_COOKIE['close_mapquery'] != "1") {
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("#map").mapQuery({
layers:[{ //add layers to your map; you need to define at least one to be able to see anything on the map
type:"osm" //add a layer of the type osm (OpenStreetMap)
}]
});
$("#map2").mapQuery({
layers:[{ //add layers to your map; you need to define at least one to be able to see anything on the map
type:"osm" //add a layer of the type osm (OpenStreetMap)
}]
});
});
</script>';
}
//check if twitterbox is active and print
if($_COOKIE['close_twitter'] != "1") {
$TSearchTerm=false;
$site_TSearchTerm = get_config("diabook", "TSearchTerm" );
$TSearchTerm = get_pconfig(local_user(), "diabook", "TSearchTerm");
if ($TSearchTerm===false) $TSearchTerm=$site_TSearchTerm;
if ($TSearchTerm===false) $TSearchTerm="friendica";
$a->page['htmlhead'] .= '
<script>
$(function() {
$("#twitter").twitterSearch({
term: "friendica",
term: "'.$TSearchTerm.'",
animInSpeed: 250,
bird: false,
avatar: false,
colorExterior: "#fff",
title: "Last Tweets",
timeout: 10000 });
});
function open_twittersettings() {
$("div#twittersettings").attr("style","display: block;");
};
</script>';}
//check if community_home-plugin is activated and change css
@ -187,6 +225,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_mapquery","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_profiles","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
@ -219,6 +258,11 @@ if ($color=="dark") $color_path = "/diabook-dark/";
document.getElementById( "close_pages" ).style.display = "none";
};
if($.cookie("close_mapquery") == "1")
{
document.getElementById( "close_mapquery" ).style.display = "none";
};
if($.cookie("close_profiles") == "1")
{
document.getElementById( "close_profiles" ).style.display = "none";
@ -241,7 +285,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
if($.cookie("close_twitter") == "1")
{
document.getElementById( "twitter" ).style.display = "none";
document.getElementById( "close_twitter" ).style.display = "none";
};
if($.cookie("close_lastusers") == "1")
@ -266,6 +310,11 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_mapquery(){
document.getElementById( "close_mapquery" ).style.display = "none";
$.cookie("close_mapquery","1", { expires: 365, path: "/" });
};
function close_profiles(){
document.getElementById( "close_profiles" ).style.display = "none";
$.cookie("close_profiles","1", { expires: 365, path: "/" });
@ -287,7 +336,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
};
function close_twitter(){
document.getElementById( "twitter" ).style.display = "none";
document.getElementById( "close_twitter" ).style.display = "none";
$.cookie("close_twitter","1", { expires: 365, path: "/" });
};
@ -509,6 +558,15 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}}
//END Community Page
//mapquery
$_COOKIE['close_mapquery'] = "1";
if($_COOKIE['close_mapquery'] != "1") {
$mapquery = array();
$mapquery['title'] = Array("", t('Earth View'), "", "");
$aside['$mapquery'] = $mapquery;
}
//end mapquery
//helpers
if($_COOKIE['close_helpers'] != "1") {
$helpers = array();
@ -523,6 +581,23 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$aside['$con_services'] = $con_services;
}
//end connectable services
//twitter
if($_COOKIE['close_twitter'] != "1") {
$twitter = array();
$twitter['title'] = Array("", "<a id='twittersettings-link' href='#twittersettings' style='text-decoration:none;' onclick='open_twittersettings(); return false;'>".t('Last Tweets')."</a>", "", "");
$aside['$twitter'] = $twitter;
$TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' );
$aside['$submit'] = t('Submit');
$aside['$TSearchTerm'] = array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm);
$baseurl = $a->get_baseurl();
$aside['$baseurl'] = $baseurl;
if (isset($_POST['diabook-settings-submit'])){
set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
}
}
//end twitter
$close = t('Close');
$aside['$close'] = $close;
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
@ -543,13 +618,3 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}

2
view/theme/diabook/theme_settings.tpl
View file

@ -6,6 +6,8 @@
{{inc field_select.tpl with $field=$resolution}}{{endinc}}
{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
<div class="field select">
<a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a>
</div>