-
-{{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|escape:'html'}}" />
- {{else}}
- <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
- {{/if}}
- {{if $url}}
- <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
- {{/if}}
- <div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
+ <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}}
+ <input type="hidden" name="url" id="url" value="{{$url}}">
+ <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-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
+ </div>
+ </form>