FSN#38544 Time-picker ook inline icoontje

svn path=/Website/trunk/; revision=31731
This commit is contained in:
Jos Groot Lipman
2016-11-29 14:21:54 +00:00
parent 22bba5f479
commit 62e394454f
4 changed files with 22 additions and 23 deletions

View File

@@ -19,7 +19,7 @@ $(document).bind("mobileinit", function(){
});
$(document).bind("pageinit", function(){
$("i.dateklikker,i.timeklikker").each(function() {
$(this).appendTo($(this).prev());
// $(this).appendTo($(this).prev());
});
});

View File

@@ -992,8 +992,12 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
<% if (restype == "R" && rrr.res_ruimte_key == -1 && rsv_copy_key == -1) { /* nog geen ruimte en alle defaults zijn ingevuld? */ %>
FindAvailableRooms(true);
<% } %>
<% if (restype == "R") { /* plaats van-tijd voor tot-tijd */ %>
$("#time_from_date_from").insertBefore($("#time_from_date_to")).after("&nbsp;" + L("lcl_tot") + "&nbsp;");
<% if (restype == "R") { /* verplaats van-tijd naar voor tot-tijd */ %>
var clocksymbol = $("#time_from_date_from").next();
$("#time_from_date_from").insertBefore($("#time_from_date_to"))
.after("&nbsp;" + L("lcl_tot") + "&nbsp;")
.after(clocksymbol)
.after(" ");
<% } %>
});

View File

@@ -172,8 +172,8 @@ function _FCLTcalendar (fieldID, params)
<input type="text" step='<%=60*(params.timeStep||15)%>'
class="fldtime<%=!params.readonly&&params.required?" required":"" + " " + (params.timeClass||"")%><%=params.addClass? " " + params.addClass : ""%>"
id="time_from_<%=fieldID%>" <%=readotag%> size="5" value="<%=iniTime%>">
<% if (!params.hidden && !params.readonly) { %>
<i class='fa fa-clock-o fa-fw timeklikker <%=(params.timeClass||"")%>' onclick='$("#time_from_<%=fieldID%>")[0].click(); FcltMgr.stopPropagation(event);'></i>
<% if (!params.readonly) { %>
<i class='fa fa-clock-o fa-fw timeklikker <%=(params.timeClass||"")%>' onclick='$("#time_from_<%=fieldID%>")[0].click(); FcltMgr.stopPropagation(event);'></i>
<% }
}

View File

@@ -362,7 +362,7 @@ th {
.tabcloseall, .pincurrenttab {
color: #888; /*==iconcolor==*/
cursor: pointer;
font-size: 1.4em;
font-size: 1.8em;
float: right;
line-height: 31px;
padding: 0px 5px 3px 3px;
@@ -752,7 +752,9 @@ body.modal .fcltblock {
color: ==blockheadercolor==;
font-weight: normal;
font-size: 1.1em;
padding: 1px 0 2px 6px;
xpadding: 1px 0 2px 6px;
padding: 3px 0 0 6px;
height: 24px;
border-style: outset;
}
.fcltblockhead img.details {
@@ -1157,7 +1159,13 @@ span.button:hover {
-webkit-transition: background-color 0.4s; /* Safari */
transition: background-color 0.4s;
}
#showbody .blockbuttoncontainer #buttons ul li.hasIcon {
/* like #showbody .fcltblockhead; still not perfect */
background-color: ==showblockheaderbackgroundcolor==;
font-size: 0.9em;
padding-bottom: 3px;
margin-top: -3px;
}
#buttons ul li.byHamburger,
#buttons ul li.byHamburger a {
border-left: 0px;
@@ -1169,7 +1177,8 @@ span.button:hover {
#buttons ul li.hasIcon a:hover,
.blockbuttoncontainer #buttons ul li.hasIcon:hover,
.blockbuttoncontainer #buttons ul li.hasIcon:hover i,
.blockbuttoncontainer #buttons ul li.hasIcon:hover span {
.blockbuttoncontainer #buttons ul li.hasIcon:hover span,
#showbody #buttons ul li.hasIcon:hover {
color: ==iconhovercolor==;
background-color: ==buttonhoverbackgroundcolor==;
}
@@ -2658,20 +2667,6 @@ select.fldimport_app_key, .fldfinomsch, .flduitvExist
width: 55px;
cursor: pointer;
}
span.fcltafter:after {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
position:relative;
right: 14px;
bottom: 1px;
}
span.fldtime:after {
content: "\f017"; /* fa-clock-o */
}
i.dateklikker {
font-size: 1.2em;