added feedback

diff --git a/src/Model/User.php b/src/Model/User.php
index 8945faeaefdb4dbe26878967e072613c39eb767c..64253946fd71207f0c54b50b58c4ad76ed5ecaf5 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -130,7 +130,7 @@ class User
        }
 
        /**
-        * Get a user based on it's email
+        * Get a user based on its email
         *
         * @param string        $email
         * @param array          $fields

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 3901a0bc77d4f587b42afcfbe040d86a873d69b1..ae8ea1496831699ec1df175bbcc3b5da4ae818cf 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -76,7 +76,7 @@ class Friendica extends BaseModule
                                '<strong>' . FRIENDICA_VERSION . '</strong>',
                                $app->getBaseURL(),
                                '<strong>' . DB_UPDATE_VERSION . '</strong>',
-                               '<strong>' . $config->get("system", "post_update_version") . '</strong>'),
+                               '<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
                        'friendica' => L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
                        'bugs'      => L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . L10n::t('the bugtracker at github') . '</a>',
                        'info'      => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),

diff --git a/view/templates/feedtest.tpl b/view/templates/feedtest.tpl
index 2147198f1d7b8a9d0e9211f78d39797803c152d3..f1edf44a949357e5d8064b19deadbd25ef8463f0 100644 (file)
--- a/view/templates/feedtest.tpl
+++ b/view/templates/feedtest.tpl
@@ -1,30 +1,32 @@
-<h2>Feed Test</h2>
-<form action="feedtest" method="get" class="panel panel-default">
-       <div class="panel-body">
-               <div class="form-group">
-                       {{include file="field_input.tpl" field=$url}}
-               </div>
-               <p><button type="submit" class="btn btn-primary">Submit</button></p>
-       </div>
-</form>
-
-{{if $result}}
-<div class="feedtest-result">
-       <div class="panel panel-default">
-               <div class="panel-heading">
-                       <h3 class="panel-title">Output Items</h3>
-               </div>
+<div id="feedtest" class="widget">
+       <h2>Feed Test</h2>
+       <form action="feedtest" method="get" class="panel panel-default">
                <div class="panel-body">
-                       <pre>{{$result.output}}</pre>
+                       <div class="form-group">
+                               {{include file="field_input.tpl" field=$url}}
+                       </div>
+                       <p><button type="submit" class="btn btn-primary">Submit</button></p>
                </div>
-       </div>
-       <div class="panel panel-default">
-               <div class="panel-heading">
-                       <h3 class="panel-title">Input Feed XML</h3>
+       </form>
+
+       {{if $result}}
+       <div class="feedtest-result">
+               <div class="panel panel-default">
+                       <div class="panel-heading">
+                               <h3 class="panel-title">Output Items</h3>
+                       </div>
+                       <div class="panel-body">
+                               <pre>{{$result.output}}</pre>
+                       </div>
                </div>
-               <div class="panel-body">
-                       {{$result.input}}
+               <div class="panel panel-default">
+                       <div class="panel-heading">
+                               <h3 class="panel-title">Input Feed XML</h3>
+                       </div>
+                       <div class="panel-body">
+                               {{$result.input}}
+                       </div>
                </div>
        </div>
+       {{/if}}
 </div>
-{{/if}}
\ No newline at end of file

diff --git a/view/templates/friendica.tpl b/view/templates/friendica.tpl
index 3beabda3670d8f3aae99e842b94d4bac57782d51..f5e1830cac43c2adbed33c0e6fc8cbd8c98f9fb0 100644 (file)
--- a/view/templates/friendica.tpl
+++ b/view/templates/friendica.tpl
@@ -1,45 +1,47 @@
-<h1>Friendica</h1>
-<br>
-<p>{{$about nofilter}}</p>
-<br>
-<p>{{$friendica nofilter}}</p>
-<br>
-<p>{{$bugs nofilter}}</p>
-<br>
-<p>{{$info nofilter}}</p>
-<br>
+<div id="friendica" class="widget">
+       <h1>Friendica</h1>
+       <br>
+       <p>{{$about nofilter}}</p>
+       <br>
+       <p>{{$friendica nofilter}}</p>
+       <br>
+       <p>{{$bugs nofilter}}</p>
+       <br>
+       <p>{{$info nofilter}}</p>
+       <br>
 
-<p>{{$visible_addons.title nofilter}}</p>
-{{if $visible_addons.list}}
-<div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">{{$visible_addons.list nofilter}}</div>
-{{/if}}
+       <p>{{$visible_addons.title nofilter}}</p>
+       {{if $visible_addons.list}}
+       <div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">{{$visible_addons.list nofilter}}</div>
+       {{/if}}
 
-{{if $tos}}
-<p>{{$tos nofilter}}</p>
-{{/if}}
+       {{if $tos}}
+       <p>{{$tos nofilter}}</p>
+       {{/if}}
 
-{{if $block_list}}
-<div id="about_blocklist">
-       <p>{{$block_list.title nofilter}}</p>
-       <br>
-       <table class="table">
-               <thead>
-                       <tr>
-                               <th>{{$block_list.header[0] nofilter}}</th>
-                               <th>{{$block_list.header[1] nofilter}}</th>
-                       </tr>
-               </thead>
-               <tbody>
-               {{foreach $block_list.list as $blocked}}
-                       <tr>
-                               <td>{{$blocked.domain nofilter}}</td>
-                               <td>{{$blocked.reason nofilter}}</td>
-                       </tr>
-               {{/foreach}}
-               </tbody>
-       </table>
-</div>
+       {{if $block_list}}
+       <div id="about_blocklist">
+               <p>{{$block_list.title nofilter}}</p>
+               <br>
+               <table class="table">
+                       <thead>
+                               <tr>
+                                       <th>{{$block_list.header[0] nofilter}}</th>
+                                       <th>{{$block_list.header[1] nofilter}}</th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                       {{foreach $block_list.list as $blocked}}
+                               <tr>
+                                       <td>{{$blocked.domain nofilter}}</td>
+                                       <td>{{$blocked.reason nofilter}}</td>
+                               </tr>
+                       {{/foreach}}
+                       </tbody>
+               </table>
+       </div>
 
-{{/if}}
+       {{/if}}
 
 {{$hooked nofilter}}
+</div>
\ No newline at end of file