changed yaml indentation

Change-Id: Ia76338949a2213982687d39cc974ff4ac91686ec
Signed-off-by: lombardofr <lombardo@everyup.it>

diff --git a/lib/util.py b/lib/util.py
index 9d33aa6..ac92c4d 100644 (file)
--- a/lib/util.py
+++ b/lib/util.py
@@ -78,7 +78,7 @@ class Util(object):
     def json2yaml(cls, object_json):
         """Converts a json object into a yaml representation"""
         log.debug('json2yaml')
-        return yaml.safe_dump(object_json, default_flow_style=False, indent=2) if not object_json is None else None
+        return yaml.safe_dump(object_json, default_flow_style=False, indent=4) if not object_json is None else None
 
     @classmethod
     def openfile(cls, filepath, mode='r', buffering=1):

diff --git a/projecthandler/template/project/osm/descriptor/descriptor_view.html b/projecthandler/template/project/osm/descriptor/descriptor_view.html
index 0b9512c..3fd70a2 100644 (file)
--- a/projecthandler/template/project/osm/descriptor/descriptor_view.html
+++ b/projecthandler/template/project/osm/descriptor/descriptor_view.html
@@ -64,17 +64,17 @@ Edit {{ descriptor_type|upper }} Descriptor
         editorJSON = CodeMirror(function (elt) {
             myJsonTextArea.parentNode.replaceChild(elt, myJsonTextArea);
         }, json_editor_settings);
-
-
         editorJSON.setValue(JSON.stringify({{descriptor_strings.descriptor_string_json | safe}}, null, "\t"));
         editorJSON.setOption("autoRefresh", true);
+        editorJSON.setSize("auto", "auto");
+
         var myYamlTextArea = document.getElementById("code_editor_yaml");
         editorYaml = CodeMirror(function (elt) {
             myYamlTextArea.parentNode.replaceChild(elt, myYamlTextArea);
         }, yaml_editor_settings);
         var des_strings = {{descriptor_strings | safe}};
         editorYaml.setValue(des_strings.descriptor_string_yaml);
-
+        editorYaml.setSize("auto", "auto");
     });