Merge branch 'pull'

pull/203/merge
friendica 11 years ago
commit 1e02fd8a72

@ -26,6 +26,7 @@ $a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
$a->strings["Submit"] = "Senden";
$a->strings["Help:"] = "Hilfe:";
$a->strings["Help"] = "Hilfe";
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NeuHier";
$a->strings["Not Found"] = "Nicht gefunden";
$a->strings["Page not found."] = "Seite nicht gefunden.";
$a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d";
@ -125,6 +126,9 @@ $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/A
$a->strings["Item not found"] = "Beitrag nicht gefunden";
$a->strings["Edit post"] = "Beitrag bearbeiten";
$a->strings["Post to Email"] = "An E-Mail senden";
$a->strings["PostIt to Friendica"] = "Teile mit Friendica";
$a->strings["Post to Friendica"] = "Teile mit Friendica";
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her, indem du diesen Link zu deinen Lesezeichen hinzufügst.";
$a->strings["Edit"] = "Bearbeiten";
$a->strings["Upload photo"] = "Foto hochladen";
$a->strings["Attach file"] = "Datei anhängen";
@ -244,6 +248,7 @@ $a->strings["Profile Match"] = "Profilübereinstimmungen";
$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
$a->strings["is interested in:"] = "ist interessiert an:";
$a->strings["Connect"] = "Verbinden";
$a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["No matches"] = "Keine Übereinstimmungen";
$a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
$a->strings["Visible to:"] = "Sichtbar für:";
@ -676,6 +681,7 @@ $a->strings["Force users to register with a space between firstname and lastname
$a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
$a->strings["Community Pages"] = "Foren";
$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt.";
@ -830,6 +836,7 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
$a->strings["Global Directory"] = "Weltweites Verzeichnis";
$a->strings["Local Directory"] = "Lokales Verzeichnis";
$a->strings["Normal site view"] = "Normale Seitenansicht";
$a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen";
$a->strings["Find on this site"] = "Auf diesem Server suchen";
@ -1164,6 +1171,7 @@ $a->strings["Dating"] = "Dating";
$a->strings["Unfaithful"] = "Untreu";
$a->strings["Sex Addict"] = "Sexbesessen";
$a->strings["Friends"] = "Freunde";
$a->strings["Find Friends"] = "Freunde finden";
$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
$a->strings["Casual"] = "Casual";
$a->strings["Engaged"] = "Verlobt";

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$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>
@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<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-aerith/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<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" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_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>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

@ -1260,7 +1260,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }

@ -1255,7 +1255,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }

@ -2042,6 +2042,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

@ -3,7 +3,7 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.011)
* Version: (Version: 1.012)
* Author:
*/
@ -139,7 +139,8 @@ function diabook_aerith_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -188,10 +189,28 @@ function diabook_aerith_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$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>
@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<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: 11px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<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" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_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>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

@ -543,15 +543,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -630,7 +632,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1007,6 +1009,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@ -1219,7 +1223,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1720,7 +1724,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1772,7 +1776,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1783,18 +1789,20 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
background-color: #055580;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;

@ -544,15 +544,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -631,7 +633,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1006,6 +1008,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@ -1218,7 +1222,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1721,7 +1725,7 @@ transition: all 0.2s ease-in-out;
float: left;
margin-top: 2px;
margin-left: 10px;
font-size: 14px;
}
#profile-attach-wrapper {
float: left;
@ -1767,7 +1771,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1778,18 +1784,20 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
background-color: #055580;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;

@ -544,15 +544,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -631,7 +633,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1706,7 +1708,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1758,7 +1760,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1769,18 +1773,20 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
background-color: #055580;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;

@ -541,15 +541,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* messages */
#message-new {
@ -708,7 +710,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1085,6 +1087,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@ -1725,7 +1729,7 @@ body .pageheader{
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1777,7 +1781,9 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1788,18 +1794,20 @@ body .pageheader{
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
background-color: #055580;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;
@ -1990,6 +1998,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

@ -3,7 +3,7 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.011)
* Version: (Version: 1.012)
* Author:
*/
@ -139,7 +139,8 @@ function diabook_blue_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -188,10 +189,28 @@ function diabook_blue_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$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>
@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<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-red/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<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" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_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>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

@ -1257,7 +1257,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }

@ -1235,7 +1235,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }

@ -579,6 +579,7 @@ header #banner #logo-text {
font-weight: bold;
padding: 1em 0px;
text-decoration: none;
background-color: red;
}
.mail-list-wrapper {
background-color: #f6f7f8;
@ -2027,6 +2028,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

@ -3,7 +3,7 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.011)
* Version: (Version: 1.012)
* Author:
*/
@ -139,7 +139,8 @@ function diabook_red_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -188,10 +189,28 @@ function diabook_red_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$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>
@ -16,8 +16,8 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<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>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<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" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_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>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

@ -545,15 +545,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -632,7 +634,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1001,6 +1003,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@ -1201,7 +1205,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1694,6 +1698,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
@ -1746,7 +1751,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1757,9 +1764,10 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1769,6 +1777,8 @@ transition: all 0.2s ease-in-out;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
background-color: #33ACFF;

@ -543,15 +543,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -630,7 +632,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -995,6 +997,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@ -1195,7 +1199,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1688,7 +1692,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1740,7 +1744,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1751,9 +1757,10 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1763,6 +1770,8 @@ transition: all 0.2s ease-in-out;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;

@ -543,15 +543,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -630,7 +632,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1680,7 +1682,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1732,7 +1734,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1743,9 +1747,10 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1755,6 +1760,8 @@ transition: all 0.2s ease-in-out;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;

@ -542,15 +542,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* messages */
#message-new {
@ -709,7 +711,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1076,7 +1078,13 @@ aside #profiles-menu {
width: 20em;
}
aside #search-text {
width: 173px;
width: 150px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
aside #side-follow-url {
width: 173px;
@ -1699,7 +1707,7 @@ body .pageheader{
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1751,7 +1759,9 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1762,9 +1772,10 @@ body .pageheader{
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1774,6 +1785,8 @@ body .pageheader{
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
border: 0px;
@ -1964,6 +1977,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

@ -3,7 +3,7 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.011)
* Version: (Version: 1.012)
* Author:
*/
@ -143,7 +143,8 @@ function diabook_community_info(){
//right_aside FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -193,9 +194,28 @@ function diabook_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;