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

Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src 

# Conflicts:
#	doc/htconfig.md
This commit is contained in:
Hypolite Petovan 2016-12-07 23:15:46 -05:00
parent e29023dc8c a4959626ad
commit 88e336b3bc
22 changed files with 5065 additions and 5022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Accesskeys.md
View File

@ -1,6 +1,8 @@
Accesskeys in Friendica Accesskeys in Friendica
======================= =======================
* [Home](help)
General General
------- -------
* p: profile * p: profile

2
doc/Home.md
View File

@ -20,7 +20,6 @@ Friendica Documentation and Resources
* [Community Forums](help/Forums) * [Community Forums](help/Forums)
* [Chats](help/Chats) * [Chats](help/Chats)
* Further information * Further information
* [Improve Performance](help/Improve-Performance)
* [Move your account](help/Move-Account) * [Move your account](help/Move-Account)
* [Delete your account](help/Remove-Account) * [Delete your account](help/Remove-Account)
* [Frequently asked questions (FAQ)](help/FAQ) * [Frequently asked questions (FAQ)](help/FAQ)
@ -33,6 +32,7 @@ Friendica Documentation and Resources
* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd) * [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
* [Using SSL with Friendica](help/SSL) * [Using SSL with Friendica](help/SSL)
* [Config values that can only be set in .htconfig.php](help/htconfig) * [Config values that can only be set in .htconfig.php](help/htconfig)
* [Improve Performance](help/Improve-Performance)
**Developer Manual** **Developer Manual**

2
doc/Protocol.md
View File

@ -1,6 +1,8 @@
Used Protocols Used Protocols
=============== ===============
* [Home](help)
Friendicas DFRN Protocol Friendicas DFRN Protocol
--- ---

2
doc/Settings.md
View File

@ -1,5 +1,7 @@
# Settings # Settings
* [Home](help)
If you are the admin of a Friendica node, you have access to the so called **Admin Panel** where you can configure your Friendica node. If you are the admin of a Friendica node, you have access to the so called **Admin Panel** where you can configure your Friendica node.
On the front page of the admin panel you will see a summary of information about your node. On the front page of the admin panel you will see a summary of information about your node.

3
doc/api.md
View File

@ -1,5 +1,8 @@
Friendica API Friendica API
=== ===
* [Home](help)
The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public). The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public).
Please refer to the linked documentation for further information. Please refer to the linked documentation for further information.

4
doc/de/BBCode.md
View File

@ -474,6 +474,10 @@ Du kannst Videos, Musikdateien und weitere Dinge in Beiträgen einbinden.
<td>[vimeo]Vimeo video ID[/vimeo]</td> <td>[vimeo]Vimeo video ID[/vimeo]</td>
<td>Vimeo-Player im iframe einbinden.</td> <td>Vimeo-Player im iframe einbinden.</td>
</tr> </tr>
<tr>
<td>[embed]URL[/embed]</td>
<td>OEmbed rich content einbetten.</td>
</tr>
<tr> <tr>
<td>[iframe]URL[/iframe]</td> <td>[iframe]URL[/iframe]</td>
<td>General embed, iframe size is limited by the theme size for video players.</td> <td>General embed, iframe size is limited by the theme size for video players.</td>

2
doc/de/Home.md
View File

@ -20,7 +20,6 @@ Friendica - Dokumentation und Ressourcen
* [Community-Foren](help/Forums) * [Community-Foren](help/Forums)
* [Chats](help/Chats) * [Chats](help/Chats)
* Weiterführende Informationen * Weiterführende Informationen
* [Performance verbessern](help/Improve-Performance)
* [Account umziehen](help/Move-Account) * [Account umziehen](help/Move-Account)
* [Account löschen](help/Remove-Account) * [Account löschen](help/Remove-Account)
* [Bugs und Probleme](help/Bugs-and-Issues) * [Bugs und Probleme](help/Bugs-and-Issues)
@ -35,6 +34,7 @@ Friendica - Dokumentation und Ressourcen
* [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN) * [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)
* [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL) * [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
* [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können](help/htconfig) (EN) * [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können](help/htconfig) (EN)
* [Performance verbessern](help/Improve-Performance)
**Dokumentation für Entwickler** **Dokumentation für Entwickler**

2
doc/de/Settings.md
View File

@ -1,5 +1,7 @@
# Settings # Settings
* [Zur Startseite der Hilfe](help)
Wenn du der Administrator einer Friendica Instanz bist, hast du Zugriff auf das so genannte **Admin Panel** in dem du die Friendica Instanz konfigurieren kannst, Wenn du der Administrator einer Friendica Instanz bist, hast du Zugriff auf das so genannte **Admin Panel** in dem du die Friendica Instanz konfigurieren kannst,
Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusammengefasst. Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusammengefasst.

2
doc/de/Text_editor.md
View File

@ -52,6 +52,8 @@ Cleanzero <img src="doc/img/editor_zero.png" alt="cleanzero.png" style="padding
Darkbubble <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="padding-left: 14px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i> Darkbubble <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="padding-left: 14px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i>
Frio <img src="doc/img/editor_frio.png" alt="frio.png" style="padding-left: 44px; vertical-align:middle;">
Frost <img src="doc/img/editor_frost.png" alt="frost.png" style="padding-left: 42px; vertical-align:middle;"> Frost <img src="doc/img/editor_frost.png" alt="frost.png" style="padding-left: 42px; vertical-align:middle;">
Vier <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;"> <i>(inkl. dispy)</i> Vier <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;"> <i>(inkl. dispy)</i>

3
doc/htconfig.md
View File

@ -1,6 +1,8 @@
Config values that can only be set in .htconfig.php Config values that can only be set in .htconfig.php
=================================================== ===================================================
* [Home](help)
There are some config values that haven't found their way into the administration page. There are some config values that haven't found their way into the administration page.
This has several reasons. This has several reasons.
Maybe they are part of a current development that isn't considered stable and will be added later in the administration page when it is considered safe. Maybe they are part of a current development that isn't considered stable and will be added later in the administration page when it is considered safe.
@ -30,7 +32,6 @@ Example: To set the directory value please add this line to your .htconfig.php:
* **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS. * **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
* **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL. * **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
* **event_input_format** - Default value is "ymd". * **event_input_format** - Default value is "ymd".
* **frontend_worker** (Boolean) - Activates the frontend worker which acts as a replacement for running the poller via the command line.
* **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10. * **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
* **ignore_cache** (Boolean) - For development only. Disables the item cache. * **ignore_cache** (Boolean) - For development only. Disables the item cache.
* **like_no_comment** (Boolean) - Don't update the "commented" value of an item when it is liked. * **like_no_comment** (Boolean) - Don't update the "commented" value of an item when it is liked.

BIN
doc/img/editor_frio.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
doc/translations.md
View File

@ -1,6 +1,8 @@
Friendica translations Friendica translations
====================== ======================
* [Home](help)
Translation Process Translation Process
------------------- -------------------

1
include/identity.php
View File

@ -813,7 +813,6 @@ function zrl_init(&$a) {
$result = Cache::get("gprobe:".$urlparts["host"]); $result = Cache::get("gprobe:".$urlparts["host"]);
if (!is_null($result)) { if (!is_null($result)) {
$result = unserialize($result);
if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) { if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG); logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
return; return;

2
include/oembed.php
View File

@ -261,7 +261,7 @@ function oembed_iframe($src, $width, $height) {
$width = '100%'; $width = '100%';
$s = App::get_baseurl() . '/oembed/'.base64url_encode($src); $s = App::get_baseurl() . '/oembed/'.base64url_encode($src);
return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>'; return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
} }

3
mod/admin.php
View File

@ -669,6 +669,7 @@ function admin_page_site_post(&$a) {
$worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 4); $worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 4);
$worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False); $worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False);
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
$worker_frontend = ((x($_POST,'worker_frontend')) ? True : False);
if($a->get_path() != "") if($a->get_path() != "")
$diaspora_enabled = false; $diaspora_enabled = false;
@ -819,6 +820,7 @@ function admin_page_site_post(&$a) {
set_config('system','worker_queues', $worker_queues); set_config('system','worker_queues', $worker_queues);
set_config('system','worker_dont_fork', $worker_dont_fork); set_config('system','worker_dont_fork', $worker_dont_fork);
set_config('system','worker_fastlane', $worker_fastlane); set_config('system','worker_fastlane', $worker_fastlane);
set_config('system','frontend_worker', $worker_frontend);
if($rino==2 and !function_exists('mcrypt_create_iv')) { if($rino==2 and !function_exists('mcrypt_create_iv')) {
notice(t("RINO2 needs mcrypt php extension to work.")); notice(t("RINO2 needs mcrypt php extension to work."));
@ -1050,6 +1052,7 @@ function admin_page_site(&$a) {
'$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")), '$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
'$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")), '$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
'$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")), '$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")),
'$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), get_config('system','frontend_worker'), t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this.')),
'$form_security_token' => get_form_security_token("admin_site") '$form_security_token' => get_form_security_token("admin_site")

10019
util/messages.po
View File

File diff suppressed because it is too large Load Diff

8
view/lang/de/messages.po
View File

@ -36,8 +36,8 @@ msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 21:45+0100\n" "POT-Creation-Date: 2016-11-20 21:45+0100\n"
"PO-Revision-Date: 2016-11-21 10:27+0000\n" "PO-Revision-Date: 2016-11-30 13:34+0000\n"
"Last-Translator: Andreas H.\n" "Last-Translator: rabuzarus <rabuzarus@t-online.de>\n"
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -3173,7 +3173,7 @@ msgstr "Probleme oder Fehler gefunden? Bitte besuche"
#: mod/friendica.php:75 #: mod/friendica.php:75
msgid "the bugtracker at github" msgid "the bugtracker at github"
msgstr "dem Bugtracker auf github" msgstr "den Bugtracker auf github"
#: mod/friendica.php:76 #: mod/friendica.php:76
msgid "" msgid ""
@ -3183,7 +3183,7 @@ msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot co
#: mod/friendica.php:90 #: mod/friendica.php:90
msgid "Installed plugins/addons/apps:" msgid "Installed plugins/addons/apps:"
msgstr "Installierte Plugins/Erweiterungen/Apps" msgstr "Installierte Plugins/Erweiterungen/Apps:"
#: mod/friendica.php:103 #: mod/friendica.php:103
msgid "No installed plugins/addons/apps" msgid "No installed plugins/addons/apps"

4
view/lang/de/strings.php
View File

@ -738,9 +738,9 @@ $a->strings["This is Friendica, version"] = "Dies ist Friendica, Version";
$a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist"; $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist";
$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a>, um mehr über das Friendica Projekt zu erfahren."; $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a>, um mehr über das Friendica Projekt zu erfahren.";
$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
$a->strings["the bugtracker at github"] = "dem Bugtracker auf github"; $a->strings["the bugtracker at github"] = "den Bugtracker auf github";
$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"; $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com";
$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps"; $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps:";
$a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert"; $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert";
$a->strings["No valid account found."] = "Kein gültiges Konto gefunden."; $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe Deine E-Mail."; $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe Deine E-Mail.";

9
view/templates/admin_site.tpl
View File

@ -158,9 +158,12 @@
<h3>{{$worker_title}}</h3> <h3>{{$worker_title}}</h3>
{{include file="field_checkbox.tpl" field=$worker}} {{include file="field_checkbox.tpl" field=$worker}}
{{include file="field_input.tpl" field=$worker_queues}} {{if $worker.2}}
{{include file="field_checkbox.tpl" field=$worker_dont_fork}} {{include file="field_input.tpl" field=$worker_queues}}
{{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$worker_dont_fork}}
{{include file="field_checkbox.tpl" field=$worker_fastlane}}
{{include file="field_checkbox.tpl" field=$worker_frontend}}
{{/if}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
</form> </form>

7
view/theme/frio/css/style.css
View File

@ -2318,9 +2318,13 @@ section.help-content-wrapper h2 {
section.help-content-wrapper h3 { section.help-content-wrapper h3 {
font-size: 1.2em; font-size: 1.2em;
} }
section.help-content-wrapper h4 {
font-size: 1em;
}
section.help-content-wrapper h1, section.help-content-wrapper h1,
section.help-content-wrapper h2, section.help-content-wrapper h2,
section.help-content-wrapper h3, section.help-content-wrapper h3,
section.help-content-wrapper h4,
section.help-content-wrapper h5, section.help-content-wrapper h5,
section.help-content-wrapper h6 { section.help-content-wrapper h6 {
margin-top: 24px; margin-top: 24px;
@ -2332,7 +2336,8 @@ section.help-content-wrapper p {
margin: 0.4em 0; margin: 0.4em 0;
} }
section.help-content-wrapper p, section.help-content-wrapper p,
section.help-content-wrapper a { section.help-content-wrapper a,
section.help-content-wrapper li {
line-height: 1.6; line-height: 1.6;
font-size: 0.96em; font-size: 0.96em;
} }

6
view/theme/frio/templates/nav.tpl
View File

@ -141,7 +141,7 @@
{{/foreach}} {{/foreach}}
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
{{if $nav.notifications}} {{if $nav.notifications}}
<li role="menuitem"><a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw"></i> {{$nav.notifications.1}}</a></li> <li role="menuitem"><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw"></i> {{$nav.notifications.1}}</a></li>
{{/if}} {{/if}}
{{if $nav.messages}} {{if $nav.messages}}
<li role="menuitem"><a class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li> <li role="menuitem"><a class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li>
@ -160,7 +160,7 @@
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
{{/if}} {{/if}}
{{if $nav.help}} {{if $nav.help}}
<li role="menuitem"><a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="fa fa-question-circle fa-fw"></i> {{$nav.help.3}}</a></li> <li role="menuitem"><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="fa fa-question-circle fa-fw"></i> {{$nav.help.3}}</a></li>
{{/if}} {{/if}}
{{if $nav.settings}} {{if $nav.settings}}
<li role="menuitem"><a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw"></i> {{$nav.settings.1}}</a></li> <li role="menuitem"><a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw"></i> {{$nav.settings.1}}</a></li>
@ -196,7 +196,7 @@
<a role="menuitem" class="{{$usermenu.2}} list-group-item" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a> <a role="menuitem" class="{{$usermenu.2}} list-group-item" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a>
{{/foreach}} {{/foreach}}
{{if $nav.notifications}} {{if $nav.notifications}}
<a role="menuitem" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" class="list-group-item"><i class="fa fa-exclamation-circle fa-fw"></i> {{$nav.notifications.1}}</a> <a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}" class="list-group-item"><i class="fa fa-exclamation-circle fa-fw"></i> {{$nav.notifications.1}}</a>
{{/if}} {{/if}}
{{if $nav.contacts}} {{if $nav.contacts}}
<a role="menuitem" class="nav-link {{$nav.contacts.2}} list-group-item" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw"></i> {{$nav.contacts.1}}</a> <a role="menuitem" class="nav-link {{$nav.contacts.2}} list-group-item" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw"></i> {{$nav.contacts.1}}</a>

2
view/theme/frio/templates/nav_head.tpl
View File

@ -1,5 +1,5 @@
<script> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#nav-search-input-field").search_autocomplete(baseurl + '/acl'); $("#nav-search-input-field").search_autocomplete(baseurl + '/acl');
}); });