Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud into production

one/static/script/cloud.js

@@ -185,8 +185,10 @@ $(function() {
     $('.hidden-password').click(function() {
         if($(this).attr('type') == 'password'){
             $(this).attr('type', 'text');
+            $(this).addClass('shown');
         } else {
             $(this).attr('type', 'password');
+            $(this).removeClass('shown');
         }
     });
     $('.selected-summary').next().show();
@@ -197,15 +199,12 @@ $(function() {
     function get_vm_details(id) {
         $.get('/vm/credentials/' + id, function(data) {
             $('#modal-container').html(data);
-            $('.hidden-password').each(function() {
-                $(this).val('******');
-            });
-            $('.hidden-password').click(function() {
-                if(!$(this).hasClass('shown')) {
-                    $(this).val($(this).data('value'));
+            $('#modal-container .hidden-password').click(function() {
+                if($(this).attr('type') == 'password'){
+                    $(this).attr('type', 'text');
                     $(this).addClass('shown');
                 } else {
-                    $(this).val('******');
+                    $(this).attr('type', 'password');
                     $(this).removeClass('shown');
                 }
             })

one/static/style/box.less

@@ -460,10 +460,10 @@
     background-image: url(/static/icons/computer-off.png);
 }
 
-#template .wm .summary .name{
+#template .entry .summary .name{
   background-image: url(/static/icons/document-template.png)
 }
-#template .wm .public-template .name{
+#template .entry .public-template .name{
   background-image: url(/static/icons/blue-document-share.png)
 }
 #new-template-button .name{

one/templates/box/template/box.html

@@ -23,7 +23,7 @@
 {% endblock %}
 
 {% block content %}
-<ul class="vm-list entry-list">
+<ul class="vm-list entry-list" id="template">
     {% for t in mytemplates %}
         {% include "box/template/entry.html" %}
     {% endfor %}

one/templates/box/template/summary.html

@@ -40,9 +40,9 @@
     <a href="#" class="try-template" data-id="{{t.id}}" title="{% trans "Try"  %}">
         <img src="/static/icons/control.png" alt="{% trans "Start" %}"/>
     </a>
-    <a href="#" title="{% trans "Edit" %}">
+    <!--<a href="#" title="{% trans "Edit" %}">
         <img src="/static/icons/pencil.png" alt="{% trans "Edit" %}" />
-    </a>
+    </a>-->
     <a href="#" class="template-share" data-id="{{t.id}}" data-gid="{{group.id}}" title="{% trans "Share" %}">
         <img src="/static/icons/user-share.png" alt="{% trans "Share" %}" />
     </a>
@@ -50,7 +50,7 @@
     <a href="#" class="delete-template" data-id="{{ t.id }}" data-name="{{ t.name }}" title="{% trans "Remove" %}">
         <img src="/static/icons/minus-circle.png" alt="{% trans "Remove" %}" />
     </a>
-    <a href="#" class="edit-template" data-id="{{ t.id }}" title="{% trans "Edit" %}">
+    <!--<a href="#" class="edit-template" data-id="{{ t.id }}" title="{% trans "Edit" %}">
         <img src="/static/icons/pencil.png" alt="{% trans "Edit" %}" />
-    </a>
+    </a>-->
 {% endblock actions %}

school/views.py

@@ -242,13 +242,13 @@ def group_ajax_owner_autocomplete(request):
 
     results = map(lambda u: {
         'name': u.get_full_name(),
-        'neptun': u.username }, User.objects.filter(last_name__startswith=request.POST['q'])[:5])
+        'neptun': u.username }, User.objects.filter(last_name__istartswith=request.POST['q'])[:5])
     results += map(lambda u: {
         'name': u.get_full_name(),
-        'neptun': u.username }, User.objects.filter(first_name__startswith=request.POST['q'])[:5])
+        'neptun': u.username }, User.objects.filter(first_name__istartswith=request.POST['q'])[:5])
     results += map(lambda u: {
         'name': u.get_full_name(),
-        'neptun': u.username }, User.objects.filter(username__startswith=request.POST['q'])[:5])
+        'neptun': u.username }, User.objects.filter(username__istartswith=request.POST['q'])[:5])
     return HttpResponse(json.dumps(results, ensure_ascii=False))
 
 @login_required