summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-07-21 02:54:07 -0500
committerAdam Young <ayoung@redhat.com>2011-07-21 11:47:57 -0400
commit4ff959f55d4aa0a6a832821ed19ecbb9a05dbbbf (patch)
tree5b34f511d3be1e86a2fb69259e958d9d3b99c01c /install
parentb5fe1e8f615271f4f71826b83e51f5e3abd277a6 (diff)
downloadfreeipa-4ff959f55d4aa0a6a832821ed19ecbb9a05dbbbf.zip
freeipa-4ff959f55d4aa0a6a832821ed19ecbb9a05dbbbf.tar.gz
freeipa-4ff959f55d4aa0a6a832821ed19ecbb9a05dbbbf.tar.xz
Removed custom layouts using HTML templates.
The code for supporting custom layouts using HTML templates has been removed. If it's needed again in the future the code can be restored. Ticket #1501
Diffstat (limited to 'install')
-rw-r--r--install/configure.ac2
-rw-r--r--install/ui/Makefile.am1
-rw-r--r--install/ui/details.js24
-rw-r--r--install/ui/dialog.js48
-rw-r--r--install/ui/hbac.js177
-rw-r--r--install/ui/ipa.js8
-rw-r--r--install/ui/layouts/Makefile.am22
-rw-r--r--install/ui/layouts/default/Makefile.am30
-rwxr-xr-xinstall/ui/layouts/default/hbacrule-details-accesstime.html49
-rwxr-xr-xinstall/ui/layouts/default/hbacrule-details-general.html57
-rwxr-xr-xinstall/ui/layouts/default/hbacrule-details-host.html78
-rwxr-xr-xinstall/ui/layouts/default/hbacrule-details-service.html78
-rwxr-xr-xinstall/ui/layouts/default/hbacrule-details-sourcehost.html78
-rwxr-xr-xinstall/ui/layouts/default/hbacrule-details-user.html78
-rwxr-xr-xinstall/ui/layouts/default/sudorule-details-general.html49
-rwxr-xr-xinstall/ui/layouts/default/sudorule-group-dialog.html110
-rwxr-xr-xinstall/ui/layouts/default/sudorule-host-dialog.html110
-rwxr-xr-xinstall/ui/layouts/default/sudorule-hostgroup-dialog.html110
-rwxr-xr-xinstall/ui/layouts/default/sudorule-user-dialog.html110
-rw-r--r--install/ui/rule.js2
-rw-r--r--install/ui/sudo.js32
21 files changed, 84 insertions, 1169 deletions
diff --git a/install/configure.ac b/install/configure.ac
index 88bf9f8..8a1dac6 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -73,8 +73,6 @@ AC_CONFIG_FILES([
migration/Makefile
share/Makefile
ui/Makefile
- ui/layouts/Makefile
- ui/layouts/default/Makefile
tools/Makefile
tools/man/Makefile
updates/Makefile
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index b53f439..138db15 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = 1.7
NULL =
SUBDIRS = \
- layouts \
$(NULL)
appdir = $(IPA_DATA_DIR)/ui
diff --git a/install/ui/details.js b/install/ui/details.js
index 82804b5..45ffa6f 100644
--- a/install/ui/details.js
+++ b/install/ui/details.js
@@ -37,7 +37,6 @@ IPA.details_section = function(spec) {
that.name = spec.name || '';
that.label = spec.label || '';
- that.template = spec.template;
that._entity_name = spec.entity_name;
that.fields = $.ordered_map();
@@ -105,8 +104,6 @@ IPA.details_section = function(spec) {
that.create = function(container) {
- if (that.template) return;
-
var fields = that.fields.values;
for (var i=0; i<fields.length; i++) {
var field = fields[i];
@@ -123,8 +120,6 @@ IPA.details_section = function(spec) {
that.container = container;
- if (that.template) return;
-
var fields = that.fields.values;
for (var i=0; i<fields.length; i++) {
var field = fields[i];
@@ -139,23 +134,6 @@ IPA.details_section = function(spec) {
that.record = record;
var fields = that.fields.values;
-
- if (that.template) {
- var template = IPA.get_template(that.template);
- this.container.load(
- template,
- function(data, text_status, xhr) {
- for (var i=0; i<fields.length; i++) {
- var field = fields[i];
- var span = $('span[name='+field.name+']', this.container).first();
- field.setup(span);
- field.load(record);
- }
- }
- );
- return;
- }
-
for (var j=0; j<fields.length; j++) {
var field = fields[j];
field.load(record);
@@ -230,8 +208,6 @@ IPA.details_list_section = function(spec) {
// do not call section_create() here
- if (that.template) return;
-
var dl = $('<dl/>', {
'id': that.name,
'class': 'entryattrs'
diff --git a/install/ui/dialog.js b/install/ui/dialog.js
index 5245ba9..ada30b0 100644
--- a/install/ui/dialog.js
+++ b/install/ui/dialog.js
@@ -32,7 +32,6 @@ IPA.dialog = function(spec) {
that.name = spec.name;
that.title = spec.title;
- that.template = spec.template;
that._entity_name = spec.entity_name;
that.width = spec.width || 400;
@@ -254,40 +253,19 @@ IPA.dialog = function(spec) {
container.append(that.container);
}
- if (that.template) {
- var template = IPA.get_template(that.template);
- that.container.load(
- template,
- function(data, text_status, xhr) {
- that.setup();
- that.container.dialog({
- 'title': that.title,
- 'modal': true,
- 'width': that.width,
- 'height': that.height,
- 'buttons': that.buttons,
- close: function(event, ui) {
- that.close();
- }
- });
- }
- );
-
- } else {
- that.create();
- that.setup();
-
- that.container.dialog({
- 'title': that.title,
- 'modal': true,
- 'width': that.width,
- 'height': that.height,
- 'buttons': that.buttons,
- close: function(event, ui) {
- that.close();
- }
- });
- }
+ that.create();
+ that.setup();
+
+ that.container.dialog({
+ 'title': that.title,
+ 'modal': true,
+ 'width': that.width,
+ 'height': that.height,
+ 'buttons': that.buttons,
+ close: function(event, ui) {
+ that.close();
+ }
+ });
};
that.option = function(name, value) {
diff --git a/install/ui/hbac.js b/install/ui/hbac.js
index 1e2cefb..be4e736 100644
--- a/install/ui/hbac.js
+++ b/install/ui/hbac.js
@@ -156,22 +156,11 @@ IPA.hbacrule_details_facet = function(spec) {
that.init = function() {
- var section;
-
- if (IPA.layout) {
- section = that.create_section({
- 'name': 'general',
- 'label': IPA.messages.details.general,
- 'template': 'hbacrule-details-general.html #contents'
- });
-
- } else {
- section = IPA.hbacrule_details_general_section({
- 'name': 'general',
- 'label': IPA.messages.details.general
- });
- that.add_section(section);
- }
+ var section = IPA.hbacrule_details_general_section({
+ 'name': 'general',
+ 'label': IPA.messages.details.general
+ });
+ that.add_section(section);
section.text({name: 'cn', read_only: true});
section.radio({name: 'accessruletype'});
@@ -180,30 +169,21 @@ IPA.hbacrule_details_facet = function(spec) {
var param_info = IPA.get_entity_param('hbacrule', 'usercategory');
- if (IPA.layout) {
- section = that.create_section({
- 'name': 'user',
- 'label': IPA.messages.objects.hbacrule.user,
- 'template': 'hbacrule-details-user.html #contents'
- });
-
- } else {
- section = IPA.rule_details_section({
- 'name': 'user',
- 'label': IPA.messages.objects.hbacrule.user,
- 'text': param_info.doc+':',
- 'field_name': 'usercategory',
- 'options': [
- { 'value': 'all', 'label': IPA.messages.objects.hbacrule.anyone },
- { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_users }
- ],
- 'tables': [
- { 'field_name': 'memberuser_user' },
- { 'field_name': 'memberuser_group' }
- ]
- });
- that.add_section(section);
- }
+ section = IPA.rule_details_section({
+ 'name': 'user',
+ 'label': IPA.messages.objects.hbacrule.user,
+ 'text': param_info.doc+':',
+ 'field_name': 'usercategory',
+ 'options': [
+ { 'value': 'all', 'label': IPA.messages.objects.hbacrule.anyone },
+ { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_users }
+ ],
+ 'tables': [
+ { 'field_name': 'memberuser_user' },
+ { 'field_name': 'memberuser_group' }
+ ]
+ });
+ that.add_section(section);
var category = section.add_field(IPA.radio_widget({
name: 'usercategory'
@@ -221,30 +201,21 @@ IPA.hbacrule_details_facet = function(spec) {
param_info = IPA.get_entity_param('hbacrule', 'hostcategory');
- if (IPA.layout) {
- section = that.create_section({
- 'name': 'host',
- 'label': IPA.messages.objects.hbacrule.host,
- 'template': 'hbacrule-details-host.html #contents'
- });
-
- } else {
- section = IPA.rule_details_section({
- 'name': 'host',
- 'label': IPA.messages.objects.hbacrule.host,
- 'text': param_info.doc+':',
- 'field_name': 'hostcategory',
- 'options': [
- { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_host },
- { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_hosts }
- ],
- 'tables': [
- { 'field_name': 'memberhost_host' },
- { 'field_name': 'memberhost_hostgroup' }
- ]
- });
- that.add_section(section);
- }
+ section = IPA.rule_details_section({
+ 'name': 'host',
+ 'label': IPA.messages.objects.hbacrule.host,
+ 'text': param_info.doc+':',
+ 'field_name': 'hostcategory',
+ 'options': [
+ { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_host },
+ { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_hosts }
+ ],
+ 'tables': [
+ { 'field_name': 'memberhost_host' },
+ { 'field_name': 'memberhost_hostgroup' }
+ ]
+ });
+ that.add_section(section);
category = section.add_field(IPA.radio_widget({
name: 'hostcategory'
@@ -262,30 +233,21 @@ IPA.hbacrule_details_facet = function(spec) {
param_info = IPA.get_entity_param('hbacrule', 'servicecategory');
- if (IPA.layout) {
- section = that.create_section({
- 'name': 'service',
- 'label': IPA.messages.objects.hbacrule.service,
- 'template': 'hbacrule-details-service.html #contents'
- });
-
- } else {
- section = IPA.rule_details_section({
- 'name': 'service',
- 'label': IPA.messages.objects.hbacrule.service,
- 'text': param_info.doc+':',
- 'field_name': 'servicecategory',
- 'options': [
- { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_service },
- { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_services }
- ],
- 'tables': [
- { 'field_name': 'memberservice_hbacsvc' },
- { 'field_name': 'memberservice_hbacsvcgroup' }
- ]
- });
- that.add_section(section);
- }
+ section = IPA.rule_details_section({
+ 'name': 'service',
+ 'label': IPA.messages.objects.hbacrule.service,
+ 'text': param_info.doc+':',
+ 'field_name': 'servicecategory',
+ 'options': [
+ { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_service },
+ { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_services }
+ ],
+ 'tables': [
+ { 'field_name': 'memberservice_hbacsvc' },
+ { 'field_name': 'memberservice_hbacsvcgroup' }
+ ]
+ });
+ that.add_section(section);
category = section.add_field(IPA.radio_widget({
name: 'servicecategory'
@@ -303,30 +265,21 @@ IPA.hbacrule_details_facet = function(spec) {
param_info = IPA.get_entity_param('hbacrule', 'sourcehostcategory');
- if (IPA.layout) {
- section = that.create_section({
- 'name': 'sourcehost',
- 'label': IPA.messages.objects.hbacrule.sourcehost,
- 'template': 'hbacrule-details-sourcehost.html #contents'
- });
-
- } else {
- section = IPA.rule_details_section({
- 'name': 'sourcehost',
- 'label': IPA.messages.objects.hbacrule.sourcehost,
- 'text': param_info.doc+':',
- 'field_name': 'sourcehostcategory',
- 'options': [
- { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_host },
- { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_hosts }
- ],
- 'tables': [
- { 'field_name': 'sourcehost_host' },
- { 'field_name': 'sourcehost_hostgroup' }
- ]
- });
- that.add_section(section);
- }
+ section = IPA.rule_details_section({
+ 'name': 'sourcehost',
+ 'label': IPA.messages.objects.hbacrule.sourcehost,
+ 'text': param_info.doc+':',
+ 'field_name': 'sourcehostcategory',
+ 'options': [
+ { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_host },
+ { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_hosts }
+ ],
+ 'tables': [
+ { 'field_name': 'sourcehost_host' },
+ { 'field_name': 'sourcehost_hostgroup' }
+ ]
+ });
+ that.add_section(section);
category = section.add_field(IPA.radio_widget({
name: 'sourcehostcategory'
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index 4b50523..a6c9694 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -52,16 +52,8 @@ var IPA = ( function () {
that.entities = $.ordered_map();
that.entity_factories = {};
- that.layout = $.bbq.getState('layout');
- that.layouts_dir = 'layouts';
-
that.network_call_count = 0;
- that.get_template = function(path) {
- var layout = that.layout || 'default';
- return that.layouts_dir+'/'+layout+'/'+path;
- };
-
/* initialize the IPA JSON-RPC helper
* arguments:
* url - JSON-RPC URL to use (optional) */
diff --git a/install/ui/layouts/Makefile.am b/install/ui/layouts/Makefile.am
deleted file mode 100644
index 711c236..0000000
--- a/install/ui/layouts/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS = 1.7
-
-NULL =
-
-SUBDIRS = \
- default \
- $(NULL)
-
-appdir = $(IPA_DATA_DIR)/ui/layouts
-app_DATA = \
- $(NULL)
-
-EXTRA_DIST = \
- $(app_DATA) \
- $(NULL)
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in
- $(NULL)
-
-distclean:
diff --git a/install/ui/layouts/default/Makefile.am b/install/ui/layouts/default/Makefile.am
deleted file mode 100644
index 82a58c7..0000000
--- a/install/ui/layouts/default/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AUTOMAKE_OPTIONS = 1.7
-
-NULL =
-
-SUBDIRS = \
- $(NULL)
-
-appdir = $(IPA_DATA_DIR)/ui/layouts/default
-app_DATA = \
- hbacrule-details-accesstime.html \
- hbacrule-details-general.html \
- hbacrule-details-host.html \
- hbacrule-details-service.html \
- hbacrule-details-sourcehost.html \
- hbacrule-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 = \
- $(app_DATA) \
- $(NULL)
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in
- $(NULL)
diff --git a/install/ui/layouts/default/hbacrule-details-accesstime.html b/install/ui/layouts/default/hbacrule-details-accesstime.html
deleted file mode 100755
index 8d5e258..0000000
--- a/install/ui/layouts/default/hbacrule-details-accesstime.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>When</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- <span name="accesstime">
- <span name="text">Rule applies when access is being requested at:</span>
- <input type="radio" name="accesstime" value="all"/>Any Time
- <input type="radio" name="accesstime" value=""/>Specified Times
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- <br/>
-
- <span name="table">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Access Time</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Access Times"/>
- <input type="button" name="add" value="Add Access Times"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="time"/>
- </td>
- <td>
- <span name="accesstime">time</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
- </span>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/install/ui/layouts/default/hbacrule-details-general.html b/install/ui/layouts/default/hbacrule-details-general.html
deleted file mode 100755
index 9783690..0000000
--- a/install/ui/layouts/default/hbacrule-details-general.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>General</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- <table style="width: 100%; border: 0 solid black;">
- <tr>
- <td style="width: 100px; text-align: right;">
- Name:
- </td>
- <td>
- <span name="cn">
- <input type="text" name="cn" size="30"/>
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- <td style="text-align: right;">
- Rule type:
- <span name="accessruletype">
- <input type="radio" name="accessruletype" value="allow"/>Allow
- <input type="radio" name="accessruletype" value="deny"/>Deny
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- </tr>
- <tr>
- <td style="text-align: right; vertical-align: top;">
- Description:
- </td>
- <td colspan="2">
- <span name="description">
- <textarea name="description" rows="5" style="width: 100%;" cols="40"></textarea>
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- </tr>
- <tr>
- <td style="text-align: right; vertical-align: top;">
- Rule status:
- </td>
- <td colspan="2">
- <span name="ipaenabledflag">
- <input type="radio" name="ipaenabledflag" value="TRUE"/>Active
- <input type="radio" name="ipaenabledflag" value="FALSE"/>Inactive
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/install/ui/layouts/default/hbacrule-details-host.html b/install/ui/layouts/default/hbacrule-details-host.html
deleted file mode 100755
index 1ba386d..0000000
--- a/install/ui/layouts/default/hbacrule-details-host.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Accessing</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- Rule applies when access is requested to:
- <span name="hostcategory">
- <input type="radio" name="hostcategory" value="all"/>Any Host
- <input type="radio" name="hostcategory" value=""/>Specified Hosts and Groups
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- <br/>
-
- <span name="memberhost_host">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Host</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Hosts"/>
- <input type="button" name="add" value="Add Hosts"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="host"/>
- </td>
- <td>
- <span name="memberhost_host">host</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-
- <span name="memberhost_hostgroup">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Host Group</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Host Groups"/>
- <input type="button" name="add" value="Add Host Groups"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="hostgroups"/>
- </td>
- <td>
- <span name="memberhost_hostgroup">hostgroups</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/install/ui/layouts/default/hbacrule-details-service.html b/install/ui/layouts/default/hbacrule-details-service.html
deleted file mode 100755
index 77e8420..0000000
--- a/install/ui/layouts/default/hbacrule-details-service.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Via Service</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- Rule applies when access is requested via:
- <span name="servicecategory">
- <input type="radio" name="servicecategory" value="all"/>Any Service
- <input type="radio" name="servicecategory" value=""/>Specified Services and Groups
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- <br/>
-
- <span name="memberservice_hbacsvc">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Service</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Services"/>
- <input type="button" name="add" value="Add Services"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="service"/>
- </td>
- <td>
- <span name="memberservice_hbacsvc">service</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-
- <span name="memberservice_hbacsvcgroup">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Service Group</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Service Groups"/>
- <input type="button" name="add" value="Add Service Groups"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="services"/>
- </td>
- <td>
- <span name="memberservice_hbacsvcgroup">services</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/install/ui/layouts/default/hbacrule-details-sourcehost.html b/install/ui/layouts/default/hbacrule-details-sourcehost.html
deleted file mode 100755
index aae1ef3..0000000
--- a/install/ui/layouts/default/hbacrule-details-sourcehost.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>From</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- Rule applies when access is being initiated from:
- <span name="sourcehostcategory">
- <input type="radio" name="sourcehostcategory" value="all"/>Any Host
- <input type="radio" name="sourcehostcategory" value=""/>Specified Hosts and Groups
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- <br/>
-
- <span name="sourcehost_host">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Host</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Hosts"/>
- <input type="button" name="add" value="Add Hosts"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="host"/>
- </td>
- <td>
- <span name="sourcehost_host">host</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-
- <span name="sourcehost_hostgroup">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">Host Group</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Host Groups"/>
- <input type="button" name="add" value="Add Host Groups"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="hosts"/>
- </td>
- <td>
- <span name="sourcehost_hostgroup">hosts</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/install/ui/layouts/default/hbacrule-details-user.html b/install/ui/layouts/default/hbacrule-details-user.html
deleted file mode 100755
index 1b58848..0000000
--- a/install/ui/layouts/default/hbacrule-details-user.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Who</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- Rule applies when access is requested by:
- <span name="usercategory">
- <input type="radio" name="usercategory" value="all"/>Anyone
- <input type="radio" name="usercategory" value=""/>Specified Users and Groups
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- <br/>
-
- <span name="memberuser_user">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">User</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove Users"/>
- <input type="button" name="add" value="Add Users"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="user"/>
- </td>
- <td>
- <span name="memberuser_user">user</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-
- <span name="memberuser_group">
- <table class="search-table">
- <thead>
- <tr>
- <th style="width: 25px;">
- <input type="checkbox" name="select"/>
- </th>
- <th>
- <span style="float: left;">User Group</span>
- <span name="buttons" style="float: right;">
- <input type="button" name="remove" value="Remove User Groups"/>
- <input type="button" name="add" value="Add User Groups"/>
- </span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="checkbox" name="select" value="users"/>
- </td>
- <td>
- <span name="memberuser_group">users</span>
- </td>
- </tr>
- </tbody>
- </table>
- </span>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/install/ui/layouts/default/sudorule-details-general.html b/install/ui/layouts/default/sudorule-details-general.html
deleted file mode 100755
index 728ecf1..0000000
--- a/install/ui/layouts/default/sudorule-details-general.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>General</title>
-
- <link rel="stylesheet" type="text/css" href="jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="ipa.css" />
-</head>
-<body>
-<div id="contents">
- <table style="width: 100%; border: 0 solid black;">
- <tr>
- <td style="width: 100px; text-align: right;">
- Name:
- </td>
- <td>
- <span name="cn">
- <input type="text" name="cn" size="30"/>
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- </tr>
- <tr>
- <td style="text-align: right; vertical-align: top;">
- Description:
- </td>
- <td>
- <span name="description">
- <textarea name="description" rows="5" style="width: 100%;" cols="40"></textarea>
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- </tr>
- <tr>
- <td style="text-align: right; vertical-align: top;">
- Rule status:
- </td>
- <td>
- <span name="ipaenabledflag">
- <input type="radio" name="ipaenabledflag" value="TRUE"/>Active
- <input type="radio" name="ipaenabledflag" value="FALSE"/>Inactive
- <span name="undo" class="ui-state-highlight ui-corner-all" style="display: none;">undo</span>
- </span>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/install/ui/layouts/default/sudorule-group-dialog.html b/install/ui/layouts/default/sudorule-group-dialog.html
deleted file mode 100755
index d576f1a..0000000
--- a/install/ui/layouts/default/sudorule-group-dialog.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Adder Dialog</title>
-
- <link rel="stylesheet" type="text/css" href="../../jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="../../ipa.css" />
-</head>
-<body>
-<div id="contents">
-
- <div class="adder-dialog-filter">
- <input type="text" name="filter" style="width: 244px">
- <input type="button" name="find" value="Find">
- </div>
-
- <div class="adder-dialog-results">
-
- <div name="available" class="adder-dialog-internal">
-
- <div class="ui-widget-header">
- Available
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Groups
- </th>
- </tr>
- </thead>
- <tbody style="height: 106px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="cn"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="buttons" class="adder-dialog-buttons">
- <p><input type="button" name="remove" value="<<"></p>
- <p><input type="button" name="add" value=">>"></p>
- </div>
-
- <div name="selected" class="adder-dialog-selected">
-
- <div class="ui-widget-header">
- Prospective
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Groups
- </th>
- </tr>
- </thead>
- <tbody style="height: 151px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="cn"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="external" class="adder-dialog-external">
-
- <div class="ui-widget-header">
- External
- </div>
-
- <input type="text" name="external" style="width: 244px">
- </div>
-
- </div>
-</div>
-</body>
-</html>
diff --git a/install/ui/layouts/default/sudorule-host-dialog.html b/install/ui/layouts/default/sudorule-host-dialog.html
deleted file mode 100755
index 5eec418..0000000
--- a/install/ui/layouts/default/sudorule-host-dialog.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Adder Dialog</title>
-
- <link rel="stylesheet" type="text/css" href="../../jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="../../ipa.css" />
-</head>
-<body>
-<div id="contents">
-
- <div class="adder-dialog-filter">
- <input type="text" name="filter" style="width: 244px">
- <input type="button" name="find" value="Find">
- </div>
-
- <div class="adder-dialog-results">
-
- <div name="available" class="adder-dialog-internal">
-
- <div class="ui-widget-header">
- Available
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Hosts
- </th>
- </tr>
- </thead>
- <tbody style="height: 106px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="fqdn"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="buttons" class="adder-dialog-buttons">
- <p><input type="button" name="remove" value="<<"></p>
- <p><input type="button" name="add" value=">>"></p>
- </div>
-
- <div name="selected" class="adder-dialog-selected">
-
- <div class="ui-widget-header">
- Prospective
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Hosts
- </th>
- </tr>
- </thead>
- <tbody style="height: 151px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="fqdn"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="external" class="adder-dialog-external">
-
- <div class="ui-widget-header">
- External
- </div>
-
- <input type="text" name="external" style="width: 244px">
- </div>
-
- </div>
-</div>
-</body>
-</html>
diff --git a/install/ui/layouts/default/sudorule-hostgroup-dialog.html b/install/ui/layouts/default/sudorule-hostgroup-dialog.html
deleted file mode 100755
index 57d72f3..0000000
--- a/install/ui/layouts/default/sudorule-hostgroup-dialog.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Adder Dialog</title>
-
- <link rel="stylesheet" type="text/css" href="../../jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="../../ipa.css" />
-</head>
-<body>
-<div id="contents">
-
- <div class="adder-dialog-filter">
- <input type="text" name="filter" style="width: 244px">
- <input type="button" name="find" value="Find">
- </div>
-
- <div class="adder-dialog-results">
-
- <div name="available" class="adder-dialog-internal">
-
- <div class="ui-widget-header">
- Available
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Host Groups
- </th>
- </tr>
- </thead>
- <tbody style="height: 106px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="cn"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="buttons" class="adder-dialog-buttons">
- <p><input type="button" name="remove" value="<<"></p>
- <p><input type="button" name="add" value=">>"></p>
- </div>
-
- <div name="selected" class="adder-dialog-selected">
-
- <div class="ui-widget-header">
- Prospective
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Host Groups
- </th>
- </tr>
- </thead>
- <tbody style="height: 151px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="cn"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="external" class="adder-dialog-external">
-
- <div class="ui-widget-header">
- External
- </div>
-
- <input type="text" name="external" style="width: 244px">
- </div>
-
- </div>
-</div>
-</body>
-</html>
diff --git a/install/ui/layouts/default/sudorule-user-dialog.html b/install/ui/layouts/default/sudorule-user-dialog.html
deleted file mode 100755
index 78687ce..0000000
--- a/install/ui/layouts/default/sudorule-user-dialog.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Adder Dialog</title>
-
- <link rel="stylesheet" type="text/css" href="../../jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="../../ipa.css" />
-</head>
-<body>
-<div id="contents">
-
- <div class="adder-dialog-filter">
- <input type="text" name="filter" style="width: 244px">
- <input type="button" name="find" value="Find">
- </div>
-
- <div class="adder-dialog-results">
-
- <div name="available" class="adder-dialog-internal">
-
- <div class="ui-widget-header">
- Available
- </div>
-
- <table class="search-table scrollable">
- <thead style="display: block;">
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Users
- </th>
- </tr>
- </thead>
- <tbody style="height: 106px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="uid"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="buttons" class="adder-dialog-buttons">
- <p><input type="button" name="remove" value="<<"></p>
- <p><input type="button" name="add" value=">>"></p>
- </div>
-
- <div name="selected" class="adder-dialog-selected">
-
- <div class="ui-widget-header">
- Prospective
- </div>
-
- <table class="search-table scrollable">
- <thead>
- <tr>
- <th style="width: 22px;">
- <input type="checkbox" name="select">
- </th>
- <th style="width: 216px;">
- Users
- </th>
- </tr>
- </thead>
- <tbody style="height: 151px;">
- <tr>
- <td style="width: 22px;">
- <input type="checkbox" name="select">
- </td>
- <td style="width: 200px;">
- <span name="uid"></span>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="2">
- <span name="summary"></span>
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
-
- <div name="external" class="adder-dialog-external">
-
- <div class="ui-widget-header">
- External
- </div>
-
- <input type="text" name="external" style="width: 244px">
- </div>
-
- </div>
-</div>
-</body>
-</html>
diff --git a/install/ui/rule.js b/install/ui/rule.js
index aec8657..40d05c8 100644
--- a/install/ui/rule.js
+++ b/install/ui/rule.js
@@ -36,8 +36,6 @@ IPA.rule_details_section = function(spec) {
that.create = function(container) {
- if (that.template) return;
-
if (that.text) container.append(that.text);
var field = that.get_field(that.field_name);
diff --git a/install/ui/sudo.js b/install/ui/sudo.js
index fecb0b0..30479fb 100644
--- a/install/ui/sudo.js
+++ b/install/ui/sudo.js
@@ -263,21 +263,11 @@ IPA.sudorule_details_facet = function(spec) {
var that = IPA.details_facet(spec);
- var section;
-
- if (IPA.layout) {
- section = that.create_section({
- 'name': 'general',
- 'label': IPA.messages.details.general,
- 'template': 'sudorule-details-general.html #contents'
- });
- } else {
- section = IPA.sudo.rule_details_general_section({
- 'name': 'general',
- 'label': IPA.messages.details.general
- });
- that.add_section(section);
- }
+ var section = IPA.sudo.rule_details_general_section({
+ 'name': 'general',
+ 'label': IPA.messages.details.general
+ });
+ that.add_section(section);
section.text({name: 'cn', read_only: true});
section.textarea({name: 'description'});
@@ -929,8 +919,6 @@ IPA.sudo.rule_details_command_section = function(spec) {
that.create = function(container) {
- if (that.template) return;
-
var field = that.get_field('cmdcategory');
var param_info = IPA.get_entity_param(that.entity_name, 'cmdcategory');
@@ -1098,8 +1086,6 @@ IPA.sudo.rule_details_runas_section = function(spec) {
that.create = function(container) {
- if (that.template) return;
-
var field = that.get_field('ipasudorunasusercategory');
var param_info = IPA.get_entity_param(that.entity_name, 'ipasudorunasusercategory');
@@ -1287,18 +1273,12 @@ IPA.sudorule_association_table_widget = function(spec) {
var label = IPA.metadata.objects[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.sudo.rule_association_adder_dialog({
'title': title,
'entity_name': that.entity_name,
'pkey': pkey,
'other_entity': that.other_entity,
- 'external': that.external,
- 'template': template
+ 'external': that.external
});
};