List view: Subselect UI: Fixes

-Split subselect options into 2 subcategories, 'label' and 'dataProvider'

-Localize subselect label
This commit is contained in:
Brian Federle 2013-03-13 11:05:20 -07:00
parent 70164aa3bb
commit 7566424a0b
4 changed files with 12 additions and 4 deletions

View File

@ -17,6 +17,7 @@
#new labels (begin) **********************************************************************************************
label.use.vm.ip=Use VM IP:
label.menu.regions=Regions
label.region=Region
label.add.region=Add Region

View File

@ -25,6 +25,7 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script language="javascript">
dictionary = {
'label.use.vm.ip': '<fmt:message key="label.use.vm.ip"/>',
'label.add.region': '<fmt:message key="label.add.region"/>',
'label.remove.region': '<fmt:message key="label.remove.region"/>',
'message.remove.region': '<fmt:message key="message.remove.region"/>',

View File

@ -1682,7 +1682,10 @@
listView: $.extend(true, {}, cloudStack.sections.instances, {
listView: {
filters: false,
subselect: instanceSecondaryIPSubselect,
subselect: {
label: 'label.use.vm.ip',
dataProvider: instanceSecondaryIPSubselect
},
dataProvider: function(args) {
var data = {
page: args.page,
@ -3025,7 +3028,10 @@
listView: $.extend(true, {}, cloudStack.sections.instances, {
listView: {
filters: false,
subselect: instanceSecondaryIPSubselect,
subselect: {
label: 'label.use.vm.ip',
dataProvider: instanceSecondaryIPSubselect
},
dataProvider: function(args) {
var networkid;
if('vpc' in args.context)

View File

@ -1048,7 +1048,7 @@
if (subselect) {
var $td = $tr.find('td.first');
var $select = $('<div></div>').addClass('subselect').append(
$('<span>').html('Use IP:'),
$('<span>').html(_l(subselect.label)),
$('<select>')
).hide();
var $selectionArea = $tr.find('td:last').find('input');
@ -1059,7 +1059,7 @@
$selectionArea.change(function() {
if ($(this).is(':checked')) {
// Populate data
subselect({
subselect.dataProvider({
context: $.extend(true, {}, options.context, {
instances: [$tr.data('json-obj')]
}),