bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Reformat dfrn_request and auto_request templates

Browse source
This commit is contained in:
Hypolite Petovan 2020-02-05 22:40:09 -05:00
parent 7f402da40f
commit 45f6707ff4
4 changed files with 254 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
view/templates/auto_request.tpl
View file

@ -1,60 +1,64 @@
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{if $myaddr == ""}} {{if !$myaddr}}
<p id="dfrn-request-intro"> <p id="dfrn-request-intro">
{{$page_desc}}<br /> {{$page_desc}}
</p>
<ul id="dfrn-request-networks"> <ul id="dfrn-request-networks">
<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li> <li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li> <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li> <li><a href="https://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
</ul> </ul>
<p>
{{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$invite_desc nofilter}} {{$desc nofilter}}
</p>
<p>
{{$desc nofilter}}
</p> </p>
{{/if}} {{/if}}
{{if $request}} <form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
<form action="{{$request}}" method="post" />
{{else}}
<form action="dfrn_request/{{$nickname}}" method="post" />
{{/if}}
{{if $photo}} {{if $photo}}
<img src="{{$photo}}" alt="" id="dfrn-request-photo"> <img src="{{$photo}}" alt="" id="dfrn-request-photo">
{{/if}} {{/if}}
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}} <dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} {{if $url}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} <dt>{{$url_label}}</dt>
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}} <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
{{/if}}
{{if $location}}
<dt>{{$location_label}}</dt>
<dd>{{$location}}</dd>
{{/if}}
{{if $keywords}}
<dt>{{$keywords_label}}</dt>
<dd>{{$keywords}}</dd>
{{/if}}
{{if $about}}
<dt>{{$about_label}}</dt>
<dd>{{$about nofilter}}</dd>
{{/if}}
</dl>
<div id="dfrn-request-url-wrapper" > <div id="dfrn-request-url-wrapper">
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label> <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
{{if $myaddr}} {{if $myaddr}}
{{$myaddr}} {{$myaddr}}
<input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" /> <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
{{else}} {{else}}
<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" /> <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
{{/if}} {{/if}}
{{if $url}} {{if $url}}
<input type="hidden" name="url" id="url" value="{{$url}}" /> <input type="hidden" name="url" id="url" value="{{$url}}">
{{/if}} {{/if}}
<div id="dfrn-request-url-end"></div> <div id="dfrn-request-url-end"></div>
</div> </div>
<div id="dfrn-request-info-wrapper" >
</div>
<div id="dfrn-request-submit-wrapper"> <div id="dfrn-request-submit-wrapper">
{{if $submit}} {{if $submit}}
<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" /> <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
{{/if}} {{/if}}
<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" /> <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div> </div>
</form> </form>

118
view/templates/dfrn_request.tpl
View file

@ -1,90 +1,98 @@
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{if $myaddr}} {{if !$myaddr}}
{{else}}
<p id="dfrn-request-intro"> <p id="dfrn-request-intro">
{{$page_desc}}<br /> {{$page_desc}}
</p>
<ul id="dfrn-request-networks"> <ul id="dfrn-request-networks">
<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li> <li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li> <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li> <li><a href="https://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
</ul> </ul>
{{$invite_desc nofilter}} <p>
{{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$desc nofilter}} {{$desc nofilter}}
</p> </p>
{{/if}} {{/if}}
{{if $request}} <form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
<form action="{{$request}}" method="post">
{{else}}
<form action="dfrn_request/{{$nickname}}" method="post">
{{/if}}
{{if $photo}} {{if $photo}}
<img src="{{$photo}}" alt="" id="dfrn-request-photo" /> <img src="{{$photo}}" alt="" id="dfrn-request-photo">
{{/if}} {{/if}}
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}} <dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} {{if $url}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} <dt>{{$url_label}}</dt>
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}} <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
{{/if}}
{{if $location}}
<dt>{{$location_label}}</dt>
<dd>{{$location}}</dd>
{{/if}}
{{if $keywords}}
<dt>{{$keywords_label}}</dt>
<dd>{{$keywords}}</dd>
{{/if}}
{{if $about}}
<dt>{{$about_label}}</dt>
<dd>{{$about nofilter}}</dd>
{{/if}}
</dl>
<div id="dfrn-request-url-wrapper" > <div id="dfrn-request-url-wrapper">
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label> <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
{{if $myaddr}} {{if $myaddr}}
{{$myaddr}} {{$myaddr}}
<input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" /> <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
{{else}} {{else}}
<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" /> <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
{{/if}} {{/if}}
{{if $url}} {{if $url}}
<input type="hidden" name="url" id="url" value="{{$url}}" /> <input type="hidden" name="url" id="url" value="{{$url}}">
{{/if}} {{/if}}
<div id="dfrn-request-url-end"></div> <div id="dfrn-request-url-end"></div>
</div> </div>
<p id="dfrn-request-options"> <p id="dfrn-request-options">
{{$pls_answer}} {{$pls_answer}}
</p> </p>
<div id="dfrn-request-info-wrapper" > <div id="dfrn-request-info-wrapper">
{{include file="field_checkbox.tpl" field=$does_know_you}} {{include file="field_checkbox.tpl" field=$does_know_you}}
<!-- {{*
<p id="doiknowyou"> <p id="doiknowyou">
{{$does_know}} {{$does_know}}
</p> </p>
<div id="dfrn-request-know-yes-wrapper"> <div id="dfrn-request-know-yes-wrapper">
<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label> <label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
<input type="radio" name="knowyou" id="knowyouyes" value="1" /> <input type="radio" name="knowyou" id="knowyouyes" value="1" >
<div id="dfrn-request-knowyou-break" ></div> <div id="dfrn-request-knowyou-break" ></div>
</div> </div>
<div id="dfrn-request-know-no-wrapper"> <div id="dfrn-request-know-no-wrapper">
<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label> <label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" /> <input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" >
<div id="dfrn-request-knowyou-end"></div> <div id="dfrn-request-knowyou-end"></div>
</div> </div>
--> *}}
<p id="dfrn-request-message-desc"> <p id="dfrn-request-message-desc">
{{$add_note}} {{$add_note}}
</p> </p>
<div id="dfrn-request-message-wrapper"> <div id="dfrn-request-message-wrapper">
<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea> <textarea name="dfrn-request-message" rows="4" cols="64"></textarea>
</div>
</div> </div>
</div>
<div id="dfrn-request-submit-wrapper"> <div id="dfrn-request-submit-wrapper">
{{if $submit}} {{if $submit}}
<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" /> <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
{{/if}} {{/if}}
<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" /> <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div> </div>
</form> </form>

109
view/theme/frio/templates/auto_request.tpl
View file

@ -1,63 +1,66 @@
<div class="generic-page-wrapper"> <div class="generic-page-wrapper">
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{if $myaddr == ""}} {{if !$myaddr}}
<p id="dfrn-request-intro"> <p id="dfrn-request-intro">
{{$page_desc}}<br /> {{$page_desc}}
<ul id="dfrn-request-networks"> </p>
<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li> <ul id="dfrn-request-networks">
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li> <li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li> <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
</ul> <li><a href="https://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
</p> </ul>
<p> <p>
{{$invite_desc nofilter}} {{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$desc}} {{$desc}}
</p> </p>
{{/if}} {{/if}}
{{if $request}} <form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
<form action="{{$request}}" method="post" />
{{else}}
<form action="dfrn_request/{{$nickname}}" method="post" />
{{/if}}
{{if $photo}} {{if $photo}}
<img src="{{$photo}}" alt="" id="dfrn-request-photo"> <img src="{{$photo}}" alt="" id="dfrn-request-photo">
{{/if}} {{/if}}
<dl>
{{if $url}}
<dt>{{$url_label}}</dt>
<dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
{{/if}}
{{if $location}}
<dt>{{$location_label}}</dt>
<dd>{{$location}}</dd>
{{/if}}
{{if $keywords}}
<dt>{{$keywords_label}}</dt>
<dd>{{$keywords}}</dd>
{{/if}}
{{if $about}}
<dt>{{$about_label}}</dt>
<dd>{{$about}}</dd>
{{/if}}
</dl>
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}} <div id="dfrn-request-url-wrapper">
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
{{if $myaddr}}
{{$myaddr}}
<input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
{{else}}
<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
{{/if}}
{{if $url}}
<input type="hidden" name="url" id="url" value="{{$url}}">
{{/if}}
<div id="dfrn-request-url-end"></div>
</div>
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} <div id="dfrn-request-submit-wrapper">
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}} {{if $submit}}
<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
<div id="dfrn-request-url-wrapper" > {{/if}}
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label> <input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
{{if $myaddr}} </div>
{{$myaddr}} </form>
<input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" />
{{else}}
<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
{{/if}}
{{if $url}}
<input type="hidden" name="url" id="url" value="{{$url}}" />
{{/if}}
<div id="dfrn-request-url-end"></div>
</div>
<div id="dfrn-request-info-wrapper" >
</div>
<div id="dfrn-request-submit-wrapper">
{{if $submit}}
<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
{{/if}}
<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
</div>
</form>
</div> </div>

171
view/theme/frio/templates/dfrn_request.tpl
View file

@ -1,92 +1,99 @@
<div class="generic-page-wrapper"> <div class="generic-page-wrapper">
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{if $myaddr}} {{if !$myaddr}}
{{else}} <p id="dfrn-request-intro">
<p id="dfrn-request-intro"> {{$page_desc}}
{{$page_desc}}<br /> </p>
<ul id="dfrn-request-networks"> <ul id="dfrn-request-networks">
<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li> <li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li> <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li> <li><a href="https://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
</ul> </ul>
{{$invite_desc nofilter}} <p>
</p> {{$invite_desc nofilter}}
<p> </p>
{{$desc}} <p>
</p> {{$desc}}
</p>
{{/if}} {{/if}}
{{if $request}} <form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
<form action="{{$request}}" method="post">
{{else}}
<form action="dfrn_request/{{$nickname}}" method="post">
{{/if}}
{{if $photo}} {{if $photo}}
<img src="{{$photo}}" alt="" id="dfrn-request-photo" /> <img src="{{$photo}}" alt="" id="dfrn-request-photo">
{{/if}} {{/if}}
<dl>
{{if $url}}
<dt>{{$url_label}}</dt>
<dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
{{/if}}
{{if $location}}
<dt>{{$location_label}}</dt>
<dd>{{$location}}</dd>
{{/if}}
{{if $keywords}}
<dt>{{$keywords_label}}</dt>
<dd>{{$keywords}}</dd>
{{/if}}
{{if $about}}
<dt>{{$about_label}}</dt>
<dd>{{$about}}</dd>
{{/if}}
</dl>
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}} <div id="dfrn-request-url-wrapper">
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} {{if $myaddr}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}} {{$myaddr}}
<input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
<div id="dfrn-request-url-wrapper" > {{else}}
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label> <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
{{if $myaddr}}
{{$myaddr}}
<input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
{{else}}
<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
{{/if}}
{{if $url}}
<input type="hidden" name="url" id="url" value="{{$url}}" />
{{/if}}
<div id="dfrn-request-url-end"></div>
</div>
<p id="dfrn-request-options">
{{$pls_answer}}
</p>
<div id="dfrn-request-info-wrapper" >
{{include file="field_checkbox.tpl" field=$does_know_you}}
<!--
<p id="doiknowyou">
{{$does_know}}
</p>
<div id="dfrn-request-know-yes-wrapper">
<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
<input type="radio" name="knowyou" id="knowyouyes" value="1" />
<div id="dfrn-request-knowyou-break" ></div>
</div>
<div id="dfrn-request-know-no-wrapper">
<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
<div id="dfrn-request-knowyou-end"></div>
</div>
-->
<p id="dfrn-request-message-desc">
{{$add_note}}
</p>
<div id="dfrn-request-message-wrapper">
<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
</div>
</div>
<div id="dfrn-request-submit-wrapper">
{{if $submit}}
<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
{{/if}} {{/if}}
<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" /> {{if $url}}
</div> <input type="hidden" name="url" id="url" value="{{$url}}">
</form> {{/if}}
<div id="dfrn-request-url-end"></div>
</div>
<p id="dfrn-request-options">
{{$pls_answer}}
</p>
<div id="dfrn-request-info-wrapper">
{{include file="field_checkbox.tpl" field=$does_know_you}}
{{*
<p id="doiknowyou">
{{$does_know}}
</p>
<div id="dfrn-request-know-yes-wrapper">
<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
<input type="radio" name="knowyou" id="knowyouyes" value="1" >
<div id="dfrn-request-knowyou-break" ></div>
</div>
<div id="dfrn-request-know-no-wrapper">
<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" >
<div id="dfrn-request-knowyou-end"></div>
</div>
*}}
<p id="dfrn-request-message-desc">
{{$add_note}}
</p>
<div id="dfrn-request-message-wrapper">
<textarea name="dfrn-request-message" rows="4" cols="64"></textarea>
</div>
</div>
<div id="dfrn-request-submit-wrapper">
{{if $submit}}
<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
{{/if}}
<input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div>
</form>
</div> </div>