network page start

webgui/stats/templates/stats/network.html

@@ -48,39 +48,53 @@
                 </div>
             </a>
         </header>
-        <section class="ui segment container">
-                <div class="ui centered card">
+        <section class="ui basic text segment container">
+                <div class="ui card">
                     <div class="content">
                         <div class="header">
-                        <i class="settings icon"></i>
-                            Configuration
-                            {% if {{ network.password }} or {{ network.use_ssl }} %}
+                            <i class="cloud icon"></i>
+                            {{ network }}
+                            {% if network.password %}
                                 <div class="right floated content">
-                                    {% if {{ network.password }} %}
-                                        <i class="privacy icon"></i>
-                                    {% endif %}
+                                    <i class="green privacy icon" title="NickServ password saved"></i>
                                 </div>
                             {% endif %}
                         </div>
-                        <h4 class="ui sub header">
-                            <i class="cloud icon"></i>
-                            {{ network }}
-                        </h4>
                         <div class="meta">
-                            {{ network.host }}:{{ network.port }} {{ network.home_channel }}
+                            {{ network.host }}:{{ network.port }}
+                            {% if network.use_ssl %}
+                                <div class="right floated content">
+                                    <i class="green lock icon" title="Encrypted connection"></i>
+                                </div>
+                            {% endif %}
                         </div>
-                        <div class="description">
-                            <div class="ui basic label">
-                                <i class="id card icon"></i>
-                                {{ network.username }}
-                            </div>
-                            <div class="ui basic label">
-                                <i class="terminal icon"></i>
-                            {{ network.command_character }}
+                        <div class="ui divider"></div>
+                        <div class="content">
+                            <div class="ui list">
+                                <div class="item" title="Home channel">
+                                    <i class="hashtag icon"></i>
+                                    <div class="content">
+                                        {{ network.home_channel }}
+                                    </div>
+                                </div>
+                                <div class="item" title="Username">
+                                    <i class="id card icon"></i>
+                                    <div class="content">
+                                        {{ network.username }}
+                                    </div>
+                                </div>
                             </div>
-                            <div class="ui basic label">
-                                <i class="help icon"></i>
-                                {{ network.help_character }}
+                            <div class="ui bottom right attached basic label">
+                                <div class="ui divided horizontal list">
+                                    <div class="item" title="Command character">
+                                        <i class="terminal icon"></i>
+                                        {{ network.command_character }}
+                                    </div>
+                                    <div class="item" title="Heplp character">
+                                        <i class="help icon"></i>
+                                        {{ network.help_character }}
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

webgui/stats/templates/stats/networks.html

@@ -50,8 +50,8 @@
                     {% for network in networks %}
                         <a class="item" href="{% url 'stats:network' network.name %}">
                             <div class="right floated content">
-                                {% if network.password %}<i class="privacy icon" alt="NickServ password saved"></i>{% endif %}
-                                {% if network.use_ssl %}<i class="lock icon" title="Encrypted connection"></i>{% endif %}
+                                {% if network.password %}<i class="green privacy icon" title="NickServ password saved"></i>{% endif %}
+                                {% if network.use_ssl %}<i class="green lock icon" title="Encrypted connection"></i>{% endif %}
                                 </div>
                             <i class="middle aligned server icon"></i>
                             <div class="content">
@@ -93,7 +93,7 @@
                 }
             </script>
             <div class="ui card">
-                <div class="content">
+                <div title="Messages seen per network" class="content">
                     <div class="header">
                         <div>
                             <i class="ui comments icon"></i>
@@ -128,13 +128,13 @@
                 }
             </script>
             <div class="ui card">
-                <div class="content">
+                <div class="content" title="Users seen per network">
                     <div class="header">
-                    <div>
-                        <i class="ui users icon"></i>
-                        /
-                        <i class="ui sitemap icon"></i>
-                    </div>
+                        <div>
+                            <i class="ui users icon"></i>
+                            /
+                            <i class="ui sitemap icon"></i>
+                        </div>
                     </div>
                 </div>
                 <div class="content">
@@ -163,13 +163,13 @@
                 }
             </script>
             <div class="ui card">
-                <div class="content">
+                <div class="content" title="Channels joined per network">
                     <div class="header">
-                    <div>
-                        <i class="ui hashtag icon"></i>
-                        /
-                        <i class="ui sitemap icon"></i>
-                    </div>
+                        <div>
+                            <i class="ui hashtag icon"></i>
+                            /
+                            <i class="ui sitemap icon"></i>
+                        </div>
                     </div>
                 </div>
                 <div class="content">

webgui/webgui/common/convert_units.py

@@ -1,16 +1,16 @@
 def shorten_number (number):
     if len(str(number)) > 20:
-        number = str(int(number /1000000000000000000)) +"E"
+        number = str(number /1000000000000000000) +"E"
     if len(str(number)) > 17:
-        number = str(int(number /1000000000000000)) +"P"
+        number = str(number /1000000000000000) +"P"
     if len(str(number)) > 14:
-        number = str(int(number /1000000000000)) +"T"
+        number = str(number /1000000000000) +"T"
     if len(str(number)) > 11:
-        number = str(int(number /1000000000)) +"G"
+        number = str(number /1000000000) +"G"
     if len(str(number)) > 8:
-        number = str(int(number /1000000)) +"M"
+        number = str(number /1000000) +"M"
     if len(str(number)) > 5:
-        number = str(int(number /1000)) + "K"
+        number = str(number /1000) + "K"
     if len(str(number)) > 4:
-        number = str(int(number /100)) + "h"
-    return str(number)
+        number = str(number /100) + "h"
+    return str(int(number))