[master] WebGUI revision updated, playlist editor splitter replaced, performance
monitor config fixed
Signed-off-by: Tamas Levente Kiss <tamas.levente.kiss@ericsson.com>
diff --git a/lib/WebGUI b/lib/WebGUI
index 6281e41..f62ca1b 160000
--- a/lib/WebGUI
+++ b/lib/WebGUI
@@ -1 +1 @@
-Subproject commit 6281e419a153a1b722d22511905102e665b57275
+Subproject commit f62ca1bc0f54de368d341b97e0f773c4f44f70ff
diff --git a/src/Microservices/PerformanceMonitor/config.json b/src/Microservices/PerformanceMonitor/config.json
index 6dd44cd..04410f6 100644
--- a/src/Microservices/PerformanceMonitor/config.json
+++ b/src/Microservices/PerformanceMonitor/config.json
@@ -1,50 +1,49 @@
-{
- "PerfMonitors": {
- "Demo": {
- "cmd": "echo Demo Process statistics;echo Demo Info >> /dev/stderr;echo Demo System statistics > <workspace>/sysstat.out; exit 111"
- },
- "Demo2": {
- "cmd": "echo Demo Process statistics > <workspace>/console.out;echo Demo Info >> <workspace>/stderr.out;echo Demo System statistics > <workspace>/sysstat.out; exit 111"
- },
- "default": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E titansim -i eth0"
- },
- "titansim_no_wait": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E titansim -i eth0 -T -1"
- },
- "titansim_with_system": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E titansim -i eth0 -t -s <workspace>/sysstat.out"
- },
- "titansim_with_system-FixHC": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -b ~/build/titansim -H -l <workspace>/../../esekilxxen1846_ConfigEditor_release_evolution_0/*hc*.log -i eth0 -t -s <workspace>/sysstat.out"
- },
- "titansim_with_system-HC": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -b ~/build/titansim -H -i eth0 -t -s <workspace>/sysstat.out",
- "options": "{\"-l\": \"<workspace>/../../esekilxxen1846_ConfigEditor_release_evolution_0/*hc*.log\"}"
- },
- "top": {
- "cmd": "echo Set the number of processes to 43 by starting top command, pressing n and setting 43. Then press W to save setup into .toprc. Next top command will show 43 processes >> /dev/stderr;top -b"
- },
- "top_own": {
- "cmd": "top -b -u $USER"
- },
- "top_user": {
- "cmd": "top -b",
- "options": "{ \"-u\" : \"$USER\" }"
- },
- "python": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E python -i eth0 -T -1"
- },
- "python_with_system": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E python -i eth0 -T -1",
- "options": "{ \"-s\" : \"<workspace>/sysstat.out\" }"
- },
- },
- "sysstatlogger_help": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -h"
- },
- "sysstatlogger": {
- "cmd": "~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh"
- }
- }
+{
+ "PerfMonitors":{
+ "Demo":{
+ "cmd":"echo Demo Process statistics;echo Demo Info >> /dev/stderr;echo Demo System statistics > <workspace>/sysstat.out; exit 111"
+ },
+ "Demo2":{
+ "cmd":"echo Demo Process statistics > <workspace>/console.out;echo Demo Info >> <workspace>/stderr.out;echo Demo System statistics > <workspace>/sysstat.out; exit 111"
+ },
+ "default":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E titansim -i eth0"
+ },
+ "titansim_no_wait":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E titansim -i eth0 -T -1"
+ },
+ "titansim_with_system":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E titansim -i eth0 -t -s <workspace>/sysstat.out"
+ },
+ "titansim_with_system-FixHC":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -b ~/build/titansim -H -l <workspace>/../../esekilxxen1846_ConfigEditor_release_evolution_0/*hc*.log -i eth0 -t -s <workspace>/sysstat.out"
+ },
+ "titansim_with_system-HC":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -b ~/build/titansim -H -i eth0 -t -s <workspace>/sysstat.out",
+ "options":"{\"-l\": \"<workspace>/../../esekilxxen1846_ConfigEditor_release_evolution_0/*hc*.log\"}"
+ },
+ "top":{
+ "cmd":"echo Set the number of processes to 43 by starting top command, pressing n and setting 43. Then press W to save setup into .toprc. Next top command will show 43 processes >> /dev/stderr;top -b"
+ },
+ "top_own":{
+ "cmd":"top -b -u $USER"
+ },
+ "top_user":{
+ "cmd":"top -b",
+ "options":"{ \"-u\" : \"$USER\" }"
+ },
+ "python":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E python -i eth0 -T -1"
+ },
+ "python_with_system":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -E python -i eth0 -T -1",
+ "options":"{ \"-s\" : \"<workspace>/sysstat.out\" }"
+ }
+ },
+ "sysstatlogger_help":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh -h"
+ },
+ "sysstatlogger":{
+ "cmd":"~/git/CLL_devel/src/Libraries/EPTF_Core_Library_CNL113512/tools/SysStatLogger/sysstatLogger.sh"
+ }
}
diff --git a/src/Microservices/Playlist/WebApplication/Views/View.css b/src/Microservices/Playlist/WebApplication/Views/View.css
index de61832..dcd546d 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View.css
+++ b/src/Microservices/Playlist/WebApplication/Views/View.css
@@ -1,5 +1,25 @@
/* Main tabs and title */
+#PlaylistEditor_Container .Aligner .ui-resizable-handle {
+ background-color: #aaa;
+ width: 5px;
+}
+
+#PlaylistEditor_Container {
+ height: 100%;
+}
+
+.PlaylistEditor_Helpside {
+ width: 20%;
+ height: 100%;
+}
+
+#PlaylistEditor_HelpTree {
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+}
+
#PlaylistEditor_MainView {
height: calc(100% - 45px);
}
@@ -17,7 +37,7 @@
/* Playlist editor tab */
#PlaylistEditor_RequestEditorSplit {
- height: calc(100% - 57px);
+ height: calc(100% - 56px);
}
#PlaylistEditor_Playground {
diff --git a/src/Microservices/Playlist/WebApplication/Views/View.html b/src/Microservices/Playlist/WebApplication/Views/View.html
index 99aa15c..4418ab9 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View.html
+++ b/src/Microservices/Playlist/WebApplication/Views/View.html
@@ -13,12 +13,14 @@
<button id="PlaylistEditor_Button_Add" class="PlaylistEditor_Button_Right">Add command</button>
</div>
<div class="line"></div>
-<div id="PlaylistEditor_RequestEditorSplit">
- <div class="PlaylistEditor_Helpside">
- <input id="PlaylistEditor_HelpSearch"></input>
- <div id="PlaylistEditor_HelpTree"></div>
+<div id="PlaylistEditor_Container">
+ <div id="PlaylistEditor_RequestEditorSplit" class="Aligner">
+ <div class="PlaylistEditor_Helpside Aligner_Horizontal_Content">
+ <input id="PlaylistEditor_HelpSearch"></input>
+ <div id="PlaylistEditor_HelpTree"></div>
+ </div>
+ <div id="PlaylistEditor_Playground" class="Aligner_Horizontal_Content"></div>
</div>
- <div id="PlaylistEditor_Playground"></div>
<div id="PlaylistEditor_Legend">
<table id="PlaylistEditor_LegendTable">
<col width="50px"></col>
diff --git a/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js b/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js
index 98d7736..056b7dc 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js
+++ b/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js
@@ -23,11 +23,11 @@
///////////////////// GENERAL VIEW FUNCTIONS //////////////////////////////
this.applicationCreated = function() {
- $("#PlaylistEditor_RequestEditorSplit").split({
- orientation: "vertical",
- limit: 100,
- position: "20%"
+ var aligner = new CView_Aligner([], "PlaylistEditor_RequestEditorSplit", undefined, {
+ "existing": true,
+ "resizable": true
});
+ aligner.applicationCreated();
v_helpTree = $("#PlaylistEditor_HelpTree");
createHelpJSTree(v_viewmodel.getHelp());
