From afed2df4634eb96be043d7a2b290d5d016f484d9 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Tue, 4 Jan 2011 13:50:40 -0500 Subject: [PATCH] Fixed SUDO dialog boxes. The dialog boxes for SUDO details page have been modified to generate the HTML code by default. --- install/static/layouts/default/Makefile.am | 5 + .../layouts/default/sudorule-user-dialog.html | 2 +- install/static/sudorule.js | 96 +++++++++++++++++++- 3 files changed, 100 insertions(+), 3 deletions(-) diff --git a/install/static/layouts/default/Makefile.am b/install/static/layouts/default/Makefile.am index 904fad171fd6c5e1a460b505ba99aefb1cab6dac..ca57a653975b57b0bd57126ec04544cf6bec982c 100644 --- a/install/static/layouts/default/Makefile.am +++ b/install/static/layouts/default/Makefile.am @@ -13,6 +13,11 @@ app_DATA = \ hbac-details-service.html \ hbac-details-sourcehost.html \ hbac-details-user.html \ + sudorule-details-general.html \ + sudorule-group-dialog.html \ + sudorule-host-dialog.html \ + sudorule-hostgroup-dialog.html \ + sudorule-user-dialog.html \ $(NULL) EXTRA_DIST = \ diff --git a/install/static/layouts/default/sudorule-user-dialog.html b/install/static/layouts/default/sudorule-user-dialog.html index c40b97594ea0192140a55685880355a36880c3cc..78687cead60d94c667d386162b8ac5b7dbc96654 100755 --- a/install/static/layouts/default/sudorule-user-dialog.html +++ b/install/static/layouts/default/sudorule-user-dialog.html @@ -1,7 +1,7 @@ - SAdder Dialog + Adder Dialog diff --git a/install/static/sudorule.js b/install/static/sudorule.js index c314ccd0b047fdec59498434fe457cc85faa1aac..3ee42c9be9d36425ea9f641c5d80bd20f277f051 100755 --- a/install/static/sudorule.js +++ b/install/static/sudorule.js @@ -750,12 +750,17 @@ function ipa_sudorule_association_table_widget(spec) { var label = IPA.metadata[that.other_entity].label; var title = 'Add '+label+' to '+that.entity_name+' '+pkey; + var template; + if (IPA.layout) { + template = 'sudorule-'+that.other_entity+'-dialog.html #contents'; + } + return ipa_sudorule_association_adder_dialog({ 'title': title, 'entity_name': that.entity_name, 'pkey': pkey, 'other_entity': that.other_entity, - 'template': 'sudorule-'+that.other_entity+'-dialog.html #contents' + 'template': template }); }; @@ -775,7 +780,8 @@ function ipa_sudorule_association_adder_dialog(spec) { that.create_column({ name: pkey_name, label: IPA.metadata[that.other_entity].label, - primary_key: true + primary_key: true, + width: '200px' }); } @@ -798,6 +804,92 @@ function ipa_sudorule_association_adder_dialog(spec) { that.association_adder_dialog_init(); }; + that.create = function() { + + // do not call that.dialog_create(); + + var search_panel = $('
', { + 'class': 'adder-dialog-filter' + }).appendTo(that.container); + + $('', { + type: 'text', + name: 'filter', + style: 'width: 244px' + }).appendTo(search_panel); + + search_panel.append(' '); + + $('', { + type: 'button', + name: 'find', + value: 'Find' + }).appendTo(search_panel); + + var results_panel = $('
', { + 'class': 'adder-dialog-results' + }).appendTo(that.container); + + var available_panel = $('
', { + name: 'available', + 'class': 'adder-dialog-internal' + }).appendTo(results_panel); + + $('
', { + html: 'Available', + 'class': 'ui-widget-header' + }).appendTo(available_panel); + + that.available_table.create(available_panel); + + var buttons_panel = $('
', { + name: 'buttons', + 'class': 'adder-dialog-buttons' + }).appendTo(results_panel); + + var p = $('

').appendTo(buttons_panel); + $('', { + type: 'button', + name: 'remove', + value: '<<' + }).appendTo(p); + + p = $('

').appendTo(buttons_panel); + $('', { + type: 'button', + name: 'add', + value: '>>' + }).appendTo(p); + + var selected_panel = $('

', { + name: 'selected', + 'class': 'adder-dialog-selected' + }).appendTo(results_panel); + + $('
', { + html: 'Prospective', + 'class': 'ui-widget-header' + }).appendTo(selected_panel); + + that.selected_table.create(selected_panel); + + var external_panel = $('
', { + name: 'external', + 'class': 'adder-dialog-external' + }).appendTo(results_panel); + + $('
', { + html: 'External', + 'class': 'ui-widget-header' + }).appendTo(external_panel); + + $('', { + type: 'text', + name: 'external', + style: 'width: 244px' + }).appendTo(external_panel); + }; + that.setup = function() { that.association_adder_dialog_setup(); that.external_field = $('input[name=external]', that.container); -- 1.6.6.1