[Kimchi-devel] [PATCH ][Wok] Fix for Multi-culture UI issue in wok settings tab
nagamanc at linux.vnet.ibm.com
nagamanc at linux.vnet.ibm.com
Thu Dec 1 09:19:37 UTC 2016
From: Nagamani Chennuboina <nagamanc at linux.vnet.ibm.com>
Issue is, text in table header/cells are truncated in settings tab.
Changed required HTML,css and JS files
Signed-off-by: Nagamani Chennuboina <nagamanc at linux.vnet.ibm.com>
---
ui/css/settings.css | 1 +
ui/css/src/settings.scss | 3 ++-
ui/css/wok.css | 2 +-
ui/js/wok.bootgrid.js | 21 +++++++++++++++++++++
ui/js/wok.user-log.js | 18 +++++++++++++++---
ui/pages/wok-ui.html.tmpl | 4 ++--
6 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/ui/css/settings.css b/ui/css/settings.css
index 641b805..1c88909 100644
--- a/ui/css/settings.css
+++ b/ui/css/settings.css
@@ -35,6 +35,7 @@
border-bottom: 1px solid #eee;
overflow: visible;
clear: both;
+ margin: 12px 10px 12px 0px !important;
}
#wok-root-container .accordion:first-chld {
diff --git a/ui/css/src/settings.scss b/ui/css/src/settings.scss
index 557605e..9e42ff8 100644
--- a/ui/css/src/settings.scss
+++ b/ui/css/src/settings.scss
@@ -30,6 +30,7 @@
#wok-root-container{
.accordion {
@include wok-accordion();
+ margin: 12px 10px 12px 0px !important;
}
}
@@ -113,4 +114,4 @@ span.trim {
.disabled .button {
cursor: not-allowed;
}
-}
\ No newline at end of file
+}
diff --git a/ui/css/wok.css b/ui/css/wok.css
index f77b2af..b1b63b4 100644
--- a/ui/css/wok.css
+++ b/ui/css/wok.css
@@ -1473,7 +1473,7 @@ input[type=radio].wok-radio + label {
/*
* Project Wok
*
-* Copyright IBM Corp, 2015-2016
+* Copyright IBM Corp, 2016
*
* Code derived from Project Kimchi
*
diff --git a/ui/js/wok.bootgrid.js b/ui/js/wok.bootgrid.js
index ec3afd6..93da4d8 100644
--- a/ui/js/wok.bootgrid.js
+++ b/ui/js/wok.bootgrid.js
@@ -74,6 +74,27 @@ wok.createBootgrid = function(opts) {
"settings-user-log-message": function(column, row) {
return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.message+'">' +row.message+ '</span> ';
},
+ "settings-user-log-user": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.user+'">' +row.user+ '</span> ';
+ },
+ "settings-user-log-ip": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.ip+'">' +row.ip+ '</span> ';
+ },
+ "settings-user-log-req": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.req+'">' +row.req+ '</span> ';
+ },
+ "settings-user-log-date": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.date+'">' +row.date+ '</span> ';
+ },
+ "settings-user-log-time": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.time+'">' +row.time+ '</span> ';
+ },
+ "settings-user-log-zone": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.zone+'">' +row.zone+ '</span> ';
+ },
+ "settings-user-log-message": function(column, row) {
+ return '<span class="trim" data-toggle="tooltip" data-placement="auto bottom" title="'+row.message+'">' +row.message+ '</span> ';
+ },
},
converters: converters,
css: {
diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js
index 41bc765..91c6318 100644
--- a/ui/js/wok.user-log.js
+++ b/ui/js/wok.user-log.js
@@ -77,45 +77,57 @@ wok.listUserLogConfig = function() {
"column-id": 'app',
"converter": 'string',
"formatter": "settings-user-log-app",
+ "width": "166px",
"title": i18n['WOKSETT0001M']
}, {
"column-id": 'user',
"converter": 'string',
+ "width": "118px",
+ "formatter": "settings-user-log-user",
"title": i18n['WOKSETT0002M']
}, {
"column-id": 'ip',
"converter": 'string',
+ "formatter": "settings-user-log-ip",
+ "width": "164px",
"title": i18n['WOKSETT0014M']
}, {
"column-id": 'req',
"converter": 'string',
+ "width": "145px",
+ "formatter": "settings-user-log-req",
"title": i18n['WOKSETT0003M']
}, {
"column-id": 'date',
"converter": 'date-locale-converter',
"order": 'desc',
+ "width": "118px",
+ "formatter": "settings-user-log-date",
"title": i18n['WOKSETT0004M']
}, {
"column-id": 'time',
"converter": 'time-locale-converter',
"order": 'desc',
+ "formatter": "settings-user-log-time",
+ "width": "119px",
"title": i18n['WOKSETT0005M']
}, {
"column-id": 'zone',
"converter": 'string',
- "width": "6%",
+ "formatter": "settings-user-log-zone",
+ "width": "155px",
"title": i18n['WOKSETT0013M']
}, {
"column-id": 'status',
"converter": 'string',
- "width": "7%",
+ "width": "130px",
"title": i18n['WOKSETT0015M']
}, {
"column-id": 'message',
"converter": 'string',
"formatter": "settings-user-log-message",
"sortable": false,
- "width": "30%",
+ "width": "150px",
"title": i18n['WOKSETT0006M']
}
];
diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
index c10b2bd..ab611cf 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -192,10 +192,10 @@
</script>
<footer class="footer">
<div class="container">
- <p class="text-muted powered hidden">$_("Powered by"):</p>
+ <p class="text-muted powered hidden">$_("Powered by :")</p>
<ul id="plugins">
</ul>
- <span class="wok-version">$_("Wok Version"): $get_version()</span>
+ <span class="wok-version">$_("Wok Version :") $get_version()</span>
</div>
</footer>
</body>
--
2.1.0
More information about the Kimchi-devel
mailing list