Merge remote-tracking branch 'origin/master' into releases

one/static/script/cloud.js

@@ -21,9 +21,9 @@ $(function() {
     $('a[href=#]').click(function(e) {
     $('a[href=#]').click(function(e) {
         e.preventDefault();
         e.preventDefault();
     });
     });
-    $('.host-toggle').click(function(e){
+    $('.host-toggle').click(function(e) {
         e.preventDefault();
         e.preventDefault();
-        if($(this).find('.v4').is(':hidden')){
+        if ($(this).find('.v4').is(':hidden')) {
             $(this).find('.v4').show();
             $(this).find('.v4').show();
             $(this).find('.v6').hide();
             $(this).find('.v6').hide();
             $(this).parent().next().find('.host').show();
             $(this).parent().next().find('.host').show();
@@ -88,20 +88,20 @@ $(function() {
         var handler = arguments.callee;
         var handler = arguments.callee;
         var oldName = $(this).data('name');
         var oldName = $(this).data('name');
         var content = $('#vm-' + id + '-name').html();
         var content = $('#vm-' + id + '-name').html();
-        var self=this;
+        var self = this;
         var url = $(this).data('url');
         var url = $(this).data('url');
-        $('#vm-'+id).addClass('editing');
-        $(this).unbind('click').click(function(e){
+        $('#vm-' + id).addClass('editing');
+        $(this).unbind('click').click(function(e) {
             e.preventDefault();
             e.preventDefault();
             e.stopPropagation();
             e.stopPropagation();
             $(this).unbind('click').click(handler);
             $(this).unbind('click').click(handler);
             $('#vm-' + id + '-name-details').show();
             $('#vm-' + id + '-name-details').show();
             $('#vm-' + id + '-name').html(content);
             $('#vm-' + id + '-name').html(content);
-            $('#vm-'+id).removeClass('editing');
+            $('#vm-' + id).removeClass('editing');
         })
         })
         $('#vm-' + id + '-name-details').hide();
         $('#vm-' + id + '-name-details').hide();
         $('#vm-' + id + '-name').html('<input type="text" value="' + oldName + '" />\
         $('#vm-' + id + '-name').html('<input type="text" value="' + oldName + '" />\
-<input type="submit" value="' + gettext('Rename') + '" data-url="'+url+'"/>');
+<input type="submit" value="' + gettext('Rename') + '" data-url="' + url + '"/>');
         $('#vm-' + id + '-name').find('input[type="text"]').click(function(f) {
         $('#vm-' + id + '-name').find('input[type="text"]').click(function(f) {
             f.preventDefault();
             f.preventDefault();
             f.stopPropagation();
             f.stopPropagation();
@@ -120,7 +120,7 @@ $(function() {
                     $('#vm-' + id + '-name').text(data.name);
                     $('#vm-' + id + '-name').text(data.name);
                     $(self).click(handler);
                     $(self).click(handler);
                     $(self).data('name', newName);
                     $(self).data('name', newName);
-                    $('#vm-'+id).removeClass('editing');
+                    $('#vm-' + id).removeClass('editing');
                 }
                 }
             });
             });
         })
         })
@@ -171,14 +171,14 @@ $(function() {
         })
         })
         $('#modal').show();
         $('#modal').show();
     });
     });
-    $('.edit-template').click(function(e){
+    $('.edit-template').click(function(e) {
         e.preventDefault();
         e.preventDefault();
         e.stopPropagation();
         e.stopPropagation();
-        var id=$(this).data('id');
+        var id = $(this).data('id');
         $.ajax({
         $.ajax({
             type: 'GET',
             type: 'GET',
             url: $(this).data('url'),
             url: $(this).data('url'),
-            success: function(data){
+            success: function(data) {
                 $('#modal').show();
                 $('#modal').show();
                 $('#modal-container').html(data);
                 $('#modal-container').html(data);
             }
             }
@@ -285,9 +285,9 @@ $(function() {
     function get_vm_details(id) {
     function get_vm_details(id) {
         $.get('/vm/credentials/' + id, function(data) {
         $.get('/vm/credentials/' + id, function(data) {
             $('#modal-container').html(data);
             $('#modal-container').html(data);
-            $('#modal-container .host-toggle').click(function(e){
+            $('#modal-container .host-toggle').click(function(e) {
                 e.preventDefault();
                 e.preventDefault();
-                if($(this).find('.v4').is(':hidden')){
+                if ($(this).find('.v4').is(':hidden')) {
                     $(this).find('.v4').show();
                     $(this).find('.v4').show();
                     $(this).find('.v6').hide();
                     $(this).find('.v6').hide();
                     $(this).parent().next().find('.host').show();
                     $(this).parent().next().find('.host').show();
@@ -327,7 +327,7 @@ $(function() {
         });
         });
     }
     }
 
 
-    cloud.confirm=vm_confirm_popup;
+    cloud.confirm = vm_confirm_popup;
     /**
     /**
      * Manage VM State (STOP)
      * Manage VM State (STOP)
      */
      */
@@ -372,8 +372,8 @@ $(function() {
     function renew_suspend_vm(id) {
     function renew_suspend_vm(id) {
         manage_vm(id, "renew/suspend", function(data) {
         manage_vm(id, "renew/suspend", function(data) {
             //workaround for some strange jquery parse error :o
             //workaround for some strange jquery parse error :o
-            var foo=$('<div />').append(data);
-            $('#vm-'+id+' .details-container').replaceWith(foo.find('.details-container'));
+            var foo = $('<div />').append(data);
+            $('#vm-' + id + ' .details-container').replaceWith(foo.find('.details-container'));
         });
         });
     }
     }
     /**
     /**
@@ -392,7 +392,7 @@ $(function() {
             type: 'POST',
             type: 'POST',
             url: '/vm/' + state + '/' + id + '/',
             url: '/vm/' + state + '/' + id + '/',
             success: function(data, b, c) {
             success: function(data, b, c) {
-                if(f) {
+                if (f) {
                     f(data);
                     f(data);
                 } else if (state == "resume") {
                 } else if (state == "resume") {
                     window.location.href = '/vm/show/' + id + "/";
                     window.location.href = '/vm/show/' + id + "/";

one/templates/box/file/box.html

@@ -105,7 +105,7 @@
             <div class="clear"></div>
             <div class="clear"></div>
         </div>
         </div>
         <div class="details">
         <div class="details">
-            <div class="container">
+            <div class="details-container">
                 <form style="padding-bottom: 10px" action="{% url one.views.key_add %}" method="POST">
                 <form style="padding-bottom: 10px" action="{% url one.views.key_add %}" method="POST">
                     {% csrf_token %}
                     {% csrf_token %}
                     <textarea style="margin-bottom: 5px" name="key" placeholder="{% trans "Public key in OpenSSH format" %}"></textarea><br />
                     <textarea style="margin-bottom: 5px" name="key" placeholder="{% trans "Public key in OpenSSH format" %}"></textarea><br />
@@ -129,6 +129,7 @@
             <div class="clear"></div>
             <div class="clear"></div>
         </div>
         </div>
         <div class="details">
         <div class="details">
+            <div class="details-container">
                 <div class="container">
                 <div class="container">
                     <div id="upload-zone" class="upload-zone">
                     <div id="upload-zone" class="upload-zone">
                         <p>{% trans "Drag and drop files here to start uploading." %}</p>
                         <p>{% trans "Drag and drop files here to start uploading." %}</p>
@@ -152,6 +153,7 @@
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
+        </div>
     </li>
     </li>
     <li class="entry small">
     <li class="entry small">
         <div class="summary">
         <div class="summary">

school/templates/box/person/box.html

@@ -33,7 +33,7 @@
         {% include "box/person/entry.html" %}
         {% include "box/person/entry.html" %}
     {% endfor %}
     {% endfor %}
     <li class="entry small-row">
     <li class="entry small-row">
-        <div class="summary" id="new-member">
+        <div class="summary" id="new-member" data-fallback="slide">
             <div class="name">{% trans "Add user" %}</div>
             <div class="name">{% trans "Add user" %}</div>
             <div id="new-member-form">
             <div id="new-member-form">
                 <input type="text" placeholder="{% trans "User NEPTUN code" %}" />
                 <input type="text" placeholder="{% trans "User NEPTUN code" %}" />

school/templates/show-group.html

@@ -32,7 +32,7 @@
                     <div class="clear"></div>
                     <div class="clear"></div>
                 </div>
                 </div>
                 <div class="details">
                 <div class="details">
-                    <div class="container">
+                    <div class="details-container">
                         {% if not owner.user %}
                         {% if not owner.user %}
                         {% trans "This user never logged in, no data available" %}
                         {% trans "This user never logged in, no data available" %}
                         {% else %}
                         {% else %}
@@ -53,16 +53,18 @@
             </li>
             </li>
             {% endfor %}
             {% endfor %}
             <li class="entry small-row">
             <li class="entry small-row">
-                <div class="summary" id="new-owner" data-gid="{{group.id}}">
+                <div class="summary" id="new-owner" data-gid="{{group.id}}" data-fallback="slide">
                     <div class="name">{% trans "Add owner" %}</div>
                     <div class="name">{% trans "Add owner" %}</div>
                     <div class="clear"></div>
                     <div class="clear"></div>
                 </div>
                 </div>
                 <div class="details" id="new-owner-form">
                 <div class="details" id="new-owner-form">
+                    <div class="details-container">
                         <div class="container">
                         <div class="container">
                             <input type="text" placeholder="{% trans "Owner name/NEPTUN" %}" data-url="{% url school.views.group_ajax_owner_autocomplete %}"/>
                             <input type="text" placeholder="{% trans "Owner name/NEPTUN" %}" data-url="{% url school.views.group_ajax_owner_autocomplete %}"/>
                             <div id="new-owner-autocomplete"></div>
                             <div id="new-owner-autocomplete"></div>
                         </div>
                         </div>
                     </div>
                     </div>
+                </div>
             </li>
             </li>
         </ul>
         </ul>
     </div>
     </div>