juick-www: cleanup templates

1 files changed, 8 insertions, 8 deletions

diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
index 39c6d875..7a95f2a9 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
@@ -5,11 +5,11 @@
     <form action="/settings" method="POST" enctype="multipart/form-data">
         <fieldset>
             <legend>Notification options</legend>
-            <p><input type="checkbox" name="jnotify" value="1" {% if notify_options.isRepliesEnabled() %}
+            <p><input type="checkbox" name="jnotify" value="1" {% if notify_options.repliesEnabled %}
                       checked="checked" {% endif %}/> Reply notifications (&quot;Message posted&quot;)</p>
-            <p><input type="checkbox" name="subscr_notify" value="1" {% if notify_options.isSubscriptionsEnabled() %}
+            <p><input type="checkbox" name="subscr_notify" value="1" {% if notify_options.subscriptionsEnabled %}
                       checked="checked" {% endif %}/> Subscriptions notifications (&quot;@user subscribed...&quot;)</p>
-            <p><input type="checkbox" name="recomm" value="1" {% if notify_options.isRecommendationsEnabled() %}
+            <p><input type="checkbox" name="recomm" value="1" {% if notify_options.recommendationsEnabled %}
                       checked="checked" {% endif %}/> Posts recommendations (&quot;Recommended by @user&quot;)</p>
             <p><input type="hidden" name="page" value="main"/><input type="submit" value="  OK  "/></p>
         </fieldset>
@@ -41,7 +41,7 @@
                 {% endfor %}
                 {% for auth in auths %}
                 <label><input type="radio" name="delete"
-                              value="xmpp-unauth;{{ auth.getAccount() }}">{{ auth.getAccount() }}</label>
+                              value="xmpp-unauth;{{ auth.account }}">{{ auth.account }}</label>
                 &mdash; <a href="#"
                            onclick="alert(\'To confirm, please send &quot;AUTH {{ auth.getAuthCode() }}&quot; (without quotes) from this account to &quot;juick@juick.com&quot;.\'); return false;">Confirm</a><br/>
                 {% endfor %}
@@ -83,13 +83,13 @@
                 Sent to <select name="account">
                     <option value="">Disabled</option>
                     {% for email in emails %}
-                    <option value="{{ email }}" {% if eopts.getEmail()== email %} selected="selected" {% endif %}>
+                    <option value="{{ email }}" {% if eopts.email == email %} selected="selected" {% endif %}>
                         {{ email }}
                     </option>
                     {% endfor %}
                 </select> every day at <select name="time">
                     {% for hour in hours %}
-                    <option value="{{ hour }}" {% if eopts.getSubscriptionHour() == hour %} selected="selected" {%
+                    <option value="{{ hour }}" {% if eopts.subscriptionHour == hour %} selected="selected" {%
                             endif %}>
                         {{ hour }}:00 GMT
                     </option>
@@ -111,8 +111,8 @@
         <legend style="background: url(//static.juick.com/settings/facebook.png) no-repeat; padding-left: 58px; line-height: 48px;">
             Facebook
         </legend>
-        {% if fbstatus.isConnected() %}
-        {% if fbstatus.isCrosspostEnabled() %}
+        {% if fbstatus.connected %}
+        {% if fbstatus.crosspostEnabled %}
         <form action="/settings" method="post">
             <div>
                 Facebook: <b>Enabled</b> &mdash;