bugfix

rotbot/events/on_whoreply.py

@@ -2,4 +2,3 @@ from common import log
 
 def process_event(self, connection, event):
     log.info(event)
-    #Protectees.update(self,  event.arguments[4], event.arguments[1], event.arguments[2])

website/rotbot/forms.py

@@ -20,7 +20,7 @@ class NetworkForm(ModelForm):
             'home_channel': '<i class="hashtag icon"></i>Home channel',
             'command_character': '<i class="terminal icon"></i>Command character',
             'help_character': '<i class="help icon"></i>Help character',
-            'network_services': '<i class="lightbulb outline icon"></i>Network services',
+            'services': '<i class="lightbulb outline icon"></i>Network services',
             'enabled': '<i class="power off icon"></i>Enabled',
             # 'mute': '<i class="comment slash icon"></i>Mute',
         }

website/rotbot/templates/rotbot/network_form.html

@@ -5,7 +5,7 @@
   <form class= "ui form" method="post" action="{% block formtag %}{% endblock formtag %}">
     {% csrf_token %}
     {{ form.non_field_errors }}
-    {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+    {% for field in form.hidden_fields %}{{ field }}{% endfor %}
     <div class="two fields">
       {% render_field form.name %}
       {% render_field form.slug %}
@@ -26,7 +26,7 @@
       {% render_field form.home_channel %}
       {% render_field form.command_character %}
       {% render_field form.help_character %}
-      {% render_field form.network_services %}
+      {% render_field form.services %}
       <script type="text/javascript">
         $('.selection.dropdown')
           .dropdown()
@@ -41,233 +41,190 @@
     {% render_field form.enabled %}
     <button class="ui right floated inverted positive button" type="submit" value="Submit"><i class="save icon"></i>Save</button>
   </form>
-{% endblock %}
 
 
+{% endblock %}
+
   <form class= "ui form" method="post" action="{#% block formtag %}{% endblock formtag %#}">
     {% csrf_token %}
+    {% for field in form.hidden_fields %}{{ field }}{% endfor %}
     {{ form.non_field_errors }}
-    {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
     <div class="two fields">
-      {% render_field form.name %}
-      {% render_field form.slug %}
+      <div class="required field{% if form.name.errors %} error{% endif %}">
+        <label for="{{ form.name.id_for_label }}">{{ form.name.label|safe }}</label>
+        {{ form.name }}
+        {% if form.name.errors %}
+          <div class="ui inverted red message">
+            {{ form.name.errors }}
+          </div>
+        {% endif %}
+      </div>
+      <div class="required field{% if form.slug.errors %} error{% endif %}">
+        <label for="{{ form.slug.id_for_label }}">{{ form.slug.label|safe }}</label>
+        {{ form.slug }}
+        {% if form.slug.errors %}
+          <div class="ui inverted red message">
+            {{ form.slug.errors }}
+          </div>
+        {% endif %}
+      </div>
     </div>
     {{ hostformset.management_form }}
     {% for hostform in hostformset %}
       {{ hostform.non_field_errors }}
+      {% for field in hostform.hidden_fields %}{{ field }}{% endfor %}
       <div class="four fields">
-        {% render_field hostform.address %}
-        {% render_field hostform.port %}
-        {% render_field hostform.ssl %}
-        {% render_field hostform.DELETE %}
+        <div class="required field{% if hostform.address.errors %} error{% endif %}">
+          <label for="{{ hostform.address.id_for_label }}">{{ hostform.address.label|safe }}</label>
+          {{ hostform.address }}
+          {% if hostform.address.errors %}
+            <div class="ui inverted red message">
+              {{ hostform.address.errors }}
+            </div>
+          {% endif %}
+        </div>
+        <div class="required field{% if hostform.port.errors %} error{% endif %}">
+          <label for="{{ hostform.port.id_for_label }}">{{ hostform.port.label|safe }}</label>
+          {{ hostform.port }}
+          {% if hostform.port.errors %}
+            <div class="ui inverted red message">
+              {{ hostform.port.errors }}
+            </div>
+          {% endif %}
+        </div>
+        <div class="field{% if hostform.ssl.errors %} error{% endif %}">
+          <div class="ui inverted toggle checkbox">
+            {{ hostform.ssl }}
+            <label for="{{ hostform.ssl.id_for_label }}">{{ hostform.ssl.label|safe }}</label>
+            {% if hostform.port.errors %}
+              <div class="ui inverted red message">
+                {{ hostform.port.errors }}
+              </div>
+            {% endif %}
+          </div>
+        </div>
+        <div class="field">
+          <div class="ui inverted checkbox">
+            {{ hostform.DELETE }}
+            {% if hostform.instance.pk %}
+              <label for="{{ hostform.DELETE.id_for_label }}">{{ hostform.DELETE.label }}</label>
+            {% else %}
+              <label for="{{ hostform.DELETE.id_for_label }}">Clear</label>
+            {% endif %}
+            {% if hostform.DELETE.errors %}
+              <div class="ui inverted red message">
+                {{ hostform.DELETE.errors }}
+              </div>
+            {% endif %}
+          </div>
+        </div>
       </div>
     {% endfor %}
     <div class="four fields">
-      {% render_field form.nickname %}
-      {% render_field form.password %}
-      {% render_field form.mail %}
-      {% render_field form.username %}
-    </div>
-    <div class="four fields">
-      {% render_field form.home_channel %}
-      {% render_field form.command_character %}
-      {% render_field form.help_character %}
-      {% render_field form.network_services %}
-      <script type="text/javascript">
-        $('.selection.dropdown')
-          .dropdown()
-        ;
-      </script>
-    </div>
-    {{ ownerformset.management_form }}
-    {% for ownerform in ownerformset %}
-      {% render_form ownerform %}
-    {% endfor %}
-    {% render_field form.enabled %}
-    <button class="ui right floated inverted positive button" type="submit" value="Submit"><i class="save icon"></i>Save</button>
-  </form>
-
-
-  {% csrf_token %}
-  {{ form.non_field_errors }}
-  {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
-  <div class="two fields">
-    <div class="required field{% if form.name.errors %} error{% endif %}">
-      <label for="{{ form.name.id_for_label }}">{{ form.name.label|safe }}</label>
-      {{ form.name }}
-      {% if form.name.errors %}
-        <div class="ui inverted red message">
-          {{ form.name.errors }}
-        </div>
-      {% endif %}
-    </div>
-    <div class="required field{% if form.slug.errors %} error{% endif %}">
-      <label for="{{ form.slug.id_for_label }}">{{ form.slug.label|safe }}</label>
-      {{ form.slug }}
-      {% if form.slug.errors %}
-        <div class="ui inverted red message">
-          {{ form.slug.errors }}
-        </div>
-      {% endif %}
+      <div class="required field{% if form.nickname.errors %} error{% endif %}">
+        <label for="{{ form.nickname.id_for_label }}">{{ form.nickname.label|safe }}</label>
+        {{ form.nickname }}
+        {% if form.nickname.errors %}
+          <div class="ui inverted red message">
+            {{ form.nickname.errors }}
+          </div>
+        {% endif %}
+      </div>
+      <div class="field{% if form.password.errors %} error{% endif %}">
+        <label for="{{ form.password.id_for_label }}">{{ form.password.label|safe }}</label>
+        {{ form.password }}
+        {% if form.password.errors %}
+          <div class="ui inverted red message">
+            {{ form.password.errors }}
+          </div>
+        {% endif %}
+      </div>
+      <div class="field{% if form.mail.errors %} error{% endif %}">
+        <label for="{{ form.mail.id_for_label }}">{{ form.mail.label|safe }}</label>
+        {{ form.mail }}
+        {% if form.mail.errors %}
+          <div class="ui inverted red message">
+            {{ form.mail.errors }}
+          </div>
+        {% endif %}
+      </div>
+      <div class="required field{% if form.username.errors %} error{% endif %}">
+        <label for="{{ form.username.id_for_label }}">{{ form.username.label|safe }}</label>
+        {{ form.username }}
+        {% if form.username.errors %}
+          <div class="ui inverted red message">
+            {{ form.username.errors }}
+          </div>
+        {% endif %}
+      </div>
     </div>
-  </div>
-  {{ hostformset.management_form }}
-  {% for hostform in hostformset %}
-    {{ hostform.non_field_errors }}
-    {% for field in hostform.hidden_fields %}{{ field }}{% endfor %}
     <div class="four fields">
-      <div class="required field{% if hostform.address.errors %} error{% endif %}">
-        <label for="{{ hostform.address.id_for_label }}">{{ hostform.address.label|safe }}</label>
-        {{ hostform.address }}
-        {% if hostform.address.errors %}
+      <div class="required field{% if form.home_channel.errors %} error{% endif %}">
+        <label for="{{ form.home_channel.id_for_label }}">{{ form.home_channel.label|safe }}</label>
+        {{ form.home_channel }}
+        {% if form.home_channel.errors %}
           <div class="ui inverted red message">
-            {{ hostform.address.errors }}
+            {{ form.home_channel.errors }}
           </div>
         {% endif %}
       </div>
-      <div class="required field{% if hostform.port.errors %} error{% endif %}">
-        <label for="{{ hostform.port.id_for_label }}">{{ hostform.port.label|safe }}</label>
-        {{ hostform.port }}
-        {% if hostform.port.errors %}
+      <div class="required field{% if form.command_character.errors %} error{% endif %}">
+        <label for="{{ form.command_character.id_for_label }}">{{ form.command_character.label|safe }}</label>
+        {{ form.command_character }}
+        {% if form.command_character.errors %}
           <div class="ui inverted red message">
-            {{ hostform.port.errors }}
+            {{ form.command_character.errors }}
           </div>
         {% endif %}
       </div>
-      <div class="field{% if hostform.ssl.errors %} error{% endif %}">
-        <div class="ui inverted toggle checkbox">
-          {{ hostform.ssl }}
-          <label for="{{ hostform.ssl.id_for_label }}">{{ hostform.ssl.label|safe }}</label>
-          {% if hostform.port.errors %}
+      <div class="required field{% if form.help_character.errors %} error{% endif %}">
+        <label for="{{ form.help_character.id_for_label }}">{{ form.help_character.label|safe }}</label>
+        {{ form.help_character }}
+        {% if form.help_character.errors %}
+          <div class="ui inverted red message">
+            {{ form.help_character.errors }}
+          </div>
+        {% endif %}
+      </div>
+      {% render_field form.services %}
+      <script type="text/javascript">
+        $('.selection.dropdown')
+          .dropdown()
+        ;
+      </script>
+    </div>
+    {{ ownerformset.management_form }}
+    {% for ownerform in ownerformset %}
+      {% for field in hostform.hidden_fields %}{{ field }}{% endfor %}
+      <div class="two fields">
+        <div class="field{% if ownerform.hostmask.errors %} error{% endif %}">
+          <label for="{{ ownerform.hostmask.id_for_label }}">{{ ownerform.hostmask.label|safe }}</label>
+          {{ ownerform.hostmask }}
+          {% if ownerform.hostmask.errors %}
             <div class="ui inverted red message">
-              {{ hostform.port.errors }}
+              {{ ownerform.hostmask.errors }}
             </div>
           {% endif %}
         </div>
-      </div>
-      <div class="field">
-        <div class="ui inverted checkbox">
-          {{ hostform.DELETE }}
-          {% if hostform.instance.pk %}
-            <label for="{{ hostform.DELETE.id_for_label }}">{{ hostform.DELETE.label }}</label>
-          {% else %}
-            <label for="{{ hostform.DELETE.id_for_label }}">Clear</label>
-          {% endif %}
-          {% if hostform.DELETE.errors %}
+        <div class="field{% if ownerform.DELETE.errors %} error{% endif %}">
+          <label for="{{ ownerform.DELETE.id_for_label }}">{{ ownerform.DELETE.label|safe }}</label>
+          {{ ownerform.DELETE }}
+          {% if ownerform.DELETE.errors %}
             <div class="ui inverted red message">
-              {{ hostform.DELETE.errors }}
+              {{ ownerform.DELETE.errors }}
             </div>
           {% endif %}
         </div>
       </div>
-    </div>
-  {% endfor %}
-  <div class="four fields">
-    <div class="required field{% if form.nickname.errors %} error{% endif %}">
-      <label for="{{ form.nickname.id_for_label }}">{{ form.nickname.label|safe }}</label>
-      {{ form.nickname }}
-      {% if form.nickname.errors %}
-        <div class="ui inverted red message">
-          {{ form.nickname.errors }}
-        </div>
-      {% endif %}
-    </div>
-    <div class="field{% if form.password.errors %} error{% endif %}">
-      <label for="{{ form.password.id_for_label }}">{{ form.password.label|safe }}</label>
-      {{ form.password }}
-      {% if form.password.errors %}
-        <div class="ui inverted red message">
-          {{ form.password.errors }}
-        </div>
-      {% endif %}
-    </div>
-    <div class="field{% if form.mail.errors %} error{% endif %}">
-      <label for="{{ form.mail.id_for_label }}">{{ form.mail.label|safe }}</label>
-      {{ form.mail }}
-      {% if form.mail.errors %}
-        <div class="ui inverted red message">
-          {{ form.mail.errors }}
-        </div>
-      {% endif %}
-    </div>
-    <div class="required field{% if form.username.errors %} error{% endif %}">
-      <label for="{{ form.username.id_for_label }}">{{ form.username.label|safe }}</label>
-      {{ form.username }}
-      {% if form.username.errors %}
-        <div class="ui inverted red message">
-          {{ form.username.errors }}
-        </div>
-      {% endif %}
-    </div>
-  </div>
-  <div class="four fields">
-    <div class="required field{% if form.home_channel.errors %} error{% endif %}">
-      <label for="{{ form.home_channel.id_for_label }}">{{ form.home_channel.label|safe }}</label>
-      {{ form.home_channel }}
-      {% if form.home_channel.errors %}
-        <div class="ui inverted red message">
-          {{ form.home_channel.errors }}
-        </div>
-      {% endif %}
-    </div>
-    <div class="required field{% if form.command_character.errors %} error{% endif %}">
-      <label for="{{ form.command_character.id_for_label }}">{{ form.command_character.label|safe }}</label>
-      {{ form.command_character }}
-      {% if form.command_character.errors %}
-        <div class="ui inverted red message">
-          {{ form.command_character.errors }}
-        </div>
-      {% endif %}
-    </div>
-    <div class="required field{% if form.help_character.errors %} error{% endif %}">
-      <label for="{{ form.help_character.id_for_label }}">{{ form.help_character.label|safe }}</label>
-      {{ form.help_character }}
-      {% if form.help_character.errors %}
+    {% endfor %}
+    <div class="ui inverted toggle checkbox{% if form.enabled.errors %} error{% endif %}">
+      {{ form.enabled }}
+      <label for="{{ form.enabled.id_for_label }}">{{ form.enabled.label|safe }}</label>
+      {% if form.enabled.errors %}
         <div class="ui inverted red message">
-          {{ form.help_character.errors }}
+          {{ form.enabled.errors }}
         </div>
       {% endif %}
     </div>
-    {% render_field form.network_services %}
-    <script type="text/javascript">
-      $('.selection.dropdown')
-        .dropdown()
-      ;
-    </script>
-  </div>
-  {{ ownerformset.management_form }}
-  {% for ownerform in ownerformset %}
-    {% for field in hostform.hidden_fields %}{{ field }}{% endfor %}
-    <div class="two fields">
-      <div class="field{% if ownerform.hostmask.errors %} error{% endif %}">
-        <label for="{{ ownerform.hostmask.id_for_label }}">{{ ownerform.hostmask.label|safe }}</label>
-        {{ ownerform.hostmask }}
-        {% if ownerform.hostmask.errors %}
-          <div class="ui inverted red message">
-            {{ ownerform.hostmask.errors }}
-          </div>
-        {% endif %}
-      </div>
-      <div class="field{% if ownerform.DELETE.errors %} error{% endif %}">
-        <label for="{{ ownerform.DELETE.id_for_label }}">{{ ownerform.DELETE.label|safe }}</label>
-        {{ ownerform.DELETE }}
-        {% if ownerform.DELETE.errors %}
-          <div class="ui inverted red message">
-            {{ ownerform.DELETE.errors }}
-          </div>
-        {% endif %}
-      </div>
-    </div>
-  {% endfor %}
-  <div class="ui inverted toggle checkbox{% if form.enabled.errors %} error{% endif %}">
-    {{ form.enabled }}
-    <label for="{{ form.enabled.id_for_label }}">{{ form.enabled.label|safe }}</label>
-    {% if form.enabled.errors %}
-      <div class="ui inverted red message">
-        {{ form.enabled.errors }}
-      </div>
-    {% endif %}
-  </div>
-
-  <button class="ui right floated inverted positive button" type="submit" value="Submit"><i class="save icon"></i>Save</button>
-</form>
+    <button class="ui right floated inverted positive button" type="submit" value="Submit"><i class="save icon"></i>Save</button>
+  </form>

website/templates/base.html

@@ -11,13 +11,13 @@
     <meta name="description" content="{{ description }}">
     <meta name="keywords" content="{{ keywords }}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <style type="text/css">
+    <link rel="stylesheet" type="text/css" href="{% static "semantic.min.css" %}">
+    <style>
       .main.container {
         padding-top: 5em;
       }
     </style>
     <script src="{% static "jquery@3.3.1/dist/jquery.min.js" %}"></script>
-    <link rel="stylesheet" type="text/css" href="{% static "semantic.min.css" %}">
     <script src="{% static "semantic.min.js" %}"></script>
     <script src="{% static "Chart.min.js" %}"></script>
   </head>