From 79a4a61fe89e089de67bbe1544a4359bed095f58 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 27 Jun 2013 18:21:53 +0200 Subject: [PATCH] Add tips in policies table and fixed columns width --- .../public/js/apptools-appflow-services.js | 56 ++++++++++++++----- .../public/js/apptools-appflow-templates.js | 55 ++++++++++++++---- 2 files changed, 86 insertions(+), 25 deletions(-) diff --git a/flow/sunstone/public/js/apptools-appflow-services.js b/flow/sunstone/public/js/apptools-appflow-services.js index bddc6c5995..5a28f17a60 100644 --- a/flow/sunstone/public/js/apptools-appflow-services.js +++ b/flow/sunstone/public/js/apptools-appflow-services.js @@ -1507,13 +1507,28 @@ function updateServiceInfo(request,elem){ \ \ \ - '+tr("Type")+'\ - '+tr("Adjust")+'\ - '+tr("Min")+'\ - '+tr("Expression")+'\ - '+tr("# Periods")+'\ - '+tr("Period")+'\ - '+tr("Cooldown")+'\ + '+tr("Type")+'\ + '+tr("Type of adjustment.")+'

\ + '+tr("CHANGE: Add/substract the given number of VMs.")+'
\ + '+tr("CARDINALITY: Set the cardinality to the given number.")+'
\ + '+tr("PERCENTAGE_CHANGE: Add/substract the given percentage to the current cardinality.")+'\ +
\ + \ + '+tr("Adjust")+'\ + '+tr("Positive or negative adjustment. Its meaning depends on 'type'")+'

\ + '+tr("CHANGE: -2, will substract 2 VMs from the role")+'
\ + '+tr("CARDINALITY: 8, will set carditanilty to 8")+'
\ + '+tr("PERCENTAGE_CHANGE: 20, will increment cardinality by 20%")+'\ +
\ + \ + '+tr("Min")+'\ + '+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")+'\ \ \ '; @@ -1543,11 +1558,26 @@ function updateServiceInfo(request,elem){ \ \ \ - '+tr("Type")+'\ - '+tr("Adjust")+'\ - '+tr("Min")+'\ - '+tr("Time format")+'\ - '+tr("Time expression")+'\ + '+tr("Type")+'\ + '+tr("Type of adjustment.")+'

\ + '+tr("CHANGE: Add/substract the given number of VMs.")+'
\ + '+tr("CARDINALITY: Set the cardinality to the given number.")+'
\ + '+tr("PERCENTAGE_CHANGE: Add/substract the given percentage to the current cardinality.")+'\ +
\ + \ + '+tr("Adjust")+'\ + '+tr("Positive or negative adjustment. Its meaning depends on 'type'")+'

\ + '+tr("CHANGE: -2, will substract 2 VMs from the role")+'
\ + '+tr("CARDINALITY: 8, will set carditanilty to 8")+'
\ + '+tr("PERCENTAGE_CHANGE: 20, will increment cardinality by 20%")+'\ +
\ + \ + '+tr("Min")+'\ + '+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")+'\ \ \ '; @@ -1576,7 +1606,7 @@ function updateServiceInfo(request,elem){ ' context.html(info_str); - + setupTips(context, "tip-top"); var vms = []; serviceroleVMsDataTable = $('#datatable_service_vms_'+role.name, context).dataTable({ diff --git a/flow/sunstone/public/js/apptools-appflow-templates.js b/flow/sunstone/public/js/apptools-appflow-templates.js index 3f9a8b298d..36f99c405a 100644 --- a/flow/sunstone/public/js/apptools-appflow-templates.js +++ b/flow/sunstone/public/js/apptools-appflow-templates.js @@ -810,13 +810,28 @@ function updateServiceTemplateInfo(request,elem){ \ \ \ - '+tr("Type")+'\ - '+tr("Adjust")+'\ - '+tr("Min")+'\ - '+tr("Expression")+'\ - '+tr("# Periods")+'\ - '+tr("Period")+'\ - '+tr("Cooldown")+'\ + '+tr("Type")+'\ + '+tr("Type of adjustment.")+'

\ + '+tr("CHANGE: Add/substract the given number of VMs.")+'
\ + '+tr("CARDINALITY: Set the cardinality to the given number.")+'
\ + '+tr("PERCENTAGE_CHANGE: Add/substract the given percentage to the current cardinality.")+'\ +
\ + \ + '+tr("Adjust")+'\ + '+tr("Positive or negative adjustment. Its meaning depends on 'type'")+'

\ + '+tr("CHANGE: -2, will substract 2 VMs from the role")+'
\ + '+tr("CARDINALITY: 8, will set carditanilty to 8")+'
\ + '+tr("PERCENTAGE_CHANGE: 20, will increment cardinality by 20%")+'\ +
\ + \ + '+tr("Min")+'\ + '+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")+'\ \ \ '; @@ -846,11 +861,26 @@ function updateServiceTemplateInfo(request,elem){ \ \ \ - '+tr("Type")+'\ - '+tr("Adjust")+'\ - '+tr("Min")+'\ - '+tr("Time format")+'\ - '+tr("Time expression")+'\ + '+tr("Type")+'\ + '+tr("Type of adjustment.")+'

\ + '+tr("CHANGE: Add/substract the given number of VMs.")+'
\ + '+tr("CARDINALITY: Set the cardinality to the given number.")+'
\ + '+tr("PERCENTAGE_CHANGE: Add/substract the given percentage to the current cardinality.")+'\ +
\ + \ + '+tr("Adjust")+'\ + '+tr("Positive or negative adjustment. Its meaning depends on 'type'")+'

\ + '+tr("CHANGE: -2, will substract 2 VMs from the role")+'
\ + '+tr("CARDINALITY: 8, will set carditanilty to 8")+'
\ + '+tr("PERCENTAGE_CHANGE: 20, will increment cardinality by 20%")+'\ +
\ + \ + '+tr("Min")+'\ + '+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")+'\ \ \ '; @@ -879,6 +909,7 @@ function updateServiceTemplateInfo(request,elem){ ' context.html(info_str); + setupTips(context, "tip-top"); } if(selected_row_template_role_id) {