keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-03-27 00:55:25 -07:00
commit ed30635bee
10 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
view/de/strings.php
View file

@ -4,23 +4,23 @@ function string_plural_select_de($n){
return ($n != 1); return ($n != 1);
} }
; ;
$a->strings["Post successful."] = "Beitrag erfolgreich ver<EFBFBD>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["[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 settings applied."] = "Einstellungen zum Kontakt angewandt.";
$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
$a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Permission denied."] = "Zugriff verweigert.";
$a->strings["Contact not found."] = "Kontakt nicht gefunden."; $a->strings["Contact not found."] = "Kontakt nicht gefunden.";
$a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren"; $a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren";
$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zur<EFBFBD>ck-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was auf dieser Seite gemacht wird."; $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
$a->strings["Return to contact editor"] = "Zur<EFBFBD>ck zum Kontakteditor"; $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
$a->strings["Name"] = "Name"; $a->strings["Name"] = "Name";
$a->strings["Account Nickname"] = "Account-Spitzname"; $a->strings["Account Nickname"] = "Account-Spitzname";
$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - <EFBFBD>berschreibt Name/Spitzname"; $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
$a->strings["Account URL"] = "Account-URL"; $a->strings["Account URL"] = "Account-URL";
$a->strings["Friend Request URL"] = "URL f<EFBFBD>r Freundschaftsanfragen"; $a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen";
$a->strings["Friend Confirm URL"] = "URL f<EFBFBD>r Best<73>tigungen von Freundschaftsanfragen"; $a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen";
$a->strings["Notification Endpoint URL"] = "URL-Endpunkt f<EFBFBD>r Benachrichtigungen"; $a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
$a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; $a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
$a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; $a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
$a->strings["Submit"] = "Senden"; $a->strings["Submit"] = "Senden";
@ -28,7 +28,7 @@ $a->strings["Help:"] = "Hilfe:";
$a->strings["Help"] = "Hilfe"; $a->strings["Help"] = "Hilfe";
$a->strings["Not Found"] = "Nicht gefunden"; $a->strings["Not Found"] = "Nicht gefunden";
$a->strings["Page not found."] = "Seite nicht gefunden."; $a->strings["Page not found."] = "Seite nicht gefunden.";
$a->strings["File exceeds size limit of %d"] = "Die Datei ist gr<EFBFBD><EFBFBD>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["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
$a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet."; $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
$a->strings["Suggest Friends"] = "Kontakte vorschlagen"; $a->strings["Suggest Friends"] = "Kontakte vorschlagen";
@ -40,7 +40,7 @@ $a->strings["link to source"] = "Link zum Originalbeitrag";
$a->strings["Events"] = "Veranstaltungen"; $a->strings["Events"] = "Veranstaltungen";
$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; $a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
$a->strings["Previous"] = "Vorherige"; $a->strings["Previous"] = "Vorherige";
$a->strings["Next"] = "N<EFBFBD>chste"; $a->strings["Next"] = "Nächste";
$a->strings["hour:minute"] = "Stunde:Minute"; $a->strings["hour:minute"] = "Stunde:Minute";
$a->strings["Event details"] = "Veranstaltungsdetails"; $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."; $a->strings["Format is %s %s. Starting date and Description are required."] = "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig.";

2
view/theme/diabook-blue/communityhome.tpl
View file

@ -24,7 +24,7 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $lastusers_title }} {{ if $nv }}
<h3>Find Friends</h3> <h3>Find Friends</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.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.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.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>

18
view/theme/diabook-blue/style-network.css
View file

@ -387,7 +387,7 @@
margin-bottom: 1px; margin-bottom: 1px;
width: 484px; width: 484px;
border-bottom: 1px solid #BDCDD4; border-bottom: 1px solid #BDCDD4;
background-color: #E4EEF7; background-color: #fff;
padding: 8px; padding: 8px;
} }
@ -1324,12 +1324,11 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
float: right; float: right;
} }
.wall-item-container.comment { .wall-item-container.comment {
margin-top: 0px; margin-top: 5px;
margin-bottom: 0px; margin-bottom: 5px;
margin-left: 80px; margin-left: 80px;
width: 500px; width: 500px;
border-bottom: 1px solid hsl(198, 21%, 79%); border-bottom: 1px solid hsl(198, 21%, 79%);
background-color: #E4EEF7;
} }
.wall-item-container.comment .contact-photo { .wall-item-container.comment .contact-photo {
width: 32px; 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 { .wall-item-container.comment .wall-item-links {
padding-left: 12px; padding-left: 12px;
} }
.wall-item-like {
background-color: #E4EEF7;
}
.wall-item-dislike{
background-color: #E4EEF7;
border-bottom: 1px solid #BECED5;
}
.wall-item-comment-wrapper { .wall-item-comment-wrapper {
margin: 1px 0px 0px 80px; margin: 1px 0px 0px 80px;
background-color: #E4EEF7; background-color: #fff;
width: 500px; width: 500px;
} }
.wall-item-comment-wrapper .comment-edit-photo { .wall-item-comment-wrapper .comment-edit-photo {

4
view/theme/diabook-blue/theme.php
View file

@ -137,7 +137,7 @@ function diabook_blue_community_info(){
$aside['$fostitJS'] = $fostitJS; $aside['$fostitJS'] = $fostitJS;
//nav FIND FRIENDS //nav FIND FRIENDS
if(local_user()) {
$nv = array(); $nv = array();
$nv['directory'] = Array('directory', t('Directory'), "", ""); $nv['directory'] = Array('directory', t('Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", "");
@ -145,7 +145,7 @@ function diabook_blue_community_info(){
$nv['invite'] = Array('invite', t('Invite Friends'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
$aside['$nv'] = $nv; $aside['$nv'] = $nv;
};
//Community Page //Community Page
$page = '<div id="page-sidebar-right_aside" class="widget"> $page = '<div id="page-sidebar-right_aside" class="widget">
<div class="title tool"> <div class="title tool">

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

@ -24,6 +24,14 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $nv }}
<h3>Find Friends</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.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>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>
{{ endif }}
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3>PostIt to Friendica</h3> <h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div> <div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>

BIN
view/theme/diabook/icons/pscontacts.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 710 B

BIN
view/theme/diabook/icons/pubgroups.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 781 B

1
view/theme/diabook/profile_side.tpl
View file

@ -9,6 +9,7 @@
<ul id="profile-side-menu" class="menu-profile-side"> <ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>

3
view/theme/diabook/style-network.css
View file

@ -926,6 +926,9 @@ ul.menu-popup .empty {
.menu-profile-list.com_side{ .menu-profile-list.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
} }
.menu-profile-list.pscontacts{
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
}
/* aside */ /* aside */
aside { aside {

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

@ -139,6 +139,17 @@ function diabook_community_info(){
$aside['$fostitJS'] = $fostitJS; $aside['$fostitJS'] = $fostitJS;
//right_aside FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
$aside['$nv'] = $nv;
};
//Community Page //Community Page
$page = '<div id="page-sidebar-right_aside" class="widget"> $page = '<div id="page-sidebar-right_aside" class="widget">
<div class="title tool"> <div class="title tool">
@ -200,6 +211,7 @@ if ($a->argv[0] === "network" && local_user()){
$ps = array('usermenu'=>array()); $ps = array('usermenu'=>array());
$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));
$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));