diff --git a/computes/forms.py b/computes/forms.py index 7dfcbe6..ff8e9b9 100644 --- a/computes/forms.py +++ b/computes/forms.py @@ -13,6 +13,7 @@ class ComputeAddTcpForm(forms.Form): max_length=100) password = forms.CharField(error_messages={'required': _('No password has been entered')}, max_length=100) + details = forms.CharField(max_length=50, required=False) def clean_name(self): name = self.cleaned_data['name'] @@ -49,6 +50,7 @@ class ComputeAddSshForm(forms.Form): max_length=100) login = forms.CharField(error_messages={'required': _('No login has been entered')}, max_length=20) + details = forms.CharField(max_length=50, required=False) def clean_name(self): name = self.cleaned_data['name'] @@ -87,6 +89,7 @@ class ComputeAddTlsForm(forms.Form): max_length=100) password = forms.CharField(error_messages={'required': _('No password has been entered')}, max_length=100) + details = forms.CharField(max_length=50, required=False) def clean_name(self): name = self.cleaned_data['name'] @@ -125,6 +128,7 @@ class ComputeEditHostForm(forms.Form): login = forms.CharField(error_messages={'required': _('No login has been entered')}, max_length=100) password = forms.CharField(max_length=100) + details = forms.CharField(max_length=50, required=False) def clean_name(self): name = self.cleaned_data['name'] diff --git a/computes/models.py b/computes/models.py index df9bf02..daedcab 100644 --- a/computes/models.py +++ b/computes/models.py @@ -6,7 +6,7 @@ class Compute(models.Model): hostname = models.CharField(max_length=20) login = models.CharField(max_length=20) password = models.CharField(max_length=14, blank=True, null=True) - details = models.CharField(max_length=50, null=True, blank=True) + details = models.CharField(max_length=50, null=True, blank=True) type = models.IntegerField() def __unicode__(self): diff --git a/computes/templates/computes.html b/computes/templates/computes.html index 2ffc6f4..58ffb31 100644 --- a/computes/templates/computes.html +++ b/computes/templates/computes.html @@ -62,8 +62,9 @@

{% trans "Edit connection" %}

{% ifequal compute.type 1 %} -
-
{% csrf_token %} + {% csrf_token %} +
+
@@ -89,23 +90,28 @@
-
-
- - - - -
+
+ +
+ +
+
+
+ + + +
+ {% endifequal %} {% ifequal compute.type 2 %} -
-
{% csrf_token %} + {% csrf_token %} +

{% trans "Need create ssh authorization key. If you have another SSH port on your server, you can add IP:PORT like '192.168.1.1:2222'." %}

@@ -124,25 +130,33 @@
+
-
-
- - - - -
+
+ +
+ +
+
+
+
+ + + + +
+ {% endifequal %} {% ifequal compute.type 3 %} -
-
{% csrf_token %} + {% csrf_token %} +
@@ -168,23 +182,29 @@
-
-
- - - - -
+
+ +
+ +
+
+
+
+ + + +
+ {% endifequal %} {% ifequal compute.type 4 %} -
-
{% csrf_token %} + {% csrf_token %} +
@@ -192,19 +212,25 @@
-
-
- - - - -
+
+ +
+ +
+
+
+
+ + + +
+ {% endifequal %} diff --git a/computes/templates/create_comp_block.html b/computes/templates/create_comp_block.html index 9e9a965..734e4c1 100644 --- a/computes/templates/create_comp_block.html +++ b/computes/templates/create_comp_block.html @@ -9,7 +9,7 @@
- +

{% trans "Add Connection" %}

@@ -50,6 +50,12 @@
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+