friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2012-11-09 23:40:17 +01:00
parent fb02d72a35 b01ca0e345
commit 71e43e68d4
14 changed files with 286 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1518' ); define ( 'FRIENDICA_VERSION', '3.0.1521' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 ); define ( 'DB_UPDATE_VERSION', 1156 );
@ -947,6 +947,7 @@ if(! function_exists('login')) {
'$lname' => array('username', t('Nickname or Email address: ') , '', ''), '$lname' => array('username', t('Nickname or Email address: ') , '', ''),
'$lpassword' => array('password', t('Password: '), '', ''), '$lpassword' => array('password', t('Password: '), '', ''),
'$lremember' => array('remember', t('Remember me'), 0, ''),
'$openid' => !$noid, '$openid' => !$noid,
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''), '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),

42
include/auth.php
View file

@ -2,6 +2,7 @@
require_once('include/security.php'); require_once('include/security.php');
require_once('include/datetime.php');
function nuke_session() { function nuke_session() {
unset($_SESSION['authenticated']); unset($_SESSION['authenticated']);
@ -68,7 +69,18 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
goaway(z_root()); goaway(z_root());
} }
authenticate_success($r[0]); // Make sure to refresh the last login time for the user if the user
// stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false;
if(! x($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
}
if( strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) {
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
$login_refresh = true;
}
authenticate_success($r[0], false, false, $login_refresh);
} }
} }
else { else {
@ -162,8 +174,36 @@ else {
goaway(z_root()); goaway(z_root());
} }
// If the user specified to remember the authentication, then change the cookie
// to expire after one year (the default is when the browser is closed).
// If the user did not specify to remember, change the cookie to expire when the
// browser is closed. The reason this is necessary is because if the user
// specifies to remember, then logs out and logs back in without specifying to
// remember, the old "remember" cookie may remain and prevent the session from
// expiring when the browser is closed.
//
// It seems like I should be able to test for the old cookie, but for some reason when
// I read the lifetime value from session_get_cookie_params(), I always get '0'
// (i.e. expire when the browser is closed), even when there's a time expiration
// on the cookie
if($_POST['remember']) {
$old_sid = session_id();
session_set_cookie_params('31449600'); // one year
session_regenerate_id(false);
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
}
else {
$old_sid = session_id();
session_set_cookie_params('0');
session_regenerate_id(false);
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
}
// if we haven't failed up this point, log them in. // if we haven't failed up this point, log them in.
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
authenticate_success($record, true, true); authenticate_success($record, true, true);
} }
} }

9
include/security.php
View file

@ -1,6 +1,6 @@
<?php <?php
function authenticate_success($user_record, $login_initial = false, $interactive = false) { function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) {
$a = get_app(); $a = get_app();
@ -65,6 +65,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
if($login_initial) if($login_initial)
logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG); logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
if($login_refresh)
logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid'])); intval($_SESSION['uid']));
@ -76,7 +78,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
if($login_initial) { if($login_initial || $login_refresh) {
$l = get_browser_language(); $l = get_browser_language();
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1", q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
@ -84,7 +86,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
dbesc($l), dbesc($l),
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
}
if($login_initial) {
call_hooks('logged_in', $a->user); call_hooks('logged_in', $a->user);
if(($a->module !== 'home') && isset($_SESSION['return_url'])) if(($a->module !== 'home') && isset($_SESSION['return_url']))

3
mod/photos.php
View file

@ -27,12 +27,13 @@ function photos_init(&$a) {
if(! count($r)) if(! count($r))
return; return;
$a->data['user'] = $r[0];
$o .= '<div class="vcard">'; $o .= '<div class="vcard">';
$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>'; $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>'; $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
$o .= '</div>'; $o .= '</div>';
$a->data['user'] = $r[0];
$sql_extra = permissions_sql($a->data['user']['uid']); $sql_extra = permissions_sql($a->data['user']['uid']);

322
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1518\n" "Project-Id-Version: 3.0.1521\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-05 10:00-0800\n" "POT-Creation-Date: 2012-11-08 10:00-0800\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"
@ -42,7 +42,7 @@ msgstr ""
#: ../../mod/notifications.php:66 ../../mod/contacts.php:146 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
#: ../../mod/settings.php:86 ../../mod/settings.php:525 #: ../../mod/settings.php:86 ../../mod/settings.php:525
#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
@ -59,7 +59,7 @@ msgstr ""
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165 #: ../../addon/fbpost/fbpost.php:165
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -287,7 +287,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:52 ../../boot.php:1701 #: ../../include/nav.php:52 ../../boot.php:1711
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -345,7 +345,7 @@ msgstr ""
#: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../mod/events.php:448 ../../mod/directory.php:134
#: ../../include/event.php:40 ../../include/bb2diaspora.php:412 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
#: ../../boot.php:1237 #: ../../boot.php:1241
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -413,7 +413,7 @@ msgstr ""
#: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:927 ../../mod/settings.php:933
#: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:963 ../../mod/settings.php:964
#: ../../mod/settings.php:965 ../../mod/settings.php:966 #: ../../mod/settings.php:965 ../../mod/settings.php:966
#: ../../mod/settings.php:967 ../../mod/register.php:236 #: ../../mod/settings.php:967 ../../mod/register.php:237
#: ../../mod/profiles.php:574 #: ../../mod/profiles.php:574
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -425,12 +425,12 @@ msgstr ""
#: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:927 ../../mod/settings.php:933
#: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:963 ../../mod/settings.php:964
#: ../../mod/settings.php:965 ../../mod/settings.php:966 #: ../../mod/settings.php:965 ../../mod/settings.php:966
#: ../../mod/settings.php:967 ../../mod/register.php:237 #: ../../mod/settings.php:967 ../../mod/register.php:238
#: ../../mod/profiles.php:575 #: ../../mod/profiles.php:575
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:50 ../../boot.php:1694 #: ../../mod/photos.php:50 ../../boot.php:1704
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
@ -657,7 +657,7 @@ msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1405 ../../mod/photos.php:1449 #: ../../mod/photos.php:1405 ../../mod/photos.php:1449
#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585 #: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
#: ../../object/Item.php:558 #: ../../object/Item.php:558
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -948,7 +948,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1020,6 +1020,65 @@ msgstr ""
msgid "Submit Request" msgid "Submit Request"
msgstr "" msgstr ""
#: ../../mod/uexport.php:10 ../../mod/settings.php:30
#: ../../include/nav.php:137
msgid "Account settings"
msgstr ""
#: ../../mod/uexport.php:15 ../../mod/settings.php:35
msgid "Display settings"
msgstr ""
#: ../../mod/uexport.php:21 ../../mod/settings.php:41
msgid "Connector settings"
msgstr ""
#: ../../mod/uexport.php:26 ../../mod/settings.php:46
msgid "Plugin settings"
msgstr ""
#: ../../mod/uexport.php:31 ../../mod/settings.php:51
msgid "Connected apps"
msgstr ""
#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
msgid "Export personal data"
msgstr ""
#: ../../mod/uexport.php:41 ../../mod/settings.php:61
msgid "Remove account"
msgstr ""
#: ../../mod/uexport.php:49 ../../mod/settings.php:69
#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings"
msgstr ""
#: ../../mod/uexport.php:73
msgid "Export account"
msgstr ""
#: ../../mod/uexport.php:73
msgid ""
"Export your account info and contacts. Use this to make a backup of your "
"account and/or to move it to another server."
msgstr ""
#: ../../mod/uexport.php:74
msgid "Export all"
msgstr ""
#: ../../mod/uexport.php:74
msgid ""
"Export your accout info, contacts and all your items as json. Could be a "
"very big file, and could take a lot of time. Use this to make a full backup "
"of your account (photos are not exported)"
msgstr ""
#: ../../mod/install.php:117 #: ../../mod/install.php:117
msgid "Friendica Social Communications Server - Setup" msgid "Friendica Social Communications Server - Setup"
msgstr "" msgstr ""
@ -1340,7 +1399,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:1175 #: ../../include/contact_widgets.php:9 ../../boot.php:1179
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1407,7 +1466,7 @@ msgstr[1] ""
#: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../mod/content.php:589 ../../addon/page/page.php:77
#: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:195 ../../boot.php:586 #: ../../include/contact_widgets.php:195 ../../boot.php:590
#: ../../object/Item.php:280 ../../addon.old/page/page.php:77 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77
#: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
msgid "show more" msgid "show more"
@ -2007,13 +2066,13 @@ msgid "Password reset requested at %s"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/register.php:91 ../../mod/register.php:145
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/fbpost/fbpost.php:661
#: ../../addon.old/public_server/public_server.php:62 #: ../../addon.old/public_server/public_server.php:62
@ -2027,7 +2086,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:936 #: ../../mod/lostpass.php:83 ../../boot.php:940
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2071,43 +2130,6 @@ msgstr ""
msgid "Reset" msgid "Reset"
msgstr "" msgstr ""
#: ../../mod/settings.php:30 ../../include/nav.php:137
msgid "Account settings"
msgstr ""
#: ../../mod/settings.php:35
msgid "Display settings"
msgstr ""
#: ../../mod/settings.php:41
msgid "Connector settings"
msgstr ""
#: ../../mod/settings.php:46
msgid "Plugin settings"
msgstr ""
#: ../../mod/settings.php:51
msgid "Connected apps"
msgstr ""
#: ../../mod/settings.php:56
msgid "Export personal data"
msgstr ""
#: ../../mod/settings.php:61
msgid "Remove account"
msgstr ""
#: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings"
msgstr ""
#: ../../mod/settings.php:113 #: ../../mod/settings.php:113
msgid "Missing some important data!" msgid "Missing some important data!"
msgstr "" msgstr ""
@ -2717,7 +2739,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1708 #: ../../mod/notes.php:44 ../../boot.php:1718
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2735,6 +2757,35 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: ../../mod/uimport.php:41
msgid "Import"
msgstr ""
#: ../../mod/uimport.php:43
msgid "Move account"
msgstr ""
#: ../../mod/uimport.php:44
msgid ""
"You can move here an account from another Friendica server. <br>\r\n"
" You need to export your account form the old "
"server and upload it here. We will create here your old account with all "
"your contacts. We will try also to inform you friends that you moved here."
"<br>\r\n"
" <b>This feature is experimental. We can't move "
"here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
msgstr ""
#: ../../mod/uimport.php:47
msgid "Account file"
msgstr ""
#: ../../mod/uimport.php:47
msgid ""
"To export your accont, go to \"Settings->Export your porsonal data\" and "
"select \"Export account\""
msgstr ""
#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
#, php-format #, php-format
msgid "Number of daily wall messages for %s exceeded. Message failed." msgid "Number of daily wall messages for %s exceeded. Message failed."
@ -2849,7 +2900,7 @@ msgstr ""
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684 #: ../../boot.php:1694
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -3076,91 +3127,91 @@ msgstr ""
msgid "View Contacts" msgid "View Contacts"
msgstr "" msgstr ""
#: ../../mod/register.php:88 ../../mod/regmod.php:52 #: ../../mod/register.php:89 ../../mod/regmod.php:52
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: ../../mod/register.php:96 #: ../../mod/register.php:97
msgid "" msgid ""
"Registration successful. Please check your email for further instructions." "Registration successful. Please check your email for further instructions."
msgstr "" msgstr ""
#: ../../mod/register.php:100 #: ../../mod/register.php:101
msgid "Failed to send email message. Here is the message that failed." msgid "Failed to send email message. Here is the message that failed."
msgstr "" msgstr ""
#: ../../mod/register.php:105 #: ../../mod/register.php:106
msgid "Your registration can not be processed." msgid "Your registration can not be processed."
msgstr "" msgstr ""
#: ../../mod/register.php:142 #: ../../mod/register.php:143
#, php-format #, php-format
msgid "Registration request at %s" msgid "Registration request at %s"
msgstr "" msgstr ""
#: ../../mod/register.php:151 #: ../../mod/register.php:152
msgid "Your registration is pending approval by the site owner." msgid "Your registration is pending approval by the site owner."
msgstr "" msgstr ""
#: ../../mod/register.php:189 #: ../../mod/register.php:190
msgid "" msgid ""
"This site has exceeded the number of allowed daily account registrations. " "This site has exceeded the number of allowed daily account registrations. "
"Please try again tomorrow." "Please try again tomorrow."
msgstr "" msgstr ""
#: ../../mod/register.php:217 #: ../../mod/register.php:218
msgid "" msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID " "You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'." "and clicking 'Register'."
msgstr "" msgstr ""
#: ../../mod/register.php:218 #: ../../mod/register.php:219
msgid "" msgid ""
"If you are not familiar with OpenID, please leave that field blank and fill " "If you are not familiar with OpenID, please leave that field blank and fill "
"in the rest of the items." "in the rest of the items."
msgstr "" msgstr ""
#: ../../mod/register.php:219 #: ../../mod/register.php:220
msgid "Your OpenID (optional): " msgid "Your OpenID (optional): "
msgstr "" msgstr ""
#: ../../mod/register.php:233 #: ../../mod/register.php:234
msgid "Include your profile in member directory?" msgid "Include your profile in member directory?"
msgstr "" msgstr ""
#: ../../mod/register.php:255 #: ../../mod/register.php:256
msgid "Membership on this site is by invitation only." msgid "Membership on this site is by invitation only."
msgstr "" msgstr ""
#: ../../mod/register.php:256 #: ../../mod/register.php:257
msgid "Your invitation ID: " msgid "Your invitation ID: "
msgstr "" msgstr ""
#: ../../mod/register.php:259 ../../mod/admin.php:444 #: ../../mod/register.php:260 ../../mod/admin.php:444
msgid "Registration" msgid "Registration"
msgstr "" msgstr ""
#: ../../mod/register.php:267 #: ../../mod/register.php:268
msgid "Your Full Name (e.g. Joe Smith): " msgid "Your Full Name (e.g. Joe Smith): "
msgstr "" msgstr ""
#: ../../mod/register.php:268 #: ../../mod/register.php:269
msgid "Your Email Address: " msgid "Your Email Address: "
msgstr "" msgstr ""
#: ../../mod/register.php:269 #: ../../mod/register.php:270
msgid "" msgid ""
"Choose a profile nickname. This must begin with a text character. Your " "Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be '<strong>nickname@$sitename</" "profile address on this site will then be '<strong>nickname@$sitename</"
"strong>'." "strong>'."
msgstr "" msgstr ""
#: ../../mod/register.php:270 #: ../../mod/register.php:271
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898 #: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -3208,7 +3259,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
#: ../../mod/display.php:169 ../../include/items.php:3780 #: ../../mod/display.php:169 ../../include/items.php:3837
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -3217,7 +3268,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
#: ../../include/nav.php:51 ../../boot.php:1691 #: ../../include/nav.php:51 ../../boot.php:1701
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -4094,7 +4145,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:1085 #: ../../mod/profile.php:21 ../../boot.php:1089
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -4495,23 +4546,23 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:689 ../../boot.php:1203 #: ../../mod/profiles.php:689 ../../boot.php:1207
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:690 ../../boot.php:1204 #: ../../mod/profiles.php:690 ../../boot.php:1208
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:701 ../../boot.php:1214 #: ../../mod/profiles.php:701 ../../boot.php:1218
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:703 ../../boot.php:1217 #: ../../mod/profiles.php:703 ../../boot.php:1221
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:704 ../../boot.php:1218 #: ../../mod/profiles.php:704 ../../boot.php:1222
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4640,17 +4691,17 @@ msgid "Gender: "
msgstr "" msgstr ""
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
#: ../../boot.php:1239 #: ../../boot.php:1243
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
#: ../../boot.php:1242 #: ../../boot.php:1246
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
#: ../../boot.php:1244 #: ../../boot.php:1248
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -5521,7 +5572,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:923 #: ../../include/nav.php:64 ../../boot.php:927
#: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:28
#: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/communityhome.php:34
#: ../../addon.old/communityhome/twillingham/communityhome.php:28 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@ -6130,7 +6181,7 @@ msgstr ""
#: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:279
#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
#: ../../include/enotify.php:28 ../../include/notifier.php:724 #: ../../include/enotify.php:28 ../../include/notifier.php:774
#: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:279
#: ../../addon.old/dav/friendica/main.php:280 #: ../../addon.old/dav/friendica/main.php:280
msgid "noreply" msgid "noreply"
@ -8122,7 +8173,7 @@ msgstr ""
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
#: ../../include/delivery.php:457 ../../include/notifier.php:717 #: ../../include/delivery.php:457 ../../include/notifier.php:767
msgid "(no subject)" msgid "(no subject)"
msgstr "" msgstr ""
@ -8389,6 +8440,37 @@ msgstr ""
msgid "Embedding disabled" msgid "Embedding disabled"
msgstr "" msgstr ""
#: ../../include/uimport.php:61
msgid "Error decoding account file"
msgstr ""
#: ../../include/uimport.php:67
msgid "Error! No version data in file! This is not a Friendica account file?"
msgstr ""
#: ../../include/uimport.php:72
msgid "Error! I can't import this file: DB schema version is not compatible."
msgstr ""
#: ../../include/uimport.php:92
msgid "User creation error"
msgstr ""
#: ../../include/uimport.php:110
msgid "User profile creation error"
msgstr ""
#: ../../include/uimport.php:155
#, php-format
msgid "%d contact not imported"
msgid_plural "%d contacts not imported"
msgstr[0] ""
msgstr[1] ""
#: ../../include/uimport.php:233
msgid "Done. You can now login with your username and password"
msgstr ""
#: ../../include/group.php:25 #: ../../include/group.php:25
msgid "" msgid ""
"A deleted group with this name was revived. Existing item permissions " "A deleted group with this name was revived. Existing item permissions "
@ -8420,7 +8502,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:922 #: ../../include/nav.php:46 ../../boot.php:926
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -8428,7 +8510,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1677 #: ../../include/nav.php:49 ../../boot.php:1687
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -8508,11 +8590,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1197 #: ../../include/nav.php:138 ../../boot.php:1201
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1197 #: ../../include/nav.php:138 ../../boot.php:1201
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -8937,15 +9019,15 @@ msgstr ""
msgid "following" msgid "following"
msgstr "" msgstr ""
#: ../../include/items.php:3300 #: ../../include/items.php:3357
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:3300 #: ../../include/items.php:3357
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
#: ../../include/items.php:3981 #: ../../include/items.php:4038
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
@ -9183,101 +9265,101 @@ msgstr ""
msgid "This action is not available under your subscription plan." msgid "This action is not available under your subscription plan."
msgstr "" msgstr ""
#: ../../boot.php:584 #: ../../boot.php:588
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:587 #: ../../boot.php:591
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:794 #: ../../boot.php:798
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:796 #: ../../boot.php:800
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:897 #: ../../boot.php:901
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:925 #: ../../boot.php:929
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:926 #: ../../boot.php:930
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:929 #: ../../boot.php:933
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:935 #: ../../boot.php:939
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:1046 #: ../../boot.php:1050
msgid "Requested account is not available." msgid "Requested account is not available."
msgstr "" msgstr ""
#: ../../boot.php:1123 #: ../../boot.php:1127
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1189 #: ../../boot.php:1193
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1311 ../../boot.php:1397 #: ../../boot.php:1315 ../../boot.php:1401
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1312 ../../boot.php:1398 #: ../../boot.php:1316 ../../boot.php:1402
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1357 ../../boot.php:1438 #: ../../boot.php:1361 ../../boot.php:1442
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1369 #: ../../boot.php:1373
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1370 #: ../../boot.php:1374
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1431 #: ../../boot.php:1435
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1449 #: ../../boot.php:1453
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1450 #: ../../boot.php:1454
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1680 #: ../../boot.php:1690
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1687 #: ../../boot.php:1697
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1704 #: ../../boot.php:1714
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1711 #: ../../boot.php:1721
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""

2
view/login.tpl
View file

@ -13,6 +13,8 @@
</div> </div>
{{ endif }} {{ endif }}
{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
<div id="login-extra-links"> <div id="login-extra-links">
{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }} {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a> <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>

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

@ -109,14 +109,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;} #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;} #nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} #nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:102px;top:-20px;position:relative;width:8em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
#search-text,#mini-search-text{background:white;color:#2e2f2e;} #search-text,#mini-search-text{background:white;color:#2e2f2e;}
#search-text{border:1px solid #eeeeee;margin:5px 0;} #search-text{border:1px solid #eeeeee;margin:5px 0;}
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:4px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;} #user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;}
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;} .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;} .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}

4
view/theme/dispy/light/style.css
View file

@ -109,14 +109,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;} #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;} #nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} #nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:102px;top:-20px;position:relative;width:8em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
#search-text,#mini-search-text{background:white;color:#111111;} #search-text,#mini-search-text{background:white;color:#111111;}
#search-text{border:1px solid #999999;margin:5px 0;} #search-text{border:1px solid #999999;margin:5px 0;}
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:4px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;} #user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;}
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;} .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;} .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}

8
view/theme/dispy/nav.tpl
View file

@ -44,10 +44,6 @@
<li><a id="nav-apps-link" class="nav-link $nav.apps.2" <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li> href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
{{ endif }} {{ endif }}
{{ if $nav.help }}
<li><a id="nav-help-link" class="nav-link $nav.help.2"
href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
{{ endif }}
</ul> </ul>
<div id="user-menu"> <div id="user-menu">
@ -89,6 +85,10 @@
{{ if $nav.manage }} {{ if $nav.manage }}
<li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li> <li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
{{ endif }} {{ endif }}
{{ if $nav.help }}
<li><a id="nav-help-link" class="nav-link $nav.help.2"
href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
{{ endif }}
</ul> </ul>
{{ if $userinfo }} {{ if $userinfo }}

10
view/theme/duepuntozero/style.css
View file

@ -430,6 +430,9 @@ div.wall-item-content-wrapper.shiny {
height: 50px; height: 50px;
} }
#login-submit-wrapper {
clear: both;
}
#login-submit-button { #login-submit-button {
/* margin-top: 10px; */ /* margin-top: 10px; */
margin-left: 200px; margin-left: 200px;
@ -3295,3 +3298,10 @@ ul.menu-popup {
#datebrowse-sidebar select { #datebrowse-sidebar select {
margin-left: 25px; margin-left: 25px;
} }
#div_id_remember label {
width: 170px;
}
#div_id_remember input {
width: 20px;
}

4
view/theme/frost-mobile/login-style.css
View file

@ -87,6 +87,10 @@ div.section-wrapper {
margin-left: 30px; margin-left: 30px;
} }
#div_id_remember {
margin-top: 10px;
}
#login_openid { #login_openid {
margin-top: 50px; margin-top: 50px;
} }

2
view/theme/frost-mobile/login.tpl
View file

@ -25,6 +25,8 @@
<input type="submit" name="submit" id="login-submit-button" value="$login" /> <input type="submit" name="submit" id="login-submit-button" value="$login" />
</div> </div>
{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
<br /><br /> <br /><br />
<div class="login-extra-links"> <div class="login-extra-links">
{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }} {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}

4
view/theme/frost/login-style.css
View file

@ -87,6 +87,10 @@ div.section-wrapper {
margin-left: 140px; margin-left: 140px;
} }
#div_id_remember {
margin-top: 10px;
}
/*.openid input {*/ /*.openid input {*/
#id_openid_url, .openid input { #id_openid_url, .openid input {
background: url(login-bg.gif) no-repeat; background: url(login-bg.gif) no-repeat;

4
view/theme/frost/login.tpl
View file

@ -25,7 +25,9 @@
<input type="submit" name="submit" id="login-submit-button" value="$login" /> <input type="submit" name="submit" id="login-submit-button" value="$login" />
</div> </div>
<br /><br /><br /><br /> {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
<br /><br /><br />
<div class="login-extra-links"> <div class="login-extra-links">
{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }} {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a> <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>