Merge pull request #282 from grycap/devel

Minor change
grycap · Mar 30, 2022 · 4f1e038 · 4f1e038
2 parents 3501076 + 6fbc03b
commit 4f1e038
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/app/templates/default_form.html b/app/templates/default_form.html
@@ -14,7 +14,7 @@
         {% set min_length = value.constraints | selectattr('min_length') | map(attribute='min_length') | list  %}
         {% set max_length = value.constraints | selectattr('max_length') | map(attribute='max_length') | list  %}
         <div class="form-group">
-          <label for="{{key}}">{% if value.description %}{{value.description}}{% else %}{{key}}{% endif %}</label>
+          <label for="{{key}}" style="white-space: pre-wrap;">{% if value.description %}{{value.description}}{% else %}{{key}}{% endif %}</label>
 
 	  <!-- select type if constraints are defined -->
 	  {% set constraints = value.constraints | selectattr('valid_values') | map(attribute='valid_values') | list  %}

diff --git a/app/templates/input_types.html b/app/templates/input_types.html
@@ -1,12 +1,6 @@
 <div class="form-group">
   {% if value.tag_type is not defined or value.tag_type != "hidden" %}
-  <label for="{{key}}">
-    {% if value.description is defined %}
-    {{value.description}}
-    {% else %}
-    {{key}}
-    {% endif %}
-  </label>
+  <label for="{{key}}" style="white-space: pre-wrap;">{% if value.description is defined %}{{value.description}}{% else %}{{key}}{% endif %}</label>
   {% endif %}
 
   {% set min_length = value.constraints | selectattr('min_length') | map(attribute='min_length') | list  %}

diff --git a/app/utils.py b/app/utils.py
@@ -28,7 +28,6 @@
 import ast
 import time
 import sys
-from radl.radl import outport
 from radl.radl_json import parse_radl
 from flask import flash, g
 from app import appdb

diff --git a/tosca-templates/simple-node-disk.yml b/tosca-templates/simple-node-disk.yml
@@ -45,7 +45,9 @@ topology_template:
       type: map
       entry_schema:
         type: PortSpec
-      description: Comma separated list of ports to be Opened in the Cloud site (eg. 22,80,443)
+      description: |
+        Comma separated list of ports to be Opened in the Cloud site (eg. 22,80,443).
+        You can also include the remote CIDR (eg. 8.8.0.0/24-22,9.9.9.0/24-80,443).
       default: 22
 
   node_templates: