TT#81185 Fix 'back' button behaviour for admin panel v2

- also show page description/location for proxied pages, like: "Subscriber Preferences for carol@10.0.0.1". It significantly improves user experience/understanding about the current location. - restore missing button "Expand Groups" for proxied 'accordion' pages - restore missing confirmation "Are you sure?" for proxied pages - fix main navigation buttons layout to have proper padding on proxied pages - fix missing "Edit" button on all pages for proxied mode Change-Id: I0df8cd37abdd0eebfd90b8c3e9f38daa1c97cc2d
5 years ago · 080b2ac877
parent 2884071513
commit 080b2ac877
3 changed files with 34 additions and 8 deletions
--- a/share/layout/body.tt
+++ b/share/layout/body.tt
@ -1,4 +1,16 @@
 [% USE date %]
+[% IF framed -%]
+
+<div id="wrapper">
+  <h2>[% template.title or site_config.title %]</h2>
+
+  <div id="content">
+    [% content %]
+  </div>
+</div>
+
+[% ELSE -%]
+
 <body>
 <div id="wrapper">
    <div id="topbar">
@ -31,12 +43,12 @@
                    <li>
                        <a class="btn btn-small btn-secondary" href="javascript:toggleOpenvpn('confirm');void(0);"><i class="icon-off"></i>Openvpn</a>
                    </li>
-[%ELSE-%]
+[%      ELSE -%]
                    <li>
                        <a class="btn btn-small btn-success" href="javascript:toggleOpenvpn('confirm');void(0);"><i class="icon-ok"></i>Openvpn</a>
                    </li>
-[%END-%]
-[%END-%]
+[%      END -%]
+[%   END -%]
                    <li class="dropdown">
                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                        <i class="icon-globe"></i> [% c.loc('Language') %]
@ -113,6 +125,7 @@
        </div>
    </div>
 </div>
+[% END -%] <!-- framed=0 -->

 <script src="/js/Theme.js"></script>

@ -216,7 +229,11 @@ var mainWrapperInit = function () {

    if($('.accordion-body').length) {
        if(!$('#toggle-accordions').length){
+          [% IF framed -%]
+            $('#content').prepend('<a href="#" id="toggle-accordions" class="btn btn-small btn-tertiary pull-right ngcp-accordion-closed"><i class="icon-resize-full"></i> [% c.loc('Expand Groups') %]</a>');
+          [% ELSE -%]
            $('#content').children('.container').prepend('<a href="#" id="toggle-accordions" class="btn btn-small btn-tertiary pull-right ngcp-accordion-closed"><i class="icon-resize-full"></i> [% c.loc('Expand Groups') %]</a>');
+          [% END -%]
        }
        $('#toggle-accordions').click(function() {
            if($('#toggle-accordions').hasClass('ngcp-accordion-closed')) {
@ -273,6 +290,7 @@ $( document ).ready(function() {


 [%PROCESS 'administrator/openvpn_wrapper.tt' %]
-
+[% UNLESS framed -%]
 </body>
+[% END -%]
 [% # vim: set tabstop=4 syntax=html expandtab: -%]
--- a/share/layout/html.tt
+++ b/share/layout/html.tt
@ -45,11 +45,19 @@

    </head>
    [% IF framed -%]
-        <div style="padding: 24px 24px 24px">
+        <div style="padding: 14px 24px 24px">
        <style>
          @media (min-width: 1200px) {
            .row { margin-left: 0px; }
          }
+          #content {
+            margin-top: 0;
+            margin-bottom: 0;
+          }
+          h2 {
+            margin-bottom: 0;
+            line-height: 24px;
+          }
        </style>
    [% END -%]
    [% content %]
--- a/share/layout/wrapper.tt
+++ b/share/layout/wrapper.tt
@ -1,7 +1,7 @@
 [%
    IF template.name.match('^api|(\.html$|\.css$|\.js$|\.txt$)');
        content;
-    ELSIF template.name.match('^login\/login\.tt$') || framed;
+    ELSIF template.name.match('^login\/login\.tt$');
       content WRAPPER html.tt;
    ELSE;
       content WRAPPER html.tt + body.tt;