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-25 00:43:09 -07:00
parent abb9fecf09 07535692dc
commit d1345e5054
10 changed files with 450 additions and 444 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/install.php
View file

@ -315,14 +315,16 @@ function check_php(&$phpath, &$checks) {
$help = ""; $help = "";
if(!$passed) { if(!$passed) {
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . EOL ;
$help .= EOL . EOL ;
$tpl = get_markup_template('field_input.tpl'); $tpl = get_markup_template('field_input.tpl');
$help .= replace_macros($tpl, array( $help .= replace_macros($tpl, array(
'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')), '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')),
)); ));
$phpath=""; $phpath="";
} }
check_add($checks, t('Command line PHP'), $passed, true, $help); check_add($checks, t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
if($passed) { if($passed) {
$str = autoname(8); $str = autoname(8);

8
view/de/friend_complete_eml.tpl
View file

@ -4,15 +4,15 @@ Hallo $[username],
Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat
deine Kontaktanfrage auf '$[sitename]' bestätigt. deine Kontaktanfrage auf '$[sitename]' bestätigt.
Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
ohne einschränkungen austauschen. ohne Einschränkungen austauschen.
Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du
Änderungen an diesem Kontakt vornehmen willst. Änderungen an diesem Kontakt vornehmen willst.
$[siteurl] $[siteurl]
[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt [Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält,
die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben]. die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
Beste Grüße, Beste Grüße,

798
view/de/messages.po
View file

File diff suppressed because it is too large Load diff

10
view/de/register_open_eml.tpl
View file

@ -11,18 +11,18 @@ Passwort: $[password]
Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern,
nachdem du dich erstmalig eingeloggt hast. nachdem du dich erstmalig eingeloggt hast.
Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
Eventuell möchtest du außerdem einige grundlegenden Informationen in deinem Standart-Profil (auf der "Profile" Seite) eintragen, Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen,
damit andere Leute dich einfacher finden können. damit andere Leute dich einfacher finden können.
Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Bild hochzuladen, Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und
vielleicht auch in welchen Land Du lebst; falls du nicht konkreter vielleicht auch in welchen Land du lebst; falls du nicht konkreter
werden möchtest. werden möchtest.
Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig.
Wenn Du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
ein paar neue und interessante Freunde zu finden. ein paar neue und interessante Freunde zu finden.

2
view/head.tpl
View file

@ -29,7 +29,7 @@
<script> <script>
var updateInterval = $update_interval; var updateInterval = $update_interval;
var localUser = $local_user; var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
function confirmDelete() { return confirm("$delitem"); } function confirmDelete() { return confirm("$delitem"); }
function commentOpen(obj,id) { function commentOpen(obj,id) {

4
view/install_checks.tpl
View file

@ -1,6 +1,6 @@
<h1>$title</h1> <h1>$title</h1>
<h2>$pass</h2> <h2>$pass</h2>
<form action="$baseurl/install" method="post"> <form action="$baseurl/index.php?q=install" method="post">
<table> <table>
{{ for $checks as $check }} {{ for $checks as $check }}
<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr> <tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
@ -19,6 +19,6 @@
<input type="submit" value="$next"> <input type="submit" value="$next">
{{ else }} {{ else }}
<input type="hidden" name="pass" value="1"> <input type="hidden" name="pass" value="1">
<input type="button" value="$reload" onclick="document.location.reload()"> <input type="submit" value="$reload">
{{ endif }} {{ endif }}
</form> </form>

6
view/theme/dispy/dark/style.css
View file

@ -213,9 +213,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:smaller;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;} .comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;}
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} .wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;} .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
.wall-item-location>br{display:none;} .wall-item-location>br{display:none;}
@ -397,9 +396,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
#sidebar-group-ul{padding-left:0;} #sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} .sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
.sidebar-group-element a{border:0;text-decoration:none;} .sidebar-group-element a{border:0;text-decoration:none;}
.sidebar-group-element.group-selected{color:#2e2f2e;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;} #peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{} #sidebar-new-group:hover{}

25
view/theme/dispy/dark/style.less
View file

@ -1419,7 +1419,9 @@ nav #nav-notifications-linkmenu {
color: @main_colour; color: @main_colour;
line-height: 1; line-height: 1;
display: inline-block; display: inline-block;
font-size: smaller; font-size: x-small;
margin: 0.5em auto;
font-weight: bold;
} }
.comment-edit-preview { .comment-edit-preview {
width: auto; width: auto;
@ -1430,12 +1432,6 @@ nav #nav-notifications-linkmenu {
font-size: smaller; font-size: smaller;
} }
} }
.wall-item-author,
.wall-item-actions-author {
margin: 0.5em auto 0;
font-size: 0.75em;
font-weight: bold;
}
.wall-item-location { .wall-item-location {
margin-top: 2em; margin-top: 2em;
width: 6em; width: 6em;
@ -2377,14 +2373,15 @@ div {
// .borders(1px, solid, @link_colour); // .borders(1px, solid, @link_colour);
.multibutton_active; .multibutton_active;
} }
// .group-selected:hover, .categories-selected:hover,
// .nets-selected:hover, .group-selected:hover,
// .fileas-selected:hover { .nets-selected:hover,
.fileas-selected:hover {
// padding: 4px; // padding: 4px;
// color: @link_colour; // color: @bg_colour;
// background: @bg_colour; // background: @bg_colour;
// .borders(1px, solid, @link_colour); // .borders(1px, solid, @link_colour);
// } }
.groupsideedit { .groupsideedit {
margin-right: 10px; margin-right: 10px;
} }
@ -2404,10 +2401,6 @@ div {
.sidebar-group-element { .sidebar-group-element {
.multibutton; .multibutton;
.rounded_corners; .rounded_corners;
color: @main_colour;
&.group-selected {
color: @bg_colour;
}
} }
#sidebar-new-group { #sidebar-new-group {
margin: auto; margin: auto;

8
view/theme/dispy/light/style.css
View file

@ -213,9 +213,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:smaller;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;} .comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;}
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} .wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;} .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
.wall-item-location>br{display:none;} .wall-item-location>br{display:none;}
@ -391,15 +390,14 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.fc-state-highlight{background:#eeeeec;color:#111111;} .fc-state-highlight{background:#eeeeec;color:#111111;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;} #group-sidebar{margin-bottom:10px;}
.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#eeeeec;background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} .categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#111111;background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;} .categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;}
.groupsideedit{margin-right:10px;} .groupsideedit{margin-right:10px;}
#sidebar-group-ul{padding-left:0;} #sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} .sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.sidebar-group-element a{border:0;text-decoration:none;} .sidebar-group-element a{border:0;text-decoration:none;}
.sidebar-group-element.group-selected{color:#eeeeec;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;} #peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{} #sidebar-new-group:hover{}

27
view/theme/dispy/light/style.less
View file

@ -1420,7 +1420,9 @@ nav #nav-notifications-linkmenu {
color: @main_colour; color: @main_colour;
line-height: 1; line-height: 1;
display: inline-block; display: inline-block;
font-size: smaller; font-size: x-small;
margin: 0.5em auto;
font-weight: bold;
} }
.comment-edit-preview { .comment-edit-preview {
width: auto; width: auto;
@ -1431,12 +1433,6 @@ nav #nav-notifications-linkmenu {
font-size: smaller; font-size: smaller;
} }
} }
.wall-item-author,
.wall-item-actions-author {
margin: 0.5em auto 0;
font-size: 0.75em;
font-weight: bold;
}
.wall-item-location { .wall-item-location {
margin-top: 2em; margin-top: 2em;
width: 6em; width: 6em;
@ -2373,19 +2369,20 @@ div {
.nets-selected, .nets-selected,
.fileas-selected { .fileas-selected {
// padding: 4px; // padding: 4px;
color: @bg_colour; color: @main_colour;
// background: @dk_bg_colour; // background: @dk_bg_colour;
// .borders(1px, solid, @hover_colour); // .borders(1px, solid, @hover_colour);
.multibutton_active; .multibutton_active;
} }
// .group-selected:hover, .categories-selected:hover,
// .nets-selected:hover, .group-selected:hover,
// .fileas-selected:hover { .nets-selected:hover,
.fileas-selected:hover {
// padding: 4px; // padding: 4px;
// color: @link_colour; // color: @link_colour;
// background: @bg_colour; // background: @bg_colour;
// .borders(1px, solid, @link_colour); // .borders(1px, solid, @link_colour);
// } }
.groupsideedit { .groupsideedit {
margin-right: 10px; margin-right: 10px;
} }
@ -2405,10 +2402,6 @@ div {
.sidebar-group-element { .sidebar-group-element {
.multibutton; .multibutton;
.rounded_corners; .rounded_corners;
color: @main_colour;
&.group-selected {
color: @bg_colour;
}
} }
#sidebar-new-group { #sidebar-new-group {
margin: auto; margin: auto;