cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [37/50] [abbrv] git commit: updated refs/heads/ui-restyle to c64bfa5
Date Thu, 20 Feb 2014 19:17:43 GMT
CLOUDSTACK-6140: UI - template - detailView - move fields that are used more often to the top.


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

Branch: refs/heads/ui-restyle
Commit: c93b0967ef5278049d0940566eb455b38d3e5cbe
Parents: b01720d
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Feb 19 15:30:49 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed Feb 19 15:31:02 2014 -0800

----------------------------------------------------------------------
 ui/scripts/templates.js | 69 ++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c93b0967/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 716c615..3551613 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -938,23 +938,15 @@
                                             required: true
                                         }
                                     }
-                                }, {
-                                    id: {
-                                        label: 'label.id'
-                                    },
-                                    zonename: {
-                                        label: 'label.zone.name'
-                                    },
-                                    zoneid: {
-                                        label: 'label.zone.id'
+                                }, { 
+                                	isready: {
+                                        label: 'state.ready',
+                                        converter: cloudStack.converters.toBooleanText
                                     },
-                                    displaytext: {
-                                        label: 'label.description',
-                                        isEditable: true,
-                                        validation: {
-                                            required: true
-                                        }
+                                    status: {
+                                        label: 'label.status'
                                     },
+                                     
                                     hypervisor: {
                                         label: 'label.hypervisor'
                                     },
@@ -968,17 +960,8 @@
                                                 return false;
                                         },
                                         converter: cloudStack.converters.toBooleanText
-                                    },
-                                    templatetype: {
-                                        label: 'label.type'
-                                    },
-                                    isready: {
-                                        label: 'state.ready',
-                                        converter: cloudStack.converters.toBooleanText
-                                    },
-                                    status: {
-                                        label: 'label.status'
-                                    },
+                                    },   
+                                                                                        
           
                                     size: {
                                         label: 'label.size',
                                         converter: function(args) {
@@ -1036,12 +1019,8 @@
                                                 return false;
                                         },
                                         converter: cloudStack.converters.toBooleanText
-                                    },
-                                    crossZones: {
-                                        label: 'label.cross.zones',
-                                        converter: cloudStack.converters.toBooleanText
-                                    },
-
+                                    },                                    
+                                    
                                     ostypeid: {
                                         label: 'label.os.type',
                                         isEditable: true,
@@ -1067,6 +1046,21 @@
                                         }
                                     },
 
+                                    zonename: {
+                                        label: 'label.zone.name'
+                                    },  
+                                    crossZones: {
+                                        label: 'label.cross.zones',
+                                        converter: cloudStack.converters.toBooleanText
+                                    },
+                                    displaytext: {
+                                        label: 'label.description',
+                                        isEditable: true,
+                                        validation: {
+                                            required: true
+                                        }
+                                    },        
+                                    
                                     domain: {
                                         label: 'label.domain'
                                     },
@@ -1076,6 +1070,17 @@
                                     created: {
                                         label: 'label.created',
                                         converter: cloudStack.converters.toLocalDate
+                                    },
+                                    
+                                    templatetype: {
+                                        label: 'label.type'
+                                    },
+                                    
+                                    id: {
+                                        label: 'label.id'
+                                    },
+                                    zoneid: {
+                                        label: 'label.zone.id'
                                     }
                                 }],
 


Mime
View raw message