Merge branch 'notes-2.x'

view/lean-console/base/layout.phtml

@@ -25,7 +25,11 @@
 
         <div id="right-panel">
             <header id="body-header">
-                {% section "header" %}{% endsection %}
+                {% section "header" %}
+                    <div class="flex align-items-center justify-content-end">
+                        <a class="btn-blue" href="{% url %}">⇠ Return</a>
+                    </div>
+                {% endsection %}
             </header>
 
             <div id="subheader">

view/lean-console/page/caching/picea.phtml

@@ -4,10 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "breadcrumb-items" %}
     <li class="breadcrumb-item">{% _ 'breadcrumb' %}</li>
 {% endsection %}

view/lean-console/page/dashboard/index.phtml

@@ -4,10 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "content" %}
     <section>
         <article>Welcome into your Lean Console section. Select the appropriate menu item from the sidebar.</article>

view/lean-console/page/debugging/logs.phtml

@@ -4,14 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
-{% section "breadcrumb-items" %}
-    <li class="breadcrumb-item">{% _ 'logs.breadcrumb' %}</li>
-{% endsection %}
-
 {% section "content" %}
         <section>
             <header>

view/lean-console/page/request/route.phtml

@@ -4,14 +4,21 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "breadcrumb-items" %}
     <li class="breadcrumb-item">{% _ 'route.breadcrumb' %}</li>
 {% endsection %}
 
+{% function routeHtml($route) %}
+    <div class="grid">
+        <strong class="col route-name">{{ $route->name }}</strong>
+        <div class="col route-uri">{{ $route->getRoute() }}</div>
+        <div class="col route-methods">{{ implode(', ', (array) ( $route->method ?? $route->methods )) }}</div>
+        <div class="col controller-method">
+            <span class="class">{{ $route->class }}</span>::<span>{{ $route->classMethod }}</span>
+        </div>
+    </div>
+{% endfunction %}
+
 {% section "content" %}
     <section>
         <header>
@@ -27,15 +34,16 @@
                     <div class="col controller-method">{% _ 'route.target' %}</div>
                 </strong>
 
-                {% foreach $routes as $name => $route %}
-                    <div class="grid">
-                        <strong class="col route-name">{{ $name }}</strong>
-                        <div class="col route-uri">{{ $route['route'] }}</div>
-                        <div class="col route-methods">{{ implode(', ', $route['routeMethods']) }}</div>
-                        <div class="col controller-method">
-                            <span class="class">{{ $route['class'] }}</span>::<span>{{ $route['classMethod'] }}</span>
+                {% foreach $routes as $route %}
+                    {{ routeHtml($route) }}
+                    
+                    {% if $overridden = $routing->findOverriddenRoute($route) %}
+                        <div style="background:rgba(255,0,0,0.2); text-decoration:line-through">
+                            {% foreach $routing->findOverriddenRoute($route) as $overridden %}
+                                {{ routeHtml($overridden) }}
+                            {% endforeach %}
                         </div>
-                    </div>
+                    {% endif %}
                 {% endforeach %}
             {% else %}
                 {% _ 'routeless' %}

view/lean-console/page/storage/database.phtml

@@ -6,10 +6,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "breadcrumb-items" %}
     <li class="breadcrumb-item">{% _ 'database.breadcrumb' %}</li>
 {% endsection %}

view/lean-console/page/storage/database_import.phtml

@@ -4,10 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "content" %}
     {% if $connections %}
         {% ui:form.post "database.import" %}

view/lean-console/page/storage/session.phtml

@@ -4,10 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "breadcrumb-items" %}
     <li class="breadcrumb-item">{% _ 'session.breadcrumb' %}</li>
 {% endsection %}

view/lean-console/page/templating/picea.phtml

@@ -4,10 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "breadcrumb-items" %}
     <li class="breadcrumb-item">{% _ 'breadcrumb' %}</li>
 {% endsection %}

view/lean-console/page/update/index.phtml

@@ -4,10 +4,6 @@
 
 {% title _("title") %}
 
-{% section "header" %}
-    <div class="page-title">{% _ "page-title" %}</div>
-{% endsection %}
-
 {% section "content" %}
     <section>
         <header>