Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  ignore removed plugins
  fix messed up config tables w/ duplicate entries
  small fixes for the German strings
  fix bad sql update
  revert config changes, we're getting duplicate keys
  new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...

* master:
This commit is contained in:
Simon L'nu 2012-04-07 03:10:09 -04:00
commit bc69a957dc
180 changed files with 365 additions and 231 deletions

View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1303' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1135 );
define ( 'DB_UPDATE_VERSION', 1137 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

132
include/config.php Normal file → Executable file
View file

@ -1,4 +1,5 @@
<?php
/**
*
* Arbitrary configuration storage
@ -9,15 +10,11 @@
*
* There are a few places in the code (such as the admin panel) where boolean
* configurations need to be fixed as of 10/08/2011.
*
* @package config;
*/
/**
* retrieve a "family" of config variables
* from database to cached storage
*/
// retrieve a "family" of config variables from database to cached storage
if(! function_exists('load_config')) {
function load_config($family) {
global $a;
@ -34,29 +31,29 @@ if(! function_exists('load_config')) {
}
}
}
}
}
}}
// get a particular config variable given the family name
// and key. Returns false if not set.
// $instore is only used by the set_config function
// to determine if the key already exists in the DB
// If a key is found in the DB but doesn't exist in
// local config cache, pull it into the cache so we don't have
// to hit the DB again for this item.
/**
* get a particular config variable given the family name
* and key. Returns false if not set.
*
* If a key is found in the DB but doesn't exist in
* local config cache, pull it into the cache so we don't have
*to hit the DB again for this item.
*/
if(! function_exists('get_config')) {
function get_config($family, $key) {
function get_config($family, $key, $instore = false) {
global $a;
if(! $instore) {
if(isset($a->config[$family][$key])) {
if($a->config[$family][$key] === '!<unset>!') {
return false;
}
return $a->config[$family][$key];
}
}
$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($family),
dbesc($key)
@ -71,17 +68,13 @@ if(! function_exists('get_config')) {
$a->config[$family][$key] = '!<unset>!';
}
return false;
}
}
}}
// Store a config value ($value) in the category ($family)
// under the key ($key)
// Return the value, or false if the database update failed
/**
* Store a config value ($value) in the category ($family)
* under the key ($key)
*
* Return the value, or false if the database update failed
*/
if(! function_exists('set_config')) {
function set_config($family,$key,$value) {
global $a;
@ -89,19 +82,30 @@ function set_config($family,$key,$value) {
$dbvalue = (is_array($value)?serialize($value):$value);
$dbvalue = (is_bool($value) ? intval($value) : $value);
if(get_config($family,$key,true) === false) {
$a->config[$family][$key] = $value;
$ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family),
dbesc($key),
dbesc($dbvalue)
);
if($ret) {
if($ret)
return $value;
}
return $ret;
}
}
}
$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($dbvalue),
dbesc($family),
dbesc($key)
);
$a->config[$family][$key] = $value;
if($ret)
return $value;
return $ret;
}}
if(! function_exists('load_pconfig')) {
@ -117,31 +121,23 @@ if(! function_exists('load_pconfig')) {
$a->config[$uid][$family][$k] = $rr['v'];
}
}
}
}
}}
/**
* get a particular user-specific config variable given the family name,
* the user id and key. Returns false if not set.
*
* If a key is found in the DB but doesn't exist in
* local config cache, pull it into the cache so we don't have
* to hit the DB again for this item.
*/
if(! function_exists('get_pconfig')) {
function get_pconfig($uid,$family, $key) {
function get_pconfig($uid,$family, $key, $instore = false) {
global $a;
if(! $instore) {
if(isset($a->config[$uid][$family][$key])) {
if($a->config[$uid][$family][$key] === '!<unset>!') {
return false;
}
return $a->config[$uid][$family][$key];
}
}
$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
intval($uid),
@ -158,13 +154,8 @@ if(! function_exists('get_pconfig')) {
$a->config[$uid][$family][$key] = '!<unset>!';
}
return false;
}
}
}}
/**
* Delete a value from config. This function
* deletes both: db value and cache entry.
*/
if(! function_exists('del_config')) {
function del_config($family,$key) {
@ -176,16 +167,13 @@ if(! function_exists('del_config')) {
dbesc($key)
);
return $ret;
}
}
}}
/**
* Store a user-specific config value ($value) for user $uid in the category ($family)
* under the key ($key).
*
* Return the value, or false if the database update failed
*/
// Same as above functions except these are for personal config storage and take an
// additional $uid argument.
if(! function_exists('set_pconfig')) {
function set_pconfig($uid,$family,$key,$value) {
@ -193,23 +181,32 @@ if(! function_exists('set_pconfig')) {
// manage array value
$dbvalue = (is_array($value)?serialize($value):$value);
$dbvalue = (is_bool($value)?serialize($value):$value);
if(get_pconfig($uid,$family,$key,true) === false) {
$a->config[$uid][$family][$key] = $value;
$ret = q("REPLACE INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
intval($uid),
dbesc($family),
dbesc($key),
dbesc($dbvalue)
);
if($ret) {
if($ret)
return $value;
}
return $ret;
}
$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($dbvalue),
intval($uid),
dbesc($family),
dbesc($key)
);
}
}
$a->config[$uid][$family][$key] = $value;
if($ret)
return $value;
return $ret;
}}
if(! function_exists('del_pconfig')) {
function del_pconfig($uid,$family,$key) {
@ -223,5 +220,4 @@ if(! function_exists('del_pconfig')) {
dbesc($key)
);
return $ret;
}
}
}}

View file

@ -18,6 +18,11 @@ function uninstall_plugin($plugin){
if (! function_exists('install_plugin')){
function install_plugin($plugin) {
// silently fail if plugin was removed
if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
return false;
logger("Addons: installing " . $plugin);
$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
@include_once('addon/' . $plugin . '/' . $plugin . '.php');
@ -32,9 +37,11 @@ function install_plugin($plugin){
intval($t),
$plugin_admin
);
return true;
}
else {
logger("Addons: FAILED installing " . $plugin);
return false;
}
}}

10
js/main.js Normal file → Executable file
View file

@ -120,8 +120,6 @@
if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
$('#home-update').html(home);
var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
$('#intro-update').html(intro);
@ -130,6 +128,14 @@
if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
$('#mail-update').html(mail);
var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
$('#intro-update-li').html(intro);
var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
$('#mail-update-li').html(mail);
var eNotif = $(data).find('notif')
notif = eNotif.attr('count');
if (notif>=0){

View file

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1135 );
define( 'UPDATE_VERSION' , 1137 );
/**
*
@ -1143,16 +1143,66 @@ q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `rep
}
function update_1134() {
// faulty update merged forward
// had a hardwired tablename of 'friendica' which isn't the right name on most systems
}
function update_1135() {
//there can't be indexes with more than 1000 bytes in mysql,
//so change charset to be smaller
q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL");
//and add the index
q("ALTER TABLE `friendica`.`config` ADD UNIQUE `access` ( `cat` , `k` ) ");
//same thing for pconfig
q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL");
q("ALTER TABLE `friendica`.`pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )");
// faulty update merged forward. Bad update in 1134 caused duplicate k,cat pairs
// these have to be cleared before the unique keys can be added.
}
function update_1136() {
$arr = array();
// order in reverse so that we save the newest entry
$r = q("select * from config where 1 order by id desc");
if(count($r)) {
foreach($r as $rr) {
$found = false;
foreach($arr as $x) {
if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
$found = true;
q("delete from config where id = %d limit 1",
intval($rr['id'])
);
}
}
if(! $found) {
$arr[] = $rr;
}
}
}
$arr = array();
$r = q("select * from pconfig where 1 order by id desc");
if(count($r)) {
foreach($r as $rr) {
$found = false;
foreach($arr as $x) {
if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
$found = true;
q("delete from pconfig where id = %d limit 1",
intval($rr['id'])
);
}
}
if(! $found) {
$arr[] = $rr;
}
}
}
q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) ");
q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )");
}

View file

@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-04-04 15:51-0700\n"
"PO-Revision-Date: 2012-04-06 07:35+0000\n"
"POT-Creation-Date: 2012-04-05 10:00-0700\n"
"PO-Revision-Date: 2012-04-06 10:40+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n"
@ -411,7 +411,7 @@ msgstr "wurde getaggt in einem"
#: ../../view/theme/diabook-blue/theme.php:82
#: ../../view/theme/diabook/theme.php:86
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
#: ../../include/diaspora.php:1650 ../../include/conversation.php:53
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
msgstr "Foto"
@ -1021,8 +1021,8 @@ msgid "This is required for message delivery to work."
msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
#: ../../mod/install.php:343
msgid "PHP \"register_argc_argv\""
msgstr "PHP \"register_argc_argv\""
msgid "PHP register_argc_argv"
msgstr "PHP register_argc_argv"
#: ../../mod/install.php:364
msgid ""
@ -2232,7 +2232,7 @@ msgstr "Markierte"
#: ../../mod/network.php:197
msgid "Shared Links"
msgstr "Geteilte Internetlinks"
msgstr "Geteilte Links"
#: ../../mod/network.php:270
#, php-format
@ -2274,7 +2274,7 @@ msgstr "Ungültiger Kontakt."
msgid "Personal Notes"
msgstr "Persönliche Notizen"
#: ../../mod/notes.php:63 ../../mod/filer.php:29
#: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
msgid "Save"
msgstr "Speichern"
@ -2713,7 +2713,7 @@ msgstr "Personen Suche"
#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
#: ../../view/theme/diabook-aerith/theme.php:77
#: ../../view/theme/diabook-aerith/theme.php:86
#: ../../include/diaspora.php:1650 ../../include/conversation.php:48
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130
msgid "status"
@ -2725,7 +2725,7 @@ msgstr "Status"
#: ../../view/theme/diabook-blue/theme.php:91
#: ../../view/theme/diabook/theme.php:95
#: ../../view/theme/diabook-aerith/theme.php:91
#: ../../include/diaspora.php:1666 ../../include/conversation.php:65
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s mag %2$ss %3$s"
@ -3798,11 +3798,11 @@ msgstr "sichtbar für jeden"
msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten"
#: ../../mod/filer.php:28 ../../include/conversation.php:918
#: ../../mod/filer.php:29 ../../include/conversation.php:918
msgid "Save to Folder:"
msgstr "In diesen Ordner verschieben:"
#: ../../mod/filer.php:28
#: ../../mod/filer.php:29
msgid "- select -"
msgstr "- auswählen -"
@ -4006,7 +4006,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
msgid "Unable to set contact photo."
msgstr "Konnte das Bild des Kontakts nicht speichern."
#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503
#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
#: ../../include/conversation.php:101
#, php-format
msgid "%1$s is now friends with %2$s"
@ -5216,7 +5216,7 @@ msgstr "Hilfe oder @NewHere"
#: ../../view/theme/diabook/theme.php:206
#: ../../view/theme/diabook-aerith/theme.php:201
msgid "Connect Services"
msgstr "Mit anderen Webanwendungen verbinden"
msgstr "Verbinde Dienste"
#: ../../view/theme/diabook-red/theme.php:207
#: ../../view/theme/diabook-blue/theme.php:207
@ -5850,15 +5850,15 @@ msgstr "Beitrag"
msgid "Item filed"
msgstr "Beitrag abgelegt"
#: ../../include/diaspora.php:578
#: ../../include/diaspora.php:582
msgid "Sharing notification from Diaspora network"
msgstr "Freigabe-Benachrichtigung von Diaspora"
#: ../../include/diaspora.php:1965
#: ../../include/diaspora.php:1969
msgid "Attachments:"
msgstr "Anhänge:"
#: ../../include/diaspora.php:2148
#: ../../include/diaspora.php:2152
#, php-format
msgid "[Relayed] Comment authored by %s from network %s"
msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"

View file

@ -212,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec
$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
@ -491,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
$a->strings["Posted Order"] = "Neueste Beiträge";
$a->strings["New"] = "Neue";
$a->strings["Starred"] = "Markierte";
$a->strings["Shared Links"] = "Geteilte Internetlinks";
$a->strings["Shared Links"] = "Geteilte Links";
$a->strings["Warning: This group contains %s member from an insecure network."] = array(
0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
@ -1158,7 +1158,7 @@ $a->strings["Similar Interests"] = "Ähnliche Interessen";
$a->strings["Invite Friends"] = "Freunde einladen";
$a->strings["Community Pages"] = "Foren";
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
$a->strings["Connect Services"] = "Mit anderen Webanwendungen verbinden";
$a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";

0
view/theme/diabook-aerith/communityhome.tpl Normal file → Executable file
View file

0
view/theme/diabook-aerith/contact_template.tpl Normal file → Executable file
View file

0
view/theme/diabook-aerith/directory_item.tpl Normal file → Executable file
View file

0
view/theme/diabook-aerith/fpostit/fpostit.js Normal file → Executable file
View file

0
view/theme/diabook-aerith/group_side.tpl Normal file → Executable file
View file

0
view/theme/diabook-aerith/icons/attach.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

0
view/theme/diabook-aerith/icons/audio.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

0
view/theme/diabook-aerith/icons/camera.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

0
view/theme/diabook-aerith/icons/close_box.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

0
view/theme/diabook-aerith/icons/drop.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
view/theme/diabook-aerith/icons/file_as.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

0
view/theme/diabook-aerith/icons/link.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
view/theme/diabook-aerith/icons/lock.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
view/theme/diabook-aerith/icons/lupe.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

0
view/theme/diabook-aerith/icons/messages.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

0
view/theme/diabook-aerith/icons/messages2.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

0
view/theme/diabook-aerith/icons/next.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

0
view/theme/diabook-aerith/icons/notifications.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

0
view/theme/diabook-aerith/icons/notify.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

0
view/theme/diabook-aerith/icons/notify2.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

0
view/theme/diabook-aerith/icons/pencil.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

0
view/theme/diabook-aerith/icons/photo-menu.jpg Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 459 B

0
view/theme/diabook-aerith/icons/prev.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

0
view/theme/diabook-aerith/icons/recycle.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-aerith/icons/remote.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

0
view/theme/diabook-aerith/icons/scroll_top.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-aerith/icons/selected.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

0
view/theme/diabook-aerith/icons/star.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

0
view/theme/diabook-aerith/icons/starred.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

0
view/theme/diabook-aerith/icons/tagged.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

0
view/theme/diabook-aerith/icons/unlock.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

0
view/theme/diabook-aerith/icons/unstarred.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

0
view/theme/diabook-aerith/icons/video.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

0
view/theme/diabook-aerith/icons/weblink.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

0
view/theme/diabook-aerith/jot.tpl Normal file → Executable file
View file

0
view/theme/diabook-aerith/mail_conv.tpl Normal file → Executable file
View file

View file

@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>

0
view/theme/diabook-aerith/photo_view.tpl Normal file → Executable file
View file

View file

@ -22,7 +22,7 @@
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}

0
view/theme/diabook-aerith/rs_common_tabs.tpl Normal file → Executable file
View file

0
view/theme/diabook-aerith/search_item.tpl Normal file → Executable file
View file

View file

@ -2093,9 +2093,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View file

@ -2082,10 +2082,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View file

@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
.intro-end {
border-bottom: 1px solid black;
clear: both;
margin-bottom: 25px;
padding-bottom: 25px;
width: 75%;
}
.intro-form-end {
clear: both;
}
.intro-fullname {
padding-bottom: 5px;
padding-top: 5px;
}
.intro-wrapper-end {
clear: both;
padding-bottom: 5px;
}
code {
font-family: Courier, monospace;
white-space: pre;
@ -2111,10 +2129,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

2
view/theme/diabook-aerith/theme.php Normal file → Executable file
View file

@ -3,7 +3,7 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.012)
* Version: (Version: 1.013)
* Author:
*/

0
view/theme/diabook-blue/communityhome.tpl Normal file → Executable file
View file

0
view/theme/diabook-blue/contact_template.tpl Normal file → Executable file
View file

0
view/theme/diabook-blue/directory_item.tpl Normal file → Executable file
View file

0
view/theme/diabook-blue/fpostit/fpostit.js Normal file → Executable file
View file

0
view/theme/diabook-blue/group_side.tpl Normal file → Executable file
View file

0
view/theme/diabook-blue/icons/attach.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

0
view/theme/diabook-blue/icons/audio.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

0
view/theme/diabook-blue/icons/camera.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

0
view/theme/diabook-blue/icons/close_box.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

0
view/theme/diabook-blue/icons/contacts2.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 549 B

0
view/theme/diabook-blue/icons/drop.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
view/theme/diabook-blue/icons/file_as.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

0
view/theme/diabook-blue/icons/link.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
view/theme/diabook-blue/icons/lock.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
view/theme/diabook-blue/icons/lupe.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

0
view/theme/diabook-blue/icons/messages.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 490 B

0
view/theme/diabook-blue/icons/next.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

0
view/theme/diabook-blue/icons/notifications.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

0
view/theme/diabook-blue/icons/notify.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
view/theme/diabook-blue/icons/pencil.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

0
view/theme/diabook-blue/icons/prev.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

0
view/theme/diabook-blue/icons/recycle.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-blue/icons/remote.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

0
view/theme/diabook-blue/icons/scroll_top.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-blue/icons/selected.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

0
view/theme/diabook-blue/icons/star.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

0
view/theme/diabook-blue/icons/starred.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

0
view/theme/diabook-blue/icons/tagged.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

0
view/theme/diabook-blue/icons/unlock.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

0
view/theme/diabook-blue/icons/unstarred.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

0
view/theme/diabook-blue/icons/video.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

0
view/theme/diabook-blue/icons/weblink.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

0
view/theme/diabook-blue/jot.tpl Normal file → Executable file
View file

0
view/theme/diabook-blue/mail_conv.tpl Normal file → Executable file
View file

View file

@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>

0
view/theme/diabook-blue/photo_view.tpl Normal file → Executable file
View file

View file

@ -22,7 +22,7 @@
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}

0
view/theme/diabook-blue/rs_common_tabs.tpl Normal file → Executable file
View file

0
view/theme/diabook-blue/search_item.tpl Normal file → Executable file
View file

View file

@ -2054,9 +2054,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View file

@ -2049,10 +2049,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View file

@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
.intro-end {
border-bottom: 1px solid black;
clear: both;
margin-bottom: 25px;
padding-bottom: 25px;
width: 75%;
}
.intro-form-end {
clear: both;
}
.intro-fullname {
padding-bottom: 5px;
padding-top: 5px;
}
.intro-wrapper-end {
clear: both;
padding-bottom: 5px;
}
code {
font-family: Courier, monospace;
white-space: pre;
@ -2067,10 +2085,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

2
view/theme/diabook-blue/theme.php Normal file → Executable file
View file

@ -3,7 +3,7 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.012)
* Version: (Version: 1.013)
* Author:
*/

0
view/theme/diabook-red/communityhome.tpl Normal file → Executable file
View file

0
view/theme/diabook-red/contact_template.tpl Normal file → Executable file
View file

0
view/theme/diabook-red/directory_item.tpl Normal file → Executable file
View file

0
view/theme/diabook-red/fpostit/fpostit.js Normal file → Executable file
View file

0
view/theme/diabook-red/group_side.tpl Normal file → Executable file
View file

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