etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/ui-granular-settings'

This commit is contained in:
Pranav Saxena 2013-05-02 17:31:22 +05:30
parent 326bac7bfb c1de600cb4
commit 6e2ecff4f5
4 changed files with 155 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/index.jsp
View File

@ -1662,6 +1662,7 @@ under the License.
<script type="text/javascript" src="scripts/ui-custom/autoscaler.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/healthCheck.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/autoscaler.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/granularSettings.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/zoneChart.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/dashboard.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/installWizard.js?t=<%=now%>"></script>

22
ui/scripts/accounts.js
View File

@ -277,6 +277,7 @@
detailView: {
name: 'Account details',
isMaximized: true,
viewAll: { path: 'accounts.users', label: 'label.users' },
actions: {
@ -895,6 +896,27 @@
}
});
}
},
// Granular settings for account
settings: {
title: 'label.menu.global.settings',
custom: cloudStack.uiCustom.granularSettings({
dataProvider: function(args) {
args.response.success({
data: [
{ name: 'config.param.1', value: 1 },
{ name: 'config.param.2', value: 2 }
]
});
},
actions: {
edit: function(args) {
// call updateAccountLevelParameters
args.response.success();
}
}
})
}
}
}

86
ui/scripts/system.js
View File

@ -5519,6 +5519,27 @@
}
}
}
},
// Granular settings for zone
settings: {
title: 'label.menu.global.settings',
custom: cloudStack.uiCustom.granularSettings({
dataProvider: function(args) {
args.response.success({
data: [
{ name: 'config.param.1', value: 1 },
{ name: 'config.param.2', value: 2 }
]
});
},
actions: {
edit: function(args) {
// call updateZoneLevelParamter
args.response.success();
}
}
})
}
}
}
@ -9096,6 +9117,27 @@
});
}
}
},
// Granular settings for cluster
settings: {
title: 'label.menu.global.settings',
custom: cloudStack.uiCustom.granularSettings({
dataProvider: function(args) {
args.response.success({
data: [
{ name: 'config.param.1', value: 1 },
{ name: 'config.param.2', value: 2 }
]
});
},
actions: {
edit: function(args) {
// call updateClusterLevelParameters
args.response.success();
}
}
})
}
}
}
@ -10531,6 +10573,7 @@
detailView: {
name: "Primary storage details",
isMaximized: true,
actions: {
edit: {
label: 'label.edit',
@ -10715,6 +10758,27 @@
}
});
}
},
// Granular settings for storage pool
settings: {
title: 'label.menu.global.settings',
custom: cloudStack.uiCustom.granularSettings({
dataProvider: function(args) {
args.response.success({
data: [
{ name: 'config.param.1', value: 1 },
{ name: 'config.param.2', value: 2 }
]
});
},
actions: {
edit: function(args) {
// call updateStorageLevelParameters
args.response.success();
}
}
})
}
}
}
@ -10854,6 +10918,7 @@
detailView: {
name: 'Secondary storage details',
isMaximized: true,
actions: {
remove: {
label: 'label.action.delete.secondary.storage' ,
@ -10909,6 +10974,27 @@
}
});
}
},
// Granular settings for storage pool
settings: {
title: 'label.menu.global.settings',
custom: cloudStack.uiCustom.granularSettings({
dataProvider: function(args) {
args.response.success({
data: [
{ name: 'config.param.1', value: 1 },
{ name: 'config.param.2', value: 2 }
]
});
},
actions: {
edit: function(args) {
// call updateStorageLevelParameters
args.response.success();
}
}
})
}
}
}

46
ui/scripts/ui-custom/granularSettings.js Normal file
View File

@ -0,0 +1,46 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
(function($, cloudStack) {
cloudStack.uiCustom.granularSettings = function(args) {
var dataProvider = args.dataProvider;
var actions = args.actions;
return function(args) {
var context = args.context;
var listView = {
id: 'settings',
fields: {
name: { label: 'label.name' },
value: { label: 'label.value', editable: true }
},
actions: {
edit: {
label: 'label.change.value',
action: actions.edit
}
},
dataProvider: dataProvider
};
var $listView = $('<div>').listView({ context: context, listView: listView });
return $listView;
}
};
}(jQuery, cloudStack));