some cleanup

themes/grav/css-compiled/template.css

@@ -907,6 +907,11 @@ tr {
     box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); }
     .button-group .dropdown-menu.language-switcher {
       min-width: auto; }
+    .button-group .dropdown-menu.lang-switcher {
+      min-width: 150px;
+      left: inherit; }
+      .button-group .dropdown-menu.lang-switcher button {
+        width: 100%; }
     .button-group .dropdown-menu .divider {
       height: 1px;
       margin: 9px 0;
@@ -1388,10 +1393,12 @@ tr {
     .pages-list .row .hint:after, .pages-list .row [data-hint]:after {
       border-radius: 2px; }
     .pages-list .row .badge.lang {
-      background-color: gray;
+      background-color: #aaa;
       color: white;
       border-radius: 20%;
       margin-left: 8px; }
+    .pages-list .row .badge.lang.info {
+      background-color: #9055AF; }
   .pages-list .page-tools {
     display: inline-block;
     float: right;
@@ -1749,7 +1756,7 @@ body.remodal_active .remodal {
     height: 3.5em;
     text-align: center;
     line-height: 3.5em;
-    padding: 0 3rem; }
+    padding: 0 2rem; }
     .form-tabs > label:last-of-type {
       border-bottom: none; }
     .form-tabs > label:hover {

themes/grav/scss/template/_buttons.scss

@@ -82,6 +82,14 @@
             min-width: auto;
         }
 
+        &.lang-switcher {
+            min-width: 150px;
+            left: inherit;
+            button {
+                width: 100%;
+            }
+        }
+
         .divider {
             height: 1px;
             margin: 9px 0;

themes/grav/scss/template/_pages.scss

@@ -45,11 +45,15 @@
         }
 
         .badge.lang {
-            background-color: gray;
+            background-color: #aaa;
             color: white;
             border-radius: 20%;
             margin-left: 8px;
         }
+
+        .badge.lang.info {
+            background-color: $info-bg;
+        }
     }
 
     .page-tools {

themes/grav/scss/template/_tabs.scss

@@ -75,7 +75,7 @@ $tab-label-height:3.5em;
 
         text-align:center;
         line-height: $tab-label-height;
-        padding: 0 3rem;
+        padding: 0 2rem;
 
         &:last-of-type {
             border-bottom:none;

themes/grav/templates/pages.html.twig

@@ -71,8 +71,8 @@
                 <i class="page-icon fa fa-fw fa-circle-o {{ p.children(0).count > 0 ? 'children-closed' : ''}} {{ p.modular ? 'modular' : (not p.routable ? 'not-routable' : (not p.visible ? 'not-visible' : (not p.page ? 'folder' :  ''))) }}"></i>
                 </span>
                 <a href="{{ page_url }}" class="page-edit">{{ p.menu }}</a>
-                {% if p.language and p.language != admin_lang %}
-                    <span class="badge lang">{{p.language ?: default_site_lang}}</span>
+                {% if p.language %}
+                    <span class="badge lang {% if p.language == admin_lang %}info{% endif %}">{{p.language ?: default_site_lang}}</span>
                 {% endif %}
                 <span class="page-home">{{ p.home ? '<i class="fa fa-home"></i>' }}</span>
                 <span class="page-tools">
@@ -136,6 +136,8 @@
                 {% endif %}
             {% endif %}
 
+            {{ dump(admin_lang) }}
+
             <div class="button-group">
                 <button class="button" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN.SAVE"|tu }}</button>
                 {% if exists and admin.multilang %}
@@ -143,9 +145,9 @@
                         <button type="button" class="button dropdown-toggle" data-toggle="dropdown">
                             <i class="fa fa-caret-down"></i>
                         </button>
-                        <ul class="dropdown-menu language-switcher">
+                        <ul class="dropdown-menu lang-switcher">
                             {% for language in context.untranslatedLanguages %}
-                                {% if language != page_lang %}
+                                {% if language != page_lang and language != admin_lang %}
                                     <li><button class="button task" name="task" value="saveas" lang="{{language}}" form="blueprints">{{ "PLUGIN_ADMIN.SAVE_AS"|tu }} {{ admin.siteLanguages[language]|capitalize }}</button>
                                 {% endif %}
                             {% endfor %}
@@ -179,7 +181,7 @@
         <div class="admin-form-wrapper" data-media-url="{{ base_url }}/media/{{ admin.route|trim('/') }}.json" data-media-local="{{ base_url_relative_frontend }}/{{ admin.route|trim('/') }}" data-media-types="{{ media_types }}">
             <div id="admin-topbar">
 
-                {% if admin.multilang %}
+                {% if admin.multilang and page_lang %}
                     <div id="admin-lang-toggle" class="button-group">
                         <button type="button" class="button disabled">
                             {% if exists %}