Merge branch 'fcp-interface' into next

[Sone.git] / src / main / resources / templates / options.html

diff --git a/src/main/resources/templates/options.html b/src/main/resources/templates/options.html
index dfeb3e9..368c14e 100644 (file)
--- a/src/main/resources/templates/options.html
+++ b/src/main/resources/templates/options.html
@@ -31,6 +31,8 @@
 
                <%ifnull currentSone>
                        <p><%= Page.Options.Section.SoneSpecificOptions.NotLoggedIn|l10n|html|replace needle="{link}" replacement='<a href="login.html">'|replace needle="{/link}" replacement='</a>'></p>
+               <%else>
+                       <p><%= Page.Options.Section.SoneSpecificOptions.LoggedIn|l10n|html></p>
                <%/if>
 
                <p>
@@ -41,17 +43,34 @@
                <h2><%= Page.Options.Section.RuntimeOptions.Title|l10n|html></h2>
 
                <p><%= Page.Options.Option.InsertionDelay.Description|l10n|html></p>
+               <%if =insertion-delay|in collection=fieldErrors>
+                       <p class="warning"><%= Page.Options.Warnings.ValueNotChanged|l10n|html></p>
+               <%/if>
                <p><input type="text" name="insertion-delay" value="<% insertion-delay|html>" /></p>
 
                <p><%= Page.Options.Option.PostsPerPage.Description|l10n|html></p>
+               <%if =posts-per-page|in collection=fieldErrors>
+                       <p class="warning"><%= Page.Options.Warnings.ValueNotChanged|l10n|html></p>
+               <%/if>
                <p><input type="text" name="posts-per-page" value="<% posts-per-page|html>" /></p>
 
+               <p>
+                       <input type="checkbox" name="require-full-access"<%if require-full-access> checked="checked"<%/if> />
+                       <%= Page.Options.Option.RequireFullAccess.Description|l10n|html></p>
+               </p>
+
                <h2><%= Page.Options.Section.TrustOptions.Title|l10n|html></h2>
 
                <p><%= Page.Options.Option.PositiveTrust.Description|l10n|html></p>
+               <%if =positive-trust|in collection=fieldErrors>
+                       <p class="warning"><%= Page.Options.Warnings.ValueNotChanged|l10n|html></p>
+               <%/if>
                <p><input type="text" name="positive-trust" value="<% positive-trust|html>" /></p>
 
                <p><%= Page.Options.Option.NegativeTrust.Description|l10n|html></p>
+               <%if =negative-trust|in collection=fieldErrors>
+                       <p class="warning"><%= Page.Options.Warnings.ValueNotChanged|l10n|html></p>
+               <%/if>
                <p><input type="text" name="negative-trust" value="<% negative-trust|html>" /></p>
 
                <p><%= Page.Options.Option.TrustComment.Description|l10n|html></p>
@@ -72,7 +91,9 @@
 
                <h2><%= Page.Options.Section.RescueOptions.Title|l10n|html></h2>
 
-               <p><%= Page.Options.Option.SoneRescueMode.Description|l10n|html></p>
+               <p><%= Page.Options.Option.SoneRescueMode.Description1|l10n|html></p>
+               <p><%= Page.Options.Option.SoneRescueMode.Description2|l10n|html></p>
+               <p><%= Page.Options.Option.SoneRescueMode.Description3|l10n|html></p>
                <p><select name="sone-rescue-mode"><option disabled="disabled"><%= WebInterface.SelectBox.Choose|l10n|html></option><option value="true"<%if sone-rescue-mode> selected="selected"<%/if>><%= WebInterface.SelectBox.Yes|l10n|html></option><option value="false"<%if !sone-rescue-mode> selected="selected"<%/if>><%= WebInterface.SelectBox.No|l10n|html></option></select>
 
                <h2><%= Page.Options.Section.Cleaning.Title|l10n|html></h2>