From e1ca7a982bf093eb013d98c793fa75e33e19dd5d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 15 Jul 2013 12:49:35 +0200 Subject: [PATCH] feature #2158: Add tooltips to elasticity policies --- .../public/js/plugins/datastores-tab.js | 4 +- .../public/js/plugins/oneflow-services.js | 39 +++++++--- .../public/js/plugins/oneflow-templates.js | 72 +++++++++++++++---- 3 files changed, 91 insertions(+), 24 deletions(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index a9a454e933..9913f3d759 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -217,7 +217,7 @@ var create_datastore_tmpl = \ \
\ -
'+tr("Paths that can not be used to register images. A space separated list of paths. This will prevent users registering important files as VM images and accessing them thourgh their VMs. OpenNebula will automatically add its configuration directories: /var/lib/one, /etc/one and oneadmin's home ($HOME).")+'
\ +
'+tr("If you need to un-block a directory under one of the RESTRICTED_DIRS")+'
\
\ \
\ @@ -228,7 +228,7 @@ var create_datastore_tmpl = \
\
\ -
'+tr("If you need to un-block a directory under one of the RESTRICTED_DIRS")+'
\ +
'+tr("Paths that can not be used to register images. A space separated list of paths. This will prevent users registering important files as VM images and accessing them thourgh their VMs. OpenNebula will automatically add its configuration directories: /var/lib/one, /etc/one and oneadmin's home ($HOME).")+'
\
\ \
\ diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js index acf83c033a..1b40c156e5 100644 --- a/src/sunstone/public/js/plugins/oneflow-services.js +++ b/src/sunstone/public/js/plugins/oneflow-services.js @@ -1257,7 +1257,7 @@ function updateServiceInfo(request,elem){ \
\
\ -
'+ tr("Period") +'
\ +
'+ tr("Seconds between each group of actions") +'
\
\
\ \ @@ -1266,7 +1266,7 @@ function updateServiceInfo(request,elem){ \
\
\ -
'+ tr("VMs per period") +'
\ +
'+ tr("Number of VMs to apply the action to each period") +'
\
\ \ \ @@ -1513,10 +1513,23 @@ function updateServiceInfo(request,elem){ '+tr("Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute.")+'\ \ \ - '+tr("Expression")+'\ - '+tr("# Periods")+'\ - '+tr("Period")+'\ - '+tr("Cooldown")+'\ + '+tr("Expression")+'\ + '+tr("Expression to trigger the elasticity")+'

\ + '+tr("Example: ATT < 20")+'
\ + \ + \ + '+tr("# Periods")+'\ + '+tr("Number of periods that the expression must be true before the elasticity is triggered")+'\ + \ + \ + '+tr("Period")+'\ + '+tr("Duration, in seconds, of each period in '# Periods'")+'\ + \ + \ + '+tr("Cooldown")+'\ + '+tr("Cooldown period duration after a scale operation, in seconds")+'\ + \ + \ \ \ '; @@ -1564,8 +1577,17 @@ function updateServiceInfo(request,elem){ '+tr("Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute.")+'\ \ \ - '+tr("Time format")+'\ - '+tr("Time expression")+'\ + '+tr("Time format")+'\ + '+tr("Recurrence: Time for recurring adjustements. Time is specified with the Unix cron syntax")+'

\ + '+tr("Start time: Exact time for the adjustement")+'\ + \ + \ + '+tr("Time expression")+'\ + '+tr("Time expression depends on the the time formar selected")+'

\ + '+tr("Recurrence: Time for recurring adjustements. Time is specified with the Unix cron syntax")+'
\ + '+tr("Start time: Exact time for the adjustement")+'
\ + \ + \ \ \ '; @@ -1743,6 +1765,7 @@ function setupScaleDialog(){ \ \
\ +
'+ tr("Number of VMs to instantiate with this role") +'
\
\ \
\ diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index adf8ee1621..8ebe9e9fd0 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -168,7 +168,7 @@ var create_service_template_tmpl = '\ \
\
\ -
'+ tr("Shutdown action") +'
\ +
'+ tr("VM shutdown action: 'shutdown' or 'shutdown-hard'.") +'
\
\ \ \ @@ -244,7 +244,7 @@ var role_tab_content = '\ \ \
\ -
'+ tr("Shutdown action") +'
\ +
'+ tr("VM shutdown action: 'shutdown' or 'shutdown-hard'. If it is not set, the one set for the Service will be used") +'
\
\ \ \ @@ -335,10 +335,23 @@ var role_tab_content = '\ '+tr("Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute.")+'\ \ \ - '+tr("Expression")+'\ - '+tr("# Periods")+'\ - '+tr("Period")+'\ - '+tr("Cooldown")+'\ + '+tr("Expression")+'\ + '+tr("Expression to trigger the elasticity")+'

\ + '+tr("Example: ATT < 20")+'
\ + \ + \ + '+tr("# Periods")+'\ + '+tr("Number of periods that the expression must be true before the elasticity is triggered")+'\ + \ + \ + '+tr("Period")+'\ + '+tr("Duration, in seconds, of each period in '# Periods'")+'\ + \ + \ + '+tr("Cooldown")+'\ + '+tr("Cooldown period duration after a scale operation, in seconds")+'\ + \ + \ \ \ \ @@ -379,8 +392,17 @@ var role_tab_content = '\ '+tr("Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute.")+'\ \ \ - '+tr("Time format")+'\ - '+tr("Time expression")+'\ + '+tr("Time format")+'\ + '+tr("Recurrence: Time for recurring adjustements. Time is specified with the Unix cron syntax")+'

\ + '+tr("Start time: Exact time for the adjustement")+'\ + \ + \ + '+tr("Time expression")+'\ + '+tr("Time expression depends on the the time formar selected")+'

\ + '+tr("Recurrence: Time for recurring adjustements. Time is specified with the Unix cron syntax")+'
\ + '+tr("Start time: Exact time for the adjustement")+'
\ + \ + \ \ \ \ @@ -826,10 +848,23 @@ function updateServiceTemplateInfo(request,elem){ '+tr("Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute.")+'\ \ \ - '+tr("Expression")+'\ - '+tr("# Periods")+'\ - '+tr("Period")+'\ - '+tr("Cooldown")+'\ + '+tr("Expression")+'\ + '+tr("Expression to trigger the elasticity")+'

\ + '+tr("Example: ATT < 20")+'
\ + \ + \ + '+tr("# Periods")+'\ + '+tr("Number of periods that the expression must be true before the elasticity is triggered")+'\ + \ + \ + '+tr("Period")+'\ + '+tr("Duration, in seconds, of each period in '# Periods'")+'\ + \ + \ + '+tr("Cooldown")+'\ + '+tr("Cooldown period duration after a scale operation, in seconds")+'\ + \ + \ \ \ '; @@ -877,8 +912,17 @@ function updateServiceTemplateInfo(request,elem){ '+tr("Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute.")+'\ \ \ - '+tr("Time format")+'\ - '+tr("Time expression")+'\ + '+tr("Time format")+'\ + '+tr("Recurrence: Time for recurring adjustements. Time is specified with the Unix cron syntax")+'

\ + '+tr("Start time: Exact time for the adjustement")+'\ + \ + \ + '+tr("Time expression")+'\ + '+tr("Time expression depends on the the time formar selected")+'

\ + '+tr("Recurrence: Time for recurring adjustements. Time is specified with the Unix cron syntax")+'
\ + '+tr("Start time: Exact time for the adjustement")+'
\ + \ + \ \ \ ';