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

Merge pull request #8221 from nupplaphil/bug/7998-crepair_link

Browse source 
Replace old crepair content
This commit is contained in:
Hypolite Petovan 2020-02-02 14:01:51 -05:00 committed by GitHub
commit b1bfafe1f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Contact.php
View file

@ -374,7 +374,7 @@ class Contact extends BaseModule
if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) { if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
self::updateContactFromProbe($contact_id); self::updateContactFromProbe($contact_id);
DI::baseUrl()->redirect('crepair/' . $contact_id); DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/');
// NOTREACHED // NOTREACHED
} }
@ -571,7 +571,6 @@ class Contact extends BaseModule
'$visit' => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']), '$visit' => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
'$blockunblock' => DI::l10n()->t('Block/Unblock contact'), '$blockunblock' => DI::l10n()->t('Block/Unblock contact'),
'$ignorecont' => DI::l10n()->t('Ignore contact'), '$ignorecont' => DI::l10n()->t('Ignore contact'),
'$lblcrepair' => DI::l10n()->t('Repair URL settings'),
'$lblrecent' => DI::l10n()->t('View conversations'), '$lblrecent' => DI::l10n()->t('View conversations'),
'$lblsuggest' => $lblsuggest, '$lblsuggest' => $lblsuggest,
'$nettype' => $nettype, '$nettype' => $nettype,
@ -910,7 +909,7 @@ class Contact extends BaseModule
if (!empty($contact['uid'])) { if (!empty($contact['uid'])) {
$tabs[] = ['label' => DI::l10n()->t('Advanced'), $tabs[] = ['label' => DI::l10n()->t('Advanced'),
'url' => 'crepair/' . $contact['id'], 'url' => 'contact/' . $contact['id'] . '/advanced/',
'sel' => (($active_tab == 6) ? 'active' : ''), 'sel' => (($active_tab == 6) ? 'active' : ''),
'title' => DI::l10n()->t('Advanced Contact Settings'), 'title' => DI::l10n()->t('Advanced Contact Settings'),
'id' => 'advanced-tab', 'id' => 'advanced-tab',

6
view/global.css
View file

@ -486,13 +486,13 @@ aside .help-aside-wrapper h1 {
opacity: 1.0; opacity: 1.0;
} }
.crepair-label { .contact-advanced-label {
margin-top: 10px; margin-top: 10px;
float: left; float: left;
width: 250px; width: 250px;
} }
.crepair-input { .contact-advanced-input {
margin-top: 10px; margin-top: 10px;
float: left; float: left;
width: 200px; width: 200px;
@ -549,7 +549,7 @@ td.pendingnote > p > span {
} }
/* warning message */ /* warning message */
.crepair-error-message, .contact-advanced-error-message,
.warning-message { .warning-message {
padding: 10px; padding: 10px;
margin: 5px; margin: 5px;

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

@ -2650,29 +2650,29 @@ aside input[type='text'] {
margin-top: 15px; margin-top: 15px;
} }
#crepair-name-label, #contact-advanced-name-label,
#crepair-nick-label, #contact-advanced-nick-label,
#crepair-attag-label, #contact-advanced-attag-label,
#crepair-url-label, #contact-advanced-url-label,
#crepair-request-label, #contact-advanced-request-label,
#crepair-confirm-label, #contact-advanced-confirm-label,
#crepair-notification-label, #contact-advanced-notification-label,
#crepair-photo-label, #contact-advanced-photo-label,
#crepair-poll-label { #contact-advanced-poll-label {
float: left; float: left;
width: 200px; width: 200px;
margin-bottom: 15px; margin-bottom: 15px;
} }
#crepair-name, #contact-advanced-name,
#crepair-nick, #contact-advanced-nick,
#crepair-attag, #contact-advanced-attag,
#crepair-url, #contact-advanced-url,
#crepair-request, #contact-advanced-request,
#crepair-confirm, #contact-advanced-confirm,
#crepair-notify, #contact-advanced-notify,
#crepair-photo, #contact-advanced-photo,
#crepair-poll { #contact-advanced-poll {
float: left; float: left;
width: 300px; width: 300px;
} }

8
view/theme/frio/templates/crepair.tpl → view/theme/frio/templates/contact/advanced.tpl
View file

@ -1,17 +1,17 @@
<div id="crepair" class="generic-page-wrapper"> <div id="contact-advanced" class="generic-page-wrapper">
{{include file="section_title.tpl"}} {{include file="section_title.tpl"}}
{{$tab_str nofilter}} {{$tab_str nofilter}}
<div class="crepair-error-message">{{$warning nofilter}}</div><br> <div class="contact-advanced-error-message">{{$warning nofilter}}</div><br>
<div class="crepair-return"> <div class="contact-advanced-return">
{{$info nofilter}}<br> {{$info nofilter}}<br>
<!-- <a href="{{$returnaddr}}">{{$return}}</a> --> <!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
</div> </div>
<br /> <br />
<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" > <form id="contact-advanced-form" action="contact/{{$contact_id}}/advanced" method="post" >
<!-- <h4>{{$contact_name}}</h4> --> <!-- <h4>{{$contact_name}}</h4> -->

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

@ -3170,13 +3170,13 @@ margin-left: 0px;
color: #efefef; color: #efefef;
} }
.crepair-label { .contact-advanced-label {
margin-top: 10px; margin-top: 10px;
float: left; float: left;
width: 250px; width: 250px;
} }
.crepair-input { .contact-advanced-input {
margin-top: 10px; margin-top: 10px;
float: left; float: left;
width: 200px; width: 200px;