[1/2] git commit: refs/heads/master - CLOUDSTACK-1493:IP Reservation UI tooltip enhancement for detail view: Widget modification done to support this enhancement

[pr...@apache.org]

CLOUDSTACK-1493:IP Reservation UI tooltip enhancement for detail view: Widget modification done to support this enhancement


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

Branch: refs/heads/master
Commit: fd335b4b7b57cf2b707e970b948a6f3c08a207ba
Parents: 6b257bf
Author: Pranav Saxena <pr...@citrix.com>
Authored: Mon Mar 4 16:37:31 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Mon Mar 4 16:37:31 2013 +0530

----------------------------------------------------------------------
 ui/scripts/docs.js                  |   19 +++++++++++++++++++
 ui/scripts/ui/widgets/detailView.js |    8 +++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fd335b4b/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 0ccedc5..3356ecb 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -15,6 +15,25 @@
 // specific language governing permissions and limitations
 // under the License.
 cloudStack.docs = {
+
+  //IP Reservation tooltips
+   helpIPReservationCidr: {
+     desc:'Edit CIDR when you want to configure IP Reservation in isolated guest Network',
+     externalLink:''
+
+   },
+
+  helpIPReservationNetworkCidr:{
+   desc:'The CIDR of the entire network when IP reservation is configured',
+   externalLink:' '
+
+   },
+
+  helpReservedIPRange:{
+     desc:'The IP Range which is not used by CloudStack to allocate to Guest VMs.Can be used for Non Cloudstack purposes.',
+     externalLink:''
+   },
+
   // Add account
   helpAccountUsername: {
   desc: 'Any desired login ID. Must be unique in the current domain. The same username can exist in other domains, including sub-domains.',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fd335b4b/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index f0cc8fd..db7f524 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -338,6 +338,8 @@
 
       $detailView.find('.tagger').find('input[type=text]').val('');
 
+      $('div.container div.panel div.detail-group .details .main-groups').find('.cidr').toolTip({ docID:'helpIPReservationCidr' , mode:'hover' , tooltip:'.tooltip-box' });
+
       var convertInputs = function($inputs) {
         // Save and turn back into labels
         $inputs.each(function() {
@@ -489,7 +491,11 @@
 
         return true;
       });
-	    
+	   
+         $('div.container div.panel div.detail-group .details .main-groups').find('.reservediprange').toolTip({ docID:'helpReservedIPRange' , mode:'hover' , tooltip:'.tooltip-box' });
+          $('div.container div.panel div.detail-group .details .main-groups').find('.networkcidr').toolTip({ docID:'helpIPReservationNetworkCidr' , mode:'hover' , tooltip:'.tooltip-box' });
+
+ 
 	    $detailView.find('td.value span').each(function() {
         var name = $(this).closest('tr').data('detail-view-field');
         var $value = $(this);