Browse Source

Streamline UI for max space usage

Vijayakrishnan 5 năm trước cách đây
mục cha
commit
4bbfb435a7

+ 13 - 3
app/Console/Commands/GenerateTreeCommand.php

@@ -568,11 +568,21 @@ class GenController {
             unlink(resource_path("views/{$controller->root}/{$controller->parentControllerName}/actions.blade.php"));
         }
 
+        // write info view
+        $text = file_get_contents(base_path('generatecv/tree-templates/info.template.blade.php'));
+        $text = str_replace("_NAME_", $this->snakeToTitleCase($controller->name), $text);
+        $text = str_replace("_UID_", '<?= $record->uid ?>', $text);
+        $text = str_replace("_INDEX_ROUTE_", $controller->name . '-index', $text);
+        $this->file_force_contents(resource_path("views/{$controller->root}/{$controller->name}/info.blade.php"), $text);
+        echo "Generated " . resource_path("views/{$controller->root}/{$controller->name}/info.blade.php") . "\n";
+
+        // write main view
         $text = file_get_contents(base_path('generatecv/tree-templates/show.template.blade.php'));
         $text = str_replace("_NAME_", $this->snakeToTitleCase($controller->name), $text);
         $text = str_replace("_UID_", '<?= $record->uid ?>', $text);
         $text = str_replace("_INDEX_ROUTE_", $controller->name . '-index', $text);
         $text = str_replace("_SUB_LINKS_VIEW_", "{$controller->root}/{$controller->name}/subs", $text);
+        $text = str_replace("_INFO_VIEW_", "{$controller->root}/{$controller->name}/info", $text);
         $this->file_force_contents(resource_path("views/{$controller->root}/{$controller->name}/{$method->name}.blade.php"), $text);
         echo "Generated " . resource_path("views/{$controller->root}/{$controller->name}/{$method->name}.blade.php") . "\n";
     }
@@ -813,11 +823,11 @@ class GenController {
         }
         else {
             $text = str_replace("_SUB_VIEW_",
-                "<h4 class='py-3 border-bottom'>" .
-                $this->camelToTitleCase($this->snakeToTitleCase($method->name)) . "</h4>" .
+                "<h5 class='py-3 border-bottom'>" .
+                $this->camelToTitleCase($this->snakeToTitleCase($method->name)) . "</h5>" .
                 "Controller: <b>{$controller->name}</b><br>" .
                 "Action: <b>{$method->name}()</b><br>" .
-                "View: <b>{$controller->root}/{$controller->name}/{$method->name}.blade.php</b><br>",
+                "View: <b>{$controller->root}/{$controller->name}/{$method->name}.blade.php</b><br><br>",
                 $text);
         }
         return $text;

+ 1 - 1
generatecv/tree-templates/dashboard-group.template.blade.php

@@ -1,4 +1,4 @@
-<div class="table-responsive p-0 bg-white table-sm my-3">
+<div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>
         <tr>

+ 4 - 4
generatecv/tree-templates/dashboard-grouped.template.blade.php

@@ -1,11 +1,11 @@
-<div class="row">
-    <div class="col-7">
+<div class="row mt-3">
+    <div class="col-8">
 
         <!-- _GROUPS_ -->
 
     </div>
-    <div class="col-5">
-        <div class="border-left h-100 pt-3 px-3">
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
             @include('_ACTION_LINKS_VIEW_')
         </div>
     </div>

+ 5 - 5
generatecv/tree-templates/dashboard.template.blade.php

@@ -1,7 +1,7 @@
-<div class="row">
-    <div class="col-7">
+<div class="row mt-3">
+    <div class="col-8">
 
-        <div class="table-responsive p-0 bg-white table-sm mt-3">
+        <div class="table-responsive p-0 bg-white table-sm">
             <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
                 <thead>
                 <tr>
@@ -20,8 +20,8 @@
         </div>
 
     </div>
-    <div class="col-5">
-        <div class="border-left h-100 pt-3 px-3">
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
             @include('_ACTION_LINKS_VIEW_')
         </div>
     </div>

+ 7 - 0
generatecv/tree-templates/info.template.blade.php

@@ -0,0 +1,7 @@
+<div class="row">
+    <div class="col-12">
+        <h4 class="d-flex mb-3">
+            <div>_NAME_: Single [_UID_]</div>
+        </h4>
+    </div>
+</div>

+ 7 - 14
generatecv/tree-templates/show.template.blade.php

@@ -1,25 +1,18 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <h3 class="d-flex mb-3">
-        <div>_NAME_: Single [_UID_]</div>
-        <div class="ml-auto">
-            <a class="btn btn-primary btn-sm" href="{{route('_INDEX_ROUTE_')}}">
-                <i class="fa fa-chevron-left" aria-hidden="true"></i>
-                Back
-            </a>
-        </div>
-    </h3>
-
     <div class="card">
-        <div class="row">
-            <div class="col-3">
+        <div class="d-flex align-items-stretch">
+            <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('_SUB_LINKS_VIEW_')
                 </div>
             </div>
-            <div class="col-9">
-                @yield('content-inner')
+            <div class="flex-grow-1 p-3 mb-3 inner-content">
+                <div class="border-bottom">@include('_INFO_VIEW_')</div>
+                <div>
+                    @yield('content-inner')
+                </div>
             </div>
         </div>
     </div>

+ 3 - 3
generatecv/tree-templates/sub-index.template.blade.php

@@ -1,14 +1,14 @@
 @extends('_LAYOUT_')
 @section('content-inner')
 
-    <div class="mr-3 pb-3">
+    <div class="pb-3">
 
-        <h4 class='my-3 d-flex'>
+        <h5 class='my-3 d-flex'>
             <div>_NAME_</div>
             <div class="ml-auto">
                 <!-- _ADD_NEW_LINK_ -->
             </div>
-        </h4>
+        </h5>
 
         <div class="table-responsive p-0 bg-white border">
             <table class="table table-hover text-nowrap">

+ 6 - 0
resources/views/layouts/pro-logged-in.blade.php

@@ -141,6 +141,12 @@
         border-radius: 8px;
         overflow: hidden;
     }
+    .inner-side-nav {
+        width: 200px;
+    }
+    .inner-content {
+        width: calc(100% - 200px);
+    }
 </style>
 
 <script>