keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-05-10 09:58:52 +02:00
commit 4709960189
23 changed files with 123 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1336' ); define ( 'FRIENDICA_VERSION', '3.0.1337' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 ); define ( 'DB_UPDATE_VERSION', 1143 );

2
include/conversation.php
View file

@ -959,7 +959,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $a->cmd, '$return_path' => $a->query_string,
'$action' => $a->get_baseurl(true) . '/item', '$action' => $a->get_baseurl(true) . '/item',
'$share' => (x($x,'button') ? $x['button'] : t('Share')), '$share' => (x($x,'button') ? $x['button'] : t('Share')),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),

132
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1336\n" "Project-Id-Version: 2.3.1337\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -156,7 +156,7 @@ msgstr ""
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:683 #: ../../view/theme/diabook/theme.php:683
#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/diabook/config.php:190
@ -220,7 +220,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127 #: ../../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" msgid "Events"
msgstr "" msgstr ""
@ -270,7 +270,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:423 ../../include/event.php:37 #: ../../mod/events.php:423 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1092 #: ../../include/bb2diaspora.php:260 ../../boot.php:1098
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -345,7 +345,7 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:43 ../../boot.php:1487 #: ../../mod/photos.php:43 ../../boot.php:1493
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
@ -545,7 +545,7 @@ msgstr ""
#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1232 ../../mod/photos.php:1272
#: ../../mod/photos.php:1303 ../../include/conversation.php:554 #: ../../mod/photos.php:1303 ../../include/conversation.php:554
#: ../../boot.php:506 #: ../../boot.php:512
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -1166,7 +1166,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../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" msgid "Connect"
msgstr "" msgstr ""
@ -1692,7 +1692,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:680 #: ../../addon/facebook/facebook.php:680
#: ../../addon/facebook/facebook.php:1170 #: ../../addon/facebook/facebook.php:1170
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726
#: ../../boot.php:686 #: ../../boot.php:692
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1702,7 +1702,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:818 #: ../../mod/lostpass.php:83 ../../boot.php:824
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2352,7 +2352,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1499 #: ../../mod/notes.php:44 ../../boot.php:1505
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2603,7 +2603,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../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" msgid "Profile"
msgstr "" msgstr ""
@ -2775,7 +2775,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" 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" msgid "Register"
msgstr "" msgstr ""
@ -2818,7 +2818,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126 #: ../../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" msgid "Photos"
msgstr "" msgstr ""
@ -3597,7 +3597,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:949 #: ../../mod/profile.php:21 ../../boot.php:955
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -4005,23 +4005,23 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:621 ../../boot.php:1058 #: ../../mod/profiles.php:621 ../../boot.php:1064
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:622 ../../boot.php:1059 #: ../../mod/profiles.php:622 ../../boot.php:1065
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:633 ../../boot.php:1069 #: ../../mod/profiles.php:633 ../../boot.php:1075
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:635 ../../boot.php:1072 #: ../../mod/profiles.php:635 ../../boot.php:1078
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:636 ../../boot.php:1073 #: ../../mod/profiles.php:636 ../../boot.php:1079
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4633,8 +4633,8 @@ msgid "Forums"
msgstr "" msgstr ""
#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
#: ../../include/contact_widgets.php:187 ../../include/conversation.php:466 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:466
#: ../../boot.php:507 #: ../../boot.php:513
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -4650,7 +4650,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:805 #: ../../include/nav.php:64 ../../boot.php:811
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -4683,6 +4683,10 @@ msgstr ""
msgid "event" msgid "event"
msgstr "" msgstr ""
#: ../../addon/hangman/hangman.php:19
msgid "Hangman"
msgstr ""
#: ../../addon/uhremotestorage/uhremotestorage.php:84 #: ../../addon/uhremotestorage/uhremotestorage.php:84
#, php-format #, php-format
msgid "" msgid ""
@ -4830,7 +4834,7 @@ msgid "Post to Drupal by default"
msgstr "" msgstr ""
#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 #: ../../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" msgid "Post from Friendica"
msgstr "" msgstr ""
@ -5549,27 +5553,35 @@ msgstr ""
msgid "Post to Blogger by default" msgid "Post to Blogger by default"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:36 #: ../../addon/posterous/posterous.php:37
msgid "Post to Posterous" msgid "Post to Posterous"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:67 #: ../../addon/posterous/posterous.php:70
msgid "Posterous Post Settings" msgid "Posterous Post Settings"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:69 #: ../../addon/posterous/posterous.php:72
msgid "Enable Posterous Post Plugin" msgid "Enable Posterous Post Plugin"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:74 #: ../../addon/posterous/posterous.php:77
msgid "Posterous login" msgid "Posterous login"
msgstr "" msgstr ""
#: ../../addon/posterous/posterous.php:79 #: ../../addon/posterous/posterous.php:82
msgid "Posterous password" msgid "Posterous password"
msgstr "" 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" msgid "Post to Posterous by default"
msgstr "" msgstr ""
@ -5779,7 +5791,7 @@ msgstr ""
msgid "Set colour scheme" msgid "Set colour scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1094 #: ../../include/profile_advanced.php:17 ../../boot.php:1100
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5800,11 +5812,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1097 #: ../../include/profile_advanced.php:37 ../../boot.php:1103
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1099 #: ../../include/profile_advanced.php:45 ../../boot.php:1105
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -6388,7 +6400,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:804 #: ../../include/nav.php:46 ../../boot.php:810
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -6396,7 +6408,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1472 #: ../../include/nav.php:49 ../../boot.php:1478
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6476,11 +6488,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1052 #: ../../include/nav.php:138 ../../boot.php:1058
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1052 #: ../../include/nav.php:138 ../../boot.php:1058
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -7155,96 +7167,96 @@ msgstr ""
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
#: ../../boot.php:505 #: ../../boot.php:511
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:508 #: ../../boot.php:514
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:681 #: ../../boot.php:687
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:683 #: ../../boot.php:689
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:783 #: ../../boot.php:789
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:807 #: ../../boot.php:813
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:808 #: ../../boot.php:814
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:811 #: ../../boot.php:817
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:817 #: ../../boot.php:823
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:984 #: ../../boot.php:990
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1044 #: ../../boot.php:1050
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1160 ../../boot.php:1236 #: ../../boot.php:1166 ../../boot.php:1242
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1161 ../../boot.php:1237 #: ../../boot.php:1167 ../../boot.php:1243
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1206 ../../boot.php:1277 #: ../../boot.php:1212 ../../boot.php:1283
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1218 #: ../../boot.php:1224
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1219 #: ../../boot.php:1225
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1270 #: ../../boot.php:1276
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1288 #: ../../boot.php:1294
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1289 #: ../../boot.php:1295
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1475 #: ../../boot.php:1481
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1481 #: ../../boot.php:1487
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1496 #: ../../boot.php:1502
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1502 #: ../../boot.php:1508
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""

3
view/theme/diabook/admin_site.tpl
View file

@ -49,6 +49,9 @@
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
{{ inc field_input.tpl with $field=$timeout }}{{ 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 }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

2
view/theme/diabook/bottom.tpl
View file

@ -67,12 +67,14 @@ $(document).ready(function() {
$("a#top").attr("id","down"); $("a#top").attr("id","down");
$("a#down").attr("onclick","scrolldown()"); $("a#down").attr("onclick","scrolldown()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png"); $("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"){ if (scrollInfo > "900"){
$("a#down").attr("id","top"); $("a#down").attr("id","top");
$("a#top").attr("onclick","scrolltop()"); $("a#top").attr("onclick","scrolltop()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
$("img#scroll_top_bottom").attr("title","Back to top");
} }
}); });

5
view/theme/diabook/diabook-aerith/style-wide.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -621,9 +622,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-aerith/style.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -621,9 +622,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-blue/style-wide.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -607,9 +608,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-blue/style.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -607,9 +608,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-dark/style-wide.css
View file

@ -553,6 +553,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -606,9 +607,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-dark/style.css
View file

@ -565,6 +565,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #2e2f2e; color: #2e2f2e;
@ -615,9 +616,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-green/style-wide.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -609,9 +610,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-green/style.css
View file

@ -557,6 +557,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -611,9 +612,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/*color*/ /*color*/
/* messages */ /* messages */

5
view/theme/diabook/diabook-pink/style-wide.css
View file

@ -555,6 +555,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -609,9 +610,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

5
view/theme/diabook/diabook-pink/style.css
View file

@ -557,6 +557,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -611,9 +612,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
/*color*/ /*color*/

6
view/theme/diabook/diabook-red/style-wide.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -619,10 +620,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
margin-left: 3px;
} }
/* messages */ /* messages */
#message-new { #message-new {

6
view/theme/diabook/diabook-red/style.css
View file

@ -554,6 +554,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -619,10 +620,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
margin-left: 3px;
} }
/* messages */ /* messages */
#message-new { #message-new {

2
view/theme/diabook/nav.tpl
View file

@ -136,7 +136,7 @@
</nav> </nav>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div> <div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div> <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div> <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/style-wide.css
View file

@ -610,9 +610,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

4
view/theme/diabook/style.css
View file

@ -611,9 +611,7 @@ header #banner #logo-img {
margin-top: 3px; margin-top: 3px;
} }
header #banner #logo-text { header #banner #logo-text {
font-size: 20px; font-size: 20px!important;position: relative!important;top: -4px!important;
position: absolute;
top: 10%;
} }
/* messages */ /* messages */
#message-new { #message-new {

8
view/theme/diabook/theme.php
View file

@ -3,7 +3,7 @@
/* /*
* Name: Diabook * Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * 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: * Author:
*/ */
@ -13,7 +13,7 @@ $a = get_app();
function diabook_init(&$a) { function diabook_init(&$a) {
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.026)"; $diabook_version = "Diabook (Version: 1.027)";
$a->page['htmlhead'] .= sprintf('<META NAME="theme" CONTENT="%s"/>', $diabook_version); $a->page['htmlhead'] .= sprintf('<META NAME="theme" CONTENT="%s"/>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -401,7 +401,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
// custom css // custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//footer //footer
$tpl = get_markup_template('footer.tpl'); $tpl = get_markup_template('footer.tpl');
$a->page['footer'] .= replace_macros($tpl, array()); $a->page['footer'] .= replace_macros($tpl, array());
@ -568,7 +568,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
if($close_pages != "1") { if($close_pages != "1") {
if(local_user()) { if(local_user()) {
$page = ' $page = '
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="close"></a></h3> <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">'; <div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array(); $pagelist = array();

7
view/theme/dispy/dark/style.css
View file

@ -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;} .action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;} .tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;} #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;} #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-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;} #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-subject{clear:right;font-weight:bold;font-size:1.2em;}
.mail-conv-body{clear:both;} .mail-conv-body{clear:both;}
.mail-conv-delete-wrapper{margin-top:5px;} .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-direction-wrapper{position:absolute;top:20px;}
.contact-edit-links{position:absolute;top:60px;} .contact-edit-links{position:absolute;top:60px;}
.contact-entry-photo{margin-left:20px;} .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-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-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;} #contact-entry-url,[id^="contact-entry-url"],#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;}

13
view/theme/dispy/dark/style.less
View file

@ -268,8 +268,8 @@ h4, h5, h6 {
[class$="-desc"], [id$="-desc"] { [class$="-desc"], [id$="-desc"] {
color: @bg_colour; color: @bg_colour;
background: @main_colour; background: @main_colour;
.rounded_corners; // .rounded_corners;
.box_shadow(3px, 3px, 5px); // .box_shadow(3px, 3px, 5px);
margin: 3px 10px 7px 0; margin: 3px 10px 7px 0;
padding: 6px 7px; padding: 6px 7px;
font-weight: bold; font-weight: bold;
@ -1736,10 +1736,11 @@ div {
/** /**
* contacts * contacts
*/ */
.view-contact-wrapper, .contact-entry-wrapper { .view-contact-wrapper,
.contact-entry-wrapper {
float: left; float: left;
margin: 0 5px 40px 0; margin: 0 5px 40px 0;
.box(120px, 120px); .box(120px, 135px);
padding: 3px; padding: 3px;
position: relative; position: relative;
} }
@ -1759,6 +1760,10 @@ div {
.contact-entry-name { .contact-entry-name {
width: 120px; width: 120px;
font-weight: bold; font-weight: bold;
font-size: small;
}
.contact-entry-details {
font-size: x-small;
} }
.contact-entry-photo { .contact-entry-photo {
position: relative; position: relative;