Reformat dfrn_request and auto_request templates

diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index 3f901f6759ff64f15485bc32deee1cb04f7548a4..84039fa4fd79d51c3d107fe5b55aa1769df9c448 100644 (file)
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -1,60 +1,64 @@
 <h1>{{$header}}</h1>
 
-{{if $myaddr == ""}}
+{{if !$myaddr}}
 <p id="dfrn-request-intro">
-{{$page_desc}}<br />
+       {{$page_desc}}
+</p>
 <ul id="dfrn-request-networks">
-<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://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</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://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
 </ul>
-</p>
 <p>
-{{$invite_desc nofilter}}
+       {{$invite_desc nofilter}}
 </p>
 <p>
-{{$desc nofilter}}
+       {{$desc nofilter}}
 </p>
 {{/if}}
 
-{{if $request}}
-<form action="{{$request}}" method="post" />
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
-{{/if}}
-
+<form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
 {{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+       <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/if}}
 
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
-
-<div id="dfrn-request-url-wrapper" >
-       <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>
-
-
-<div id="dfrn-request-info-wrapper" >
+       <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 nofilter}}</dd>
+{{/if}}
+       </dl>
 
-</div>
+       <div id="dfrn-request-url-wrapper">
+               <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>
 
        <div id="dfrn-request-submit-wrapper">
-               {{if $submit}}
-                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-               {{/if}}
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+{{if $submit}}
+               <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
+{{/if}}
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
        </div>
 </form>

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 2f6aec62e4d630c3742629896e435a2c1f4778b7..c35285fd6874d5beb2595c09287c4f1aae84d5c8 100644 (file)
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -1,90 +1,98 @@
 <h1>{{$header}}</h1>
 
-{{if $myaddr}}
-{{else}}
+{{if !$myaddr}}
 <p id="dfrn-request-intro">
-{{$page_desc}}<br />
+       {{$page_desc}}
+</p>
 <ul id="dfrn-request-networks">
-<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://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</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://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
 </ul>
-{{$invite_desc nofilter}}
+<p>
+       {{$invite_desc nofilter}}
 </p>
 <p>
-{{$desc nofilter}}
+       {{$desc nofilter}}
 </p>
 {{/if}}
 
-{{if $request}}
-<form action="{{$request}}" method="post">
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post">
-{{/if}}
-
+<form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
 {{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
+       <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/if}}
 
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/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 nofilter}}</dd>
+{{/if}}
+       </dl>
 
-<div id="dfrn-request-url-wrapper" >
-       <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-       {{if $myaddr}}
+       <div id="dfrn-request-url-wrapper">
+               <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
+{{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>
+               <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>
 
-<p id="dfrn-request-options">
-{{$pls_answer}}
-</p>
+       <p id="dfrn-request-options">
+               {{$pls_answer}}
+       </p>
 
-<div id="dfrn-request-info-wrapper" >
+       <div id="dfrn-request-info-wrapper">
 
-{{include file="field_checkbox.tpl" field=$does_know_you}}
-<!--
-<p id="doiknowyou">
-{{$does_know}}
-</p>
+               {{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" />
+               <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" />
+               <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>
+               <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>
-
        <div id="dfrn-request-submit-wrapper">
-               {{if $submit}}
-                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-               {{/if}}
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+{{if $submit}}
+               <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
+{{/if}}
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
        </div>
 </form>

diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl
index 78728818039430d734a6d88de52c12cca8c66f86..e9c4c825091bb133e83eb025d91c3269fc85f46f 100644 (file)
--- a/view/theme/frio/templates/auto_request.tpl
+++ b/view/theme/frio/templates/auto_request.tpl
@@ -1,63 +1,66 @@
 <div class="generic-page-wrapper">
-<h1>{{$header}}</h1>
+       <h1>{{$header}}</h1>
 
-{{if $myaddr == ""}}
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<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://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
-</ul>
-</p>
-<p>
-{{$invite_desc nofilter}}
-</p>
-<p>
-{{$desc}}
-</p>
+{{if !$myaddr}}
+       <p id="dfrn-request-intro">
+               {{$page_desc}}
+       </p>
+       <ul id="dfrn-request-networks">
+               <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://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
+       </ul>
+       <p>
+               {{$invite_desc nofilter}}
+       </p>
+       <p>
+               {{$desc}}
+       </p>
 {{/if}}
 
-{{if $request}}
-<form action="{{$request}}" method="post" />
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
-{{/if}}
+       <form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
 
 {{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+               <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/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}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
-
-<div id="dfrn-request-url-wrapper" >
-       <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>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
+               <div id="dfrn-request-url-wrapper">
+                       <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>
 
-       <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 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>

diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl
index 8270ebac21893f718ec5c1e5eeddd0958f0a66e5..45d4aeafd656e0565433c98fecebf6858567a0aa 100644 (file)
--- a/view/theme/frio/templates/dfrn_request.tpl
+++ b/view/theme/frio/templates/dfrn_request.tpl
@@ -1,92 +1,99 @@
 <div class="generic-page-wrapper">
-<h1>{{$header}}</h1>
+       <h1>{{$header}}</h1>
 
-{{if $myaddr}}
-{{else}}
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<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://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
-</ul>
-{{$invite_desc nofilter}}
-</p>
-<p>
-{{$desc}}
-</p>
+{{if !$myaddr}}
+       <p id="dfrn-request-intro">
+               {{$page_desc}}
+       </p>
+       <ul id="dfrn-request-networks">
+               <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://gnu.io/social/" title="{{$statusnet}}">{{$statusnet}}</a></li>
+       </ul>
+       <p>
+               {{$invite_desc nofilter}}
+       </p>
+       <p>
+               {{$desc}}
+       </p>
 {{/if}}
 
-{{if $request}}
-<form action="{{$request}}" method="post">
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post">
-{{/if}}
+       <form action="{{$request|default:"dfrn_request/$nickname"}}" method="post">
 
 {{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
+               <img src="{{$photo}}" alt="" id="dfrn-request-photo">
+{{/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}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+               <div id="dfrn-request-url-wrapper">
+                       <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>
 
-<div id="dfrn-request-url-wrapper" >
-       <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-       {{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>
 
-<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-info-wrapper" >
+                       <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" >
 
-{{include file="field_checkbox.tpl" field=$does_know_you}}
-<!--
-<p id="doiknowyou">
-{{$does_know}}
-</p>
+                       <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-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-end"></div>
+                       </div>
+                       *}}
 
-               <div id="dfrn-request-knowyou-break" ></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-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 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>
--->
-
-<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-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
-       </div>
-</form>
+       </form>
 </div>