diff --git a/application/views/backend/users.php b/application/views/backend/users.php index 2605f6bb..7eaa472d 100755 --- a/application/views/backend/users.php +++ b/application/views/backend/users.php @@ -28,7 +28,7 @@ } }; - $(function() { + $(function () { BackendUsers.initialize(true); }); @@ -83,7 +83,7 @@
-
+
-
- -
-
-
+ + + - -
-

+
+
+

- + -
-
-
- - +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ + +
-
- - +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +

+
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - -
- -
- -

-
-
-
@@ -425,12 +440,14 @@
- +
- +
@@ -587,12 +604,14 @@
- +
- +
diff --git a/assets/css/backend.css b/assets/css/backend.css index f9c185cb..7d62ee7f 100644 --- a/assets/css/backend.css +++ b/assets/css/backend.css @@ -714,40 +714,13 @@ body .form-horizontal .controls { #users-page #providers .switch-view { overflow: auto; - margin-bottom: 5px; + background: none; + padding: 0; + margin: 0; } -#users-page #providers .switch-view div { - display: inline-block; - padding: 6px 13px; - color: #333; - float: left; - margin-right: 3px; - cursor: pointer; - min-width: 100px; - text-align: center; -} - -#users-page #providers .switch-view div:hover:not(.current) { - background: #F5F5F5; -} - -#users-page #providers .switch-view strong { - display: inline-block; - float: left; - margin-right: 20px; - font-size: 17px; -} - -#users-page #providers .switch-view .current { - color: #FFF; - background: #39c678; -} - -#users-page #providers .details-view, -#users-page #providers .working-plan-view { - clear: both; - overflow: auto; +#users-page #providers .switch-view .nav-item { + margin: 0; } #users-page #providers .working-plan-view .work-start, diff --git a/assets/css/general.css b/assets/css/general.css index 45a9fee4..d1cb1f86 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -436,3 +436,7 @@ body .popover-body a { .has-error .form-control { border-color: #dc3545; } + +body .clearfix { + clear: both; +} diff --git a/assets/js/backend_users.js b/assets/js/backend_users.js index 03c6d122..cc8f77a3 100644 --- a/assets/js/backend_users.js +++ b/assets/js/backend_users.js @@ -137,6 +137,10 @@ window.BackendUsers = window.BackendUsers || {}; * Changes the displayed tab. */ $('a[data-toggle="tab"]').on('shown.bs.tab', function () { + if ($(this).parents('.switch-view').length) { + return; // Do not proceed if this was the sub navigation. + } + if ($(this).attr('href') === '#admins') { helper = new AdminsHelper(); } else if ($(this).attr('href') === '#providers') { diff --git a/assets/js/backend_users_providers.js b/assets/js/backend_users_providers.js index f3548657..9e3a9ffa 100755 --- a/assets/js/backend_users_providers.js +++ b/assets/js/backend_users_providers.js @@ -205,23 +205,8 @@ /** * Event: Display Provider Details "Click" */ - $('#providers').on('click', '.display-details', function () { - $('#providers .switch-view .current').removeClass('current'); - $(this).addClass('current'); - $('.working-plan-view').hide('fade', function () { - $('.details-view').show('fade'); - }); - }); - - /** - * Event: Display Provider Working Plan "Click" - */ - $('#providers').on('click', '.display-working-plan', function () { - $('#providers .switch-view .current').removeClass('current'); - $(this).addClass('current'); - $('.details-view').hide('fade', function () { - $('.working-plan-view').show('fade'); - }); + $('#providers').on('shown.bs.tab', 'a[data-toggle="tab"]', function () { + Backend.placeFooterToBottom(); }); /**