From b9d976e31b35cfb2307eb1396edf4e011657e175 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 27 Mar 2012 07:18:20 +0200 Subject: [PATCH 1/2] fixed Umlaute in de strings.php --- view/de/strings.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/view/de/strings.php b/view/de/strings.php index 5438a1c9fc..3f9176cd7b 100755 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -4,23 +4,23 @@ function string_plural_select_de($n){ return ($n != 1); } ; -$a->strings["Post successful."] = "Beitrag erfolgreich ver�ffentlicht."; +$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht."; $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; $a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt."; $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; $a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Contact not found."] = "Kontakt nicht gefunden."; $a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren"; -$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; -$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zur�ck-Button deines Browsers jetzt, wenn du dir unsicher bist, was auf dieser Seite gemacht wird."; -$a->strings["Return to contact editor"] = "Zur�ck zum Kontakteditor"; +$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; +$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was du tun willst."; +$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; $a->strings["Name"] = "Name"; $a->strings["Account Nickname"] = "Account-Spitzname"; -$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - �berschreibt Name/Spitzname"; +$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname"; $a->strings["Account URL"] = "Account-URL"; -$a->strings["Friend Request URL"] = "URL f�r Freundschaftsanfragen"; -$a->strings["Friend Confirm URL"] = "URL f�r Best�tigungen von Freundschaftsanfragen"; -$a->strings["Notification Endpoint URL"] = "URL-Endpunkt f�r Benachrichtigungen"; +$a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen"; +$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen"; +$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; $a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; $a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; $a->strings["Submit"] = "Senden"; @@ -28,7 +28,7 @@ $a->strings["Help:"] = "Hilfe:"; $a->strings["Help"] = "Hilfe"; $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"; +$a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d"; $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen."; $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet."; $a->strings["Suggest Friends"] = "Kontakte vorschlagen"; @@ -40,7 +40,7 @@ $a->strings["link to source"] = "Link zum Originalbeitrag"; $a->strings["Events"] = "Veranstaltungen"; $a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; $a->strings["Previous"] = "Vorherige"; -$a->strings["Next"] = "N�chste"; +$a->strings["Next"] = "Nächste"; $a->strings["hour:minute"] = "Stunde:Minute"; $a->strings["Event details"] = "Veranstaltungsdetails"; $a->strings["Format is %s %s. Starting date and Description are required."] = "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig."; From e7bc3f2bd0f578d04c271029d869e1fbc36cbec4 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 27 Mar 2012 08:28:47 +0200 Subject: [PATCH 2/2] add "find friends" to right_aside to diabook, fixes in css in diabook --- view/theme/diabook-blue/communityhome.tpl | 2 +- view/theme/diabook-blue/style-network.css | 18 +++++------------- view/theme/diabook-blue/theme.php | 4 ++-- view/theme/diabook/communityhome.tpl | 8 ++++++++ view/theme/diabook/icons/pscontacts.png | Bin 0 -> 710 bytes view/theme/diabook/icons/pubgroups.png | Bin 710 -> 781 bytes view/theme/diabook/profile_side.tpl | 1 + view/theme/diabook/style-network.css | 3 +++ view/theme/diabook/theme.php | 12 ++++++++++++ 9 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 view/theme/diabook/icons/pscontacts.png diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 854684a5f5..748e6d0779 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -24,7 +24,7 @@ {{ endif }} -{{ if $lastusers_title }} +{{ if $nv }}

Find Friends

$nv.directory.1
$nv.match.1
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index c35320fcfa..d0bcd3209e 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -387,7 +387,7 @@ margin-bottom: 1px; width: 484px; border-bottom: 1px solid #BDCDD4; - background-color: #E4EEF7; + background-color: #fff; padding: 8px; } @@ -1324,12 +1324,11 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: float: right; } .wall-item-container.comment { - margin-top: 0px; - margin-bottom: 0px; + margin-top: 5px; + margin-bottom: 5px; margin-left: 80px; width: 500px; border-bottom: 1px solid hsl(198, 21%, 79%); - background-color: #E4EEF7; } .wall-item-container.comment .contact-photo { width: 32px; @@ -1345,17 +1344,10 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: .wall-item-container.comment .wall-item-links { padding-left: 12px; } -.wall-item-like { - background-color: #E4EEF7; - - } -.wall-item-dislike{ - background-color: #E4EEF7; - border-bottom: 1px solid #BECED5; - } + .wall-item-comment-wrapper { margin: 1px 0px 0px 80px; - background-color: #E4EEF7; + background-color: #fff; width: 500px; } .wall-item-comment-wrapper .comment-edit-photo { diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index bbda4f1030..e12d940aa9 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -137,7 +137,7 @@ function diabook_blue_community_info(){ $aside['$fostitJS'] = $fostitJS; //nav FIND FRIENDS - + if(local_user()) { $nv = array(); $nv['directory'] = Array('directory', t('Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); @@ -145,7 +145,7 @@ function diabook_blue_community_info(){ $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); $aside['$nv'] = $nv; - + }; //Community Page $page = '
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index aa150b9d0c..7e50423ce2 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -24,6 +24,14 @@
{{ endif }} +{{ if $nv }} +

Find Friends

+$nv.directory.1
+$nv.match.1
+$nv.suggest.1 +$nv.invite.1 +{{ endif }} + {{ if $lastusers_title }}

PostIt to Friendica

Post to Friendica from anywhere by bookmarking this Link.
diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png new file mode 100644 index 0000000000000000000000000000000000000000..acf857f32f3bfbe68a514527e995407f8c916527 GIT binary patch literal 710 zcmV;%0y+JOP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY? z0RST%G(i3U00KryL_t(I%k7j&Pg7AChTqfP&b_VWQaW&ZduxHvMudQdMnPRTB$7y6 zkl=<5ae>Ai{ts3fCF;T+J`+vnV zHET+(3o5;Z=xnEu*%srkKbaEMI#nmW5^!|{n!L{;K`4=OZen32Em}3$Fq=T6A|_Us z$nBaf_OBdY?Q%O>J)S2jM&mOY^|ZKC($t!C=4FRKKj+JsDo_aLj~k#aoXPRZck97e zRMy1JmXgQi6&pQX0isY#LZJxO!Vx6vlSFSbU|ZV7YJQR0Yk2ptBmH;?vp!jl->e*3 z<*aO|;fN2MQ$Xv90JtU_iVOovmCz9_l?o*ijwW!9Q#Z?Y{3><>{FjjA=7QKVT7dEn zUQQM1&+I1Q>Jp$7B$dsU6hG`^dB1slF9xYN3B0g$G#Ks;UF*Ia&rKr{O#zez@9e_E z`@xShW9lBDeSN=8s(8GSKFx#HlbwAT-h(BHr&)C)NtE5#+$Hpwqu@F#-nuXzoV>Fi zxWe&8e!1U}{)UB64kQmSdBC6r-N=?X?Mn!ecxC3 zE1!vHd>&lMY(WdX*i+&~_tKU;2ii#%l|N>(fdDq%AQnB($3*s)(g> z?S{_noBl>`6#9$`t#x~BiH*CE1}ap;Ml)Uq=a{Mx5`Q2|G_$EZ5KA$ruT0Gx-!b>} zMEU&ee3EjTs)G&@90LL&pll;}-6%4)%;cCV&gOWDBVo`b#N+C6@NX~Nb)NDBa^~0> zrd=imTr!_zjB=ID3tqBCpOk8rOZ9fxUn?RX-&ZcD>DhSfi?%GQ;au6wmA30QGxgn5 zuH*_os(%6Ybj=TMq`_5sgL*9LMRh zENg@@cJY31?+ecPCEK>&5JIjsH8mCg6&#DjE;0~8!h{fiAP`6b00e`cQlVt@avqk)00000NkvXXu0mjfLcUGs delta 625 zcmV-%0*?KS2F3-DV1Ez+03#hVK>h##0!B$hK~y-)?UYGRQ&AX(-_zdCy{+X^I&gb? zYk|;4gn))dL0vc`l1N;T;D!xxfyN#F4^|o_>cSzo(8RbfCPos8Ly9sOQJ^HGLa7~T zp+MS4seivCO3QSZNU-m_mxLZX@7oH%-p^18T`|Ir5xx$ zyVWvqNjoa=`cAdZNmPoI)@m-C?)E$0K6{^z?A2l9fRCCJtb*;gtLj={VjXlN^_4J8 z%zQZWfveV0$N>+J`+vnVHET+(3o5;Z=xnEu*%srkKbaEMI#nmW5^!|{n!L{;K`4=O zZen32Em}3$Fn^msq#`C(m&om!E%vV*U+r=`T0Nd8Dn{co8uhfeQ_|F$bmnD;KtJcp zm?}^R=Z_npE}Y5n%6IF*SX9=;&6bkKyt!pGhkcV#cF<$ z+G}|Cup|9=2(vy}j^C^tTIH;4sNskYoKrySi2%4J8-I!n14@<95iOMpB@&J%aE?|=Sqd3-MhsW=I|uyiyS z?hRe*z8ud@BN0sjlm+kX!o&N)k27QH9-w`FzfG!mypcZ5gVvLseHq?^C5fk5bt6fX z-PqhE^lF%+;5sYbx-cG`yt5y;!tq6Zx!;ifhJ{cLBo8ooz@P=)$dySkI*q}WaGRXn zuW(#8xq6aw^F4EmGrg?MQm-HifJ!7CNp0Jt*{6A4KY8$T{^$7(($CM#3rj=100000 LNkvXXu0mjfco;0s diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl index 0fa8a27fd8..fc949639ea 100644 --- a/view/theme/diabook/profile_side.tpl +++ b/view/theme/diabook/profile_side.tpl @@ -9,6 +9,7 @@