diff --git a/boot.php b/boot.php index 0bd201a253..94202cd5d0 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1311' ); +define ( 'FRIENDICA_VERSION', '2.3.1312' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); @@ -936,6 +936,7 @@ if(! function_exists('profile_load')) { } if(($r === false) || (! count($r))) { + logger('profile error: ' . $a->query_string, LOGGER_DEBUG); notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; diff --git a/include/Contact.php b/include/Contact.php index 388819b01e..9ba1e8ae5c 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -158,7 +158,7 @@ function contact_photo_menu($contact) { $o = ""; foreach($menu as $k=>$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 .= "
  • $k
    • \n"; else $o .= "
  • $k
    • \n"; diff --git a/include/config.php b/include/config.php old mode 100755 new mode 100644 diff --git a/include/items.php b/include/items.php index 05c0d50169..85df340d3f 100644 --- a/include/items.php +++ b/include/items.php @@ -19,9 +19,15 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $converse = true; if($a->argv[$x] == 'starred') $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 $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)) $last_update = 'now -30 days'; + if(x($category)) { + $sql_extra .= file_tag_file_query('item',$category,'category'); + } + if($public_feed) { if(! $converse) $sql_extra .= " AND `contact`.`self` = 1 "; diff --git a/include/security.php b/include/security.php old mode 100644 new mode 100755 index 66622fd331..fc816e5d73 --- a/include/security.php +++ b/include/security.php @@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to } 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') { 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'); killme(); } -} \ No newline at end of file +} diff --git a/index.php b/index.php index 5dd93523e3..442173eeb8 100644 --- a/index.php +++ b/index.php @@ -40,8 +40,8 @@ load_translation_table($lang); require_once("dba.php"); if(! $install) { -$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); - unset($db_host, $db_user, $db_pass, $db_data); + $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); + unset($db_host, $db_user, $db_pass, $db_data); /** * Load configs from db. Overwrite configs from .htconfig.php @@ -95,6 +95,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { if(x($_GET,'zrl')) { $_SESSION['my_url'] = $_GET['zrl']; $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); + } } /** diff --git a/js/main.js b/js/main.js old mode 100755 new mode 100644 diff --git a/mod/item.php b/mod/item.php index 7f0ca3fc35..642a6758aa 100644 --- a/mod/item.php +++ b/mod/item.php @@ -759,7 +759,7 @@ function item_post(&$a) { } else { 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 ); // NOTREACHED } diff --git a/mod/profile.php b/mod/profile.php index 51f9444121..de1e272489 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -17,6 +17,7 @@ function profile_init(&$a) { goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); } else { + logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG); notice( t('Requested profile is not available.') . EOL ); $a->error = 404; return; diff --git a/mod/randprof.php b/mod/randprof.php index 53d7425e96..6713a81d9e 100644 --- a/mod/randprof.php +++ b/mod/randprof.php @@ -5,6 +5,6 @@ function randprof_init(&$a) { require_once('include/Contact.php'); $x = random_profile(); if($x) - goaway($x); + goaway(zrl($x)); goaway($a->get_baseurl() . '/profile'); } diff --git a/util/messages.po b/util/messages.po index d09b1cfc03..46011deed0 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1311\n" +"Project-Id-Version: 2.3.1312\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,8 +55,8 @@ msgstr "" #: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 -#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132 -#: ../../index.php:305 +#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142 +#: ../../index.php:309 msgid "Permission denied." msgstr "" @@ -157,7 +157,12 @@ msgstr "" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../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" msgstr "" @@ -169,11 +174,11 @@ msgstr "" msgid "Help" msgstr "" -#: ../../mod/help.php:38 ../../index.php:224 +#: ../../mod/help.php:38 ../../index.php:228 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:227 +#: ../../mod/help.php:41 ../../index.php:231 msgid "Page not found." msgstr "" @@ -813,7 +818,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:628 ../../include/items.php:2652 +#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662 msgid "[Name Withheld]" msgstr "" @@ -1642,7 +1647,7 @@ msgstr "" #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../addon/facebook/facebook.php:622 #: ../../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" msgstr "" @@ -2476,7 +2481,7 @@ msgstr "" msgid "Group name changed." 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" msgstr "" @@ -2736,7 +2741,7 @@ msgstr "" #: ../../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/display.php:142 ../../include/items.php:3044 +#: ../../mod/display.php:142 ../../include/items.php:3054 msgid "Item not found." msgstr "" @@ -5476,10 +5481,28 @@ msgstr "" msgid "Your personal photos" 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/diabook-aerith/config.php:66 msgid "Theme settings" 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 msgid "Alignment" msgstr "" @@ -5509,7 +5532,7 @@ msgid "j F" msgstr "" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 -#: ../../include/items.php:1392 +#: ../../include/items.php:1402 msgid "Birthday:" msgstr "" @@ -5769,6 +5792,14 @@ msgstr "" msgid "Unavailable" msgstr "" +#: ../../include/profile_selectors.php:33 +msgid "Has crush" +msgstr "" + +#: ../../include/profile_selectors.php:33 +msgid "Infatuated" +msgstr "" + #: ../../include/profile_selectors.php:33 msgid "Dating" msgstr "" @@ -5801,6 +5832,10 @@ msgstr "" msgid "Married" msgstr "" +#: ../../include/profile_selectors.php:33 +msgid "Imaginarily married" +msgstr "" + #: ../../include/profile_selectors.php:33 msgid "Partners" msgstr "" @@ -5809,12 +5844,16 @@ msgstr "" msgid "Cohabiting" msgstr "" +#: ../../include/profile_selectors.php:33 +msgid "Common law" +msgstr "" + #: ../../include/profile_selectors.php:33 msgid "Happy" msgstr "" #: ../../include/profile_selectors.php:33 -msgid "Not Looking" +msgid "Not looking" msgstr "" #: ../../include/profile_selectors.php:33 @@ -5837,6 +5876,10 @@ msgstr "" msgid "Divorced" msgstr "" +#: ../../include/profile_selectors.php:33 +msgid "Imaginarily divorced" +msgstr "" + #: ../../include/profile_selectors.php:33 msgid "Widowed" msgstr "" @@ -5846,7 +5889,7 @@ msgid "Uncertain" msgstr "" #: ../../include/profile_selectors.php:33 -msgid "Complicated" +msgid "It's complicated" msgstr "" #: ../../include/profile_selectors.php:33 @@ -6564,11 +6607,11 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2659 +#: ../../include/items.php:2669 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2659 +#: ../../include/items.php:2669 msgid "You have a new follower at " msgstr "" @@ -6596,7 +6639,7 @@ msgstr "" #: ../../include/security.php:329 msgid "" "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 "" #: ../../include/Contact.php:145 ../../include/conversation.php:813 diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 2958397c92..961de9bb39 100644 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -7,7 +7,7 @@ $page_desc
  • $friendica
  • $diaspora $diasnote
  • $statusnet
    • -
  • $emailnet
    • +{{ if $emailnet }}
  • $emailnet
    • {{ endif }}

    diff --git a/view/de/messages.po b/view/de/messages.po index 87994b9801..c834ec328d 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -6405,7 +6405,7 @@ msgstr "Willkommen zurück " #: ../../include/security.php:329 msgid "" "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." #: ../../include/Contact.php:137 ../../include/conversation.php:813 diff --git a/view/de/strings.php b/view/de/strings.php index a68a77a75c..6a43f049ef 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1441,7 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto"; $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $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 profile"] = "Profil anzeigen"; $a->strings["View photos"] = "Fotos ansehen"; diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index d8aa8b1818..bd3bcbc42b 100644 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -7,7 +7,7 @@ $page_desc

  • $friendica
  • $diaspora $diasnote
  • $statusnet
    • -
  • $emailnet
    • +{{ if $emailnet }}
  • $emailnet
    • {{ endif }} $invite_desc

    diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl index 09fd8da3dc..47046c371a 100644 --- a/view/theme/diabook-aerith/comment_item.tpl +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -11,7 +11,7 @@ $mytitle
    - + img url video diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/notifications3.png b/view/theme/diabook-aerith/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js b/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js new file mode 100644 index 0000000000..806e34f512 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js @@ -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 = $('
    ').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, '>') + .replace(/&/g, '&') + .replace(/\n/g, '
    '); + + 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); \ No newline at end of file diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php old mode 100755 new mode 100644 index 53c564a945..907865207e --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -292,6 +292,10 @@ $a->page['htmlhead'] .= sprintf('', $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('', $autogrowJS); + //js scripts //comment-edit-wrapper on photo_view if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -315,6 +319,15 @@ $a->page['htmlhead'] .= ' }); '; + +$a->page['htmlhead'] .= ' + +'; $a->page['htmlhead'] .= ' ', $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('', $autogrowJS); + //js scripts //comment-edit-wrapper on photo_view if ($a->argv[0].$a->argv[2] === "photos"."image"){ @@ -314,6 +318,15 @@ $a->page['htmlhead'] .= ' }); '; + +$a->page['htmlhead'] .= ' + +'; $a->page['htmlhead'] .= ' ', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('', $autogrowJS); //js scripts //comment-edit-wrapper on photo_view @@ -313,6 +316,15 @@ $a->page['htmlhead'] .= ' }); '; + +$a->page['htmlhead'] .= ' + +'; $a->page['htmlhead'] .= ' ', $diabook_version); //change css on network and profilepages $cssFile = null; - +$resolution=false; +$resolution = get_pconfig(local_user(), "diabook", "resolution"); +if ($resolution===false) $resolution="normal"; /** * prints last community activity @@ -267,9 +269,10 @@ if ($a->argv[0] === "network" && local_user()){ if($ccCookie != "8") { // COMMUNITY diabook_community_info(); - + // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css"; + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network-wide.css";} } } @@ -282,8 +285,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ diabook_community_info(); // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css"; - + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile-wide.css";} } } @@ -291,6 +294,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); + + //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('', $cookieJS); @@ -299,6 +304,9 @@ $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; $a->page['htmlhead'] .= sprintf('', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('', $autogrowJS); //js scripts //comment-edit-wrapper on photo_view @@ -324,6 +332,15 @@ $a->page['htmlhead'] .= ' '; +$a->page['htmlhead'] .= ' + +'; + $a->page['htmlhead'] .= ' diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index edabab6110..df8bbad7c2 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -39,6 +39,6 @@

    'PostIt' to Friendica

    -Post to Friendica from anywhere by bookmarking this link. +Post to Friendica from anywhere by bookmarking this link.
    diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index b02f419476..729f9be2ad 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -28,9 +28,10 @@ -