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

1 files changed, 32 insertions, 8 deletions

diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 0386d63d3..3c6fb5a82 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -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>
\ No newline at end of file