Merge branch 'master' of git://github.com/friendica/friendica

This commit is contained in:
Tobias Hößl 2012-04-22 13:31:07 +00:00
commit 27c23229c4
748 changed files with 62955 additions and 2914 deletions

View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1314' );
define ( 'FRIENDICA_VERSION', '2.3.1319' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );

View file

@ -17,6 +17,7 @@
}
var src = null;
var prev = null;
var livetime = null;
@ -558,12 +559,36 @@ function notifyMarkAll() {
}
// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
function fcFileBrowser (field_name, url, type, win) {
/* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
var cmsURL = baseurl+"/fbrowser/"+type+"/";
tinyMCE.activeEditor.windowManager.open({
file : cmsURL,
title : 'File Browser',
width : 420, // Your dimensions may differ - toy around with them!
height : 400,
resizable : "yes",
inline : "yes", // This parameter only has an effect if you use the inlinepopups plugin!
close_previous : "no"
}, {
window : win,
input : field_name
});
return false;
}
function setupFieldRichtext(){
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: "fieldRichtext",
plugins : "bbcode,paste",
plugins : "bbcode,paste, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
@ -580,6 +605,7 @@ function setupFieldRichtext(){
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
});
}

99
mod/fbrowser.php Normal file
View file

@ -0,0 +1,99 @@
<?php
/**
* @package Friendica\modules
* @subpackage FileBrowser
* @author Fabio Comuni <fabrixxm@kirgroup.com>
*/
/**
* @param App $a
*/
function fbrowser_content($a){
if (!local_user())
killme();
if ($a->argc==1)
killme();
//echo "<pre>"; var_dump($a->argv); killme();
switch($a->argv[1]){
case "image":
$path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
$albums = false;
$sql_extra = "";
$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
if ($a->argc==2){
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
intval(local_user())
);
// anon functions only from 5.3.0... meglio tardi che mai..
function folder1($el){return array(bin2hex($el['album']),$el['album']);}
$albums = array_map( "folder1" , $albums);
}
$album = "";
if ($a->argc==3){
$album = hex2bin($a->argv[2]);
$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
$sql_extra2 = "";
$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
}
$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
FROM `photo` WHERE `uid` = %d $sql_extra
GROUP BY `resource-id` $sql_extra2",
intval(local_user())
);
function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg'); }
$files = array_map("files1", $r);
$tpl = get_markup_template("filebrowser.tpl");
echo replace_macros($tpl, array(
'$type' => 'image',
'$baseurl' => $a->get_baseurl(),
'$path' => $path,
'$folders' => $albums,
'$files' =>$files,
));
break;
case "file":
if ($a->argc==2){
$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
intval(local_user())
);
function files2($rr){ global $a;
list($m1,$m2) = explode("/",$rr['filetype']);
$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
}
$files = array_map("files2", $files);
//echo "<pre>"; var_dump($files); killme();
$tpl = get_markup_template("filebrowser.tpl");
echo replace_macros($tpl, array(
'$type' => 'file',
'$baseurl' => $a->get_baseurl(),
'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
'$folders' => false,
'$files' =>$files,
));
}
break;
}
killme();
}

File diff suppressed because it is too large Load diff

View file

@ -2910,7 +2910,7 @@ msgstr "Comptes abandonats després de x dies"
#: ../../mod/admin.php:330
msgid ""
"Will not waste system resources polling external sites for abandonded "
"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."

View file

@ -654,7 +654,7 @@ $a->strings["Register policy"] = "Política per a registrar";
$a->strings["Register text"] = "Text al registrar";
$a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
$a->strings["Allowed friend domains"] = "Dominis amics permesos";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
$a->strings["Allowed email domains"] = "Dominis de correu permesos";

View file

@ -1,22 +1,22 @@
Liebe/r $username,
Hallo $[username],
großartige Neuigkeiten... '$fn' von '$dfrn_url' hat deine Kontaktaufnahme auf
'$sitename' bestätigt.
Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat
deine Kontaktanfrage auf '$[sitename]' bestätigt.
Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Fotos und
EMail ohne Einschränkungen austauschen.
Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
ohne einschränkungen austauschen.
Bitte rufe deine 'Kontakte' Seite auf $sitename auf um du Änderungen an
dieser Freundschaft vorzunehmen.
Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du
Änderungen an diesem Kontakt vornehmen willst.
$siteurl
$[siteurl]
[Du könntest zum Beispiel ein neue Profil anlegen mit Informationen die nicht
für die Allgemeinheit bestimmt sind, die du aber gerne mit '$fn' teilen
möchtest].
[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt
die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
Mit freundlichen Grüßen
$sitename Administrator
Beste Grüße,
$[sitename] Administrator

View file

@ -1,18 +1,22 @@
Liebe/r $username,
Hallo $[username],
'$fn' von '$dfrn_url' hat deine Kontaktanfrage auf '$sitename' bestätigt.
'$[fn]' auf '$[dfrn_url]' wurde akzeptiert
Deine Verbindungsanfrage auf '$[sitename]'.
'$fn' hat sich dazu entschlossen dich als "Fan" mit eingeschränkten
Kommunikationsmöglichkeiten zu akzeptieren. Dies umfasst private Nachrichten
und einige Profilaktivitäten. Sollte dies eine Prominenten oder
Gemeinschaftsseite sein, wurden diese Einstellungen automatisch vorgenommen.
'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein
paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil
Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen
automatisch angewendet.
'$fn' kann sich in Zukunft dazu entschließen eure Beziehung in eine beidseitige
Freundschaft oder freizügigere Beziehung zu erweitern.
'$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende
Beziehung in der Zukunft erweitert wird.
Ab sofort wirst du Statusmitteilungen von '$fn' erhalten, die auf deiner
'Netzwerkseite' erscheinen werden.
Du empfängst jetzt die öffentlichen Beiträge von '$[fn]',
welche auf der "Netzwerk" Seite erscheinen werden
Mit freundlichen Grüßen,
$sitename Administrator
$[siteurl]
Beste Grüße,
$[sitename] Administrator

File diff suppressed because it is too large Load diff

View file

@ -1,20 +1,20 @@
Liebe/r $username,
dein Passwort wurde wie gewünscht geändert. Bitte hebe diese Informationen
für deine Unterlagen auf (oder ändere das Passwort augenblicklich in etwas
das du dir merken kannst).
Hallo $[username],
Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese
Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort
in etwas, was du dir merken kannst).
Deine Anmeldedaten sind die Folgenden:
Deine Login Daten wurden wie folgt geändert:
Adresse der Seite: $siteurl
Anmelde Name: $email
Passwort: $new_password
Adresse der Seite: $[siteurl]
Login Name: $[email]
Passwort: $[new_password]
Du kannst diesen Passwort auf der "Einstellungen" Seite deines Accounts
ändern nachdem du angemeldet bits.
Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
Viele Grüße,
$sitename Administrator
Beste Grüße,
$[sitename] Administrator

View file

@ -1,19 +1,34 @@
Liebe/r $username,
danke für die Registrierung bei $sitename. Dein neuer Account wurde angelegt.
Die Anmeldedetails sind die Folgenden.
Hallo $[username],
Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt.
Die Login Details sind die folgenden:
Adresse der Seite: $siteurl
Anmelde Name: $email
Passwort: $password
Du kannst dein Passwort auf der "Einstellungen" Seite deines Accounts ändern
nachdem du dich angemeldet hast.
Adresse der Seite: $[siteurl]
Login Name: $[email]
Passwort: $[password]
Nimm dir bitte ein paar Augenblicke Zeit um die anderen Einstellungen deines
Accounts zu bearbeiten.
Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern
nachdem du dich eingeloggt hast.
Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.
Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen
(auf der "Profile" Seite) damit andere Leute dich einfacher finden können.
Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,
ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und
natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest
dann das.
Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig.
Wenn Du hier neu bist und keinen kennst, wird man Dir helfen
ein paar neue und interessante Freunde zu finden.
Danke dir und willkommen auf $[sitename].
Beste Grüße,
$[sitename] Administrator
Vielen Dank und Willkommen auf $sitename.
Mit freundlichem Gruß,
$sitename Administrator

View file

@ -1,21 +1,25 @@
Ein neuer Nutzer hat sich auf $sitename registriert. Diese Registration
benötigt noch deine Zustimmung.
Die Anmeldedetails sind Folgende:
Kompletter Name: $username
Adresse der Seite: $siteurl
Anmelde Name: $email
Eine Neuanmeldung auf $[sitename] benötigt
deine Aufmerksamkeit.
Um dieser Anmeldung zuzustimmen folge bitte diesem Link:
Die Login-Einzelheiten sind die folgenden:
$siteurl/regmod/allow/$hash
Kompletter Name: $[username]
Adresse der Seite: $[siteurl]
Login Name: $[email]
Um die Anfrage abzulehen und den Account zu entfernen folge diesem Link:
Um die Anfrage zu bestätigen besuche bitte:
$siteurl/regmod/deny/$hash
Besten Dank!
$[siteurl]/regmod/allow/$[hash]
Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
$[siteurl]/regmod/deny/$[hash]
Danke!

View file

@ -1,14 +1,17 @@
Liebe/r $myname,
Hallo $[myname],
du hast gerade eine Kontaktanfrage von '$requestor' auf $sitename erhalten.
du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename]
Du kannst dir das Profil unter $url ansehen.
erhalten.
Bitte melde dich auf deiner Seite an um die komplette Vorstellung anzusehen
und bestätige oder ignoriere die Anfrage.
Du kannst sein/ihr Profil unter $[url] finden.
$siteurl
Bitte melde dich an um die komplette Vorstellung einzusehen
und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
Schöne Grüße,
$sitename Administrator
$[siteurl]
Beste Grüße,
$[sitename] Administrator

View file

@ -688,7 +688,7 @@ $a->strings["Register policy"] = "Registrierungsmethode";
$a->strings["Register text"] = "Registrierungstext";
$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";

View file

@ -1,14 +1,14 @@
Dear $myname,
Dear $[myname],
You have a new follower at $sitename - '$requestor'.
You have a new follower at $[sitename] - '$[requestor]'.
You may visit their profile at $url.
You may visit their profile at $[url].
Please login to your site to approve or ignore/cancel the request.
$siteurl
$[siteurl]
Regards,
$sitename administrator
$[sitename] administrator

View file

@ -1,22 +1,22 @@
Dear $username,
Dear $[username],
Great news... '$fn' at '$dfrn_url' has accepted
your connection request at '$sitename'.
Great news... '$[fn]' at '$[dfrn_url]' has accepted
your connection request at '$[sitename]'.
You are now mutual friends and may exchange status updates, photos, and email
without restriction.
Please visit your 'Contacts' page at $sitename if you wish to make
Please visit your 'Contacts' page at $[sitename] if you wish to make
any changes to this relationship.
$siteurl
$[siteurl]
[For instance, you may create a separate profile with information that is not
available to the general public - and assign viewing rights to '$fn'].
available to the general public - and assign viewing rights to '$[fn]'].
Sincerely,
$sitename Administrator
$[sitename] Administrator

View file

@ -1,22 +1,22 @@
Dear $username,
Dear $[username],
'$fn' at '$dfrn_url' has accepted
your connection request at '$sitename'.
'$[fn]' at '$[dfrn_url]' has accepted
your connection request at '$[sitename]'.
'$fn' has chosen to accept you a "fan", which restricts
'$[fn]' has chosen to accept you a "fan", which restricts
some forms of communication - such as private messaging and some profile
interactions. If this is a celebrity or community page, these settings were
applied automatically.
'$fn' may choose to extend this into a two-way or more permissive
'$[fn]' may choose to extend this into a two-way or more permissive
relationship in the future.
You will start receiving public status updates from '$fn',
You will start receiving public status updates from '$[fn]',
which will appear on your 'Network' page at
$siteurl
$[siteurl]
Sincerely,
$sitename Administrator
$[sitename] Administrator

View file

@ -1,6 +1,6 @@
Dear $username,
A request was recently received at $sitename to reset your account
Dear $[username],
A request was recently received at $[sitename] to reset your account
password. In order to confirm this request, please select the verification link
below or paste it into your web browser address bar.
@ -12,7 +12,7 @@ issued this request.
Follow this link to verify your identity:
$reset_link
$[reset_link]
You will then receive a follow-up message containing the new password.
@ -20,13 +20,13 @@ You may change that password from your account settings page after logging in.
The login details are as follows:
Site Location: $siteurl
Login Name: $email
Site Location: $[siteurl]
Login Name: $[email]
Sincerely,
$sitename Administrator
$[sitename] Administrator

View file

@ -1,5 +1,5 @@
Dear $username,
Dear $[username],
Your password has been changed as requested. Please retain this
information for your records (or change your password immediately to
something that you will remember).
@ -7,14 +7,14 @@ something that you will remember).
Your login details are as follows:
Site Location: $siteurl
Login Name: $email
Password: $new_password
Site Location: $[siteurl]
Login Name: $[email]
Password: $[new_password]
You may change that password from your account settings page after logging in.
Sincerely,
$sitename Administrator
$[sitename] Administrator

View file

@ -1,12 +1,12 @@
Dear $username,
Thank you for registering at $sitename. Your account has been created.
Dear $[username],
Thank you for registering at $[sitename]. Your account has been created.
The login details are as follows:
Site Location: $siteurl
Login Name: $email
Password: $password
Site Location: $[siteurl]
Login Name: $[email]
Password: $[password]
You may change your password from your account "Settings" page after logging
in.
@ -26,9 +26,9 @@ If you are new and do not know anybody here, they may help
you to make some new and interesting friends.
Thank you and welcome to $sitename.
Thank you and welcome to $[sitename].
Sincerely,
$sitename Administrator
$[sitename] Administrator

View file

@ -1,25 +1,25 @@
A new user registration request was received at $sitename which requires
A new user registration request was received at $[sitename] which requires
your approval.
The login details are as follows:
Full Name: $username
Site Location: $siteurl
Login Name: $email
Full Name: $[username]
Site Location: $[siteurl]
Login Name: $[email]
To approve this request please visit the following link:
$siteurl/regmod/allow/$hash
$[siteurl]/regmod/allow/$[hash]
To deny the request and remove the account, please visit:
$siteurl/regmod/deny/$hash
$[siteurl]/regmod/deny/$[hash]
Thank you.

View file

@ -1,17 +1,17 @@
Dear $myname,
Dear $[myname],
You have just received a connection request at $sitename
You have just received a connection request at $[sitename]
from '$requestor'.
from '$[requestor]'.
You may visit their profile at $url.
You may visit their profile at $[url].
Please login to your site to view the complete introduction
and approve or ignore/cancel the request.
$siteurl
$[siteurl]
Regards,
$sitename administrator
$[sitename] administrator

View file

@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-04-16 10:00-0700\n"
"PO-Revision-Date: 2012-04-17 20:23+0000\n"
"PO-Revision-Date: 2012-04-18 17:16+0000\n"
"Last-Translator: Martin Schmitt <mas@scsy.de>\n"
"Language-Team: Esperanto (http://www.transifex.net/projects/p/friendica/language/eo/)\n"
"MIME-Version: 1.0\n"
@ -1360,7 +1360,7 @@ msgstr "%s kreis novan afiŝon"
#: ../../mod/notifications.php:497
#, php-format
msgid "%s commented on %s's post"
msgstr "%s komentis pri la afiŝon de %s"
msgstr "%s komentis pri la afiŝo de %s"
#: ../../mod/notifications.php:298
msgid "No more network notifications."
@ -2657,7 +2657,7 @@ msgstr "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registrado
msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'."
msgstr "Vi ankaŭ (nedeviga) povas plenigi la formularo tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
msgstr "Vi ankaŭ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
#: ../../mod/register.php:514
msgid ""
@ -3117,7 +3117,7 @@ msgstr "Kontoj forlasitaj post x tagoj"
#: ../../mod/admin.php:391
msgid ""
"Will not waste system resources polling external sites for abandonded "
"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo."
@ -3470,7 +3470,7 @@ msgstr "{0} petis registradon"
#: ../../mod/ping.php:191
#, php-format
msgid "{0} commented %s's post"
msgstr "{0} komentis pri la afiŝon de %s"
msgstr "{0} komentis pri la afiŝo de %s"
#: ../../mod/ping.php:196
#, php-format
@ -5576,7 +5576,7 @@ msgstr "Hejmpaĝo:"
#: ../../include/profile_advanced.php:47
msgid "Tags:"
msgstr "Tags:"
msgstr "Markoj:"
#: ../../include/profile_advanced.php:51
msgid "Religion:"
@ -5860,7 +5860,7 @@ msgstr "Edziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Imaginarily married"
msgstr "Image edziiĝinta"
msgstr "Image edziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Partners"
@ -5904,7 +5904,7 @@ msgstr "Eksedziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Imaginarily divorced"
msgstr "Image maledziiĝinta"
msgstr "Image eksedziĝinta"
#: ../../include/profile_selectors.php:33
msgid "Widowed"
@ -6490,7 +6490,7 @@ msgstr "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesaĝojn."
#: ../../include/enotify.php:73
#, php-format
msgid "%s's"
msgstr "de %s"
msgstr "de %s verkita"
#: ../../include/enotify.php:77
msgid "your"
@ -6509,7 +6509,7 @@ msgstr "%s komentis pri elemento/konversacio kiun vi sekvas."
#: ../../include/enotify.php:86
#, php-format
msgid "%s commented on %s."
msgstr "%s komentis pri %s"
msgstr "%s komentis pri %s."
#: ../../include/enotify.php:88 ../../include/enotify.php:101
#: ../../include/enotify.php:112 ../../include/enotify.php:123
@ -6923,7 +6923,7 @@ msgstr "Mesaĝo"
#: ../../boot.php:1151 ../../boot.php:1223
msgid "g A l F d"
msgstr "g A l F d"
msgstr "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d"
#: ../../boot.php:1152 ../../boot.php:1224
msgid "F d"
@ -6931,11 +6931,11 @@ msgstr "F d"
#: ../../boot.php:1177
msgid "Birthday Reminders"
msgstr "Memorigiloj por naskiĝtagoj"
msgstr "Memorigilo pri naskiĝtagoj"
#: ../../boot.php:1178
msgid "Birthdays this week:"
msgstr "Naskiĝtagoj ĉi-semajne"
msgstr "Naskiĝtagoj ĉi-semajne:"
#: ../../boot.php:1201 ../../boot.php:1266
msgid "[today]"

View file

@ -285,7 +285,7 @@ $a->strings["%s liked %s's post"] = "%s ŝatis la afiŝon de %s";
$a->strings["%s disliked %s's post"] = "%s malŝatis la afiŝon de %s";
$a->strings["%s is now friends with %s"] = "%s amikiĝis kun %s";
$a->strings["%s created a new post"] = "%s kreis novan afiŝon";
$a->strings["%s commented on %s's post"] = "%s komentis pri la afiŝon de %s";
$a->strings["%s commented on %s's post"] = "%s komentis pri la afiŝo de %s";
$a->strings["No more network notifications."] = "Ne pli da retaj atentigoj.";
$a->strings["Network Notifications"] = "Retaj Atentigoj";
$a->strings["No more system notifications."] = "Ne pli da sistemaj atentigoj.";
@ -585,7 +585,7 @@ $a->strings["Your registration can not be processed."] = "Mi ne povas prilabori
$a->strings["Registration request at %s"] = "Peto de registrado al %s";
$a->strings["Your registration is pending approval by the site owner."] = "Via registrado bezonas apropbon de la administranto.";
$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registradoj. Bonvolu provi denove morgaŭ.";
$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaŭ (nedeviga) povas plenigi la formularo tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaŭ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Se vi ne konas OpenID, bonvolu lasi tiun kampon malplena kaj entajpu la aliajn elementojn.";
$a->strings["Your OpenID (optional): "] = "Via OpenID (nedeviga):";
$a->strings["Include your profile in member directory?"] = "Aldoni vian profilon al la membrokatalogo?";
@ -688,7 +688,7 @@ $a->strings["Register policy"] = "Interkonsento pri registrado";
$a->strings["Register text"] = "Interkonsento teksto";
$a->strings["Will be displayed prominently on the registration page."] = "Tio estos eminente montrata en la registro paĝo.";
$a->strings["Accounts abandoned after x days"] = "Kontoj forlasitaj post x tagoj";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
$a->strings["Allowed friend domains"] = "Permesitaj amikaj domainoj";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn.";
$a->strings["Allowed email domains"] = "Permesitaj retpoŝtaj domajnoj";
@ -772,7 +772,7 @@ $a->strings["Tips for New Members"] = "Konsilo por novaj membroj";
$a->strings["{0} wants to be your friend"] = "{0} volas amikiĝi kun vi";
$a->strings["{0} sent you a message"] = "{0} sendis mesaĝon al vi";
$a->strings["{0} requested registration"] = "{0} petis registradon";
$a->strings["{0} commented %s's post"] = "{0} komentis pri la afiŝon de %s";
$a->strings["{0} commented %s's post"] = "{0} komentis pri la afiŝo de %s";
$a->strings["{0} liked %s's post"] = "{0} satis la afiŝon de %s";
$a->strings["{0} disliked %s's post"] = "{0} malŝatis la afiŝon de %s";
$a->strings["{0} is now friends with %s"] = "{0} amikiĝis kun %s";
@ -1238,7 +1238,7 @@ $a->strings["Birthday:"] = "Naskiĝtago:";
$a->strings["Age:"] = "Aĝo:";
$a->strings["Status:"] = "Stato:";
$a->strings["Homepage:"] = "Hejmpaĝo:";
$a->strings["Tags:"] = "Tags:";
$a->strings["Tags:"] = "Markoj:";
$a->strings["Religion:"] = "Religio:";
$a->strings["About:"] = "Pri:";
$a->strings["Hobbies/Interests:"] = "Ŝatokupoj/Interesoj:";
@ -1309,7 +1309,7 @@ $a->strings["Friends/Benefits"] = "Amikoj/Avantaĝoj";
$a->strings["Casual"] = "Neformala";
$a->strings["Engaged"] = "Fianĉiginta";
$a->strings["Married"] = "Edziĝinta";
$a->strings["Imaginarily married"] = "Image edziiĝinta";
$a->strings["Imaginarily married"] = "Image edziĝinta";
$a->strings["Partners"] = "Geparuloj";
$a->strings["Cohabiting"] = "Kunloĝanta";
$a->strings["Common law"] = "Registrita partnereco ";
@ -1320,7 +1320,7 @@ $a->strings["Betrayed"] = "Trompita";
$a->strings["Separated"] = "Disiĝinta";
$a->strings["Unstable"] = "Malfirma";
$a->strings["Divorced"] = "Eksedziĝinta";
$a->strings["Imaginarily divorced"] = "Image maledziiĝinta";
$a->strings["Imaginarily divorced"] = "Image eksedziĝinta";
$a->strings["Widowed"] = "Vidva";
$a->strings["Uncertain"] = "Ne certa";
$a->strings["It's complicated"] = "Estas komplika";
@ -1467,11 +1467,11 @@ $a->strings["%s sent you a new private message at %s."] = "%s sendis novan mesa
$a->strings["%s sent you %s."] = "%s sendis al vi %s.";
$a->strings["a private message"] = "privatan mesaĝon";
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesaĝojn.";
$a->strings["%s's"] = "de %s";
$a->strings["%s's"] = "de %s verkita";
$a->strings["your"] = "via";
$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica:Atentigo] Komento pri konversacio #%d de %s";
$a->strings["%s commented on an item/conversation you have been following."] = "%s komentis pri elemento/konversacio kiun vi sekvas.";
$a->strings["%s commented on %s."] = "%s komentis pri %s";
$a->strings["%s commented on %s."] = "%s komentis pri %s.";
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bonvolu viziti %s por vidi aŭ respondi la konversacion.";
$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Atentigo] %s afiŝis al via profilmuro";
$a->strings["%s posted to your profile wall at %s"] = "%s skribis al via profila muro ĉe %s";
@ -1568,10 +1568,10 @@ $a->strings["Or login using OpenID: "] = "Aŭ ensaluti per OpenID:";
$a->strings["Forgot your password?"] = "Ĉu vi vorgesis vian pasvorton?";
$a->strings["Edit profile"] = "Redakti profilon";
$a->strings["Message"] = "Mesaĝo";
$a->strings["g A l F d"] = "g A l F d";
$a->strings["g A l F d"] = "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d";
$a->strings["F d"] = "F d";
$a->strings["Birthday Reminders"] = "Memorigiloj por naskiĝtagoj";
$a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne";
$a->strings["Birthday Reminders"] = "Memorigilo pri naskiĝtagoj";
$a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne:";
$a->strings["[today]"] = "[hodiaŭ]";
$a->strings["Event Reminders"] = "Memorigiloj pri Okazoj";
$a->strings["Events this week:"] = "Okazoj ĉi-semajne:";

View file

@ -3136,7 +3136,7 @@ msgstr "Cuentas abandonadas después de x días"
#: ../../mod/admin.php:313
msgid ""
"Will not waste system resources polling external sites for abandonded "
"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr ""
"No gastará recursos del sistema creando encuestas desde sitios externos para"

View file

@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
$a->strings["Register policy"] = "Política de registros";
$a->strings["Register text"] = "Términos";
$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
$a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
$a->strings["Allowed email domains"] = "Dominios de correo permitidos";
$a->strings["Block public"] = "Bloqueo público";

84
view/filebrowser.tpl Normal file
View file

@ -0,0 +1,84 @@
<!DOCTYPE html>
<html>
<head>
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
<style>
.panel_wrapper div.current{.overflow: auto; height: auto!important; }
.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
.filebrowser ul{ list-style-type: none; padding:0px; }
.filebrowser.folders a { display: block; padding: 0.3em }
.filebrowser.folders a:hover { background-color: #f0f0ee; }
.filebrowser.files.image { overflow: auto; height: auto; }
.filebrowser.files.image img { height:50px;}
.filebrowser.files.image li { display: block; padding: 5px; float: left; }
.filebrowser.files.image span { display: none;}
.filebrowser.files.file img { height:16px; vertical-align: bottom;}
.filebrowser.files a { display: block; padding: 0.3em}
.filebrowser.files a:hover { background-color: #f0f0ee; }
.filebrowser a { text-decoration: none; }
</style>
<script>
var FileBrowserDialogue = {
init : function () {
// Here goes your code for setting your custom things onLoad.
},
mySubmit : function (URL) {
//var URL = document.my_form.my_field.value;
var win = tinyMCEPopup.getWindowArg("window");
// insert information now
win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
// are we an image browser
if (typeof(win.ImageDialog) != "undefined") {
// we are, so update image dimensions...
if (win.ImageDialog.getImageData)
win.ImageDialog.getImageData();
// ... and preview if necessary
if (win.ImageDialog.showPreviewImage)
win.ImageDialog.showPreviewImage(URL);
}
// close popup window
tinyMCEPopup.close();
}
}
tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
</script>
</head>
<body>
<div class="tabs">
<ul >
<li class="current"><span>FileBrowser</span></li>
</ul>
</div>
<div class="panel_wrapper">
<div id="general_panel" class="panel current">
<div class="filebrowser path">
{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
</div>
<div class="filebrowser folders">
<ul>
{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
</ul>
</div>
<div class="filebrowser files $type">
<ul>
{{ for $files as $f }}
<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
{{ endfor }}
</ul>
</div>
</div>
</div>
<div class="mceActionPanel">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</body>
</html>

View file

@ -3111,7 +3111,7 @@ msgstr "Les comptes sont abandonnés après x jours"
#: ../../mod/admin.php:313
msgid ""
"Will not waste system resources polling external sites for abandonded "
"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr ""
"Pour ne pas gaspiller les ressources système, on cesse d'interroger les "

View file

@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Taille maximale des images";
$a->strings["Register policy"] = "Politique d'inscription";
$a->strings["Register text"] = "Texte d'inscription";
$a->strings["Accounts abandoned after x days"] = "Les comptes sont abandonnés après x jours";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
$a->strings["Allowed friend domains"] = "Domaines autorisés";
$a->strings["Allowed email domains"] = "Domaines courriel autorisés";
$a->strings["Block public"] = "Interdire la publication globale";

View file

@ -3104,7 +3104,7 @@ msgstr "Account abbandonati dopo x giorni"
#: ../../mod/admin.php:313
msgid ""
"Will not waste system resources polling external sites for abandonded "
"Will not waste system resources polling external sites for abandoned "
"accounts. Enter 0 for no time limit."
msgstr ""
"Non spreca risorse di sistema controllando siti esterni per gli account "

View file

@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Massima dimensione immagini";
$a->strings["Register policy"] = "Politica di registrazione";
$a->strings["Register text"] = "Testo registrazione";
$a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
$a->strings["Allowed friend domains"] = "Domini amici consentiti";
$a->strings["Allowed email domains"] = "Domini email consentiti";
$a->strings["Block public"] = "Blocca pagine pubbliche";

View file

@ -26,7 +26,7 @@ function initEditor(cb){
mode : "specific_textareas",
editor_selector: $editselect,
auto_focus: "profile-jot-text",
plugins : "bbcode,paste,autoresize",
plugins : "bbcode,paste,autoresize, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
@ -44,6 +44,7 @@ function initEditor(cb){
convert_urls: false,
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
file_browser_callback : "fcFileBrowser",
setup : function(ed) {
cPopup = null;
ed.onKeyDown.add(function(ed,e) {

View file

@ -0,0 +1,57 @@
<script>
$(function(){
var theme = $("#id_theme :selected").val();
$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
});
</script>
<div id='adminpage'>
<h1>$title - $page</h1>
<form action="$baseurl/admin/site" method="post">
{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
{{ inc field_select.tpl with $field=$language }}{{ endinc }}
{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$registration</h3>
{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$upload</h3>
{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
<h3>$corporate</h3>
{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$advanced</h3>
{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
</form>
</div>

View file

@ -11,7 +11,8 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" >$comment</textarea>
<div class="comment-edit-bb-$id" style="display:none;">
<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>
@ -19,6 +20,7 @@
<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>
</div>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option>

View file

@ -12,8 +12,9 @@ function theme_content(&$a){
$font_size = get_pconfig(local_user(), 'diabook', 'font_size' );
$line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
$resolution = get_pconfig(local_user(), 'diabook', 'resolution' );
$color = get_pconfig(local_user(), 'diabook', 'color' );
return diabook_form($a,$font_size, $line_height, $resolution);
return diabook_form($a,$font_size, $line_height, $resolution, $color);
}
function theme_post(&$a){
@ -24,6 +25,7 @@ function theme_post(&$a){
set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']);
set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']);
set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']);
}
}
@ -32,8 +34,9 @@ function theme_admin(&$a){
$font_size = get_config('diabook', 'font_size' );
$line_height = get_config('diabook', 'line_height' );
$resolution = get_config('diabook', 'resolution' );
$color = get_config('diabook', 'color' );
return diabook_form($a,$font_size, $line_height, $resolution);
return diabook_form($a,$font_size, $line_height, $resolution, $color);
}
function theme_admin_post(&$a){
@ -41,14 +44,16 @@ function theme_admin_post(&$a){
set_config('diabook', 'font_size', $_POST['diabook_font_size']);
set_config('diabook', 'line_height', $_POST['diabook_line_height']);
set_config('diabook', 'resolution', $_POST['diabook_resolution']);
set_config('diabook', 'color', $_POST['diabook_color']);
}
}
function diabook_form(&$a, $font_size, $line_height, $resolution){
function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
$line_heights = array(
"1.3"=>"1.3",
"---"=>"---",
"1.6"=>"1.6",
"1.5"=>"1.5",
"1.4"=>"1.4",
"1.2"=>"1.2",
@ -56,11 +61,12 @@ function diabook_form(&$a, $font_size, $line_height, $resolution){
);
$font_sizes = array(
'13'=>'13',
"---"=>"---",
"15"=>"15",
'14'=>'14',
"---"=>"---",
"16"=>"16",
"15"=>"15",
'13.5'=>'13.5',
'13'=>'13',
'12.5'=>'12.5',
'12'=>'12',
);
@ -68,6 +74,15 @@ function diabook_form(&$a, $font_size, $line_height, $resolution){
'normal'=>'normal',
'wide'=>'wide',
);
$colors = array(
'diabook'=>'diabook',
'aerith'=>'aerith',
'blue'=>'blue',
'green'=>'green',
'pink'=>'pink',
'red'=>'red',
'dark'=>'dark',
);
@ -79,6 +94,7 @@ function diabook_form(&$a, $font_size, $line_height, $resolution){
'$font_size' => array('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
'$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),
));
return $o;
}

View file

@ -14,7 +14,6 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
@ -73,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

View file

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

View file

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

View file

Before

Width:  |  Height:  |  Size: 939 B

After

Width:  |  Height:  |  Size: 939 B

View file

Before

Width:  |  Height:  |  Size: 917 B

After

Width:  |  Height:  |  Size: 917 B

View file

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 335 B

View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

View file

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

View file

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

View file

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

View file

Before

Width:  |  Height:  |  Size: 774 B

After

Width:  |  Height:  |  Size: 774 B

View file

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 475 B

View file

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 803 B

View file

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

View file

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

View file

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 386 B

View file

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

View file

Before

Width:  |  Height:  |  Size: 880 B

After

Width:  |  Height:  |  Size: 880 B

View file

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 723 B

View file

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 706 B

View file

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 577 B

View file

Before

Width:  |  Height:  |  Size: 849 B

After

Width:  |  Height:  |  Size: 849 B

View file

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

View file

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View file

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

View file

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View file

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

View file

Before

Width:  |  Height:  |  Size: 637 B

After

Width:  |  Height:  |  Size: 637 B

View file

Before

Width:  |  Height:  |  Size: 901 B

After

Width:  |  Height:  |  Size: 901 B

View file

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

View file

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

View file

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

View file

Before

Width:  |  Height:  |  Size: 764 B

After

Width:  |  Height:  |  Size: 764 B

View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

View file

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

View file

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

View file

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

View file

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

View file

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 384 B

View file

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 459 B

View file

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

View file

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 664 B

View file

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View file

Before

Width:  |  Height:  |  Size: 631 B

After

Width:  |  Height:  |  Size: 631 B

View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View file

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View file

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 293 B

View file

Before

Width:  |  Height:  |  Size: 65 B

After

Width:  |  Height:  |  Size: 65 B

Some files were not shown because too many files have changed in this diff Show more