Просмотр исходного кода

HUE-5498 [editor] Fix the CSS problems with report mode

Enrico Berti 9 лет назад
Родитель
Сommit
e2a570beb9

+ 1 - 1
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 
 
 ${ commonheader(_("Create database"), 'metastore', user, request) | n,unicode }
 ${ commonheader(_("Create database"), 'metastore', user, request) | n,unicode }
 
 
-<span id="editorComponents">
+<span class="notebook">
 
 
 ${layout.metastore_menubar()}
 ${layout.metastore_menubar()}
 
 

+ 1 - 1
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 
 
 ${ commonheader(_("Create table manually"), 'metastore', user, request) | n,unicode }
 ${ commonheader(_("Create table manually"), 'metastore', user, request) | n,unicode }
 
 
-<span id="editorComponents">
+<span class="notebook">
 ${ layout.metastore_menubar() }
 ${ layout.metastore_menubar() }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>

+ 1 - 1
apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako

@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="util" file="util.mako" />
 <%namespace name="util" file="util.mako" />
 
 
 ${ commonheader(_('Create table from file'), 'metastore', user, request) | n,unicode }
 ${ commonheader(_('Create table from file'), 'metastore', user, request) | n,unicode }
-<span id="editorComponents">
+<span class="notebook">
 ${ layout.metastore_menubar() }
 ${ layout.metastore_menubar() }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>

+ 1 - 1
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="layout" file="layout.mako" />
 <%namespace name="layout" file="layout.mako" />
 
 
 ${ commonheader(_('Create table from file'), 'metastore', user, request) | n,unicode }
 ${ commonheader(_('Create table from file'), 'metastore', user, request) | n,unicode }
-<span id="editorComponents">
+<span class="notebook">
 ${ layout.metastore_menubar() }
 ${ layout.metastore_menubar() }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>

+ 1 - 1
apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako

@@ -25,7 +25,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="util" file="util.mako" />
 <%namespace name="util" file="util.mako" />
 
 
 ${ commonheader(_('Create table from file'), 'metastore', user, request) | n,unicode }
 ${ commonheader(_('Create table from file'), 'metastore', user, request) | n,unicode }
-<span id="editorComponents">
+<span class="notebook">
 ${ layout.metastore_menubar() }
 ${ layout.metastore_menubar() }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/apps.mako

@@ -24,7 +24,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="assist" file="/assist.mako" />
 % endif
 % endif
 
 
-<span id="editorComponents">
+<span class="notebook">
 
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/basictable.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/basictable.css') }">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">

+ 1 - 1
apps/metastore/src/metastore/templates/describe_partitions.mako

@@ -23,7 +23,7 @@
 <%namespace name="components" file="components.mako" />
 <%namespace name="components" file="components.mako" />
 
 
 ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name), app_name, user, request) | n,unicode }
 ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name), app_name, user, request) | n,unicode }
-<span id="editorComponents">
+<span class="notebook">
 ${ components.menubar() }
 ${ components.menubar() }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>

+ 1 - 1
apps/metastore/src/metastore/templates/metastore.mako

@@ -61,7 +61,7 @@ ${ assist.assistJSModels() }
 ${ assist.assistPanel() }
 ${ assist.assistPanel() }
 % endif
 % endif
 
 
-<span id="editorComponents">
+<span class="notebook">
 
 
 ${ components.menubar() }
 ${ components.menubar() }
 
 

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -24,7 +24,7 @@
 <%namespace name="assist" file="/assist.mako" />
 <%namespace name="assist" file="/assist.mako" />
 
 
 ${ commonheader(_("Solr Indexes"), "search", user, request, "60px") | n,unicode }
 ${ commonheader(_("Solr Indexes"), "search", user, request, "60px") | n,unicode }
-<span id="editorComponents">
+<span class="notebook">
 
 
 <script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>

+ 13 - 13
desktop/libs/notebook/src/notebook/static/notebook/css/notebook.css

@@ -238,35 +238,35 @@
 }
 }
 
 
 
 
-#editorComponents .nav {
+.notebook .nav {
   margin-bottom: 0;
   margin-bottom: 0;
 }
 }
 
 
-#editorComponents .nav i {
+.notebook .nav i {
   line-height: 20px !important;
   line-height: 20px !important;
 }
 }
 
 
-#editorComponents .nav-list > li > a, #editorComponents .nav-list .nav-header {
+.notebook .nav-list > li > a, .notebook .nav-list .nav-header {
   padding-left: 0;
   padding-left: 0;
   margin-left: 0;
   margin-left: 0;
   margin-bottom: -7px;
   margin-bottom: -7px;
   margin-top: 10px!important;
   margin-top: 10px!important;
 }
 }
 
 
-#editorComponents .nav-list {
+.notebook .nav-list {
   padding-left: 0;
   padding-left: 0;
 }
 }
 
 
-#editorComponents .dropdown-menu li {
+.notebook .dropdown-menu li {
   font-size: 14px;
   font-size: 14px;
 }
 }
 
 
-#editorComponents .dropdown a.dropdown-toggle {
+.notebook .dropdown a.dropdown-toggle {
   padding-left: 10px;
   padding-left: 10px;
   padding-right: 10px;
   padding-right: 10px;
 }
 }
 
 
-#editorComponents .search-bar {
+.notebook .search-bar {
   background-color: #F5F5F5;
   background-color: #F5F5F5;
   margin: 0;
   margin: 0;
   padding-bottom: 0;
   padding-bottom: 0;
@@ -280,20 +280,20 @@
   z-index: 1000;
   z-index: 1000;
 }
 }
 
 
-#editorComponents .search-bar input {
+.notebook .search-bar input {
   margin-left: 10px;
   margin-left: 10px;
   padding-right: 20px;
   padding-right: 20px;
 }
 }
 
 
-#editorComponents .search-bar ul li {
+.notebook .search-bar ul li {
   text-align: right;
   text-align: right;
 }
 }
 
 
-#editorComponents .search-bar ul.dropdown-menu li {
+.notebook .search-bar ul.dropdown-menu li {
   text-align: left;
   text-align: left;
 }
 }
 
 
-#editorComponents .tab-content {
+.notebook .tab-content {
   background-color: #FFFFFF;
   background-color: #FFFFFF;
   border-left: 1px solid #dddddd;
   border-left: 1px solid #dddddd;
   border-right: 1px solid #dddddd;
   border-right: 1px solid #dddddd;
@@ -338,7 +338,7 @@
   border: none;
   border: none;
 }
 }
 
 
-#editorComponents .ui-sortable {
+.notebook .ui-sortable {
   background-color: #FFF;
   background-color: #FFF;
   min-height: 0px;
   min-height: 0px;
 }
 }
@@ -1001,7 +1001,7 @@ h4.header {
   width: 220px;
   width: 220px;
 }
 }
 
 
-#editorComponents pre {
+.notebook pre {
   font-size: 11px;
   font-size: 11px;
 }
 }
 
 

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor.mako

@@ -26,7 +26,7 @@
 
 
 ${ commonheader(_('Editor'), editor_type, user, request, "68px") | n,unicode }
 ${ commonheader(_('Editor'), editor_type, user, request, "68px") | n,unicode }
 
 
-<span id="editorComponents">
+<span id="editorComponents" class="notebook">
 ${ editorComponents.includes() }
 ${ editorComponents.includes() }
 
 
 <style type="text/css">
 <style type="text/css">

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor_embeddable.mako

@@ -24,7 +24,7 @@
 <%namespace name="editorComponents" file="editor_components.mako" />
 <%namespace name="editorComponents" file="editor_components.mako" />
 <%namespace name="notebookKoComponents" file="notebook_ko_components.mako" />
 <%namespace name="notebookKoComponents" file="notebook_ko_components.mako" />
 
 
-<span id="editorComponents">
+<span id="editorComponents" class="notebook">
 ${ editorComponents.includes(is_embeddable=True) }
 ${ editorComponents.includes(is_embeddable=True) }
 
 
 <style type="text/css">
 <style type="text/css">

+ 2 - 0
desktop/libs/notebook/src/notebook/templates/notebook.mako

@@ -26,6 +26,7 @@
 
 
 ${ commonheader(_('Notebook'), app_name, user, request, "68px") | n,unicode }
 ${ commonheader(_('Notebook'), app_name, user, request, "68px") | n,unicode }
 
 
+<span class="notebook">
 ${ editorComponents.includes() }
 ${ editorComponents.includes() }
 ${ editorComponents.topBar() }
 ${ editorComponents.topBar() }
 <%editorComponents:commonHTML>
 <%editorComponents:commonHTML>
@@ -55,4 +56,5 @@ ${ notebookKoComponents.downloadSnippetResults() }
 
 
 ${ editorComponents.commonJS() }
 ${ editorComponents.commonJS() }
 
 
+</span>
 ${ commonfooter(request, messages) | n,unicode }
 ${ commonfooter(request, messages) | n,unicode }