diff --git a/share/layout/body.tt b/share/layout/body.tt index 72182ba120..f79622bef7 100644 --- a/share/layout/body.tt +++ b/share/layout/body.tt @@ -1,4 +1,16 @@ [% USE date %] +[% IF framed -%] + +
+

[% template.title or site_config.title %]

+ +
+ [% content %] +
+
+ +[% ELSE -%] +
@@ -26,17 +38,17 @@
  • [% IF c.user && c.session.user_tz_name; '(' _ c.session.user_tz.name _ ' ' _ c.loc('time') _ ')'; END; %]
    • -[%- IF ( c.user && ( c.user.roles == 'admin' || c.user.is_superuser ) ) && openvpn_info.allowed -%] -[%- IF !openvpn_info.active %] +[%- IF ( c.user && ( c.user.roles == 'admin' || c.user.is_superuser ) ) && openvpn_info.allowed -%] +[%- IF !openvpn_info.active %]
  • Openvpn
    • -[%ELSE-%] +[% ELSE -%]
  • Openvpn
    • -[%END-%] -[%END-%] +[% END -%] +[% END -%]
  • [% c.loc('Language') %] @@ -113,6 +125,7 @@
    • +[% END -%] @@ -216,7 +229,11 @@ var mainWrapperInit = function () { if($('.accordion-body').length) { if(!$('#toggle-accordions').length){ + [% IF framed -%] + $('#content').prepend(' [% c.loc('Expand Groups') %]'); + [% ELSE -%] $('#content').children('.container').prepend(' [% c.loc('Expand Groups') %]'); + [% 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 -%] +[% END -%] [% # vim: set tabstop=4 syntax=html expandtab: -%] diff --git a/share/layout/html.tt b/share/layout/html.tt index 3d16aed584..82651c92d0 100644 --- a/share/layout/html.tt +++ b/share/layout/html.tt @@ -45,11 +45,19 @@ [% IF framed -%] -
    +
    [% END -%] [% content %] diff --git a/share/layout/wrapper.tt b/share/layout/wrapper.tt index f89a304e69..444a9974ef 100644 --- 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;