move templates to frio theme

view/templates/auto_request.tpl

@@ -1,4 +1,3 @@
-<div class="generic-page-wrapper">
 <h1>{{$header}}</h1>
 
 {{if $myaddr == ""}}
@@ -54,9 +53,8 @@
 
 	<div id="dfrn-request-submit-wrapper">
 		{{if $submit}}
-			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+			<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
 		{{/if}}
-		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
 	</div>
 </form>
-</div>

view/templates/dfrn_request.tpl

@@ -1,4 +1,3 @@
-<div class="generic-page-wrapper">
 <h1>{{$header}}</h1>
 
 {{if $myaddr}}
@@ -62,7 +61,7 @@
 		<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 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>
@@ -84,9 +83,8 @@
 
 	<div id="dfrn-request-submit-wrapper">
 		{{if $submit}}
-			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+			<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
 		{{/if}}
-		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
 	</div>
 </form>
-</div>

view/theme/frio/templates/auto_request.tpl

@@ -0,0 +1,62 @@
+<div class="generic-page-wrapper">
+<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}}
+</p>
+<p>
+{{$desc}}
+</p>
+{{/if}}
+
+{{if $request}}
+<form action="{{$request}}" method="post" />
+{{else}}
+<form action="dfrn_request/{{$nickname}}" method="post" />
+{{/if}}
+
+{{if $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}}</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>
+
+	<div id="dfrn-request-submit-wrapper">
+		{{if $submit}}
+			<input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+		{{/if}}
+		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+	</div>
+</form>
+</div>

view/theme/frio/templates/dfrn_request.tpl

@@ -0,0 +1,92 @@
+<div class="generic-page-wrapper">
+<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}}
+</p>
+<p>
+{{$desc}}
+</p>
+{{/if}}
+
+{{if $request}}
+<form action="{{$request}}" method="post">
+{{else}}
+<form action="dfrn_request/{{$nickname}}" method="post">
+{{/if}}
+
+{{if $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}}</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" size="32" 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>
+
+<p id="dfrn-request-options">
+{{$pls_answer}}
+</p>
+
+<div id="dfrn-request-info-wrapper" >
+
+{{include file="field_yesno.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|escape:'html'}}" />
+		{{/if}}
+		<input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+	</div>
+</form>
+</div>