From dbbcddf84527c7df95909c5dad2d03b26262efbc Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 7 May 2012 04:40:54 -0400 Subject: [PATCH 1/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: reset permissions to forum default when adding forum delivery chain * master: From 53157bb954acb7597347c6b4a87e64e7a2f6cc79 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 9 May 2012 04:18:01 -0700 Subject: [PATCH 2/6] send browser back to correct page (with query args) after posting --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 521b4623b..e48a8e6d6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -959,7 +959,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( - '$return_path' => $a->cmd, + '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$upload' => t('Upload photo'), From 8be8db39de9ffc0947e681d5e04b305d4fdf9e20 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 9 May 2012 17:56:05 -0700 Subject: [PATCH 3/6] rev update --- boot.php | 2 +- util/messages.po | 132 ++++++++++++++++++++++++++--------------------- 2 files changed, 73 insertions(+), 61 deletions(-) diff --git a/boot.php b/boot.php index e98bfea9d..ef8763136 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.1336' ); +define ( 'FRIENDICA_VERSION', '2.3.1337' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); diff --git a/util/messages.po b/util/messages.po index e6376310b..37878d86a 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1336\n" +"Project-Id-Version: 2.3.1337\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-08 10:00-0700\n" +"POT-Creation-Date: 2012-05-09 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -156,7 +156,7 @@ msgstr "" #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../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 +#: ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/diabook/theme.php:683 #: ../../view/theme/diabook/config.php:190 @@ -220,7 +220,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127 -#: ../../include/nav.php:52 ../../boot.php:1493 +#: ../../include/nav.php:52 ../../boot.php:1499 msgid "Events" msgstr "" @@ -270,7 +270,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:423 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1092 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1098 msgid "Location:" msgstr "" @@ -345,7 +345,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:43 ../../boot.php:1487 +#: ../../mod/photos.php:43 ../../boot.php:1493 msgid "Photo Albums" msgstr "" @@ -545,7 +545,7 @@ msgstr "" #: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1303 ../../include/conversation.php:554 -#: ../../boot.php:506 +#: ../../boot.php:512 msgid "Comment" msgstr "" @@ -1166,7 +1166,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1036 +#: ../../include/contact_widgets.php:9 ../../boot.php:1042 msgid "Connect" msgstr "" @@ -1692,7 +1692,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:680 #: ../../addon/facebook/facebook.php:1170 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726 -#: ../../boot.php:686 +#: ../../boot.php:692 msgid "Administrator" msgstr "" @@ -1702,7 +1702,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:818 +#: ../../mod/lostpass.php:83 ../../boot.php:824 msgid "Password Reset" msgstr "" @@ -2352,7 +2352,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1499 +#: ../../mod/notes.php:44 ../../boot.php:1505 msgid "Personal Notes" msgstr "" @@ -2603,7 +2603,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1478 +#: ../../include/nav.php:50 ../../boot.php:1484 msgid "Profile" msgstr "" @@ -2775,7 +2775,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:784 +#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:790 msgid "Register" msgstr "" @@ -2818,7 +2818,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126 -#: ../../include/nav.php:51 ../../boot.php:1484 +#: ../../include/nav.php:51 ../../boot.php:1490 msgid "Photos" msgstr "" @@ -3597,7 +3597,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:949 +#: ../../mod/profile.php:21 ../../boot.php:955 msgid "Requested profile is not available." msgstr "" @@ -4005,23 +4005,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:621 ../../boot.php:1058 +#: ../../mod/profiles.php:621 ../../boot.php:1064 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:622 ../../boot.php:1059 +#: ../../mod/profiles.php:622 ../../boot.php:1065 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:633 ../../boot.php:1069 +#: ../../mod/profiles.php:633 ../../boot.php:1075 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:635 ../../boot.php:1072 +#: ../../mod/profiles.php:635 ../../boot.php:1078 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1073 +#: ../../mod/profiles.php:636 ../../boot.php:1079 msgid "Edit visibility" msgstr "" @@ -4633,8 +4633,8 @@ msgid "Forums" msgstr "" #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:187 ../../include/conversation.php:466 -#: ../../boot.php:507 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:466 +#: ../../boot.php:513 msgid "show more" msgstr "" @@ -4650,7 +4650,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:805 +#: ../../include/nav.php:64 ../../boot.php:811 msgid "Login" msgstr "" @@ -4683,6 +4683,10 @@ msgstr "" msgid "event" msgstr "" +#: ../../addon/hangman/hangman.php:19 +msgid "Hangman" +msgstr "" + #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -4830,7 +4834,7 @@ msgid "Post to Drupal by default" msgstr "" #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 -#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:177 +#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192 msgid "Post from Friendica" msgstr "" @@ -5549,27 +5553,35 @@ msgstr "" msgid "Post to Blogger by default" msgstr "" -#: ../../addon/posterous/posterous.php:36 +#: ../../addon/posterous/posterous.php:37 msgid "Post to Posterous" msgstr "" -#: ../../addon/posterous/posterous.php:67 +#: ../../addon/posterous/posterous.php:70 msgid "Posterous Post Settings" msgstr "" -#: ../../addon/posterous/posterous.php:69 +#: ../../addon/posterous/posterous.php:72 msgid "Enable Posterous Post Plugin" msgstr "" -#: ../../addon/posterous/posterous.php:74 +#: ../../addon/posterous/posterous.php:77 msgid "Posterous login" msgstr "" -#: ../../addon/posterous/posterous.php:79 +#: ../../addon/posterous/posterous.php:82 msgid "Posterous password" msgstr "" -#: ../../addon/posterous/posterous.php:84 +#: ../../addon/posterous/posterous.php:87 +msgid "Posterous site ID" +msgstr "" + +#: ../../addon/posterous/posterous.php:92 +msgid "Posterous API token" +msgstr "" + +#: ../../addon/posterous/posterous.php:97 msgid "Post to Posterous by default" msgstr "" @@ -5779,7 +5791,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1094 +#: ../../include/profile_advanced.php:17 ../../boot.php:1100 msgid "Gender:" msgstr "" @@ -5800,11 +5812,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1097 +#: ../../include/profile_advanced.php:37 ../../boot.php:1103 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1099 +#: ../../include/profile_advanced.php:45 ../../boot.php:1105 msgid "Homepage:" msgstr "" @@ -6388,7 +6400,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:804 +#: ../../include/nav.php:46 ../../boot.php:810 msgid "Logout" msgstr "" @@ -6396,7 +6408,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1472 +#: ../../include/nav.php:49 ../../boot.php:1478 msgid "Status" msgstr "" @@ -6476,11 +6488,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1052 +#: ../../include/nav.php:138 ../../boot.php:1058 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1052 +#: ../../include/nav.php:138 ../../boot.php:1058 msgid "Manage/edit profiles" msgstr "" @@ -7155,96 +7167,96 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:505 +#: ../../boot.php:511 msgid "Delete this item?" msgstr "" -#: ../../boot.php:508 +#: ../../boot.php:514 msgid "show fewer" msgstr "" -#: ../../boot.php:681 +#: ../../boot.php:687 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:683 +#: ../../boot.php:689 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:783 +#: ../../boot.php:789 msgid "Create a New Account" msgstr "" -#: ../../boot.php:807 +#: ../../boot.php:813 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:808 +#: ../../boot.php:814 msgid "Password: " msgstr "" -#: ../../boot.php:811 +#: ../../boot.php:817 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:817 +#: ../../boot.php:823 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:984 +#: ../../boot.php:990 msgid "Edit profile" msgstr "" -#: ../../boot.php:1044 +#: ../../boot.php:1050 msgid "Message" msgstr "" -#: ../../boot.php:1160 ../../boot.php:1236 +#: ../../boot.php:1166 ../../boot.php:1242 msgid "g A l F d" msgstr "" -#: ../../boot.php:1161 ../../boot.php:1237 +#: ../../boot.php:1167 ../../boot.php:1243 msgid "F d" msgstr "" -#: ../../boot.php:1206 ../../boot.php:1277 +#: ../../boot.php:1212 ../../boot.php:1283 msgid "[today]" msgstr "" -#: ../../boot.php:1218 +#: ../../boot.php:1224 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1219 +#: ../../boot.php:1225 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1270 +#: ../../boot.php:1276 msgid "[No description]" msgstr "" -#: ../../boot.php:1288 +#: ../../boot.php:1294 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1289 +#: ../../boot.php:1295 msgid "Events this week:" msgstr "" -#: ../../boot.php:1475 +#: ../../boot.php:1481 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1481 +#: ../../boot.php:1487 msgid "Profile Details" msgstr "" -#: ../../boot.php:1496 +#: ../../boot.php:1502 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1502 +#: ../../boot.php:1508 msgid "Only You Can See This" msgstr "" From 4a42414135538fedad53ba6a2bc46ae18d652609 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 9 May 2012 18:15:27 -0700 Subject: [PATCH 4/6] rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index ef8763136..e4d8663a3 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.1337' ); +define ( 'FRIENDICA_VERSION', '3.0.1337' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); From a077e63fa58992fe04eeb7f5aa9a865985fa1039 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 10 May 2012 02:27:48 -0400 Subject: [PATCH 5/6] don't make -desc so obnoxious looking Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 7 ++++--- view/theme/dispy/dark/style.less | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 7582c9add..169a00398 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -48,7 +48,7 @@ h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638e .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} -[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;margin:3px 10px 7px 0;padding:6px 7px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;margin:3px 10px 7px 0;padding:6px 7px;font-weight:bold;font-size:smaller;} #asidemain .field{overflow:hidden;width:200px;} #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;} #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;} @@ -279,11 +279,12 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;} .mail-conv-body{clear:both;} .mail-conv-delete-wrapper{margin-top:5px;} -.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} +.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:135px;padding:3px;position:relative;} .contact-direction-wrapper{position:absolute;top:20px;} .contact-edit-links{position:absolute;top:60px;} .contact-entry-photo{margin-left:20px;} -.contact-entry-name{width:120px;font-weight:bold;} +.contact-entry-name{width:120px;font-weight:bold;font-size:small;} +.contact-entry-details{font-size:x-small;} .contact-entry-photo{position:relative;} .contact-entry-edit-links .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:white;} #contact-entry-url,[id^="contact-entry-url"],#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index f48a77e27..caa45918c 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -268,8 +268,8 @@ h4, h5, h6 { [class$="-desc"], [id$="-desc"] { color: @bg_colour; background: @main_colour; - .rounded_corners; - .box_shadow(3px, 3px, 5px); + // .rounded_corners; + // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; padding: 6px 7px; font-weight: bold; @@ -1736,10 +1736,11 @@ div { /** * contacts */ -.view-contact-wrapper, .contact-entry-wrapper { +.view-contact-wrapper, +.contact-entry-wrapper { float: left; margin: 0 5px 40px 0; - .box(120px, 120px); + .box(120px, 135px); padding: 3px; position: relative; } @@ -1759,6 +1760,10 @@ div { .contact-entry-name { width: 120px; font-weight: bold; + font-size: small; +} +.contact-entry-details { + font-size: x-small; } .contact-entry-photo { position: relative; From 69b43582d07d90536030c780b8c85db2ef789ee4 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 10 May 2012 09:54:16 +0200 Subject: [PATCH 6/6] diabook-theme: some css/bug-fixes --- view/theme/diabook/admin_site.tpl | 3 +++ view/theme/diabook/bottom.tpl | 2 ++ view/theme/diabook/diabook-aerith/style-wide.css | 5 ++--- view/theme/diabook/diabook-aerith/style.css | 5 ++--- view/theme/diabook/diabook-blue/style-wide.css | 5 ++--- view/theme/diabook/diabook-blue/style.css | 5 ++--- view/theme/diabook/diabook-dark/style-wide.css | 5 ++--- view/theme/diabook/diabook-dark/style.css | 5 ++--- view/theme/diabook/diabook-green/style-wide.css | 5 ++--- view/theme/diabook/diabook-green/style.css | 5 ++--- view/theme/diabook/diabook-pink/style-wide.css | 5 ++--- view/theme/diabook/diabook-pink/style.css | 5 ++--- view/theme/diabook/diabook-red/style-wide.css | 6 ++---- view/theme/diabook/diabook-red/style.css | 6 ++---- view/theme/diabook/nav.tpl | 2 +- view/theme/diabook/style-wide.css | 4 +--- view/theme/diabook/style.css | 4 +--- view/theme/diabook/theme.php | 8 ++++---- 18 files changed, 36 insertions(+), 49 deletions(-) diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index dd89b81a9..346934b70 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -49,6 +49,9 @@ {{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} + {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl index 02ad1dcd2..081199360 100644 --- a/view/theme/diabook/bottom.tpl +++ b/view/theme/diabook/bottom.tpl @@ -67,12 +67,14 @@ $(document).ready(function() { $("a#top").attr("id","down"); $("a#down").attr("onclick","scrolldown()"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png"); + $("img#scroll_top_bottom").attr("title","Scroll to bottom"); } if (scrollInfo > "900"){ $("a#down").attr("id","top"); $("a#top").attr("onclick","scrolltop()"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png"); + $("img#scroll_top_bottom").attr("title","Back to top"); } }); diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index 5c263154f..43c0974b1 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -621,9 +622,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index e0f38aff6..b512c8bfe 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -621,9 +622,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index 189f4d559..103047f32 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/style-wide.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -607,9 +608,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 2b68afc6f..e7f3fd0bc 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -607,9 +608,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css index 73d0e4c0f..3475408b2 100644 --- a/view/theme/diabook/diabook-dark/style-wide.css +++ b/view/theme/diabook/diabook-dark/style-wide.css @@ -553,6 +553,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -606,9 +607,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index fdc4e6481..24d319f8a 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -565,6 +565,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #2e2f2e; @@ -615,9 +616,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index d98a6c325..0a9c5e35c 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -609,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index 6a9d8f7d0..762310e4d 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -557,6 +557,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -611,9 +612,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /*color*/ /* messages */ diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index 849566aa0..e85c58850 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -609,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 798d73979..248e3ead0 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -557,6 +557,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -611,9 +612,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ /*color*/ diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css index b9ea238e2..b068a2f5d 100644 --- a/view/theme/diabook/diabook-red/style-wide.css +++ b/view/theme/diabook/diabook-red/style-wide.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -619,10 +620,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index 05c802102..37e26b8b9 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -619,10 +620,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index f611de004..4165656bd 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ - +
$langselector
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index cf54e5b58..64393bdff 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -610,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 2834e76f2..736817c7b 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -611,9 +611,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 607414f17..15c0794fa 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.026) + * Version: (Version: 1.027) * Author: */ @@ -13,7 +13,7 @@ $a = get_app(); function diabook_init(&$a) { //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.026)"; +$diabook_version = "Diabook (Version: 1.027)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -401,7 +401,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - + //footer $tpl = get_markup_template('footer.tpl'); $a->page['footer'] .= replace_macros($tpl, array()); @@ -568,7 +568,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if($close_pages != "1") { if(local_user()) { $page = ' -

'.t("Community Pages").'

+

'.t("Community Pages").'

    '; $pagelist = array();