opening and closing tag editing

lukesnowden · Jan 2, 2019 · 41ec405 · 41ec405
1 parent 211aee1
commit 41ec405
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 5 deletions.
diff --git a/app/Libs/Elements/Traits/Formats/TabsBootstrap.php b/app/Libs/Elements/Traits/Formats/TabsBootstrap.php
@@ -5,11 +5,14 @@
 trait TabsBootstrap
 {
 
+    protected $name = 'tab';
+
     /**
      * @return mixed
      */
     public function render()
     {
+        $this->name .= substr( sha1( microtime( true ) ), 0, 5 );
         return $this->headerWrapper(
                 $this->headers()
             ) .
@@ -24,7 +27,11 @@ public function render()
      */
     protected function headerWrapper( $content )
     {
-        return sprintf( '<ul class="nav nav-tabs" id="myTab" role="tablist">%s</ul>', $content );
+        return sprintf(
+            '<ul class="nav nav-tabs" id="%s" role="tablist">%s</ul>',
+            $this->name,
+            $content
+        );
     }
 
     /**
@@ -33,7 +40,11 @@ protected function headerWrapper( $content )
      */
     protected function bodyWrapper( $content )
     {
-        return sprintf( '<div class="tab-content" id="myTabContent">%s</div>', $content );
+        return sprintf(
+            '<div class="tab-content" id="%sContent">%s</div>',
+            $this->name,
+            $content
+        );
     }
 
     /**

diff --git a/app/Libs/Layouts/Table.php b/app/Libs/Layouts/Table.php
@@ -164,6 +164,8 @@ protected function body()
             $this->valueKeyName(),
             $this->valueKeyName(),
             $this->valueKeyName(),
+            $this->valueKeyName(),
+            $this->valueKeyName(),
             $this->valueKeyName()
         );
     }
@@ -222,6 +224,24 @@ public function noRowsMessage()
         return $this->noResultsMessage;
     }
 
+    /**
+     * @param $row
+     * @return string
+     */
+    public function openingRowTag( $row )
+    {
+        return '<tr>';
+    }
+
+    /**
+     * @param $row
+     * @return string
+     */
+    public function closingRowTag( $row )
+    {
+        return '</tr>';
+    }
+
     /**
      * @param $model
      * @param $request

diff --git a/app/Libs/Layouts/Table/Column.php b/app/Libs/Layouts/Table/Column.php
@@ -65,4 +65,22 @@ public function attributesAsHtml()
         return trim( $attributes );
     }
 
+    /**
+     * @param $row
+     * @return string
+     */
+    public function openingTag( $row )
+    {
+        return '<td>';
+    }
+
+    /**
+     * @param $row
+     * @return string
+     */
+    public function closingTag( $row )
+    {
+        return '</td>';
+    }
+
 }
diff --git a/stubs/partials/table_body.stub b/stubs/partials/table_body.stub
@@ -4,10 +4,12 @@
     </tr>
 @else
     @foreach( $%s->rows() as $row )
-        <tr>
+        {!! $%s->openingRowTag( $row ) !!}
             @foreach( $%s->columns() as $column )
-                <td>{!! $column->render( $row ) !!}</td>
+                {!! $column->openingTag( $row ) !!}
+                    {!! $column->render( $row ) !!}
+                {!! $column->closingTag( $row ) !!}
             @endforeach
-        </tr>
+        {!! $%s->closingRowTag( $row ) !!}
     @endforeach
 @endif