diff options
Diffstat (limited to 'install/ui/src/freeipa')
| -rwxr-xr-x | install/ui/src/freeipa/certificate.js | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/details.js | 7 | ||||
| -rw-r--r-- | install/ui/src/freeipa/dialog.js | 8 | ||||
| -rw-r--r-- | install/ui/src/freeipa/dns.js | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/facet.js | 8 | ||||
| -rw-r--r-- | install/ui/src/freeipa/hbactest.js | 10 | ||||
| -rw-r--r-- | install/ui/src/freeipa/host.js | 7 | ||||
| -rw-r--r-- | install/ui/src/freeipa/search.js | 1 | ||||
| -rw-r--r-- | install/ui/src/freeipa/widget.js | 35 |
9 files changed, 42 insertions, 38 deletions
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js index 001f70f6d..b557081d1 100755 --- a/install/ui/src/freeipa/certificate.js +++ b/install/ui/src/freeipa/certificate.js @@ -1191,7 +1191,7 @@ IPA.cert.search_facet = function(spec) { that.search_option = $('<select/>', { name: 'search_option', - 'class': 'search-option' + 'class': 'search-option form-control' }); that.filter_container.before(that.search_option); diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index b2f07e463..8359b7fcb 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -630,15 +630,10 @@ exp.details_facet = IPA.details_facet = function(spec, no_init) { that.create_content = function(container) { that.content = $('<div/>', { - 'class': 'details-content' + 'class': 'details-content row' }).appendTo(container); that.widgets.create(that.content); - - $('<span/>', { - name: 'summary', - 'class': 'details-summary' - }).appendTo(container); }; /** diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js index 6fdfbc62d..a7f5e09fd 100644 --- a/install/ui/src/freeipa/dialog.js +++ b/install/ui/src/freeipa/dialog.js @@ -264,7 +264,7 @@ IPA.dialog = function(spec) { that.header_node.appendTo(that.dialog_node); that.body_node = $('<div/>', { - 'class': 'rcue-dialog-body' + 'class': 'rcue-dialog-body row' }); // for backwards compatibility that.container = that.body_node; @@ -768,7 +768,7 @@ IPA.adder_dialog = function(spec) { $('<div/>', { html: text.get('@i18n:dialogs.available'), - 'class': 'adder-dialog-header ui-widget-header' + 'class': 'adder-dialog-header' }).appendTo(available_panel); var available_content = $('<div/>', { @@ -789,7 +789,7 @@ IPA.adder_dialog = function(spec) { $('<div/>', { html: text.get('@i18n:dialogs.prospective'), - 'class': 'adder-dialog-header ui-widget-header' + 'class': 'adder-dialog-header' }).appendTo(selected_panel); var selected_content = $('<div/>', { @@ -838,7 +838,7 @@ IPA.adder_dialog = function(spec) { $('<div/>', { html: text.get('@i18n:objects.sudorule.external'), - 'class': 'adder-dialog-header ui-widget-header' + 'class': 'adder-dialog-header' }).appendTo(external_panel); var external_content = $('<div/>', { diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 5b8c5c090..ae76b59a1 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -416,7 +416,7 @@ IPA.dnszone_name_section_layout = function(spec) { var label_text = widget.label + that.get_measurement_unit_text(widget); - var label_cont = $('<div/>', { 'class': 'control-label' }); + var label_cont = $('<div/>', { 'class': 'control-label col-sm-3' }); widget.create_radio(label_cont); diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js index ccaf6ad28..12d8a390a 100644 --- a/install/ui/src/freeipa/facet.js +++ b/install/ui/src/freeipa/facet.js @@ -542,7 +542,7 @@ exp.facet = IPA.facet = function(spec, no_init) { that.dom_node.detach(); } else { that.dom_node = $('<div/>', { - 'class': 'facet active-facet', + 'class': 'facet active-facet fluid-container', name: that.name, 'data-name': that.name, 'data-entity': entity_name @@ -563,16 +563,16 @@ exp.facet = IPA.facet = function(spec, no_init) { dom_node.addClass(that.display_class); that.header_container = $('<div/>', { - 'class': 'facet-header' + 'class': 'facet-header col-sm-12' }).appendTo(dom_node); that.create_header(that.header_container); that.content = $('<div/>', { - 'class': 'facet-content' + 'class': 'facet-content col-sm-12' }).appendTo(dom_node); that.error_container = $('<div/>', { - 'class': 'facet-content facet-error' + 'class': 'facet-content facet-error col-sm-12' }).appendTo(dom_node); that.create_content(that.content); diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js index 1bf90b766..a936029b6 100644 --- a/install/ui/src/freeipa/hbactest.js +++ b/install/ui/src/freeipa/hbactest.js @@ -298,6 +298,7 @@ IPA.hbac.test_select_facet = function(spec) { that.filter = $('<input/>', { type: 'text', + 'class': 'form-control', name: 'filter' }).appendTo(filter_container); @@ -331,7 +332,8 @@ IPA.hbac.test_select_facet = function(spec) { var tr = $('<tr/>').appendTo(that.table.tfoot); var td = $('<td/>', { - name: 'external' + name: 'external', + colspan: that.columns.length + 1 }).appendTo(tr); that.external_radio = $('<input/>', { @@ -524,11 +526,11 @@ IPA.hbac.test_run_facet = function(spec) { }).appendTo(container); var top_panel = $('<div/>', { - 'class': 'hbac-test-top-panel' + 'class': 'hbac-test-top-panel row' }).appendTo(header); var button_panel = $('<div/>', { - 'class': 'hbac-test-button-panel' + 'class': 'hbac-test-button-panel col-sm-2' }).appendTo(top_panel); that.run_button = IPA.button({ @@ -544,7 +546,7 @@ IPA.hbac.test_run_facet = function(spec) { }).appendTo(button_panel); var result_panel = $('<div/>', { - 'class': 'hbac-test-result-panel' + 'class': 'hbac-test-result-panel col-sm-10' }).appendTo(top_panel); that.test_result = $('<p/>', { diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js index aa08409c3..c550e528d 100644 --- a/install/ui/src/freeipa/host.js +++ b/install/ui/src/freeipa/host.js @@ -325,14 +325,15 @@ IPA.host_fqdn_widget = function(spec) { that.create = function(container) { that.container = container; + container.addClass('col-sm-12'); var hostname = that.widgets.get_widget('hostname'); var dnszone = that.widgets.get_widget('dnszone'); var layout = IPA.fluid_layout({ - cont_cls: 'row-fluid', - group_cls: 'control-group span6', - widget_cls: 'control', + cont_cls: 'row fluid-row', + group_cls: 'col-sm-6 form-group', + widget_cls: 'controls', label_cls: 'control-label' }); diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js index dc7bfcf42..0a26dac9b 100644 --- a/install/ui/src/freeipa/search.js +++ b/install/ui/src/freeipa/search.js @@ -117,6 +117,7 @@ IPA.search_facet = function(spec, no_init) { that.filter = $('<input/>', { type: 'text', + 'class': 'form-control', name: 'filter' }).appendTo(that.filter_container); diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 2b3d3e81d..6bec38275 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -321,7 +321,7 @@ IPA.input_widget = function(spec) { $('<span/>', { name: 'error_link', - 'class': 'help-inline', + 'class': 'help-block', style: 'display:none' }).appendTo(container); }; @@ -674,8 +674,9 @@ IPA.text_widget = function(spec) { container.addClass('text-widget'); - that.display_control = $('<label/>', { + that.display_control = $('<p/>', { name: that.name, + 'class': 'form-control-static', style: 'display: none;' }).appendTo(container); @@ -685,6 +686,7 @@ IPA.text_widget = function(spec) { type: that.input_type, name: that.name, id: id, + 'class': 'form-control', size: that.size, title: that.tooltip, keyup: function() { @@ -1324,7 +1326,7 @@ IPA.option_widget_base = function(spec, that) { var enabled = that.enabled && option.enabled; var opt_cont = $('<span/>', { - "class": that.intput_type + "class": that.intput_type + '-cnt' }).appendTo(container); option.input_node = $('<input/>', { @@ -1720,7 +1722,7 @@ IPA.standalone_option = function(spec, container, label) { spec.type = spec.type || 'checkbox'; var opt_cont = $('<span/>', { - 'class': spec.type + 'class': spec.type + '-cnt' }); var input = $('<input/>', spec); @@ -1767,6 +1769,7 @@ IPA.select_widget = function(spec) { that.select = $('<select/>', { name: that.name, + 'class':'form-control', change: function() { that.value_changed.notify([], that); that.emit('value-change', { source: that }); @@ -1902,6 +1905,7 @@ IPA.textarea_widget = function (spec) { name: that.name, rows: that.rows, cols: that.cols, + 'class': 'form-control', readOnly: !!that.read_only, title: that.tooltip, keyup: function() { @@ -2375,7 +2379,7 @@ IPA.table_widget = function (spec) { container.addClass('table-widget table-responsive'); that.table = $('<table/>', { - 'class': 'content-table table table-condensed table-striped table-bordered', + 'class': 'content-table table table-condensed table-striped table-hover table-bordered', name: that.name }).appendTo(container); @@ -3222,6 +3226,7 @@ IPA.combobox_widget = function(spec) { that.input = $('<input/>', { type: 'text', name: that.name, + 'class': 'form-control', id: id, title: that.tooltip, keydown: that.on_input_keydown, @@ -3276,6 +3281,7 @@ IPA.combobox_widget = function(spec) { that.filter = $('<input/>', { type: 'text', name: 'filter', + 'class': 'form-control', keyup: that.on_filter_keyup, keydown: that.on_filter_keydown, blur: that.list_child_on_blur @@ -3297,8 +3303,6 @@ IPA.combobox_widget = function(spec) { }).appendTo(div); that.search_button.bind('mousedown', that.on_no_close); - - div.append('<br/>'); } that.list = $('<select/>', { @@ -3884,7 +3888,7 @@ IPA.button = function(spec) { spec = spec || {}; var el = spec.element || '<button/>'; - var button_class = spec.button_class || 'btn'; + var button_class = spec.button_class || 'btn btn-default'; var button = $(el, { id: spec.id, @@ -4074,6 +4078,7 @@ IPA.section = function(spec) { that.create = function(container) { that.widget_create(container); + container.addClass('details-section col-sm-12'); if (that.show_header) { that.create_header(container); @@ -4081,7 +4086,7 @@ IPA.section = function(spec) { that.content_container = $('<div/>', { name: that.name, - 'class': 'details-section' + 'class': 'details-section-content' }).appendTo(container); that.create_content(); @@ -4212,9 +4217,9 @@ exp.fluid_layout = IPA.fluid_layout = function(spec) { var that = IPA.layout(spec); that.cont_cls = spec.cont_cls || 'form-horizontal'; - that.widget_cls = spec.widget_cls || 'controls'; - that.label_cls = spec.label_cls || 'control-label'; - that.group_cls = spec.group_cls || 'control-group'; + that.widget_cls = spec.widget_cls || 'col-md-6 controls'; + that.label_cls = spec.label_cls || 'col-md-2 control-label'; + that.group_cls = spec.group_cls || 'form-group'; that.create = function(widgets) { @@ -4317,14 +4322,14 @@ exp.fluid_layout = IPA.fluid_layout = function(spec) { var row = that._get_row(event); if (!row) return; - row.toggleClass('error', true); + row.toggleClass('has-error', true); }; that.on_error_hide= function(event) { var row = that._get_row(event); if (!row) return; - row.toggleClass('error', false); + row.toggleClass('has-error', false); }; that.on_visible_change = function(event) { @@ -4476,7 +4481,7 @@ IPA.multiple_choice_section = function(spec) { var i, choice, choices; that.widget_create(container); - that.container.addClass('multiple-choice-section'); + that.container.addClass('multiple-choice-section col-sm-12'); that.header_element = $('<div/>', { 'class': 'multiple-choice-section-header', |