4 files changed, 133 insertions, 9 deletions
diff --git a/templates/apps/content/cluster.html b/templates/apps/content/cluster.html
new file mode 100644
index 0000000..6d30690
--- /dev/null
+++ b/templates/apps/content/cluster.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+{% block js %}
+    <link href="{{STATIC_URL}}/css/jquery.dataTables.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="{{STATIC_URL}}/js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/dataTables.fileSize.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/dataTables.percent.js"></script>
+    <script>
+        $(document).ready(function() {
+            $('#content').dataTable({
+                "aoColumns": [
+                null,
+                null,
+                { "sType": "file-size" },
+                { "sType": "percent" }
+            ]
+            });
+        });
+    </script>
+{% endblock %}
+{% block content %}
+<ul class="nav nav-pills">
+{% for cluster in clusters %}
+    <li class="{% if cluster.name == cluster_name %}active{% else %}{% endif %}">
+        <a href="{{ cluster.name }}">{{ cluster.name }}</a>
+    </li>
+{% endfor %}
+</ul>
+{% if cluster_name %}
+    <h1>Storage for {{cluster_name}}</h1>
+    <div>
+        <strong>Total storage:</strong> {{ total_bytecount|filesizeformat }}
+    </div>
+     <br>
+     <br>
+    <div>
+        <table cellpadding="0" cellspacing="0" border="0" class="table table-striped table-bordered" id="content">
+            <thead>
+                <tr>
+                    <th>Domain</th><th>Number of files</th><th>Storage used</th><th>Percent</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for domain in domains %}
+                <tr>
+                    <td><a href="../domain/{{ domain.domain }}">{{ domain.domain }}</a></td>
+                    <td>{{ domain.number_of_files }}</td>
+                    <td>{{ domain.domain_bytes|filesizeformat}}</td>
+                    <td>{% widthratio domain.domain_bytes total_bytecount 100 %}%</td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+{% endif %}
+{% endblock %}
+
+{% block widgets %}
+
+{% endblock %}
+\ No newline at end of file
diff --git a/templates/apps/content/domain.html b/templates/apps/content/domain.html
new file mode 100644
index 0000000..5efd236
--- /dev/null
+++ b/templates/apps/content/domain.html
@@ -0,0 +1,50 @@
+{% extends "base.html" %}
+{% block js %}
+    <link href="{{STATIC_URL}}/css/jquery.dataTables.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="{{STATIC_URL}}/js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/dataTables.fileSize.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/dataTables.percent.js"></script>
+    <script>
+        $(document).ready(function() {
+            $('#content').dataTable({
+                "aoColumns": [
+                null,
+                null,
+                { "sType": "file-size" },
+                { "sType": "percent" }
+            ]
+            });
+        });
+    </script>
+{% endblock %}
+{% block content %}
+<h1>Content for {{domain}}</h1>
+<div>
+    <strong>Number of files:</strong> {{ total_files }} | <strong>Total storage:</strong> {{ total_bytecount|filesizeformat }}
+</div>
+ <br>
+ <br>
+<div>
+    <table cellpadding="0" cellspacing="0" border="0" class="table table-striped table-bordered" id="content">
+        <thead>
+            <tr>
+                <th>Username</th><th>Number of files</th><th>Storage used</th><th>Percent</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for user in users %}
+            <tr>
+                <td>{{ user.username }}</td>
+                <td>{{ user.number_of_files }}</td>
+                <td>{{ user.bytecount|filesizeformat }}</td>
+                <td>{% widthratio user.bytecount total_bytecount 100 %}%</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}
+
+{% block widgets %}
+
+{% endblock %}
+\ No newline at end of file
diff --git a/templates/apps/content/user.html b/templates/apps/content/user.html
index b02ad77..697bba7 100644
--- a/templates/apps/content/user.html
+++ b/templates/apps/content/user.html
@@ -2,17 +2,28 @@
 {% block js %}
     <link href="{{STATIC_URL}}/css/jquery.dataTables.css" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="{{STATIC_URL}}/js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/dataTables.fileSize.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/dataTables.dateEuro.js"></script>
     <script>
         $(document).ready(function() {
-            $('#content').dataTable();
+            $('#content').dataTable({
+                "aoColumns": [
+                { "sType": "date-euro" },
+                null,
+                null,
+                { "sType": "file-size" },
+                { "sType": "date-euro" },
+                null,
+                { "sType": "date-euro" }
+            ]
+            });
         });
     </script>
 {% endblock %}
-{% load content_tags %}
 {% block content %}
 <h1>Content for {{username}}</h1>
 <div>
-    <strong>Number of files:</strong> {{ content|length }} | <strong>Total storage:</strong> {{ total_bytecount.bytecount__sum|humanize_bytes }}
+    <strong>Number of files:</strong> {{ content|length }} | <strong>Total storage:</strong> {{ total_bytecount.bytecount__sum|filesizeformat }}
 </div>
  <br>
  <br>
@@ -26,14 +37,14 @@
         <tbody>
         {% for item in content %}
             <tr>
-                <td>{{ item.created }}</td>
-                <td>{{ item.name }} <a href="{{ item.download_url }}"><i class="icon-download"></i></a></td>
+                <td>{{ item.created|date:"d/m/Y H:i:s" }}</td>
+                <td><a href="{{ item.go_url }}">{{ item.name }}</a> <a href="{{ item.download_url }}"><i class="icon-download"></i></a></td>
                 <td>{{ item.type }}</td>
 
-                <td>{{ item.bytecount|humanize_bytes }}</td>
-                <td>{{ item.modified }}</td>
+                <td>{{ item.bytecount|filesizeformat }}</td>
+                <td>{{ item.modified|date:"d/m/Y H:i:s" }}</td>
                 <td>{{ item.views }}</td>
-                <td>{{ item.lastviewed }}</td>
+                <td>{{ item.lastviewed|date:"d/m/Y H:i:s" }}</td>
             </tr>
         {% endfor %}
         </tbody>
diff --git a/templates/base.html b/templates/base.html
index 90d516e..e0c4695 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -87,8 +87,12 @@
 			<div class="span3">
                 <ul class="unstyled">
                     <li><h3>Users</h3></li>
-                    <li><a class="tip" title="Your list of meeting resources.." href="/rooms">My Profile</a></li>
+                    <li><a class="tip" title="Your list of meeting resources..." href="/rooms">My Profile</a></li>
+                    <li><a class="tip" title="Your list of uploaded files and recordings..." href="/content">My Files</a></li>
                     <li><a class="tip" title="Find out how much you use e-meetings..." href="/stats">Usage Statistics</a></li>
+                    {% if user.is_staff %}
+                        <li><a class="tip" title="Find out how much data each cluster stores..." href="/content/cluster">Cluster Storage</a></li>
+                    {% endif %}
                     <li><a class="tip" title="Logout" id="logout" href="/accounts/logout">Logout</a></li>
                 </ul>
 	        </div>