Merge branch 'master' into datastore-bugs

circle/bower.json

@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "bootstrap": "~3.2.0",
-    "fontawesome": "~4.2.0",
+    "fontawesome": "~4.3.0",
     "jquery": "~2.1.1",
     "no-vnc": "*",
     "jquery-knob": "~1.2.9",

circle/common/management/commands/compileless.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from django.core.management.base import BaseCommand
 
 from common.management.commands.watch import LessUtils

circle/common/management/commands/watch.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 import subprocess
 import os
 import pyinotify

circle/common/views.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from sys import exc_info
 
 import logging

circle/dashboard/arrow_local.py

+# -*- coding: utf-8 -*-
+
+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
+from arrow import locales
+
+
+class HungarianLocale(locales.Locale):
+
+    names = ['hu', 'HU']
+
+    past = '{0} ezelőtt'
+    future = '{0} múlva'
+
+    timeframes = {
+        'now': 'éppen most',
+        'seconds': {
+            'past': 'másodpercekkel',
+            'future': 'pár másodperc'},
+        'minute': {'past': 'egy perccel', 'future': 'egy perc'},
+        'minutes': {'past': '{0} perccel', 'future': '{0} perc'},
+        'hour': {'past': 'egy órával', 'future': 'egy óra'},
+        'hours': {'past': '{0} órával', 'future': '{0} óra'},
+        'day': {
+            'past': 'nappal',
+            'future': 'nap'
+        },
+        'days': {
+            'past': '{0} nappal',
+            'future': '{0} nap'
+        },
+        'month': {'past': 'egy hónappal', 'future': 'egy hónap'},
+        'months': {'past': '{0} hónappal', 'future': '{0} hónap'},
+        'year': {'past': 'egy évvel', 'future': 'egy év'},
+        'years': {'past': '{0} évvel', 'future': '{0} év'},
+    }
+
+    month_names = ['', 'Január', 'Február', 'Március', 'Április', 'Május',
+                   'Június', 'Július', 'Augusztus', 'Szeptember',
+                   'Október', 'November', 'December']
+    month_abbreviations = ['', 'Jan', 'Febr', 'Márc', 'Ápr', 'Máj', 'Jún',
+                           'Júl', 'Aug', 'Szept', 'Okt', 'Nov', 'Dec']
+
+    day_names = ['', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek',
+                 'Szombat', 'Vasárnap']
+    day_abbreviations = ['', 'Hét', 'Kedd', 'Szer', 'Csüt', 'Pént',
+                         'Szom', 'Vas']
+
+    meridians = {
+        'am': 'de',
+        'pm': 'du',
+        'AM': 'DE',
+        'PM': 'DU',
+    }
+
+    def _format_timeframe(self, timeframe, delta):
+        form = self.timeframes[timeframe]
+        if isinstance(form, dict):
+            if delta > 0:
+                form = form['future']
+            else:
+                form = form['past']
+        delta = abs(delta)
+
+        return form.format(delta)

circle/dashboard/autocomplete_light_registry.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 import autocomplete_light
 from django.contrib.auth.models import User
 from django.utils.html import escape

circle/dashboard/static/dashboard/dashboard.less

@@ -651,9 +651,11 @@ textarea[name="new_members"] {
   padding-left: 28px;
 }
 
-.dashboard-profile-vm-list a, .dashboard-profile-vm-list a:hover {
-  text-decoration: none;
-  color: #555;
+.dashboard-profile-vm-list, .dashboard-profile-group-list {
+  a, a:hover {
+    text-decoration: none;
+    color: #555;
+  }
 }
 
 #group-detail-user-table td:nth-child(2) a,

circle/dashboard/store_api.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from os.path import splitext
 import json
 import logging

circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html

 {% load i18n %}
 {% load hro %}
+{% load arrowfilter %}
 <div id="activity-timeline" class="timeline">
   {% for a in activities %}
     <div class="activity" data-activity-id="{{ a.pk }}">
@@ -10,7 +11,8 @@
         {{ a.readable_name.get_admin_text|capfirst }}
       </strong>
 
-    {{ a.started|date:"Y-m-d H:i" }}{% if a.user %}, {{ a.user }}{% endif %}
+    <span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% if a.user %}, {{ a.user }}{% endif %}
+
     {% if a.children.count > 0 %}
       <div class="sub-timeline">
         {% for s in a.children.all %}
@@ -21,7 +23,9 @@
             </span>
             &ndash;
             {% if s.finished %}
-              {{ s.finished|time:"H:i:s" }}
+              <span title="{{ s.finished }}">
+                {{ s.finished|arrowfilter:LANGUAGE_CODE }}
+              </span>
             {% else %}
               <i class="fa fa-refresh fa-spin" class="sub-activity-loading-icon"></i>
             {% endif %}

circle/dashboard/templates/dashboard/profile.html

@@ -11,24 +11,28 @@
   <div class="col-md-{% if perms.auth.change_user %}8{% else %}12{% endif %}">
     <div class="panel panel-default">
       <div class="panel-heading">
-        {% if request.user.is_superuser %}
-          <a href="{{ login_token }}"
-             class="pull-right btn btn-danger btn-xs"
-             title="{% trans "Log in as this user. Recommended to open in an incognito window." %}">
-             {% trans "Login as this user" %}</a>
-        {% endif %}
-        <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.views.user-list" %}">{% trans "Back" %}</a>
+        <div class="pull-right">
+          {% if request.user.is_superuser %}
+          <a href="{{ login_token }}" class="btn btn-danger btn-xs"
+            title="{% trans "Log in as this user. Recommended to open in an incognito window." %}">
+            <i class="fa fa-user-secret"></i>
+            {% trans "Login as this user" %}
+          </a>
+          {% endif %}
+          <a class="btn btn-default btn-xs" href="{% url "dashboard.views.user-list" %}">
+            {% trans "Back" %}</a>
+        </div>
         <h3 class="no-margin">
           <i class="fa fa-user"></i>
           {% include "dashboard/_display-name.html" with user=profile show_org=True %}
         </h3>
       </div>
       <div class="panel-body">
-        <div>
-          <div class="" style="float: left">
+        <div class="row">
+          <div class="col-sm-4">
             <img id="dashboard-profile-avatar" src="{{ avatar_url }}" class="img-rounded"/>
           </div>
-          <div class="" style="padding-left: 215px;">
+          <div class="col-sm-8">
             <p>{% trans "Username" %}: {{ profile.username }}</p>
             <p>{% trans "Organization ID" %}: {{ profile.profile.org_id|default:"-" }}</p>
             <p>{% trans "First name" %}: {{ profile.first_name|default:"-" }}</p>
@@ -48,7 +52,6 @@
             <a href="{% url "dashboard.views.profile-preferences" %}">{% trans "Change my preferences" %}</a>
             {% endif %}
           </div>
-          <div class="clearfix"></div>
         </div>
 
         {% if perm_group_list %}
@@ -57,11 +60,11 @@
             <i class="fa fa-group"></i> {% trans "Groups" %}
           </h4>
           <ul class="dashboard-profile-group-list">
-          {% for g in groups %}
-            <li>{{ g.name }}</li>
+            {% for g in groups %}
+            <li><a href="{{ g.profile.get_absolute_url }}">{{ g.name }}</a></li>
             {% empty %}
             {% trans "This user is not in any group." %}
-          {% endfor %}
+            {% endfor %}
           </ul>
         {% endif %}
 

circle/dashboard/templates/dashboard/template-list/column-template-created.html

-{{ record.created|date }}
-<br />
-{{ record.created|time }}
+{% load arrowfilter %}
+<span title="{{ record.created }}">
+  {{ record.created|arrowfilter:LANGUAGE_CODE }}
+</span>

circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html

 {% load i18n %}
 {% load hro %}
+{% load arrowfilter %}
 <div id="activity-timeline" class="timeline">
 
 {% for a in activities %}
@@ -18,10 +19,12 @@
   - {{ a.percentage }}%
 {% endif %}
 </strong>
-{% endspaceless %}{% if a.times < 2%} {{ a.started|date:"Y-m-d H:i" }}{% endif %}{% if a.user %},
-  <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}">
-    {% include "dashboard/_display-name.html" with user=a.user show_org=True %}
-  </a>
+{% endspaceless %}
+{% if a.times < 2 %}
+  <span title="{{ a.started }}">{{ a.started|arrowfilter:LANGUAGE_CODE }}</span>{% endif %}{% if a.user %},
+    <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}">
+      {% include "dashboard/_display-name.html" with user=a.user show_org=True %}
+    </a>
 {% endif %}
 {% if a.is_abortable_for_user %}
 <form action="{{ a.instance.get_absolute_url }}" method="POST" class="pull-right">
@@ -40,7 +43,9 @@
           <a href="{{ s.get_absolute_url }}">
               {{ s.readable_name|get_text:user|capfirst }}</a></span> &ndash;
         {% if s.finished %}
-          {{ s.finished|time:"H:i:s" }}
+          <span title="{{ s.finished }}">
+            {{ s.finished|arrowfilter:LANGUAGE_CODE }}
+          </span>
         {% else %}
           <i class="fa fa-refresh fa-spin" class="sub-activity-loading-icon"></i>
         {% endif %}

circle/dashboard/templates/dashboard/vm-detail/home.html

 {% load i18n %}
+{% load arrowfilter %}
 <div class="row">
   <div class="col-md-4">
     <dl id="home_name_and_description">
@@ -69,13 +70,13 @@
         <dt>{% trans "Suspended at:" %}</dt>
         <dd>
           <span title="{{ instance.time_of_suspend }}">
-            <i class="fa fa-moon-o"></i> {{ instance.time_of_suspend|timeuntil }}
+            <i class="fa fa-moon-o"></i> {{ instance.time_of_suspend|arrowfilter:LANGUAGE_CODE }}
           </span>
         </dd>
         <dt>{% trans "Destroyed at:" %}</dt>
         <dd>
           <span title="{{ instance.time_of_delete }}">
-            <i class="fa fa-times"></i> {{ instance.time_of_delete|timeuntil }}
+            <i class="fa fa-times"></i> {{ instance.time_of_delete|arrowfilter:LANGUAGE_CODE }}
           </span>
         </dd>
       </dl>

circle/dashboard/templatetags/arrowfilter.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.template import Library
+
+import arrow
+from dashboard.arrow_local import HungarianLocale
+for name in HungarianLocale.names:
+    arrow.locales._locales[name] = HungarianLocale
+
+
+register = Library()
+
+
+@register.filter
+def arrowfilter(date, language='en'):
+    if not date:
+        return ''
+    adate = arrow.get(date)
+    return adate.humanize(locale=language)

circle/dashboard/templatetags/hro.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from django.template import Library
 
 

circle/dashboard/templatetags/network_tags.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from django import template
 
 register = template.Library()

circle/dashboard/tests/test_periodic_task.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 import unittest
 from mock import patch, MagicMock
 

circle/dashboard/validators.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 

circle/dashboard/views/group.py

@@ -61,8 +61,7 @@ class GroupCodeMixin(object):
             state = StateCache(request.session)
             conf = get_config(None, request)
             client = Saml2Client(conf, state_cache=state,
-                                 identity_cache=IdentityCache(request.session),
-                                 logger=logger)
+                                 identity_cache=IdentityCache(request.session))
             subject_id = _get_subject_id(request.session)
             identity = client.users.get_identity(subject_id,
                                                  check_not_on_or_after=False)

circle/fabfile.py

 #!/bin/echo Usage: fab --list -f
+
+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 import contextlib
 import datetime
 

circle/monitor/client.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
 from itertools import islice
 from socket import gethostname
 import logging

requirements/base.txt

 amqp==1.4.6
 anyjson==0.3.3
+arrow==0.5.4
 billiard==3.3.0.18
 bpython==0.13.1
 celery==3.1.17