diff --git a/panoramix/__init__.py b/panoramix/__init__.py index 25a90e3c5f93..ca909882ed73 100644 --- a/panoramix/__init__.py +++ b/panoramix/__init__.py @@ -20,11 +20,11 @@ class MyIndexView(IndexView): - index_template = 'refactor/index.html' + index_template = 'panoramix/featured_datasets.html' appbuilder = AppBuilder( app, db.session, - base_template='refactor/base.html', + base_template='panoramix/base.html', indexview=MyIndexView, security_manager_class=app.config.get("CUSTOM_SECURITY_MANAGER")) diff --git a/panoramix/assets/html/base.html b/panoramix/assets/html/base.html deleted file mode 100644 index 006b74d1cce6..000000000000 --- a/panoramix/assets/html/base.html +++ /dev/null @@ -1,45 +0,0 @@ -{% extends 'appbuilder/init.html' %} -{% import 'appbuilder/baselib.html' as baselib %} - -{% block head_css %} - {{super()}} - - - - - - -{% endblock %} - -{% block body %} - {% include 'appbuilder/general/confirm.html' %} - {% include 'appbuilder/general/alert.html' %} - - {% block navbar %} -
- {% include 'appbuilder/navbar.html' %} -
- {% endblock %} - - {% block uncontained %}{% endblock %} - -
-
- {% block messages %} - {% include 'appbuilder/flash.html' %} - {% endblock %} - {% block content %}{% endblock %} -
-
-
- {% block content_fluid %}{% endblock %} -
- -{% endblock %} - -{% block tail_js %} - {{ super() }} - - - -{% endblock %} diff --git a/panoramix/templates/panoramix/basic.html b/panoramix/assets/html/basic.html similarity index 52% rename from panoramix/templates/panoramix/basic.html rename to panoramix/assets/html/basic.html index 377a8d28ce20..cc587efcc3f4 100644 --- a/panoramix/templates/panoramix/basic.html +++ b/panoramix/assets/html/basic.html @@ -7,13 +7,13 @@ {% block head_meta %}{% endblock %} {% block head_css %} - - - - - + + + + + - + {% endblock %} {% block head_js %}{% endblock %} diff --git a/panoramix/assets/html/explore.html b/panoramix/assets/html/explore.html index 7e170909562e..3388e0cec371 100644 --- a/panoramix/assets/html/explore.html +++ b/panoramix/assets/html/explore.html @@ -1,4 +1,4 @@ -{% extends "panoramix/basic.html" %} +{% extends "refactor/basic.html" %} {% block body %} {% set datasource = viz.datasource %} @@ -208,5 +208,5 @@

Datasource Description

{% block tail_js %} {{ super() }} - + {% endblock %} diff --git a/panoramix/assets/javascripts/modules/panoramix.js b/panoramix/assets/javascripts/modules/panoramix.js index e0f9b9c9d3e2..6850fbdf268f 100644 --- a/panoramix/assets/javascripts/modules/panoramix.js +++ b/panoramix/assets/javascripts/modules/panoramix.js @@ -460,75 +460,6 @@ var px = (function() { }); } - function initSqlEditorView() { - var database_id = $('#database_id').val(); - var editor = ace.edit("sql"); - editor.$blockScrolling = Infinity - editor.getSession().setUseWrapMode(true); - - var textarea = $('#sql').hide(); - editor.setTheme("ace/theme/crimson_editor"); - editor.setOptions({ - minLines: 16, - maxLines: Infinity, - }); - editor.getSession().setMode("ace/mode/sql"); - editor.focus(); - $("select").select2({dropdownAutoWidth : true}); - function showTableMetadata() { - $(".metadata").load( - '/panoramix/table/' + database_id + '/' + $("#dbtable").val() + '/'); - } - $("#dbtable").on("change", showTableMetadata); - showTableMetadata(); - $("#create_view").click(function(){alert("Not implemented");}); - $(".sqlcontent").show(); - $("#select_star").click(function(){ - $.ajax('/panoramix/select_star/' + database_id + '/' + $("#dbtable").val() + '/') - .done(function(msg){ - editor.setValue(msg); - }); - }); - editor.setValue(getParam('sql')); - $(window).bind("popstate", function(event) { - // Browser back button - var returnLocation = history.location || document.location; - // Could do something more lightweight here, but we're not optimizing - // for the use of the back button anyways - editor.setValue(getParam('sql')); - $("#run").click(); - }); - $("#run").click(function() { - $('#results').hide(0); - $('#loading').show(0); - history.pushState({}, document.title, '?sql=' + encodeURIComponent(editor.getValue())); - $.ajax({ - type: "POST", - url: '/panoramix/runsql/', - data: { - 'data': JSON.stringify({ - 'database_id': $('#database_id').val(), - 'sql': editor.getSession().getValue(), - })}, - success: function(data) { - $('#loading').hide(0); - $('#results').show(0); - $('#results').html(data); - - var datatable = $('table.sql_results').DataTable({ - paging: false, - searching: true, - aaSorting: [], - }); - }, - error: function(err, err2) { - $('#loading').hide(0); - $('#results').show(0); - $('#results').html(err.responseText); - }, - }); - }); - } function initDashboardView() { var gridster = $(".gridster ul").gridster({ @@ -633,7 +564,6 @@ var px = (function() { timeFormatFactory: timeFormatFactory, color: color(), renderSlice: renderSlice, - initSqlEditorView: initSqlEditorView, } })(); diff --git a/panoramix/assets/stylesheets/panoramix.css b/panoramix/assets/stylesheets/panoramix.css index 1aa66a8a81c2..9b1db9bf6378 100644 --- a/panoramix/assets/stylesheets/panoramix.css +++ b/panoramix/assets/stylesheets/panoramix.css @@ -100,7 +100,9 @@ legend.legend-style { //position: relative !important; z-index: 888; } - +.nvtooltip table td{ + font-size: small !important; +} legend { width: auto; border-bottom: 0px; diff --git a/panoramix/static/lib/ace/ace.js b/panoramix/assets/vendor/ace/ace.js similarity index 100% rename from panoramix/static/lib/ace/ace.js rename to panoramix/assets/vendor/ace/ace.js diff --git a/panoramix/static/lib/ace/mode-css.js b/panoramix/assets/vendor/ace/mode-css.js similarity index 100% rename from panoramix/static/lib/ace/mode-css.js rename to panoramix/assets/vendor/ace/mode-css.js diff --git a/panoramix/static/lib/ace/mode-sql.js b/panoramix/assets/vendor/ace/mode-sql.js similarity index 100% rename from panoramix/static/lib/ace/mode-sql.js rename to panoramix/assets/vendor/ace/mode-sql.js diff --git a/panoramix/static/lib/ace/theme-crimson_editor.js b/panoramix/assets/vendor/ace/theme-crimson_editor.js similarity index 100% rename from panoramix/static/lib/ace/theme-crimson_editor.js rename to panoramix/assets/vendor/ace/theme-crimson_editor.js diff --git a/panoramix/static/lib/gridster/jquery.gridster.min.css b/panoramix/assets/vendor/gridster/jquery.gridster.min.css similarity index 100% rename from panoramix/static/lib/gridster/jquery.gridster.min.css rename to panoramix/assets/vendor/gridster/jquery.gridster.min.css diff --git a/panoramix/static/lib/gridster/jquery.gridster.with-extras.min.js b/panoramix/assets/vendor/gridster/jquery.gridster.with-extras.min.js similarity index 100% rename from panoramix/static/lib/gridster/jquery.gridster.with-extras.min.js rename to panoramix/assets/vendor/gridster/jquery.gridster.with-extras.min.js diff --git a/panoramix/data/__init__.py b/panoramix/data/__init__.py index 3d4d58f8d58d..1689329c47c2 100644 --- a/panoramix/data/__init__.py +++ b/panoramix/data/__init__.py @@ -69,6 +69,7 @@ def load_world_bank_health_n_pop(): tbl = TBL(table_name=tbl_name) tbl.description = utils.readfile(os.path.join(DATA_FOLDER, 'countries.md')) tbl.main_dttm_col = 'year' + tbl.is_featured = True tbl.database = get_or_create_db(db.session) db.session.merge(tbl) db.session.commit() @@ -305,6 +306,7 @@ def load_birth_names(): obj = TBL(table_name = 'birth_names') obj.main_dttm_col = 'ds' obj.database = get_or_create_db(db.session) + obj.is_featured = True db.session.merge(obj) db.session.commit() obj.fetch_metadata() diff --git a/panoramix/static/refactor b/panoramix/static/assets similarity index 100% rename from panoramix/static/refactor rename to panoramix/static/assets diff --git a/panoramix/templates/panoramix/base.html b/panoramix/templates/panoramix/base.html index 323e6ad9d3ea..63457278eeca 100644 --- a/panoramix/templates/panoramix/base.html +++ b/panoramix/templates/panoramix/base.html @@ -2,19 +2,6 @@ {% block head_css %} {{super()}} - - - - + + {% endblock %} - -{% block tail_js %} - - - - -{{ super() }} -{% endblock %} -{% block footer %} -{% endblock %} - diff --git a/panoramix/templates/panoramix/explore.html b/panoramix/templates/panoramix/explore.html deleted file mode 100644 index 67b52435436e..000000000000 --- a/panoramix/templates/panoramix/explore.html +++ /dev/null @@ -1,231 +0,0 @@ -{% extends "panoramix/basic.html" %} - -{% block head_css %} -{{super()}} - -{% endblock %} - -{% block content_fluid %} -{% set datasource = viz.datasource %} -{% set form = viz.form %} - -{% macro panofield(fieldname)%} -
- {% set field = form.get_field(fieldname)%} -
- {{ viz.get_form_override(fieldname, 'label') or field.label }} - {% if field.description %} - - {% endif %} - {{ field(class_=form.field_css_classes(field.name)) }} -
-
-{% endmacro %} - -
- -
-{% endblock %} - -{% block tail_js %} -{{ super() }} - - -{% endblock %} diff --git a/panoramix/templates/panoramix/featured_datasets.html b/panoramix/templates/panoramix/featured_datasets.html index 93e5bcba89a9..847310627753 100644 --- a/panoramix/templates/panoramix/featured_datasets.html +++ b/panoramix/templates/panoramix/featured_datasets.html @@ -1,7 +1,7 @@ {% extends "panoramix/base.html" %} {% block content %}
-

Featured Datasets

+

Featured Datasets

@@ -16,7 +16,7 @@

Featured Datasets

{% for dataset in featured_datasets %} -