Sfoglia il codice sorgente

HUE-5964 [useradmin] Ported list of configurations

Enrico Berti 8 anni fa
parent
commit
02e4e91

+ 6 - 4
apps/useradmin/src/useradmin/templates/list_configurations.mako

@@ -24,8 +24,9 @@ from django.contrib.auth.models import Group
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="configKoComponents" file="/config_ko_components.mako" />
 <%namespace name="layout" file="layout.mako" />
-
+%if not is_embeddable:
 ${commonheader(_('Configurations'), "useradmin", user, request) | n,unicode}
+%endif
 ${layout.menubar(section='configurations')}
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
@@ -119,7 +120,7 @@ ${layout.menubar(section='configurations')}
   </div>
 </script>
 
-<div class="container-fluid">
+<div id="configurationsComponents" class="container-fluid">
   <!-- ko hueSpinner: { spin: loading, center: true, size: 'large' } --><!-- /ko -->
   <h4 style="width: 100%; text-align: center; display: none;" data-bind="visible: !loading() && hasErrors()">${ _('There was an error loading the configurations') }</h4>
   <!-- ko template: { if: !loading() && !hasErrors() && !selectedApp(), name: 'app-list' } --><!-- /ko -->
@@ -296,11 +297,12 @@ ${ configKoComponents.config() }
       });
     };
 
-    ko.applyBindings(new ConfigurationsViewModel());
+    ko.applyBindings(new ConfigurationsViewModel(), $('#configurationsComponents')[0]);
 
   })();
 </script>
 
 ${layout.commons()}
-
+%if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
+%endif

+ 3 - 1
apps/useradmin/src/useradmin/views.py

@@ -89,7 +89,9 @@ def list_permissions(request):
 
 
 def list_configurations(request):
-  return render("list_configurations.mako", request, {})
+  return render("list_configurations.mako", request, {
+    'is_embeddable': request.GET.get('is_embeddable', False)
+  })
 
 
 def list_for_autocomplete(request):

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 5 - 0
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -1011,4 +1011,9 @@ a:visited {
 
 .vertical-align-top {
   vertical-align: top;
+}
+
+.form-actions {
+  width: initial!important;
+  position: initial!important;
 }

Some files were not shown because too many files changed in this diff