friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

added feedback

This commit is contained in:
Philipp Holzer 2019-05-05 10:00:28 +02:00
parent 28d6441d69
commit 9123361d61
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
4 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/User.php
View File

@ -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 string $email
* @param array $fields * @param array $fields

2
src/Module/Friendica.php
View File

@ -76,7 +76,7 @@ class Friendica extends BaseModule
'<strong>' . FRIENDICA_VERSION . '</strong>', '<strong>' . FRIENDICA_VERSION . '</strong>',
$app->getBaseURL(), $app->getBaseURL(),
'<strong>' . DB_UPDATE_VERSION . '</strong>', '<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.'), '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>', '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'), 'info' => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),

50
view/templates/feedtest.tpl
View File

@ -1,30 +1,32 @@
<h2>Feed Test</h2> <div id="feedtest" class="widget">
<form action="feedtest" method="get" class="panel panel-default"> <h2>Feed Test</h2>
<div class="panel-body"> <form action="feedtest" method="get" class="panel panel-default">
<div class="form-group"> <div class="panel-body">
{{include file="field_input.tpl" field=$url}} <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>
<p><button type="submit" class="btn btn-primary">Submit</button></p> </form>
</div>
</form>
{{if $result}} {{if $result}}
<div class="feedtest-result"> <div class="feedtest-result">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Output Items</h3> <h3 class="panel-title">Output Items</h3>
</div>
<div class="panel-body">
<pre>{{$result.output}}</pre>
</div>
</div> </div>
<div class="panel-body"> <div class="panel panel-default">
<pre>{{$result.output}}</pre> <div class="panel-heading">
</div> <h3 class="panel-title">Input Feed XML</h3>
</div> </div>
<div class="panel panel-default"> <div class="panel-body">
<div class="panel-heading"> {{$result.input}}
<h3 class="panel-title">Input Feed XML</h3> </div>
</div>
<div class="panel-body">
{{$result.input}}
</div> </div>
</div> </div>
{{/if}}
</div> </div>
{{/if}}

84
view/templates/friendica.tpl
View File

@ -1,45 +1,47 @@
<h1>Friendica</h1> <div id="friendica" class="widget">
<br> <h1>Friendica</h1>
<p>{{$about nofilter}}</p> <br>
<br> <p>{{$about nofilter}}</p>
<p>{{$friendica nofilter}}</p> <br>
<br> <p>{{$friendica nofilter}}</p>
<p>{{$bugs nofilter}}</p> <br>
<br> <p>{{$bugs nofilter}}</p>
<p>{{$info nofilter}}</p> <br>
<br> <p>{{$info nofilter}}</p>
<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 $block_list}}
<div id="about_blocklist">
<p>{{$block_list.title nofilter}}</p>
<br> <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}} <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 $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}}
{{$hooked nofilter}} {{$hooked nofilter}}
</div>