From b5c164bf2fee381c0a48e2f1e2e19d52fe8afdf4 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 15 Apr 2012 19:58:26 +0200 Subject: [PATCH 01/49] diabook-themes: css-fixes --- view/de/strings.php | 2 +- view/theme/diabook-aerith/style-network.css | 3 +++ view/theme/diabook-aerith/style-profile.css | 3 +++ view/theme/diabook-aerith/style.css | 10 ++++++++-- view/theme/diabook-blue/style-network.css | 3 +++ view/theme/diabook-blue/style-profile.css | 3 +++ view/theme/diabook-blue/style.css | 10 ++++++++-- view/theme/diabook-red/style-network.css | 3 +++ view/theme/diabook-red/style-profile.css | 3 +++ view/theme/diabook-red/style.css | 10 ++++++++-- view/theme/diabook/js/README | 6 +++++- view/theme/diabook/style-network-wide.css | 11 +++++++---- view/theme/diabook/style-network.css | 3 +++ view/theme/diabook/style-profile-wide.css | 11 +++++++---- view/theme/diabook/style-profile.css | 3 +++ view/theme/diabook/style-wide.css | 18 ++++++++++++------ view/theme/diabook/style.css | 10 ++++++++-- 17 files changed, 88 insertions(+), 24 deletions(-) diff --git a/view/de/strings.php b/view/de/strings.php index 6a43f049e..91c01f8cd 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Edit"] = "Bearbeiten"; $a->strings["Upload photo"] = "Foto hochladen"; $a->strings["Attach file"] = "Datei anhängen"; -$a->strings["Insert web link"] = "eine Kontaktanfrage"; +$a->strings["Insert web link"] = "einen Weblink einfügen"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen"; diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 17335389d..679d1d77e 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -2229,6 +2229,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 3dea20697..3471b67ad 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -2203,6 +2203,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index a9269f21d..bbd9a5330 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1230,6 +1230,9 @@ aside #likes a:hover{ float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1245,7 +1248,7 @@ aside #likes a:hover{ .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1262,7 +1265,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2487,6 +2490,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 2f25372a9..59d4fafe7 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2190,6 +2190,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index f0b4fbd02..135cdb1c6 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2170,6 +2170,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 923e63e3e..5459c65bd 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1190,6 +1190,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1205,7 +1208,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1222,7 +1225,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2444,6 +2447,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 17b7af09b..03357f766 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -2226,6 +2226,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 74566d5c5..1b2caa6c0 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2184,6 +2184,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index a722dbae9..6ca2370de 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1219,6 +1219,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -1234,7 +1237,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1251,7 +1254,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2472,6 +2475,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README index c93b2118e..57ca16d02 100644 --- a/view/theme/diabook/js/README +++ b/view/theme/diabook/js/README @@ -19,4 +19,8 @@ An integer representing the maximum width for the image. Example $(function() { $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); -}); \ No newline at end of file +}); + +_______________________________________________________________________________________________ + +http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index 8c4ad0c08..0289419f4 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -396,7 +396,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 15px; + font-size: 13px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -958,8 +958,8 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 170px; - padding: 0px 10px 0px 0px; + width: 180px; + padding: 0px 5px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ @@ -1924,7 +1924,7 @@ transition: all 0.2s ease-in-out; ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 15px; + font-size: 13px; width: 805px; } ul.tabs li { @@ -2169,6 +2169,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 1e57041e4..2e6a19481 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2157,6 +2157,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index 47fb80b6d..ffd790ea6 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -395,7 +395,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 15px; + font-size: 13px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -939,8 +939,8 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 170px; - padding: 0px 10px 0px 0px; + width: 180px; + padding: 0px 5px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ @@ -1901,7 +1901,7 @@ transition: all 0.2s ease-in-out; ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 15px; + font-size: 13px; width: 805px; } ul.tabs li { @@ -2151,6 +2151,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index ff39a0456..ebde6ecfc 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2140,6 +2140,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index d9a975e2c..64f82c487 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -423,7 +423,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 15px; + font-size: 13px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -1082,8 +1082,8 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 170px; - padding: 0px 10px 0px 0px; + width: 180px; + padding: 0px 5px 0px 0px; border-right: 1px solid #D2D2D2; float: left; /* background: #F1F1F1; */ @@ -1185,6 +1185,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } /* widget */ .widget { margin-bottom: 2em; @@ -1261,7 +1264,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1278,7 +1281,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2124,7 +2127,7 @@ body .pageheader{ ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 15px; + font-size: 13px; width: 805px; } ul.tabs li { @@ -2417,6 +2420,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index e73bd1f57..fa945f848 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1182,6 +1182,9 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +#login-submit-wrapper{ + margin-top: 20px; + } /* widget */ .widget { margin-bottom: 2em; @@ -1256,7 +1259,7 @@ aside #side-peoplefind-url { .icon.text_add { background-image: url("../../../images/icons/16/add.png"); float: right; - opacity: 0.1; + opacity: 0.2; margin-right: 14px; } .icon.text_add:hover { @@ -1273,7 +1276,7 @@ transition: all 0.2s ease-in-out; } .icon.text_edit { background-image: url("../../../images/icons/10/edit.png"); - opacity: 0.1; + opacity: 0.2; margin-top: 6px; float: right; height: 10px; @@ -2406,6 +2409,9 @@ box-shadow: 1px 1px 5px 0; #group-separator, #prof-separator { display: none;} */ +#prof-members-end{ + clear: both; + } #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; From 37bb3c330d4547732610a1b15bd49a3aa57b0eb4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Apr 2012 16:21:20 -0700 Subject: [PATCH 02/49] rev update --- boot.php | 2 +- util/messages.po | 149 ++++++++++++++++++++++++----------------------- 2 files changed, 78 insertions(+), 73 deletions(-) diff --git a/boot.php b/boot.php index 94202cd5d..36e725c7f 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.1312' ); +define ( 'FRIENDICA_VERSION', '2.3.1313' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); diff --git a/util/messages.po b/util/messages.po index 46011deed..9eef043cc 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1312\n" +"Project-Id-Version: 2.3.1313\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-14 10:00-0700\n" +"POT-Creation-Date: 2012-04-15 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -159,7 +159,7 @@ msgstr "" #: ../../addon/posterous/posterous.php:90 #: ../../view/theme/diabook-red/config.php:64 #: ../../view/theme/diabook-blue/config.php:64 -#: ../../view/theme/diabook/config.php:64 +#: ../../view/theme/diabook/config.php:76 #: ../../view/theme/quattro/config.php:52 #: ../../view/theme/diabook-aerith/config.php:64 #: ../../include/conversation.php:555 @@ -222,9 +222,9 @@ msgstr "" #: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:243 -#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 -#: ../../boot.php:1470 +#: ../../boot.php:1471 msgid "Events" msgstr "" @@ -274,7 +274,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1082 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1083 msgid "Location:" msgstr "" @@ -358,7 +358,7 @@ msgstr "" #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook-red/theme.php:113 #: ../../view/theme/diabook-blue/theme.php:113 -#: ../../view/theme/diabook/theme.php:117 +#: ../../view/theme/diabook/theme.php:119 #: ../../view/theme/diabook-aerith/theme.php:114 msgid "Contact Photos" msgstr "" @@ -384,7 +384,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:111 #: ../../view/theme/diabook-red/theme.php:114 #: ../../view/theme/diabook-blue/theme.php:114 -#: ../../view/theme/diabook/theme.php:118 +#: ../../view/theme/diabook/theme.php:120 #: ../../view/theme/diabook-aerith/theme.php:115 msgid "Profile Photos" msgstr "" @@ -409,7 +409,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook-red/theme.php:85 #: ../../view/theme/diabook-blue/theme.php:85 -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:91 #: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 @@ -587,7 +587,7 @@ msgstr "" #: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245 #: ../../view/theme/diabook-blue/theme.php:245 -#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/theme.php:255 #: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101 msgid "Community" msgstr "" @@ -1181,7 +1181,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1026 +#: ../../include/contact_widgets.php:9 ../../boot.php:1027 msgid "Connect" msgstr "" @@ -1231,7 +1231,7 @@ msgstr "" #: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239 #: ../../view/theme/diabook-blue/theme.php:239 -#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77 #: ../../include/nav.php:115 msgid "Home" @@ -1611,7 +1611,7 @@ msgstr "" #: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -2274,7 +2274,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1475 +#: ../../mod/notes.php:44 ../../boot.php:1476 msgid "Personal Notes" msgstr "" @@ -2523,10 +2523,10 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:240 -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook-aerith/theme.php:241 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 -#: ../../include/nav.php:50 ../../boot.php:1457 +#: ../../include/nav.php:50 ../../boot.php:1458 msgid "Profile" msgstr "" @@ -2714,7 +2714,7 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:89 #: ../../view/theme/diabook-blue/theme.php:80 #: ../../view/theme/diabook-blue/theme.php:89 -#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93 +#: ../../view/theme/diabook/theme.php:86 ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook-aerith/theme.php:81 #: ../../view/theme/diabook-aerith/theme.php:90 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 @@ -2727,7 +2727,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:172 #: ../../view/theme/diabook-red/theme.php:94 #: ../../view/theme/diabook-blue/theme.php:94 -#: ../../view/theme/diabook/theme.php:98 +#: ../../view/theme/diabook/theme.php:100 #: ../../view/theme/diabook-aerith/theme.php:95 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format @@ -3436,15 +3436,15 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:20 ../../boot.php:939 +#: ../../mod/profile.php:21 ../../boot.php:940 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:123 ../../mod/display.php:75 +#: ../../mod/profile.php:124 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:144 +#: ../../mod/profile.php:145 msgid "Tips for New Members" msgstr "" @@ -3825,23 +3825,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:585 ../../boot.php:1048 +#: ../../mod/profiles.php:585 ../../boot.php:1049 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:586 ../../boot.php:1049 +#: ../../mod/profiles.php:586 ../../boot.php:1050 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:597 ../../boot.php:1059 +#: ../../mod/profiles.php:597 ../../boot.php:1060 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:599 ../../boot.php:1062 +#: ../../mod/profiles.php:599 ../../boot.php:1063 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:600 ../../boot.php:1063 +#: ../../mod/profiles.php:600 ../../boot.php:1064 msgid "Edit visibility" msgstr "" @@ -3895,7 +3895,7 @@ msgstr "" #: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149 #: ../../view/theme/diabook-blue/theme.php:149 -#: ../../view/theme/diabook/theme.php:153 +#: ../../view/theme/diabook/theme.php:155 #: ../../view/theme/diabook-aerith/theme.php:150 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" @@ -3913,7 +3913,7 @@ msgstr "" #: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147 #: ../../view/theme/diabook-blue/theme.php:147 -#: ../../view/theme/diabook/theme.php:151 +#: ../../view/theme/diabook/theme.php:153 #: ../../view/theme/diabook-aerith/theme.php:148 msgid "Global Directory" msgstr "" @@ -4448,7 +4448,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:155 #: ../../view/theme/diabook-red/theme.php:77 #: ../../view/theme/diabook-blue/theme.php:77 -#: ../../view/theme/diabook/theme.php:81 +#: ../../view/theme/diabook/theme.php:83 #: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" @@ -5328,42 +5328,42 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:26 #: ../../view/theme/diabook-blue/theme.php:26 -#: ../../view/theme/diabook/theme.php:30 +#: ../../view/theme/diabook/theme.php:32 #: ../../view/theme/diabook-aerith/theme.php:27 msgid "Last users" msgstr "" #: ../../view/theme/diabook-red/theme.php:55 #: ../../view/theme/diabook-blue/theme.php:55 -#: ../../view/theme/diabook/theme.php:59 +#: ../../view/theme/diabook/theme.php:61 #: ../../view/theme/diabook-aerith/theme.php:56 msgid "Last likes" msgstr "" #: ../../view/theme/diabook-red/theme.php:100 #: ../../view/theme/diabook-blue/theme.php:100 -#: ../../view/theme/diabook/theme.php:104 +#: ../../view/theme/diabook/theme.php:106 #: ../../view/theme/diabook-aerith/theme.php:101 msgid "Last photos" msgstr "" #: ../../view/theme/diabook-red/theme.php:145 #: ../../view/theme/diabook-blue/theme.php:145 -#: ../../view/theme/diabook/theme.php:149 +#: ../../view/theme/diabook/theme.php:151 #: ../../view/theme/diabook-aerith/theme.php:146 msgid "Find Friends" msgstr "" #: ../../view/theme/diabook-red/theme.php:146 #: ../../view/theme/diabook-blue/theme.php:146 -#: ../../view/theme/diabook/theme.php:150 +#: ../../view/theme/diabook/theme.php:152 #: ../../view/theme/diabook-aerith/theme.php:147 msgid "Local Directory" msgstr "" #: ../../view/theme/diabook-red/theme.php:148 #: ../../view/theme/diabook-blue/theme.php:148 -#: ../../view/theme/diabook/theme.php:152 +#: ../../view/theme/diabook/theme.php:154 #: ../../view/theme/diabook-aerith/theme.php:149 #: ../../include/contact_widgets.php:35 msgid "Similar Interests" @@ -5371,7 +5371,7 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:150 #: ../../view/theme/diabook-blue/theme.php:150 -#: ../../view/theme/diabook/theme.php:154 +#: ../../view/theme/diabook/theme.php:156 #: ../../view/theme/diabook-aerith/theme.php:151 #: ../../include/contact_widgets.php:37 msgid "Invite Friends" @@ -5381,8 +5381,8 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:246 #: ../../view/theme/diabook-blue/theme.php:165 #: ../../view/theme/diabook-blue/theme.php:246 -#: ../../view/theme/diabook/theme.php:170 -#: ../../view/theme/diabook/theme.php:254 +#: ../../view/theme/diabook/theme.php:172 +#: ../../view/theme/diabook/theme.php:256 #: ../../view/theme/diabook-aerith/theme.php:166 #: ../../view/theme/diabook-aerith/theme.php:247 msgid "Community Pages" @@ -5390,42 +5390,42 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:198 #: ../../view/theme/diabook-blue/theme.php:198 -#: ../../view/theme/diabook/theme.php:203 +#: ../../view/theme/diabook/theme.php:205 #: ../../view/theme/diabook-aerith/theme.php:199 msgid "Help or @NewHere ?" msgstr "" #: ../../view/theme/diabook-red/theme.php:204 #: ../../view/theme/diabook-blue/theme.php:204 -#: ../../view/theme/diabook/theme.php:209 +#: ../../view/theme/diabook/theme.php:211 #: ../../view/theme/diabook-aerith/theme.php:205 msgid "Connect Services" msgstr "" #: ../../view/theme/diabook-red/theme.php:210 #: ../../view/theme/diabook-blue/theme.php:210 -#: ../../view/theme/diabook/theme.php:215 +#: ../../view/theme/diabook/theme.php:217 #: ../../view/theme/diabook-aerith/theme.php:211 msgid "PostIt to Friendica" msgstr "" #: ../../view/theme/diabook-red/theme.php:210 #: ../../view/theme/diabook-blue/theme.php:210 -#: ../../view/theme/diabook/theme.php:215 +#: ../../view/theme/diabook/theme.php:217 #: ../../view/theme/diabook-aerith/theme.php:211 msgid "Post to Friendica" msgstr "" #: ../../view/theme/diabook-red/theme.php:211 #: ../../view/theme/diabook-blue/theme.php:211 -#: ../../view/theme/diabook/theme.php:216 +#: ../../view/theme/diabook/theme.php:218 #: ../../view/theme/diabook-aerith/theme.php:212 msgid " from anywhere by bookmarking this Link." msgstr "" #: ../../view/theme/diabook-red/theme.php:239 #: ../../view/theme/diabook-blue/theme.php:239 -#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" @@ -5433,57 +5433,57 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:240 -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50 msgid "Your profile page" msgstr "" #: ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook-aerith/theme.php:242 msgid "Your contacts" msgstr "" #: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:242 -#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 -#: ../../boot.php:1462 +#: ../../boot.php:1463 msgid "Photos" msgstr "" #: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:242 -#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 msgid "Your photos" msgstr "" #: ../../view/theme/diabook-red/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:243 -#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 msgid "Your events" msgstr "" #: ../../view/theme/diabook-red/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:244 -#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/theme.php:254 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 msgid "Personal notes" msgstr "" #: ../../view/theme/diabook-red/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:244 -#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/theme.php:254 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 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/diabook/config.php:78 #: ../../view/theme/quattro/config.php:54 #: ../../view/theme/diabook-aerith/config.php:66 msgid "Theme settings" @@ -5491,18 +5491,22 @@ msgstr "" #: ../../view/theme/diabook-red/config.php:67 #: ../../view/theme/diabook-blue/config.php:67 -#: ../../view/theme/diabook/config.php:67 +#: ../../view/theme/diabook/config.php:79 #: ../../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/config.php:80 #: ../../view/theme/diabook-aerith/config.php:68 msgid "Set line-height for posts and comments" msgstr "" +#: ../../view/theme/diabook/config.php:81 +msgid "Set resolution for middle column" +msgstr "" + #: ../../view/theme/quattro/config.php:55 msgid "Alignment" msgstr "" @@ -5519,7 +5523,7 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1084 +#: ../../include/profile_advanced.php:17 ../../boot.php:1085 msgid "Gender:" msgstr "" @@ -5540,11 +5544,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1087 +#: ../../include/profile_advanced.php:37 ../../boot.php:1088 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1089 +#: ../../include/profile_advanced.php:45 ../../boot.php:1090 msgid "Homepage:" msgstr "" @@ -6136,7 +6140,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1452 +#: ../../include/nav.php:49 ../../boot.php:1453 msgid "Status" msgstr "" @@ -6216,11 +6220,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1042 +#: ../../include/nav.php:138 ../../boot.php:1043 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1042 +#: ../../include/nav.php:138 ../../boot.php:1043 msgid "Manage/edit profiles" msgstr "" @@ -6659,7 +6663,8 @@ msgstr "" msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:149 ../../include/conversation.php:817 +#: ../../include/Contact.php:149 ../../include/Contact.php:161 +#: ../../include/conversation.php:817 msgid "Edit Contact" msgstr "" @@ -6886,42 +6891,42 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:974 +#: ../../boot.php:975 msgid "Edit profile" msgstr "" -#: ../../boot.php:1034 +#: ../../boot.php:1035 msgid "Message" msgstr "" -#: ../../boot.php:1150 ../../boot.php:1222 +#: ../../boot.php:1151 ../../boot.php:1223 msgid "g A l F d" msgstr "" -#: ../../boot.php:1151 ../../boot.php:1223 +#: ../../boot.php:1152 ../../boot.php:1224 msgid "F d" msgstr "" -#: ../../boot.php:1176 +#: ../../boot.php:1177 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1177 +#: ../../boot.php:1178 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1200 ../../boot.php:1265 +#: ../../boot.php:1201 ../../boot.php:1266 msgid "[today]" msgstr "" -#: ../../boot.php:1246 +#: ../../boot.php:1247 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1247 +#: ../../boot.php:1248 msgid "Events this week:" msgstr "" -#: ../../boot.php:1259 +#: ../../boot.php:1260 msgid "[No description]" msgstr "" From c8598e7da629832de3b9f52cc25f33f7f840efb2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Apr 2012 01:35:27 -0700 Subject: [PATCH 03/49] edited comments weren't being relayed --- include/items.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/items.php b/include/items.php index 85df340d3..c55a55704 100644 --- a/include/items.php +++ b/include/items.php @@ -2229,6 +2229,30 @@ function local_delivery($importer,$data) { $datarray = get_atom_elements($feed,$item); + $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($item_id), + intval($importer['importer_uid']) + ); + + // Update content if 'updated' changes + + if(count($r)) { + if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($datarray['title']), + dbesc($datarray['body']), + dbesc($datarray['tag']), + dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), + dbesc($item_id), + intval($importer['importer_uid']) + ); + } + proc_run('php',"include/notifier.php","comment-import",$r[0]['id']); + + continue; + } + + // TODO: make this next part work against both delivery threads of a community post // if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { From 0b838e4cc7031f807808c05b377252b9600840fb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Apr 2012 02:09:00 -0700 Subject: [PATCH 04/49] propagate edited comments --- include/items.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index c55a55704..e005ffaef 100644 --- a/include/items.php +++ b/include/items.php @@ -2229,7 +2229,7 @@ function local_delivery($importer,$data) { $datarray = get_atom_elements($feed,$item); - $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item_id), intval($importer['importer_uid']) ); @@ -2237,7 +2237,9 @@ function local_delivery($importer,$data) { // Update content if 'updated' changes if(count($r)) { + $iid = $r[0]['id']; if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { + logger('received updated comment' , LOGGER_DEBUG); $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($datarray['title']), dbesc($datarray['body']), @@ -2246,8 +2248,10 @@ function local_delivery($importer,$data) { dbesc($item_id), intval($importer['importer_uid']) ); + + proc_run('php',"include/notifier.php","comment-import",$iid); + } - proc_run('php',"include/notifier.php","comment-import",$r[0]['id']); continue; } From fd2f7dd6ae8871f09674a5325fd4d4ccea56b623 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Apr 2012 03:51:48 -0700 Subject: [PATCH 05/49] turn on comment edit --- include/conversation.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index f4a564742..e5549a9c1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -559,10 +559,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } } - $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes')) - ? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")) - : False); - + if(local_user() && link_compare($a->contact['url'],$item['author-link'])) + $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); + else + $edpost = false; $drop = ''; $dropping = false; From 947b6073b1920dfcb7de273dd6dae9b1ff3d7458 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 16 Apr 2012 16:05:29 +0200 Subject: [PATCH 06/49] diabook-themes: minor bugfixes --- view/theme/diabook-aerith/group_side.tpl | 5 +++++ view/theme/diabook-aerith/nav.tpl | 18 +++++++++++------- view/theme/diabook-aerith/nets.tpl | 4 ++-- view/theme/diabook-blue/group_side.tpl | 5 +++++ view/theme/diabook-blue/nav.tpl | 12 ++++++++---- view/theme/diabook-blue/nets.tpl | 4 ++-- view/theme/diabook-red/group_side.tpl | 5 +++++ view/theme/diabook-red/nav.tpl | 16 ++++++++++------ view/theme/diabook-red/nets.tpl | 4 ++-- view/theme/diabook/group_side.tpl | 5 +++++ view/theme/diabook/nav.tpl | 2 ++ view/theme/diabook/nets.tpl | 4 ++-- 12 files changed, 59 insertions(+), 25 deletions(-) mode change 100644 => 100755 view/theme/diabook-aerith/group_side.tpl mode change 100644 => 100755 view/theme/diabook-blue/group_side.tpl mode change 100644 => 100755 view/theme/diabook-red/group_side.tpl diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl old mode 100644 new mode 100755 index 642019049..8600402f2 --- a/view/theme/diabook-aerith/group_side.tpl +++ b/view/theme/diabook-aerith/group_side.tpl @@ -25,5 +25,10 @@ {{ endfor }} + {{ if $ungrouped }} + + {{ endif }} diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl index 6fab83afc..6559c49ea 100644 --- a/view/theme/diabook-aerith/nav.tpl +++ b/view/theme/diabook-aerith/nav.tpl @@ -26,6 +26,7 @@ + {{ endif }} {{ if $nav.messages }} @@ -45,7 +46,7 @@ {{ if $nav.notifications }} + {{ endif }} {{ if $nav.messages }} @@ -63,16 +64,18 @@ {{ endif }} +
  • + + {{ if $nav.directory }} {{ endif }} - {{ if $nav.apps }} + {{ endif }} {{ if $nav.messages }} @@ -63,16 +64,18 @@ {{ endif }} +
  • + + {{ if $nav.directory }} {{ endif }} - {{ if $nav.apps }} {{ endif }} +
  • +