Commit 25a1741c authored by Dave Cridland's avatar Dave Cridland Committed by GitHub

Merge pull request #646 from guusdk/OF-1196_Sysprop-textoverflow

OF-1196: Don't overflow system property name/value
parents 4d49126f 33f229a3
...@@ -275,10 +275,17 @@ function dodelete(propName) { ...@@ -275,10 +275,17 @@ function dodelete(propName) {
<input type="hidden" name="propName" value=""> <input type="hidden" name="propName" value="">
<style type="text/css"> <style type="text/css">
.hidebox { .nameColumn {
text-overflow : ellipsis; text-overflow : ellipsis;
overflow : hidden; overflow : hidden;
white-space : nowrap; white-space : nowrap;
max-width : 200px;
}
.valueColumn {
text-overflow : ellipsis;
overflow : hidden;
white-space : nowrap;
max-width : 300px;
} }
</style> </style>
...@@ -311,22 +318,14 @@ function dodelete(propName) { ...@@ -311,22 +318,14 @@ function dodelete(propName) {
%> %>
<tr class="<%= (n.equals(propName) ? "hilite" : "") %>"> <tr class="<%= (n.equals(propName) ? "hilite" : "") %>">
<td> <td class="nameColumn"><%= StringUtils.escapeHTMLTags(n) %></td>
<div class="hidebox" style="width:200px;"> <td class="valueColumn">
<span title="<%= StringUtils.escapeForXML(n) %>">
<%= StringUtils.escapeHTMLTags(n) %>
</span>
</div>
</td>
<td>
<div class="hidebox" style="width:300px;">
<% if (JiveGlobals.isPropertyEncrypted(n) || <% if (JiveGlobals.isPropertyEncrypted(n) ||
JiveGlobals.isPropertySensitive(n)) { %> JiveGlobals.isPropertySensitive(n)) { %>
<span style="color:#999;"><i>hidden</i></span> <span style="color:#999;"><i>hidden</i></span>
<% } else { %> <% } else { %>
<span title="<%= ("".equals(v) ? "&nbsp;" : v) %>"><%= ("".equals(v) ? "&nbsp;" : v) %></span> <%= ("".equals(v) ? "&nbsp;" : v) %>
<% } %> <% } %>
</div>
</td> </td>
<td align="center"><a href="#" onclick="doedit('<%= StringUtils.replace(StringUtils.escapeHTMLTags(n),"'","''") %>');" <td align="center"><a href="#" onclick="doedit('<%= StringUtils.replace(StringUtils.escapeHTMLTags(n),"'","''") %>');"
><img src="images/edit-16x16.gif" width="16" height="16" ><img src="images/edit-16x16.gif" width="16" height="16"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment