From c6b8ab534f4516605ed276b9f8677f9cf578ea45 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 6 Dec 2012 00:03:24 -0800 Subject: fixed several little nit bugs that cropped up during deployment --- view/en/register_open_eml.tpl | 30 +++++++----------------------- view/theme/redbasic/css/style.css | 6 ++++-- view/tpl/nav.tpl | 31 ++++++++++++++++--------------- 3 files changed, 27 insertions(+), 40 deletions(-) (limited to 'view') diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl index c55ac1e7e..68c4a722b 100644 --- a/view/en/register_open_eml.tpl +++ b/view/en/register_open_eml.tpl @@ -1,32 +1,16 @@ -Dear $[username], - Thank you for registering at $[sitename]. Your account has been created. +An account has been created at $[sitename] for this email address. The login details are as follows: - Site Location: $[siteurl] -Login Name: $[email] -Password: $[password] - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. +Login: $[email] +Password: $[password] +If this account was created without your knowledge and is not desired, please +login and remove the account from the links on the Settings page, and we +apologise for any inconvenience. -Thank you and welcome to $[sitename]. +Thank you and welcome. Sincerely, $[sitename] Administrator diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7dbea7acf..afe2f8979 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -409,13 +409,13 @@ div.wall-item-content-wrapper.shiny { margin-bottom: 25px; } -#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid { +#label-register-name, #label-register-nickname, #label-register-openid { float: left; width: 350px; margin-top: 10px; } -#register-name, #register-email, #register-nickname { +#register-name, #register-nickname { float: left; margin-top: 10px; width: 150px; @@ -659,6 +659,7 @@ input#dfrn-url { .profile-edit-side-link { opacity: 0.3; filter:alpha(opacity=30); + float: right; } .profile-edit-side-link:hover { opacity: 1.0; @@ -3552,6 +3553,7 @@ nav #nav-help-link, nav #nav-search-link, nav #nav-directory-link, nav #nav-apps-link, +nav #nav-user-linkmenu, nav #nav-site-linkmenu { float: right; } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5e909e172..234b20854 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -10,21 +10,6 @@ {{ endif }} - {{ if $userinfo }} - - {{ endif }} {{ if $nav.network }} + {{ if $userinfo }} + + {{ endif }} + {{ if $nav.help }}