Merge branch 'master' into master

.lgtm

@@ -1,2 +1,3 @@
-self_approval_off = false
+pattern = "(?)LGTM"
+self_approval_off = true
 ignore_maintainers_file = true

options/locale/locale_de-DE.ini

@@ -541,7 +541,7 @@ pulls=Pull-Requests
 labels=Label
 milestones=Meilensteine
 commits=Commits
-commit=Committen
+commit=Commits
 releases=Releases
 file_raw=Originalformat
 file_history=Verlauf
@@ -567,7 +567,7 @@ editor.name_your_file=Dateinamen eingeben...
 editor.filename_help=Um einen Ordner hinzuzufügen, gib den Namen ein und drücke /. Um einen Ordner zu entfernen, gehe zum Anfang des Feldes und drücke die Rücktaste.
 editor.or=oder
 editor.cancel_lower=abbrechen
-editor.commit_changes=Änderungen comitten
+editor.commit_changes=Änderungen committen
 editor.add_tmpl='%s/<filename>' hinzufügen
 editor.add='%s' hinzufügen
 editor.update='%s' ändern
@@ -1310,7 +1310,6 @@ auths.attribute_mail=E-Mail-Attribut
 auths.attributes_in_bind=Hole Attribute im Bind-Kontext
 auths.filter=Benutzerfilter
 auths.admin_filter=Admin Filter
-auths.ms_ad_sa=Ms Ad SA
 auths.smtp_auth=SMTP-Authentifizierungstyp
 auths.smtphost=SMTP-Host
 auths.smtpport=SMTP-Port

options/locale/locale_en-US.ini

@@ -1334,7 +1334,7 @@ auths.attribute_mail = Email attribute
 auths.attributes_in_bind = Fetch attributes in Bind DN context
 auths.filter = User Filter
 auths.admin_filter = Admin Filter
-auths.ms_ad_sa = Ms Ad SA
+auths.ms_ad_sa = MS AD Search Attributes
 auths.smtp_auth = SMTP Authentication Type
 auths.smtphost = SMTP Host
 auths.smtpport = SMTP Port

options/locale/locale_fi-FI.ini

@@ -805,7 +805,6 @@ auths.attribute_mail=Sähköposti määrite
 auths.attributes_in_bind=Nouda määritteet liitä DN sisällöstä
 auths.filter=Käyttäjäsuodatin
 auths.admin_filter=Ylläpitosuodatin
-auths.ms_ad_sa=MS Ad SA
 auths.smtp_auth=SMTP todennustyyppi
 auths.smtphost=SMTP isäntä
 auths.smtpport=SMTP portti

options/locale/locale_fr-FR.ini

@@ -1310,7 +1310,6 @@ auths.attribute_mail=Attribut de l'e-mail
 auths.attributes_in_bind=Aller chercher les attributs dans le contexte de liaison DN
 auths.filter=Filtre utilisateur
 auths.admin_filter=Filtre administrateur
-auths.ms_ad_sa=Ms Ad SA
 auths.smtp_auth=Type d'authentification SMTP
 auths.smtphost=Hôte SMTP
 auths.smtpport=Port SMTP

options/locale/locale_hu-HU.ini

@@ -1310,7 +1310,7 @@ auths.attribute_mail=E-mail attribútum
 auths.attributes_in_bind=Attribútumok lekérdezése a DN környezetben
 auths.filter=Felhasználói szűrő
 auths.admin_filter=Rendszergazdai szűrő
-auths.ms_ad_sa=Microsoft Active Directory SA
+auths.ms_ad_sa=MS AD Keresés attribútumok
 auths.smtp_auth=SMTP Autentikáció Típusa
 auths.smtphost=SMTP kiszolgáló
 auths.smtpport=SMTP port

options/locale/locale_lv-LV.ini

@@ -1310,7 +1310,6 @@ auths.attribute_mail=E-pasta atribūts
 auths.attributes_in_bind=Nolasīt atribūtus no saistīšanas DN konteksta
 auths.filter=Lietotāju filts
 auths.admin_filter=Administratoru filtrs
-auths.ms_ad_sa=MS Ad SA
 auths.smtp_auth=SMTP autentifikācijas tips
 auths.smtphost=SMTP resursdators
 auths.smtpport=SMTP ports

options/locale/locale_nl-NL.ini

@@ -1122,7 +1122,6 @@ auths.attribute_mail=E-mail attribuut
 auths.attributes_in_bind=Verkrijg attributes van de Bind DN context
 auths.filter=Gebruikersfilter
 auths.admin_filter=Beheerdersfilter
-auths.ms_ad_sa=MS Ad SA
 auths.smtp_auth=SMTP-authenticatietype
 auths.smtphost=SMTP host
 auths.smtpport=SMTP poort

options/locale/locale_pl-PL.ini

@@ -1267,7 +1267,6 @@ auths.attribute_mail=Atrybut e-mail
 auths.attributes_in_bind=Pobierz atrybuty w kontekście Bind DN
 auths.filter=Filtr użytkownika
 auths.admin_filter=Filtr administratora
-auths.ms_ad_sa=Atrybuty wyszukiwania MS AD
 auths.smtp_auth=Typ uwierzytelnienia SMTP
 auths.smtphost=Serwer SMTP
 auths.smtpport=Port SMTP

options/locale/locale_pt-BR.ini

@@ -1310,7 +1310,6 @@ auths.attribute_mail=Atributo e-mail
 auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN
 auths.filter=Filtro de usuário
 auths.admin_filter=Filtro de administrador
-auths.ms_ad_sa=Ms Ad SA
 auths.smtp_auth=Tipo de autenticação SMTP
 auths.smtphost=Host SMTP
 auths.smtpport=Porta SMTP

options/locale/locale_ru-RU.ini

@@ -1310,7 +1310,6 @@ auths.attribute_mail=Email
 auths.attributes_in_bind=Извлечение атрибутов в виде Bind DN
 auths.filter=Фильтр пользователя
 auths.admin_filter=Фильтр администратора
-auths.ms_ad_sa=Ms Ad SA
 auths.smtp_auth=Тип аутентификации SMTP
 auths.smtphost=Узел SMTP
 auths.smtpport=SMTP-порт

options/locale/locale_zh-CN.ini

@@ -1310,7 +1310,6 @@ auths.attribute_mail=邮箱属性
 auths.attributes_in_bind=从 Bind DN 中拉取属性信息
 auths.filter=用户过滤规则
 auths.admin_filter=管理员过滤规则
-auths.ms_ad_sa=Ms Ad SA
 auths.smtp_auth=SMTP 认证类型
 auths.smtphost=SMTP 主机地址
 auths.smtpport=SMTP 主机端口

templates/base/footer.tmpl

@@ -3,7 +3,13 @@
 <body>
 	<div>
 */}}
+
+	{{template "custom/body_inner_post" .}}
+
 	</div>
+
+	{{template "custom/body_outer_post" .}}
+
 	<footer>
 		<div class="ui container">
 			<div class="ui left">

templates/base/head.tmpl

@@ -130,9 +130,13 @@
 {{template "custom/header" .}}
 </head>
 <body>
+	{{template "custom/body_outer_pre" .}}
+
 	<div class="full height">
 		<noscript>{{.i18n.Tr "enable_javascript"}}</noscript>
 
+		{{template "custom/body_inner_pre" .}}
+
 		{{if not .PageIsInstall}}
 			<div class="ui top secondary stackable main menu following bar light">
 				<div class="ui container" id="navbar">