diff options
author | Endi S. Dewata <edewata@redhat.com> | 2014-05-06 18:00:12 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2014-05-12 18:36:49 -0400 |
commit | d4a044908fecb464616ac096fe65fa2ceb056237 (patch) | |
tree | b297df312345cc65b7c7cf121130bca56858d6ba /base/server | |
parent | 6072036edaa38670d7743b31737d8d9b32f6b868 (diff) | |
download | pki-d4a044908fecb464616ac096fe65fa2ceb056237.tar.gz pki-d4a044908fecb464616ac096fe65fa2ceb056237.tar.xz pki-d4a044908fecb464616ac096fe65fa2ceb056237.zip |
Replaced RCUE with PatternFly (part 3).
The RCUE library has been replaced with a more generic PatternFly
library. The dialog boxes and the navigation bar have been updated
accordingly.
Ticket #958
Diffstat (limited to 'base/server')
-rw-r--r-- | base/server/share/webapps/pki/css/pki-tables.css | 29 | ||||
-rw-r--r-- | base/server/share/webapps/pki/css/pki-ui.css | 34 | ||||
-rw-r--r-- | base/server/share/webapps/pki/js/pki-ui.js | 37 |
3 files changed, 18 insertions, 82 deletions
diff --git a/base/server/share/webapps/pki/css/pki-tables.css b/base/server/share/webapps/pki/css/pki-tables.css index b8534611e..63a99549b 100644 --- a/base/server/share/webapps/pki/css/pki-tables.css +++ b/base/server/share/webapps/pki/css/pki-tables.css @@ -8,7 +8,7 @@ table { table caption { text-align: left; font-weight: bold; - padding: 11.5px; + padding: 11px; } table tbody tr:nth-child(even) { @@ -20,37 +20,12 @@ table tbody tr td, table thead tr th { font-weight: normal; padding: 6px 15px; - font-size: 11.5px; + font-size: 11px; border-top: 1px #ebebeb; border-right: 1px #dcdcdc solid; text-align: left; } -.rcue-table-actions { - padding: 1px; - border-top: none; -} - -.rcue-table-actions span:last-child { - float: right; -} - -.rcue-table-actions { - padding: 1px; -} - -.rcue-table-actions button { - padding: 3px 8px; - font-size: 11px; - box-shadow: 1px 2px 2px #e3e3e3; - margin: 4px; -} - -.rcue-table-number { - text-align: right; - width: 100px; -} - table thead tr th { font-weight: bold; border: none; diff --git a/base/server/share/webapps/pki/css/pki-ui.css b/base/server/share/webapps/pki/css/pki-ui.css index 73d287704..d5c74445f 100644 --- a/base/server/share/webapps/pki/css/pki-ui.css +++ b/base/server/share/webapps/pki/css/pki-ui.css @@ -19,11 +19,8 @@ * @author Endi S. Dewata */ -@import url("pki-common.css"); -@import url("pki-tabs.css"); @import url("pki-forms.css"); @import url("pki-tables.css"); -@import url("pki-dialogs.css"); .pki-header { margin-bottom: 10px; @@ -53,39 +50,12 @@ margin-bottom: 5px; } -.pki-fields fieldset label { - min-width: 100px; +fieldset label { + min-width: 150px; display: inline-block; line-height: 30px; } -.rcue-dialog-background { - display: none; -} - -.rcue-dialog header { - position: absolute; - left: 0; - right: 0; - top: 0; - margin: 0; - padding: 16px 16px 0 22px; -} - -.rcue-dialog fieldset { - position: absolute; - left: 0; - right: 0; - top: 75px; - bottom: 60px; - padding: 16px 16px 16px 44px; -} - -.rcue-dialog footer { - right: 0; - padding: 0 16px 16px 22px; -} - input[readonly="readonly"] { background-image: none; border: 1px solid #FFFFFF; diff --git a/base/server/share/webapps/pki/js/pki-ui.js b/base/server/share/webapps/pki/js/pki-ui.js index 442c6b27d..9a1d2e593 100644 --- a/base/server/share/webapps/pki/js/pki-ui.js +++ b/base/server/share/webapps/pki/js/pki-ui.js @@ -188,7 +188,7 @@ var Dialog = Backbone.View.extend({ if (self.actions == undefined) { // by default all buttons are active self.actions = []; - self.$("button").each(function(index) { + self.$(".modal-footer button").each(function(index) { var button = $(this); var action = button.attr("name"); self.actions.push(action); @@ -204,21 +204,18 @@ var Dialog = Backbone.View.extend({ self.handlers["close"] = function() { self.close(); }; + + self.$el.modal({ show: false }); }, render: function() { var self = this; if (self.title) { - self.$("header h1").text(self.title); + self.$(".modal-title").text(self.title); } - self.$(".rcue-button-close").click(function(e) { - self.close(); - e.preventDefault(); - }); - // setup input fields - self.$("input").each(function(index) { + self.$(".modal-body input").each(function(index) { var input = $(this); var name = input.attr("name"); if (_.contains(self.readonly, name)) { @@ -229,7 +226,7 @@ var Dialog = Backbone.View.extend({ }); // setup buttons - self.$("button").each(function(index) { + self.$(".modal-footer button").each(function(index) { var button = $(this); var action = button.attr("name"); @@ -257,15 +254,14 @@ var Dialog = Backbone.View.extend({ open: function() { var self = this; self.render(); - self.$el.show(); + self.$el.modal("show"); }, close: function() { var self = this; - self.$el.hide(); + self.$el.modal("hide"); // remove event handlers - self.$(".rcue-button-close").off("click"); - self.$("button").each(function(index) { + self.$(".modal-footer button").each(function(index) { var button = $(this); button.off("click"); }); @@ -275,13 +271,13 @@ var Dialog = Backbone.View.extend({ var self = this; // load input fields - $("input", self.$el).each(function(index) { + self.$(".modal-body input").each(function(index) { var input = $(this); self.loadField(input); }); // load drop-down lists - $("select", self.$el).each(function(index) { + self.$(".modal-body select").each(function(index) { var input = $(this); self.loadField(input); }); @@ -297,13 +293,13 @@ var Dialog = Backbone.View.extend({ var self = this; // save input fields - $("input", self.$el).each(function(index) { + self.$(".modal-body input").each(function(index) { var input = $(this); self.saveField(input); }); // save drop-down lists - $("select", self.$el).each(function(index) { + self.$(".modal-body select").each(function(index) { var input = $(this); self.saveField(input); }); @@ -328,18 +324,13 @@ var ErrorDialog = Backbone.View.extend({ var self = this; if (self.title) { - self.$(".pki-title").text(self.title); + self.$(".modal-title").text(self.title); } if (self.content) { self.$("span[name=content]").html(self.content); } - self.$(".rcue-button-close").click(function(e) { - self.close(); - e.preventDefault(); - }); - self.$("button[name=close]").click(function(e) { self.close(); e.preventDefault(); |