FSN#34686 Diverse layout verbeteringen

svn path=/Website/trunk/; revision=27996
This commit is contained in:
Jos Groot Lipman
2016-02-02 11:15:05 +00:00
parent 3eb0082b88
commit 85dede4f01
7 changed files with 22 additions and 34 deletions

View File

@@ -245,9 +245,12 @@ input[readonly], select[readonly], textarea[readonly] {
border:0;
padding: 0;
}
input[readonly], select[readonly], textarea[readonly], td span[readonly], td div[readonly] {
input[readonly], select[readonly], textarea[readonly], td span.readonly, td div.readonly {
filter: alpha(opacity=70);
opacity: 0.7;
opacity: 0.7;
}
td span.readonly {
display: inline-block; /* zodat span ook width respecteert */
}
input[readonly]:hover, select[readonly]:hover, textarea[readonly]:hover {
background-color: ==backgroundcolor==;

View File

@@ -197,10 +197,10 @@ function ROFIELD(pclass, plabel, pvalue, params)
%><td class="label"><label <%=params && params.id? ' for=\"' + params.id + '\"' : ''%>><%=plabel? plabel + ":" : ""%></label></td>
<td><%
}
var input = "<span tabindex='-1'"
var input = "<span"
// De classes
input += " class='" + pclass;
input += " class='readonly " + pclass;
if (params.infoPointer)
input += " details";
if (params.type == 'button')
@@ -213,7 +213,7 @@ function ROFIELD(pclass, plabel, pvalue, params)
input += " id='" + params.id + "' name='" + params.id + "'";
if (params.title)
input += " title='" + params.title + "'";
input += " readonly value='" + safe.htmlattr(pvalue) + "'";
if (params.html)
input += " " + params.html + " ";
@@ -240,7 +240,7 @@ function ROFIELD(pclass, plabel, pvalue, params)
}
input += " onclick='" + safe.htmlattr(fnclick) + "'";
}
input += ">" + safe.htmlattr(pvalue) + "</span>";
input += ">" + safe.html(pvalue) + "</span>";
Response.Write(input);
if (params.selector) {
FCLTselector(params.selector.fieldName, params.selector.sql, params.selector.params);
@@ -283,7 +283,7 @@ function ROTEXTAREATR(pclass, plabel, pvalue, params)
%><tr <%=params.trclass?"class='"+params.trclass+"'":""%>>
<%if (plabel) {%><td class="label"><label><%=plabel? plabel + ":" : ""%></label></td><% } %>
<td <%=(params.tdhtml_ta? " " + params.tdhtml_ta : "")%>><div readonly class="<%=pclass%>"<%=(params.html? " " + params.html + " " : "")%><%=params && params.id? ' id=\"' + params.id + '\"' : ''%>><%=safe.html(pvalue)%></div></td></tr><%
<td <%=(params.tdhtml_ta? " " + params.tdhtml_ta : "")%>><div class="readonly <%=pclass%>"<%=(params.html? " " + params.html + " " : "")%><%=params && params.id? ' id=\"' + params.id + '\"' : ''%>><%=safe.html(pvalue)%></div></td></tr><%
}
// params.html wordt er ook tussen geplakt (onclick bijvoorbeeld)

View File

@@ -510,7 +510,7 @@ function listKenmerk(sql, module, key, props)
}
else
{
kv = "<div class='fldflexC50' readonly tabindex=-1>"
kv = "<div class='readonly fldflexC50'>"
+ safe.html(val)
+ "</div>";
}
@@ -543,9 +543,8 @@ function listKenmerk(sql, module, key, props)
else
{
kv = "<span"
+ " class='"
+ " class='readonly "
+ (kenmerk_search ? "fldSflexC " : "fldflexC ")
+ "' readonly tabindex=-1"
+ ">" + safe.htmlattr(val) + "</span>";
}
}
@@ -1027,9 +1026,8 @@ function listKenmerk(sql, module, key, props)
else
{
kv = "<span"
+ " class='"
+ " class='readonly "
+ (kenmerk_search ? "fldSflexC" : "fldflexC") // Is nu tekstveld
+ "' readonly tabindex=-1 "
+ ">" + (val == 1? L("lcl_check_1") : L("lcl_check_0")) + "</span>";
}
}

View File

@@ -153,10 +153,8 @@ function FCLTkostenplaatsselector(fieldName, objectName, prs_key, params)
}
// Noot: dit hierboven is een wat lousy nestingsconstructie om te ondersteunen
// [label vinkje][veld] of [vinkje veld] of [label][veld] of [veld]
%>
<nobr>
<% if (params.readonly) { %>
<span id="<%=fieldName%>_show" readonly class="fldkp">
if (params.readonly) { %>
<span id="<%=fieldName%>_show" class="readonly fldkp">
<%=safe.html(lkostenplaatsName)%>
</span>
<% } else { %>
@@ -170,9 +168,7 @@ function FCLTkostenplaatsselector(fieldName, objectName, prs_key, params)
{ /* het extra parameter veld wordt door suggest object gevuld */%>
<input type="hidden" id="<%=params.extraParamField%>" name="<%=params.extraParamField%>" value="<%= safe.htmlattr(lextraInit)%>">
<%
} %>
</nobr>
<%
}
if (!params.readonly)
{

View File

@@ -128,11 +128,10 @@ function FCLTpersoonselector(fieldName, objectName, params)
</td>
<td>
<%
} %>
<div style="white-space: nowrap;">
<% if (params.readonly) { %>
<span id="<%=fieldName%>_show" readonly class="fldpers<%=params.moreinfo ? " details" : ""%>"
<%=params.moreinfo ? " onclick='iface.persoonDetails(\"" + fieldName + "\", \"" + params.info + "\")'" : "" %>>
}
if (params.readonly) { %>
<span id="<%=fieldName%>_show" class="readonly fldpers<%=params.moreinfo ? " details" : ""%>"
<%=params.moreinfo ? " onclick='iface.persoonDetails(\"" + fieldName + "\", \"" + (params.info||"") + "\")'" : "" %>>
<%=safe.html(lperslidName)%>
</span>
<% } else { %>
@@ -153,9 +152,7 @@ function FCLTpersoonselector(fieldName, objectName, params)
{ /* het extra parameter veld wordt door suggest object gevuld */%>
<input type="hidden" id="<%=params.extraParamField%>" name="<%=params.extraParamField%>" value="<%=safe.htmlattr(lextraInit)%>">
<%
} %>
</div>
<%
}
if (params.label)
{ %>
</td>

View File

@@ -424,12 +424,10 @@ function FCLTplaatsselector(alglevel, params)
<td>
<% }
} %>
<div style="white-space: nowrap;"> <% /* FireFox */ %>
<input id="locatie<%=idadd%>"
class="fldloc<%=params.readonlylevel<2 && params.requiredlevel >= 2? " required" : ""%><%=params.readonlylevel>=2 && params.moreinfo ? " details" : ""%><%=clsautoselect%>"
<% =params.moreinfo && params.readonlylevel>=2? " title='" + safe.htmlattr(L("lcl_estate_locatie_title")) + "' onclick='plaatsselector.locatiedetails(\"#locatiekey"+idadd+"\")'" : ""%>
value="<%=safe.htmlattr(pname)%>" placeholder="<%=lwhenEmpty%>" <%=params.readonlylevel>=2? " readonly tabindex=-1": " sgonChange='onChangeLoc" + idadd + "'" + " sgCascade='" + safe.htmlattr(params.onLocCascade) + "'"%>>
</div>
<% if (!params.nolabel)
{ %>
</td>
@@ -508,12 +506,10 @@ function FCLTplaatsselector(alglevel, params)
<td>
<% }
} %>
<div style="white-space: nowrap;"> <% /* FireFox */ %>
<input id="gebouw<%=idadd%>" class="fldbld<%=params.readonlylevel<3 && params.requiredlevel >= 3? " required" : ""%><%=params.readonlylevel>=3 && params.moreinfo ? " details" : ""%><%=clsautoselect%>"
<% =params.moreinfo && params.readonlylevel>=3? " title='" + safe.htmlattr(L("lcl_estate_gebouw_title")) + "' onclick='plaatsselector.gebouwdetails(\"#gebouwkey"+idadd+"\",\"#bttype"+idadd+"\")'" : ""%>
value="<%=safe.htmlattr(pname)%>" placeholder="<%=lwhenEmpty%>" <%=params.readonlylevel>=3? " readonly tabindex=-1": " sgonChange='onChangeGeb" + idadd + "'" + " sgCascade='" + safe.htmlattr(params.onGebCascade) + "'"%>>
<input type="hidden" name="bttype<%=idadd%>" id="bttype<%=idadd%>" value="<%=pbttype%>">
</div>
<% if (!params.nolabel)
{ %>
</td>
@@ -580,11 +576,9 @@ function FCLTplaatsselector(alglevel, params)
<td>
<% }
} %>
<div style="white-space: nowrap;"> <% /* FireFox */ %>
<input id="verdieping<%=idadd%>" class="fldflr<%=params.readonlylevel<4 && params.requiredlevel >= 4? " required" : ""%><%=params.readonlylevel>=4 && params.moreinfo ? " details" : ""%><%=clsautoselect%>"
<% =params.moreinfo && params.readonlylevel>=4 ? " title='" + safe.htmlattr(L("lcl_estate_verdieping_title")) + "' onclick='plaatsselector.verdiepingdetails(\"#verdiepingkey"+idadd+"\")'" : ""%>
value="<%=safe.htmlattr(pname)%>" placeholder="<%=lwhenEmpty%>" <%=params.readonlylevel>=4? " readonly tabindex=-1": " sgonChange='onChangeVer" + idadd + "'" + " sgCascade='" + safe.htmlattr(params.onVerCascade) + "'"%>>
</div>
<% if (!params.nolabel)
{ %>
</td>

View File

@@ -124,7 +124,7 @@ function FCLTselector(fieldName, sql, params)
oRs.close();
}
%>
<span id="<%=fieldName%>_ro" readonly tabindex="-1" class="fld<%=fieldName%>"><%=safe.html(initstr)%></span>
<span id="<%=fieldName%>_ro" class="readonly fld<%=fieldName%>"><%=safe.html(initstr)%></span>
<%
}
if (params.moreinfo && !params.label) {