clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template 

frio - provide a template for invite page
This commit is contained in:
Hypolite Petovan 2018-04-24 11:37:10 -04:00 committed by GitHub
parent 8d8aef5624 ac753e3320
commit c8cc8e57c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/invite.php
View File

@ -144,14 +144,13 @@ function invite_content(App $a) {
$o = replace_macros($tpl, [ $o = replace_macros($tpl, [
'$form_security_token' => get_form_security_token("send_invite"), '$form_security_token' => get_form_security_token("send_invite"),
'$invite' => L10n::t('Send invitations'), '$title' => L10n::t('Send invitations'),
'$addr_text' => L10n::t('Enter email addresses, one per line:'), '$recipients' => ['recipients', L10n::t('Enter email addresses, one per line:')],
'$msg_text' => L10n::t('Your message:'), '$message' => ['message', L10n::t('Your message:'),L10n::t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
'$default_message' => L10n::t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
. $linktxt . $linktxt
. "\r\n" . "\r\n" . (($invonly) ? L10n::t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .L10n::t('Once you have registered, please connect with me via my profile page at:') . "\r\n" . "\r\n" . (($invonly) ? L10n::t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .L10n::t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . System::baseUrl() . '/profile/' . $a->user['nickname'] . "\r\n" . "\r\n" . System::baseUrl() . '/profile/' . $a->user['nickname']
. "\r\n" . "\r\n" . L10n::t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n" , . "\r\n" . "\r\n" . L10n::t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n"],
'$submit' => L10n::t('Submit') '$submit' => L10n::t('Submit')
]); ]);

31
view/templates/invite.tpl
View File

@ -1,31 +1,18 @@
<form action="invite" method="post" id="invite-form" > <form action="invite" method="post" id="invite-form" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="invite-wrapper"> <div id="invite-wrapper">
<h3>{{$invite}}</h3> <h3>{{$title}}</h3>
<div id="invite-recipient-text"> {{include file="field_textarea.tpl" field=$recipients}}
{{$addr_text}} {{include file="field_textarea.tpl" field=$message}}
</div>
<div id="invite-recipient-textarea"> <div id="invite-submit-wrapper">
<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea> <input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
</div> </div>
<div id="invite-message-text"> </div>
{{$msg_text}}
</div>
<div id="invite-message-textarea">
<textarea id="invite-message" name="message" rows="10" cols="72" >{{$default_message}}</textarea>
</div>
<div id="invite-submit-wrapper">
<input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
</div>
</div>
</form> </form>

2
view/theme/frio/css/style.css
View File

@ -2118,7 +2118,7 @@ ul.dropdown-menu li:hover {
#adminpage, .delegate-content-wrapper, .uexport-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
.viewcontacts-content-wrapper, .dfrn_request-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
.friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
.profperm-content-wrapper { .profperm-content-wrapper, .invite-content-wrapper {
min-height: calc(100vh - 150px); min-height: calc(100vh - 150px);
padding: 15px; padding: 15px;
padding-bottom: 20px; padding-bottom: 20px;

4
view/theme/frio/js/modal.js
View File

@ -207,6 +207,10 @@ function addToModal(url) {
//Get first element with the class "heading" //Get first element with the class "heading"
//and use it as title. //and use it as title.
loadModalTitle(); loadModalTitle();
// We need to initialize autosize again for new
// modal conent.
autosize($('.modal .text-autosize'));
} }
}); });
} }

19
view/theme/frio/templates/invite.tpl Normal file
View File

@ -0,0 +1,19 @@
<div id="invite-wrapper">
<h3 class="heading">{{$title}}</h3>
<form action="invite" method="post" id="invite-form" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div id="invite-content-wrapper">
{{include file="field_textarea.tpl" field=$recipients}}
{{include file="field_textarea.tpl" field=$message}}
<div id="invite-submit-wrapper" class="form-group pull-right">
<button type="submit" name="submit" class="btn btn-primary">{{$submit|escape:'html'}}</button>
</div>
<div class="clear"></div>
</div>
</form>
</div>

2
view/theme/frio/templates/peoplefind.tpl
View File

@ -18,6 +18,6 @@
<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
{{if $nv.inv}} {{if $nv.inv}}
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$nv.inv}}</a></div> <div class="side-link" id="side-invite-link" ><button type="button" class="btn-link" onclick="addToModal('invite'); return false;">{{$nv.inv}}</button></div>
{{/if}} {{/if}}
</div> </div>

5
view/theme/vier/style.css
View File

@ -3341,7 +3341,10 @@ img.photo-album-photo {
.videos .video-top-wrapper:hover .video-delete { .videos .video-top-wrapper:hover .video-delete {
opacity: 1; opacity: 1;
} }
/* invite page */
#invite-wrapper textarea {
width: 100%;
}
/* upload/select popup */ /* upload/select popup */
fbrowser.image .photo-album-image-wrapper { margin-left: 10px; } fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
#message-preview { margin-top: 15px; } #message-preview { margin-top: 15px; }