You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pd...@apache.org on 2015/03/08 05:59:38 UTC

git commit: updated refs/heads/master to 002236e

Repository: cloudstack
Updated Branches:
  refs/heads/master 4c0ed3d85 -> 002236e48


CLOUDSTACK-2100: vm snapshot tooltips


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/002236e4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/002236e4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/002236e4

Branch: refs/heads/master
Commit: 002236e489047508e8483034f42981c9fbad1f04
Parents: 4c0ed3d
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sat Mar 7 23:59:27 2015 -0500
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Sat Mar 7 23:59:27 2015 -0500

----------------------------------------------------------------------
 ui/scripts/docs.js      | 10 ++++++++++
 ui/scripts/instances.js |  3 +++
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/002236e4/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 2712f85..73c713f 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -300,6 +300,16 @@ cloudStack.docs = {
     helpComputeOfferingDomain: {
         desc: 'The domain to associate this compute offering with'
     },
+    // Create Instance Snapshot
+    helpCreateInstanceSnapshotName: {
+        desc: 'Give the snapshot a name. A unique name will be automatically generated if you leave this blank'
+    },
+    helpCreateInstanceSnapshotDescription: {
+        desc: 'A short description of for the snapshot'
+    },
+    helpCreateInstanceSnapshotMemory: {
+        desc: 'Check this to include CPU/memory state. Does not quiesce the VM. If not checked, the snapshot contain only volumes.'
+    },
     // Add disk offering
     helpDiskOfferingName: {
         desc: 'Any desired name for the offering',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/002236e4/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6bba213..de0cff7 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -31,14 +31,17 @@
                 fields: {
                     name: {
                         label: 'label.name',
+                        docID: 'helpCreateInstanceSnapshotName',
                         isInput: true
                     },
                     description: {
                         label: 'label.description',
+                        docID: 'helpCreateInstanceSnapshotDescription',
                         isTextarea: true
                     },
                     snapshotMemory: {
                         label: 'label.vmsnapshot.memory',
+                        docID: 'helpCreateInstanceSnapshotMemory',
                         isBoolean: true,
                         isChecked: false,
                         isHidden: function(args) {