display popup icon before the column caption

georgehristov · georgehristov · commit a4d87201b2fe · 2020-02-18T13:40:36.000+01:00
diff --git a/public/agileui.less b/public/agileui.less
@@ -73,7 +73,8 @@ footer.atk-footer {
 
 // table dropdown menu
 .atk-table-dropdown {
-  margin-top: -10px;
+  margin-top: -8px;
+  float: left;
   i {
     opacity: 0.3;
     vertical-align: bottom;
@@ -97,7 +98,6 @@ footer.atk-footer {
 }
 
 .atk-table-column-header {
-  padding-bottom: 4px;
     &:after {
       //display: none;
       font-style: normal;
diff --git a/src/TableColumn/Generic.php b/src/TableColumn/Generic.php
@@ -331,22 +331,16 @@ public function getHeaderCellHTML(\atk4\data\Field $f = null, $value = null)
 
         if ($this->hasHeaderAction) {
             $attr = array_merge($attr, ['id' => $this->name.'_th']);
-            $tag = $this->getTag(
-                'head',
-                [$captionHtmlTag,
-                    $this->headerActionTag,
-                ],
-                $attr
-            );
-        } else {
-            $tag = $this->getTag(
-                'head',
-                [$captionHtmlTag],
-                $attr
-            );
+
+            //add the action tag to the caption
+            $captionHtmlTag[2] = [$captionHtmlTag[2], $this->headerActionTag];
         }
 
-        return $tag;
+        return $this->getTag(
+            'head',
+            [$captionHtmlTag],
+            $attr
+        );
     }
 
     /**
