From 8632c903276c44d575076ac3167e3bc7ea64bd31 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 2 Feb 2020 20:50:53 +0100 Subject: [PATCH 1/2] Fix crepair links --- src/Module/Contact.php | 4 ++-- .../frio/templates/{crepair.tpl => contact/advanced.tpl} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename view/theme/frio/templates/{crepair.tpl => contact/advanced.tpl} (94%) diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 7ce47b9cd..020e3906a 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -374,7 +374,7 @@ class Contact extends BaseModule if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) { self::updateContactFromProbe($contact_id); - DI::baseUrl()->redirect('crepair/' . $contact_id); + DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/'); // NOTREACHED } @@ -910,7 +910,7 @@ class Contact extends BaseModule if (!empty($contact['uid'])) { $tabs[] = ['label' => DI::l10n()->t('Advanced'), - 'url' => 'crepair/' . $contact['id'], + 'url' => 'contact/' . $contact['id'] . '/advanced/', 'sel' => (($active_tab == 6) ? 'active' : ''), 'title' => DI::l10n()->t('Advanced Contact Settings'), 'id' => 'advanced-tab', diff --git a/view/theme/frio/templates/crepair.tpl b/view/theme/frio/templates/contact/advanced.tpl similarity index 94% rename from view/theme/frio/templates/crepair.tpl rename to view/theme/frio/templates/contact/advanced.tpl index df4976200..5c814e51e 100644 --- a/view/theme/frio/templates/crepair.tpl +++ b/view/theme/frio/templates/contact/advanced.tpl @@ -11,7 +11,7 @@
-
+ From 41ec7d8370de814e282ef70f8c0976db0ef7ad09 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 2 Feb 2020 20:56:31 +0100 Subject: [PATCH 2/2] Replace stylesheet names --- src/Module/Contact.php | 1 - view/global.css | 6 ++-- view/theme/duepuntozero/style.css | 36 +++++++++---------- .../theme/frio/templates/contact/advanced.tpl | 8 ++--- view/theme/smoothly/style.css | 4 +-- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 020e3906a..04e6cf00f 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -571,7 +571,6 @@ class Contact extends BaseModule '$visit' => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']), '$blockunblock' => DI::l10n()->t('Block/Unblock contact'), '$ignorecont' => DI::l10n()->t('Ignore contact'), - '$lblcrepair' => DI::l10n()->t('Repair URL settings'), '$lblrecent' => DI::l10n()->t('View conversations'), '$lblsuggest' => $lblsuggest, '$nettype' => $nettype, diff --git a/view/global.css b/view/global.css index a50d10de4..9805a6154 100644 --- a/view/global.css +++ b/view/global.css @@ -486,13 +486,13 @@ aside .help-aside-wrapper h1 { opacity: 1.0; } -.crepair-label { +.contact-advanced-label { margin-top: 10px; float: left; width: 250px; } -.crepair-input { +.contact-advanced-input { margin-top: 10px; float: left; width: 200px; @@ -549,7 +549,7 @@ td.pendingnote > p > span { } /* warning message */ -.crepair-error-message, +.contact-advanced-error-message, .warning-message { padding: 10px; margin: 5px; diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b30a7d4ed..f7b2d7ea1 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2650,29 +2650,29 @@ aside input[type='text'] { margin-top: 15px; } -#crepair-name-label, -#crepair-nick-label, -#crepair-attag-label, -#crepair-url-label, -#crepair-request-label, -#crepair-confirm-label, -#crepair-notification-label, -#crepair-photo-label, -#crepair-poll-label { +#contact-advanced-name-label, +#contact-advanced-nick-label, +#contact-advanced-attag-label, +#contact-advanced-url-label, +#contact-advanced-request-label, +#contact-advanced-confirm-label, +#contact-advanced-notification-label, +#contact-advanced-photo-label, +#contact-advanced-poll-label { float: left; width: 200px; margin-bottom: 15px; } -#crepair-name, -#crepair-nick, -#crepair-attag, -#crepair-url, -#crepair-request, -#crepair-confirm, -#crepair-notify, -#crepair-photo, -#crepair-poll { +#contact-advanced-name, +#contact-advanced-nick, +#contact-advanced-attag, +#contact-advanced-url, +#contact-advanced-request, +#contact-advanced-confirm, +#contact-advanced-notify, +#contact-advanced-photo, +#contact-advanced-poll { float: left; width: 300px; } diff --git a/view/theme/frio/templates/contact/advanced.tpl b/view/theme/frio/templates/contact/advanced.tpl index 5c814e51e..30a2c4bea 100644 --- a/view/theme/frio/templates/contact/advanced.tpl +++ b/view/theme/frio/templates/contact/advanced.tpl @@ -1,17 +1,17 @@ -
+
{{include file="section_title.tpl"}} {{$tab_str nofilter}} -
{{$warning nofilter}}

-
+
{{$warning nofilter}}

+
{{$info nofilter}}

- + diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 081f1710a..cc541fb87 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3170,13 +3170,13 @@ margin-left: 0px; color: #efefef; } -.crepair-label { +.contact-advanced-label { margin-top: 10px; float: left; width: 250px; } -.crepair-input { +.contact-advanced-input { margin-top: 10px; float: left; width: 200px;