The TPS UI has been modified to display the token activity message
in a textarea to avoid truncation.

The UI framework class has been modified to handle textarea.

The CSS has been modified to align the field label with the top of
textarea.

https://fedorahosted.org/pki/ticket/2299

Pushed to master under one-liner/trivial rule.

--
Endi S. Dewata
>From 9c7c9dc278451fde67c725c2898e9dc92e199060 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Fri, 3 Jun 2016 20:58:23 +0200
Subject: [PATCH] Fixed truncated token activity message in TPS UI.

The TPS UI has been modified to display the token activity message
in a textarea to avoid truncation.

The UI framework class has been modified to handle textarea.

The CSS has been modified to align the field label with the top of
textarea.

https://fedorahosted.org/pki/ticket/2299
---
 base/server/share/webapps/pki/js/pki-ui.js   | 6 +++---
 base/tps/shared/webapps/tps/ui/activity.html | 4 +++-
 dogtag/common-ui/shared/css/pki-ui.css       | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/base/server/share/webapps/pki/js/pki-ui.js b/base/server/share/webapps/pki/js/pki-ui.js
index 288461fa20d314581dac5163e7fad8c7e03a76de..c4acdb9965c57c297f7eb748b493a54bdcb6a6da 100644
--- a/base/server/share/webapps/pki/js/pki-ui.js
+++ b/base/server/share/webapps/pki/js/pki-ui.js
@@ -1080,7 +1080,7 @@ var EntryPage = Page.extend({
 
         if (self.mode == "view") {
             // All fields are read-only.
-            self.$(".pki-fields input").each(function(index) {
+            self.$(".pki-fields input, select, textarea").each(function(index) {
                 var input = $(this);
                 input.attr("readonly", "readonly");
             });
@@ -1091,7 +1091,7 @@ var EntryPage = Page.extend({
         } else {
 
             // Show editable fields.
-            self.$(".pki-fields input").each(function(index) {
+            self.$(".pki-fields input, select, textarea").each(function(index) {
                 var input = $(this);
                 var name = input.attr("name");
                 if (_.contains(self.editable, name)) {
@@ -1105,7 +1105,7 @@ var EntryPage = Page.extend({
             self.editMenu.show();
         }
 
-        self.$(".pki-fields input").each(function(index) {
+        self.$(".pki-fields input, select, textarea").each(function(index) {
             var input = $(this);
             self.loadField(input);
         });
diff --git a/base/tps/shared/webapps/tps/ui/activity.html b/base/tps/shared/webapps/tps/ui/activity.html
index 5ba96a4e19f033c4f85a448a51e13d056d059684..d9a32994feff62efd4ca8e4914b9c3e242859d80 100644
--- a/base/tps/shared/webapps/tps/ui/activity.html
+++ b/base/tps/shared/webapps/tps/ui/activity.html
@@ -42,6 +42,8 @@
     <label>Date</label>
     <input name="date" readonly="readonly"><br>
     <label>Message</label>
-    <input name="message" readonly="readonly"><br>
+    <textarea name="message" readonly="readonly" cols="100" rows="10">
+    </textarea>
+    <br>
 </fieldset>
 </div>
diff --git a/dogtag/common-ui/shared/css/pki-ui.css b/dogtag/common-ui/shared/css/pki-ui.css
index dcf9595a6f8b6873f1407093cf0af920ff040adc..1728a737eb34919f76545ccb01e8c9d50c06e774 100644
--- a/dogtag/common-ui/shared/css/pki-ui.css
+++ b/dogtag/common-ui/shared/css/pki-ui.css
@@ -71,6 +71,7 @@ fieldset label {
   min-width: 150px;
   display: inline-block;
   line-height: 30px;
+  vertical-align: top;
 }
 
 fieldset input {
-- 
2.5.5

_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to