Merge commit 'upstream/master'

This commit is contained in:
Michael Vogel 2012-04-15 16:49:54 +02:00
commit a147d6113c
162 changed files with 8652 additions and 136 deletions

View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1311' ); define ( 'FRIENDICA_VERSION', '2.3.1312' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 ); define ( 'DB_UPDATE_VERSION', 1138 );
@ -936,6 +936,7 @@ if(! function_exists('profile_load')) {
} }
if(($r === false) || (! count($r))) { if(($r === false) || (! count($r))) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;

View file

@ -158,7 +158,7 @@ function contact_photo_menu($contact) {
$o = ""; $o = "";
foreach($menu as $k=>$v){ foreach($menu as $k=>$v){
if ($v!="") { if ($v!="") {
if(($k !== t("Network Posts")) && ($k !== t("Send PM"))) if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
$o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n"; $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
else else
$o .= "<li><a href=\"$v\">$k</a></li>\n"; $o .= "<li><a href=\"$v\">$k</a></li>\n";

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

View file

@ -19,9 +19,15 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
$converse = true; $converse = true;
if($a->argv[$x] == 'starred') if($a->argv[$x] == 'starred')
$starred = true; $starred = true;
if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
$category = $a->argv[$x+1];
} }
} }
// default permissions - anonymous user // default permissions - anonymous user
$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' "; $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
@ -101,6 +107,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
if(! strlen($last_update)) if(! strlen($last_update))
$last_update = 'now -30 days'; $last_update = 'now -30 days';
if(x($category)) {
$sql_extra .= file_tag_file_query('item',$category,'category');
}
if($public_feed) { if($public_feed) {
if(! $converse) if(! $converse)
$sql_extra .= " AND `contact`.`self` = 1 "; $sql_extra .= " AND `contact`.`self` = 1 ";

4
include/security.php Normal file → Executable file
View file

@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
} }
function check_form_security_std_err_msg() { function check_form_security_std_err_msg() {
return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL; return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
} }
function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') { function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
if (!check_form_security_token($typename, $formname)) { if (!check_form_security_token($typename, $formname)) {
@ -344,4 +344,4 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
header('HTTP/1.1 403 Forbidden'); header('HTTP/1.1 403 Forbidden');
killme(); killme();
} }
} }

View file

@ -40,8 +40,8 @@ load_translation_table($lang);
require_once("dba.php"); require_once("dba.php");
if(! $install) { if(! $install) {
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
/** /**
* Load configs from db. Overwrite configs from .htconfig.php * Load configs from db. Overwrite configs from .htconfig.php
@ -95,6 +95,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
if(x($_GET,'zrl')) { if(x($_GET,'zrl')) {
$_SESSION['my_url'] = $_GET['zrl']; $_SESSION['my_url'] = $_GET['zrl'];
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
if(! $install) {
$arr = array('zrl' => $_SESSION['my_url'], 'url' => $a->cmd);
call_hooks('zrl_init',$arr);
}
} }
/** /**

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

View file

@ -759,7 +759,7 @@ function item_post(&$a) {
} }
else { else {
logger('mod_item: unable to retrieve post that was just stored.'); logger('mod_item: unable to retrieve post that was just stored.');
notify( t('System error. Post not saved.')); notice( t('System error. Post not saved.') . EOL);
goaway($a->get_baseurl() . "/" . $return_path ); goaway($a->get_baseurl() . "/" . $return_path );
// NOTREACHED // NOTREACHED
} }

View file

@ -17,6 +17,7 @@ function profile_init(&$a) {
goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
} }
else { else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;

View file

@ -5,6 +5,6 @@ function randprof_init(&$a) {
require_once('include/Contact.php'); require_once('include/Contact.php');
$x = random_profile(); $x = random_profile();
if($x) if($x)
goaway($x); goaway(zrl($x));
goaway($a->get_baseurl() . '/profile'); goaway($a->get_baseurl() . '/profile');
} }

View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1311\n" "Project-Id-Version: 2.3.1312\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-13 10:00-0700\n" "POT-Creation-Date: 2012-04-14 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -55,8 +55,8 @@ msgstr ""
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132 #: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
#: ../../index.php:305 #: ../../index.php:309
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -157,7 +157,12 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 #: ../../view/theme/diabook-red/config.php:64
#: ../../view/theme/diabook-blue/config.php:64
#: ../../view/theme/diabook/config.php:64
#: ../../view/theme/quattro/config.php:52
#: ../../view/theme/diabook-aerith/config.php:64
#: ../../include/conversation.php:555
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -169,11 +174,11 @@ msgstr ""
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: ../../mod/help.php:38 ../../index.php:224 #: ../../mod/help.php:38 ../../index.php:228
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: ../../mod/help.php:41 ../../index.php:227 #: ../../mod/help.php:41 ../../index.php:231
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
@ -813,7 +818,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2652 #: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1642,7 +1647,7 @@ msgstr ""
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
#: ../../addon/facebook/facebook.php:622 #: ../../addon/facebook/facebook.php:622
#: ../../addon/facebook/facebook.php:1076 #: ../../addon/facebook/facebook.php:1076
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2661 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -2476,7 +2481,7 @@ msgstr ""
msgid "Group name changed." msgid "Group name changed."
msgstr "" msgstr ""
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:304 #: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
@ -2736,7 +2741,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3044 #: ../../mod/display.php:142 ../../include/items.php:3054
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -5476,10 +5481,28 @@ msgstr ""
msgid "Your personal photos" msgid "Your personal photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/config.php:66
#: ../../view/theme/diabook-blue/config.php:66
#: ../../view/theme/diabook/config.php:66
#: ../../view/theme/quattro/config.php:54 #: ../../view/theme/quattro/config.php:54
#: ../../view/theme/diabook-aerith/config.php:66
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/config.php:67
#: ../../view/theme/diabook-blue/config.php:67
#: ../../view/theme/diabook/config.php:67
#: ../../view/theme/diabook-aerith/config.php:67
msgid "Set font-size for posts and comments"
msgstr ""
#: ../../view/theme/diabook-red/config.php:68
#: ../../view/theme/diabook-blue/config.php:68
#: ../../view/theme/diabook/config.php:68
#: ../../view/theme/diabook-aerith/config.php:68
msgid "Set line-height for posts and comments"
msgstr ""
#: ../../view/theme/quattro/config.php:55 #: ../../view/theme/quattro/config.php:55
msgid "Alignment" msgid "Alignment"
msgstr "" msgstr ""
@ -5509,7 +5532,7 @@ msgid "j F"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
#: ../../include/items.php:1392 #: ../../include/items.php:1402
msgid "Birthday:" msgid "Birthday:"
msgstr "" msgstr ""
@ -5769,6 +5792,14 @@ msgstr ""
msgid "Unavailable" msgid "Unavailable"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Has crush"
msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Infatuated"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Dating" msgid "Dating"
msgstr "" msgstr ""
@ -5801,6 +5832,10 @@ msgstr ""
msgid "Married" msgid "Married"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Imaginarily married"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Partners" msgid "Partners"
msgstr "" msgstr ""
@ -5809,12 +5844,16 @@ msgstr ""
msgid "Cohabiting" msgid "Cohabiting"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Common law"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Happy" msgid "Happy"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Not Looking" msgid "Not looking"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
@ -5837,6 +5876,10 @@ msgstr ""
msgid "Divorced" msgid "Divorced"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Imaginarily divorced"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Widowed" msgid "Widowed"
msgstr "" msgstr ""
@ -5846,7 +5889,7 @@ msgid "Uncertain"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Complicated" msgid "It's complicated"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
@ -6564,11 +6607,11 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion." msgid "Please visit %s to approve or reject the suggestion."
msgstr "" msgstr ""
#: ../../include/items.php:2659 #: ../../include/items.php:2669
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:2659 #: ../../include/items.php:2669
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
@ -6596,7 +6639,7 @@ msgstr ""
#: ../../include/security.php:329 #: ../../include/security.php:329
msgid "" msgid ""
"The form security token was not correct. This probably happened because the " "The form security token was not correct. This probably happened because the "
"form has been opened for too long (>3 hours) before subitting it." "form has been opened for too long (>3 hours) before submitting it."
msgstr "" msgstr ""
#: ../../include/Contact.php:145 ../../include/conversation.php:813 #: ../../include/Contact.php:145 ../../include/conversation.php:813

View file

@ -7,7 +7,7 @@ $page_desc<br />
<li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
<li>$emailnet</li> {{ if $emailnet }}<li>$emailnet</li>{{ endif }}
</ul> </ul>
</p> </p>
<p> <p>

View file

@ -6405,7 +6405,7 @@ msgstr "Willkommen zurück "
#: ../../include/security.php:329 #: ../../include/security.php:329
msgid "" msgid ""
"The form security token was not correct. This probably happened because the " "The form security token was not correct. This probably happened because the "
"form has been opened for too long (>3 hours) before subitting it." "form has been opened for too long (>3 hours) before submitting it."
msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
#: ../../include/Contact.php:137 ../../include/conversation.php:813 #: ../../include/Contact.php:137 ../../include/conversation.php:813

View file

@ -1441,7 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto";
$a->strings["Welcome "] = "Willkommen "; $a->strings["Welcome "] = "Willkommen ";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
$a->strings["Welcome back "] = "Willkommen zurück "; $a->strings["Welcome back "] = "Willkommen zurück ";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
$a->strings["View status"] = "Status anzeigen"; $a->strings["View status"] = "Status anzeigen";
$a->strings["View profile"] = "Profil anzeigen"; $a->strings["View profile"] = "Profil anzeigen";
$a->strings["View photos"] = "Fotos ansehen"; $a->strings["View photos"] = "Fotos ansehen";

View file

@ -7,7 +7,7 @@ $page_desc<br />
<li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
<li>$emailnet</li> {{ if $emailnet }}<li>$emailnet</li>{{ endif }}
</ul> </ul>
$invite_desc $invite_desc
</p> </p>

View file

@ -11,7 +11,7 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div> </div>
<div class="comment-edit-photo-end"></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);" 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)" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>

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

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

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

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

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

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

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

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

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

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

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

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

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

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

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

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

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

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

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

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

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

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

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

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

Before

Width:  |  Height:  |  Size: 901 B

After

Width:  |  Height:  |  Size: 901 B

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

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

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

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

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

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

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

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

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

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

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

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

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

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

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

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

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

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 459 B

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

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

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

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

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

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

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

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

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

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

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

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

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

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

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

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

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

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

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

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

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

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

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

View file

@ -0,0 +1,46 @@
(function($) {
/*
* Auto-growing textareas; technique ripped from Facebook
*/
$.fn.autogrow = function(options) {
this.filter('textarea').each(function() {
var $this = $(this),
minHeight = $this.height(),
lineHeight = $this.css('lineHeight');
var shadow = $('<div></div>').css({
position: 'absolute',
top: -10000,
left: -10000,
width: $(this).width(),
fontSize: $this.css('fontSize'),
fontFamily: $this.css('fontFamily'),
lineHeight: $this.css('lineHeight'),
resize: 'none'
}).appendTo(document.body);
var update = function() {
var val = this.value.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/&/g, '&amp;')
.replace(/\n/g, '<br/>');
shadow.html(val);
$(this).css('height', Math.max(shadow.height() + 20, minHeight));
}
$(this).change(update).keyup(update).keydown(update);
update.apply(this);
});
return this;
}
})(jQuery);

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

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

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

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

@ -292,6 +292,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
//load jquery.autogrow-textarea.js
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
//js scripts //js scripts
//comment-edit-wrapper on photo_view //comment-edit-wrapper on photo_view
if ($a->argv[0].$a->argv[2] === "photos"."image"){ if ($a->argv[0].$a->argv[2] === "photos"."image"){
@ -315,6 +319,15 @@ $a->page['htmlhead'] .= '
}); });
</script>'; </script>';
$a->page['htmlhead'] .= '
<script type="text/javascript">
function tautogrow(id){
$("textarea#comment-edit-text-" +id).autogrow();
};
</script>';
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>

View file

@ -11,7 +11,7 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div> </div>
<div class="comment-edit-photo-end"></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);" 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)" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>

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

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

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

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

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

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

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

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

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

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

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

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

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

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

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 549 B

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

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

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

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

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

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

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

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

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

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

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

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 490 B

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

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

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

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

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

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

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

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

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

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

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

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

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

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

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

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

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

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

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

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

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

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

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

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

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

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

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

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

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

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

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

View file

@ -0,0 +1,46 @@
(function($) {
/*
* Auto-growing textareas; technique ripped from Facebook
*/
$.fn.autogrow = function(options) {
this.filter('textarea').each(function() {
var $this = $(this),
minHeight = $this.height(),
lineHeight = $this.css('lineHeight');
var shadow = $('<div></div>').css({
position: 'absolute',
top: -10000,
left: -10000,
width: $(this).width(),
fontSize: $this.css('fontSize'),
fontFamily: $this.css('fontFamily'),
lineHeight: $this.css('lineHeight'),
resize: 'none'
}).appendTo(document.body);
var update = function() {
var val = this.value.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/&/g, '&amp;')
.replace(/\n/g, '<br/>');
shadow.html(val);
$(this).css('height', Math.max(shadow.height() + 20, minHeight));
}
$(this).change(update).keyup(update).keydown(update);
update.apply(this);
});
return this;
}
})(jQuery);

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

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

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

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

@ -290,6 +290,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
//load jquery.autogrow-textarea.js
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
//js scripts //js scripts
//comment-edit-wrapper on photo_view //comment-edit-wrapper on photo_view
if ($a->argv[0].$a->argv[2] === "photos"."image"){ if ($a->argv[0].$a->argv[2] === "photos"."image"){
@ -314,6 +318,15 @@ $a->page['htmlhead'] .= '
}); });
</script>'; </script>';
$a->page['htmlhead'] .= '
<script type="text/javascript">
function tautogrow(id){
$("textarea#comment-edit-text-" +id).autogrow();
};
</script>';
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>

View file

@ -11,7 +11,7 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div> </div>
<div class="comment-edit-photo-end"></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);" 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)" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>

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

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

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

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