Merge branch 'master' into F5695-Multiform

Documentation/Manual.rst

@@ -8289,10 +8289,11 @@ has the form be used. The following report includes the regular `form-editor`_ a
      20 {
        # All forms
        sql = SELECT CONCAT('p:{{pageAlias:T}}&form=Form&r=', f.id) as _pagee
-                    , f.name
+                    , CONCAT(f.name, ' <span class="text-muted">(', f.id, ')</span>')
                     , QMORE(f.title,50)
                     , f.tableName
-                    , CONCAT('p:{{pageAlias:T}}&formIdHistory=', f.id, '|s|b|t:<span class="badge">', COUNT(fsl.id), '</span>', IF(COUNT(fsl.id)=0,'|r:3','')  ) as _link
+                    , CONCAT('p:{{pageAlias:T}}&formIdHistory=', f.id, '|s|b|t:<span class="badge">', COUNT(fsl.id), '</span>'
+                             , IF(COUNT(fsl.id)=0, '|r:3','')  ) as _link
                     , CONCAT( '<em><span title="',MIN(fsl.created), '">', DATE_FORMAT( MIN( fsl.created), '%d.%m.%Y'), '</span></em>')
                     , CONCAT( '<em><span title="',MAX(fsl.created), '">', DATE_FORMAT( MAX( fsl.created), '%d.%m.%Y'), '</span></em>')
                     , CONCAT('<em>', GROUP_CONCAT(DISTINCT fsl.pageId ORDER BY fsl.pageId), '<em>')

less/qfq-bs.css.less

@@ -828,3 +828,7 @@ thead.qfq-sticky th, thead.qfq-sticky td {
 thead.qfq-sticky td {
   top: 49px;
 }
+
+.dropdown-menu {
+  z-index: 1060;
+}
\ No newline at end of file