]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18745b1)
[frio] Remove duplicate page wrapper in auto_request
authorHypolite Petovan <hypolite@mrpetovan.com>
Sat, 13 Jun 2020 02:05:12 +0000 (22:05 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sat, 13 Jun 2020 02:05:12 +0000 (22:05 -0400)
- [frio] Add page wrapper to minimal template (for sitewide theme settings)

view/theme/frio/php/minimal.php patch | blob | history
view/theme/frio/templates/auto_request.tpl patch | blob | history

diff --git a/view/theme/frio/php/minimal.php b/view/theme/frio/php/minimal.php
index ad4581ff03372612230c19a4130a1f933c7158a5..43c530586374423070d91df6655c8a82e12197db 100644 (file)
--- a/view/theme/frio/php/minimal.php
+++ b/view/theme/frio/php/minimal.php
@@ -6,7 +6,10 @@
        <?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
 </head>
 <body class="minimal">
-       <section><?php if(!empty($page['content'])) echo $page['content']; ?>
+       <section>
+               <div  class="generic-page-wrapper">
+                       <?php if(!empty($page['content'])) echo $page['content']; ?>
+               </div>
                <div id="page-footer"></div>
        </section>
        <!-- Modal  -->
diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl
index a6f148723fc9bfbd02eef7ea6511e0c70f62d613..eec9c7f3ec8d5d02318c0eb80818795daab71794 100644 (file)
--- a/view/theme/frio/templates/auto_request.tpl
+++ b/view/theme/frio/templates/auto_request.tpl
@@ -1,45 +1,43 @@
-<div class="generic-page-wrapper">
-       <h1>{{$header}}</h1>
+<h1>{{$header}}</h1>
 
 {{if !$myaddr}}
-       <p id="dfrn-request-intro">
-               {{$page_desc nofilter}}
-       </p>
-       <p>
-               {{$invite_desc nofilter}}
-       </p>
+<p id="dfrn-request-intro">
+       {{$page_desc nofilter}}
+</p>
+<p>
+       {{$invite_desc nofilter}}
+</p>
 {{/if}}
 
-       <form action="{{$request}}" method="post">
+<form action="{{$request}}" method="post">
 {{if $url}}
-               <dl>
-                       <dt>{{$url_label}}</dt>
-                       <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
-               </dl>
+       <dl>
+               <dt>{{$url_label}}</dt>
+               <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
+       </dl>
 {{/if}}
 {{if $keywords}}
-               <dl>
-                       <dt>{{$keywords_label}}</dt>
-                       <dd>{{$keywords}}</dd>
-               </dl>
+       <dl>
+               <dt>{{$keywords_label}}</dt>
+               <dd>{{$keywords}}</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}}
-                       <input type="hidden" name="url" id="url" value="{{$url}}">
-                       <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" 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">
+       <div id="dfrn-request-submit-wrapper">
 {{if $submit}}
-                       <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$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>
+               <input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
+       </div>
+</form>
Unnamed repository; edit this file 'description' to name the repository.