FCLT#56569 verbergen kenmerkenblock als er geen kenmerken zijn

svn path=/Website/trunk/; revision=41265

APPL/FAC/fac_edit_faq.asp

@@ -175,18 +175,10 @@ else
                      });
         BLOCK_END();
 
-        BLOCK_START("faqFlex2", L("lcl_faq_flexblok"));
-%>
-        <tr>
-          <td>
-<%          generateFlexKenmerkCode ({ faq_key: faq_key,
-                                       reado  : false,
-                                       flexcolumns: S("faq_flexcolumns")
-                                     }); %>
-          </td>
-        </tr>
-<%
-        BLOCK_END();
+        generateFlexKenmerkCode ({ faq_key: faq_key,
+                                      reado  : false,
+                                      flexcolumns: S("faq_flexcolumns")
+                                    });
 
         IFACE.FORM_END();
 %>

APPL/FAC/fac_faq_search.asp

@@ -14,9 +14,10 @@
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/faqselector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="../Shared/calendar.inc" -->
 <%
 FCLTHeader.Requires({ plugins:["kenmerk"],
-                      js: ["../FAC/fac_faq_search.js"]
+                      js: ["../FAC/fac_faq_search.js", "jquery.timepicker-table.js"]
                     });
 var sstring = getQParam("s","");
 var urole = getQParamSafe("urole", "fe");

APPL/FAC/fac_show_faq.asp

@@ -184,12 +184,10 @@ var canChange = canWriteFAQBOF || (canWriteFAQFOF && datum == null)
             BLOCK_END();
         }
 
-        BLOCK_START("faqFlex2", L("lcl_faq_flexblok"));
         generateFlexKenmerkCode ({ faq_key: faq_key,
                                    reado  : true,
                                    flexcolumns: S("faq_flexcolumns")
                                  });
-        BLOCK_END();
 %>
       </form>
     </div>

APPL/FAC/faq_flexkenmerk.inc

@@ -19,7 +19,17 @@
 <!-- #include file="../Shared/kenmerk_common.inc" -->
 <%
 function generateFlexKenmerkCode(params)
-{ %>
+{
+  if (!params.fnpre && !params.noprepostfn) // Mobile geeft die zelf mee
+  {
+    if (!params.advanced)
+    {
+      params.fnpre = function () { BLOCK_START("faqFlex2", L("lcl_faq_flexblok")); };
+      params.fnpost = BLOCK_END;
+    }
+  }
+
+%>
   <div id="faqKenmerken">
     <table id="flextable" cellpadding="0" cellspacing="0">
 <%
@@ -81,6 +91,8 @@ function generateFlexKenmerkCode(params)
                   { flexcolumns: flexcolumns,
                     kenmerk_search: advanced,
                     fnIsReadonly: isReadonly,
+                    fnpre: params.fnpre,
+                    fnpost: params.fnpost,
                     hideVervallen: faq_key<0,
                     parentKey: faq_key }
                  );

APPL/FAC/load_kenmerk.asp

@@ -29,6 +29,7 @@ generateFlexKenmerkCode ({ faq_key: getQParamInt("faq_key", -1), // FAQnummer
                            reado: getQParamInt("reado", 0) == 1, // Readonly
                            flexcolumns: getQParamInt("advanced", 0) == 1?1:S("faq_flexcolumns"),
                            advanced: getQParamInt("advanced", 0) == 1, // Geavanceerd
+                           noprepostfn: getQParamInt("noprepostfn", 0) == 1,
                            reqId: getQParamInt("reqId", -1) // Perslid key (!search && multiMode)
                          });
 %>