Repository: incubator-zeppelin Updated Branches: refs/heads/master ae092e9dc -> 8c7424a19
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8c7424a1/zeppelin-web/src/fonts/fontawesome-webfont.woff ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/fonts/fontawesome-webfont.woff b/zeppelin-web/src/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..628b6a5 Binary files /dev/null and b/zeppelin-web/src/fonts/fontawesome-webfont.woff differ http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8c7424a1/zeppelin-web/src/fonts/simple-line-icons.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/fonts/simple-line-icons.css b/zeppelin-web/src/fonts/simple-line-icons.css new file mode 100644 index 0000000..ada681e --- /dev/null +++ b/zeppelin-web/src/fonts/simple-line-icons.css @@ -0,0 +1,526 @@ +@font-face { + font-family: 'Simple-Line-Icons'; + src:url('fonts/Simple-Line-Icons.eot'); + src:url('fonts/Simple-Line-Icons.eot?#iefix') format('embedded-opentype'), + url('../fonts/Simple-Line-Icons.woff') format('woff'), + url('../fonts/Simple-Line-Icons.ttf') format('truetype'), + url('../fonts/Simple-Line-Icons.svg#Simple-Line-Icons') format('svg'); + font-weight: normal; + font-style: normal; +} + +/* Use the following CSS code if you want to use data attributes for inserting your icons */ +[data-icon]:before { + font-family: 'Simple-Line-Icons'; + content: attr(data-icon); + speak: none; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/* Use the following CSS code if you want to have a class per icon */ +/* +Instead of a list of all class selectors, +you can use the generic selector below, but it's slower: +[class*="icon-"] { +*/ +.icon-user-female, .icon-user-follow, .icon-user-following, .icon-user-unfollow, .icon-trophy, .icon-screen-smartphone, .icon-screen-desktop, .icon-plane, .icon-notebook, .icon-moustache, .icon-mouse, .icon-magnet, .icon-energy, .icon-emoticon-smile, .icon-disc, .icon-cursor-move, .icon-crop, .icon-credit-card, .icon-chemistry, .icon-user, .icon-speedometer, .icon-social-youtube, .icon-social-twitter, .icon-social-tumblr, .icon-social-facebook, .icon-social-dropbox, .icon-social-dribbble, .icon-shield, .icon-screen-tablet, .icon-magic-wand, .icon-hourglass, .icon-graduation, .icon-ghost, .icon-game-controller, .icon-fire, .icon-eyeglasses, .icon-envelope-open, .icon-envelope-letter, .icon-bell, .icon-badge, .icon-anchor, .icon-wallet, .icon-vector, .icon-speech, .icon-puzzle, .icon-printer, .icon-present, .icon-playlist, .icon-pin, .icon-picture, .icon-map, .icon-layers, .icon-handbag, .icon-globe-alt, .icon-globe, .icon-frame, .icon-folder-alt, .icon-film, .icon-feed, .icon-earphon es-alt, .icon-earphones, .icon-drop, .icon-drawer, .icon-docs, .icon-directions, .icon-direction, .icon-diamond, .icon-cup, .icon-compass, .icon-call-out, .icon-call-in, .icon-call-end, .icon-calculator, .icon-bubbles, .icon-briefcase, .icon-book-open, .icon-basket-loaded, .icon-basket, .icon-bag, .icon-action-undo, .icon-action-redo, .icon-wrench, .icon-umbrella, .icon-trash, .icon-tag, .icon-support, .icon-size-fullscreen, .icon-size-actual, .icon-shuffle, .icon-share-alt, .icon-share, .icon-rocket, .icon-question, .icon-pie-chart, .icon-pencil, .icon-note, .icon-music-tone-alt, .icon-music-tone, .icon-microphone, .icon-loop, .icon-logout, .icon-login, .icon-list, .icon-like, .icon-home, .icon-grid, .icon-graph, .icon-equalizer, .icon-dislike, .icon-cursor, .icon-control-start, .icon-control-rewind, .icon-control-play, .icon-control-pause, .icon-control-forward, .icon-control-end, .icon-calendar, .icon-bulb, .icon-bar-chart, .icon-arrow-up, .icon-arrow-right, .icon-arrow-left, .ic on-arrow-down, .icon-ban, .icon-bubble, .icon-camcorder, .icon-camera, .icon-check, .icon-clock, .icon-close, .icon-cloud-download, .icon-cloud-upload, .icon-doc, .icon-envelope, .icon-eye, .icon-flag, .icon-folder, .icon-heart, .icon-info, .icon-key, .icon-link, .icon-lock, .icon-lock-open, .icon-magnifier, .icon-magnifier-add, .icon-magnifier-remove, .icon-paper-clip, .icon-paper-plane, .icon-plus, .icon-pointer, .icon-power, .icon-refresh, .icon-reload, .icon-settings, .icon-star, .icon-symbol-female, .icon-symbol-male, .icon-target, .icon-volume-1, .icon-volume-2, .icon-volume-off, .icon-users { + font-family: 'Simple-Line-Icons'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; +} +.icon-user-female:before { + content: "\e000"; +} +.icon-user-follow:before { + content: "\e002"; +} +.icon-user-following:before { + content: "\e003"; +} +.icon-user-unfollow:before { + content: "\e004"; +} +.icon-trophy:before { + content: "\e006"; +} +.icon-screen-smartphone:before { + content: "\e010"; +} +.icon-screen-desktop:before { + content: "\e011"; +} +.icon-plane:before { + content: "\e012"; +} +.icon-notebook:before { + content: "\e013"; +} +.icon-moustache:before { + content: "\e014"; +} +.icon-mouse:before { + content: "\e015"; +} +.icon-magnet:before { + content: "\e016"; +} +.icon-energy:before { + content: "\e020"; +} +.icon-emoticon-smile:before { + content: "\e021"; +} +.icon-disc:before { + content: "\e022"; +} +.icon-cursor-move:before { + content: "\e023"; +} +.icon-crop:before { + content: "\e024"; +} +.icon-credit-card:before { + content: "\e025"; +} +.icon-chemistry:before { + content: "\e026"; +} +.icon-user:before { + content: "\e005"; +} +.icon-speedometer:before { + content: "\e007"; +} +.icon-social-youtube:before { + content: "\e008"; +} +.icon-social-twitter:before { + content: "\e009"; +} +.icon-social-tumblr:before { + content: "\e00a"; +} +.icon-social-facebook:before { + content: "\e00b"; +} +.icon-social-dropbox:before { + content: "\e00c"; +} +.icon-social-dribbble:before { + content: "\e00d"; +} +.icon-shield:before { + content: "\e00e"; +} +.icon-screen-tablet:before { + content: "\e00f"; +} +.icon-magic-wand:before { + content: "\e017"; +} +.icon-hourglass:before { + content: "\e018"; +} +.icon-graduation:before { + content: "\e019"; +} +.icon-ghost:before { + content: "\e01a"; +} +.icon-game-controller:before { + content: "\e01b"; +} +.icon-fire:before { + content: "\e01c"; +} +.icon-eyeglasses:before { + content: "\e01d"; +} +.icon-envelope-open:before { + content: "\e01e"; +} +.icon-envelope-letter:before { + content: "\e01f"; +} +.icon-bell:before { + content: "\e027"; +} +.icon-badge:before { + content: "\e028"; +} +.icon-anchor:before { + content: "\e029"; +} +.icon-wallet:before { + content: "\e02a"; +} +.icon-vector:before { + content: "\e02b"; +} +.icon-speech:before { + content: "\e02c"; +} +.icon-puzzle:before { + content: "\e02d"; +} +.icon-printer:before { + content: "\e02e"; +} +.icon-present:before { + content: "\e02f"; +} +.icon-playlist:before { + content: "\e030"; +} +.icon-pin:before { + content: "\e031"; +} +.icon-picture:before { + content: "\e032"; +} +.icon-map:before { + content: "\e033"; +} +.icon-layers:before { + content: "\e034"; +} +.icon-handbag:before { + content: "\e035"; +} +.icon-globe-alt:before { + content: "\e036"; +} +.icon-globe:before { + content: "\e037"; +} +.icon-frame:before { + content: "\e038"; +} +.icon-folder-alt:before { + content: "\e039"; +} +.icon-film:before { + content: "\e03a"; +} +.icon-feed:before { + content: "\e03b"; +} +.icon-earphones-alt:before { + content: "\e03c"; +} +.icon-earphones:before { + content: "\e03d"; +} +.icon-drop:before { + content: "\e03e"; +} +.icon-drawer:before { + content: "\e03f"; +} +.icon-docs:before { + content: "\e040"; +} +.icon-directions:before { + content: "\e041"; +} +.icon-direction:before { + content: "\e042"; +} +.icon-diamond:before { + content: "\e043"; +} +.icon-cup:before { + content: "\e044"; +} +.icon-compass:before { + content: "\e045"; +} +.icon-call-out:before { + content: "\e046"; +} +.icon-call-in:before { + content: "\e047"; +} +.icon-call-end:before { + content: "\e048"; +} +.icon-calculator:before { + content: "\e049"; +} +.icon-bubbles:before { + content: "\e04a"; +} +.icon-briefcase:before { + content: "\e04b"; +} +.icon-book-open:before { + content: "\e04c"; +} +.icon-basket-loaded:before { + content: "\e04d"; +} +.icon-basket:before { + content: "\e04e"; +} +.icon-bag:before { + content: "\e04f"; +} +.icon-action-undo:before { + content: "\e050"; +} +.icon-action-redo:before { + content: "\e051"; +} +.icon-wrench:before { + content: "\e052"; +} +.icon-umbrella:before { + content: "\e053"; +} +.icon-trash:before { + content: "\e054"; +} +.icon-tag:before { + content: "\e055"; +} +.icon-support:before { + content: "\e056"; +} +.icon-size-fullscreen:before { + content: "\e057"; +} +.icon-size-actual:before { + content: "\e058"; +} +.icon-shuffle:before { + content: "\e059"; +} +.icon-share-alt:before { + content: "\e05a"; +} +.icon-share:before { + content: "\e05b"; +} +.icon-rocket:before { + content: "\e05c"; +} +.icon-question:before { + content: "\e05d"; +} +.icon-pie-chart:before { + content: "\e05e"; +} +.icon-pencil:before { + content: "\e05f"; +} +.icon-note:before { + content: "\e060"; +} +.icon-music-tone-alt:before { + content: "\e061"; +} +.icon-music-tone:before { + content: "\e062"; +} +.icon-microphone:before { + content: "\e063"; +} +.icon-loop:before { + content: "\e064"; +} +.icon-logout:before { + content: "\e065"; +} +.icon-login:before { + content: "\e066"; +} +.icon-list:before { + content: "\e067"; +} +.icon-like:before { + content: "\e068"; +} +.icon-home:before { + content: "\e069"; +} +.icon-grid:before { + content: "\e06a"; +} +.icon-graph:before { + content: "\e06b"; +} +.icon-equalizer:before { + content: "\e06c"; +} +.icon-dislike:before { + content: "\e06d"; +} +.icon-cursor:before { + content: "\e06e"; +} +.icon-control-start:before { + content: "\e06f"; +} +.icon-control-rewind:before { + content: "\e070"; +} +.icon-control-play:before { + content: "\e071"; +} +.icon-control-pause:before { + content: "\e072"; +} +.icon-control-forward:before { + content: "\e073"; +} +.icon-control-end:before { + content: "\e074"; +} +.icon-calendar:before { + content: "\e075"; +} +.icon-bulb:before { + content: "\e076"; +} +.icon-bar-chart:before { + content: "\e077"; +} +.icon-arrow-up:before { + content: "\e078"; +} +.icon-arrow-right:before { + content: "\e079"; +} +.icon-arrow-left:before { + content: "\e07a"; +} +.icon-arrow-down:before { + content: "\e07b"; +} +.icon-ban:before { + content: "\e07c"; +} +.icon-bubble:before { + content: "\e07d"; +} +.icon-camcorder:before { + content: "\e07e"; +} +.icon-camera:before { + content: "\e07f"; +} +.icon-check:before { + content: "\e080"; +} +.icon-clock:before { + content: "\e081"; +} +.icon-close:before { + content: "\e082"; +} +.icon-cloud-download:before { + content: "\e083"; +} +.icon-cloud-upload:before { + content: "\e084"; +} +.icon-doc:before { + content: "\e085"; +} +.icon-envelope:before { + content: "\e086"; +} +.icon-eye:before { + content: "\e087"; +} +.icon-flag:before { + content: "\e088"; +} +.icon-folder:before { + content: "\e089"; +} +.icon-heart:before { + content: "\e08a"; +} +.icon-info:before { + content: "\e08b"; +} +.icon-key:before { + content: "\e08c"; +} +.icon-link:before { + content: "\e08d"; +} +.icon-lock:before { + content: "\e08e"; +} +.icon-lock-open:before { + content: "\e08f"; +} +.icon-magnifier:before { + content: "\e090"; +} +.icon-magnifier-add:before { + content: "\e091"; +} +.icon-magnifier-remove:before { + content: "\e092"; +} +.icon-paper-clip:before { + content: "\e093"; +} +.icon-paper-plane:before { + content: "\e094"; +} +.icon-plus:before { + content: "\e095"; +} +.icon-pointer:before { + content: "\e096"; +} +.icon-power:before { + content: "\e097"; +} +.icon-refresh:before { + content: "\e098"; +} +.icon-reload:before { + content: "\e099"; +} +.icon-settings:before { + content: "\e09a"; +} +.icon-star:before { + content: "\e09b"; +} +.icon-symbol-female:before { + content: "\e09c"; +} +.icon-symbol-male:before { + content: "\e09d"; +} +.icon-target:before { + content: "\e09e"; +} +.icon-volume-1:before { + content: "\e09f"; +} +.icon-volume-2:before { + content: "\e0a0"; +} +.icon-volume-off:before { + content: "\e0a1"; +} +.icon-users:before { + content: "\e001"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8c7424a1/zeppelin-web/src/index.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html new file mode 100644 index 0000000..5676afa --- /dev/null +++ b/zeppelin-web/src/index.html @@ -0,0 +1,124 @@ +<!-- +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<!doctype html> +<html ng-app="zeppelinWebApp" ng-controller="MainCtrl" class="no-js"> + <head> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta charset="utf-8"> + <title></title> + <!-- disable caches for all browser --> + <meta http-equiv="cache-control" content="max-age=0" /> + <meta http-equiv="cache-control" content="no-cache" /> + <meta http-equiv="cache-control" content="no-store" /> + <meta http-equiv="expires" content="0" /> + <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" /> + <meta http-equiv="pragma" content="no-cache" /> + + <meta name="description" content=""> + <meta name="viewport" content="width=device-width"> + <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> + <!-- build:css(.) styles/vendor.css --> + <!-- bower:css --> + <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> + <link rel="stylesheet" href="bower_components/nvd3/src/nv.d3.css" /> + <link rel="stylesheet" href="bower_components/perfect-scrollbar/src/perfect-scrollbar.css" /> + <link rel="stylesheet" href="bower_components/ng-sortable/dist/ng-sortable.css" /> + <link rel="stylesheet" href="bower_components/angular-xeditable/dist/css/xeditable.css" /> + <link rel="stylesheet" href="bower_components/highlightjs/styles/github.css" /> + <!-- endbower --> + <link rel="stylesheet" href="bower_components/jquery-ui/themes/base/all.css" /> + <!-- endbuild --> + <!-- build:css(.tmp) styles/main.css --> + <link rel="stylesheet" href="app/home/home.css"> + <link rel="stylesheet" href="app/notebook/notebook.css"> + <link rel="stylesheet" href="app/interpreter/interpreter.css"> + <link rel="stylesheet" href="fonts/font-awesome.min.css"> + <link rel="stylesheet" href="fonts/simple-line-icons.css"> + <link rel="stylesheet" href="fonts/custom-font.css"> + <!-- endbuild --> + <link rel="stylesheet" ng-href="assets/styles/looknfeel/{{looknfeel}}.css"> + </head> + <body ng-class="{'bodyAsIframe': asIframe}" > + <!--[if lt IE 7]> +<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/";>upgrade your browser</a> to improve your experience.</p> +<![endif]--> + <div ng-include src="'components/navbar/navbar.html'"></div> + <!-- Add your site or application content here --> + <div id="main" class="container"> + <div ng-view></div> + </div> + <!-- Modal :: Keyboard shortcuts --> + <div ng-include src="'components/modal-shortcut/modal-shortcut.html'"></div> + <!-- build:js(.) scripts/oldieshim.js --> + <!--[if lt IE 9]> +<script src="bower_components/es5-shim/es5-shim.js"></script> +<script src="bower_components/json3/lib/json3.min.js"></script> +<![endif]--> + <!-- endbuild --> + + <!-- build:js(.) scripts/vendor.js --> + <!-- bower:js --> + <script src="bower_components/jquery/dist/jquery.js"></script> + <script src="bower_components/angular/angular.js"></script> + <script src="bower_components/json3/lib/json3.js"></script> + <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script> + <script src="bower_components/angular-cookies/angular-cookies.js"></script> + <script src="bower_components/angular-sanitize/angular-sanitize.js"></script> + <script src="bower_components/angular-animate/angular-animate.js"></script> + <script src="bower_components/angular-touch/angular-touch.js"></script> + <script src="bower_components/angular-route/angular-route.js"></script> + <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script> + <script src="bower_components/angular-websocket/angular-websocket.min.js"></script> + <script src="bower_components/ace-builds/src-noconflict/ace.js"></script> + <script src="bower_components/ace-builds/src-noconflict/mode-scala.js"></script> + <script src="bower_components/ace-builds/src-noconflict/mode-sql.js"></script> + <script src="bower_components/ace-builds/src-noconflict/mode-markdown.js"></script> + <script src="bower_components/ace-builds/src-noconflict/keybinding-emacs.js"></script> + <script src="bower_components/ace-builds/src-noconflict/ext-language_tools.js"></script> + <script src="bower_components/ace-builds/src-noconflict/theme-github.js"></script> + <script src="bower_components/angular-ui-ace/ui-ace.js"></script> + <script src="bower_components/jquery.scrollTo/jquery.scrollTo.js"></script> + <script src="bower_components/d3/d3.js"></script> + <script src="bower_components/nvd3/nv.d3.js"></script> + <script src="bower_components/jquery-ui/jquery-ui.js"></script> + <script src="bower_components/angular-dragdrop/src/angular-dragdrop.js"></script> + <script src="bower_components/perfect-scrollbar/src/perfect-scrollbar.js"></script> + <script src="bower_components/ng-sortable/dist/ng-sortable.js"></script> + <script src="bower_components/angular-elastic/elastic.js"></script> + <script src="bower_components/angular-elastic-input/dist/angular-elastic-input.min.js"></script> + <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script> + <script src="bower_components/highlightjs/highlight.pack.js"></script> + <script src="bower_components/lodash/lodash.js"></script> + <!-- endbower --> + <!-- endbuild --> + <!-- build:js({.tmp,src}) scripts/scripts.js --> + <script src="app/app.js"></script> + <script src="app/app.controller.js"></script> + <script src="app/home/home.controller.js"></script> + <script src="app/notebook/notebook.controller.js"></script> + <script src="app/interpreter/interpreter.controller.js"></script> + <script src="app/notebook/paragraph/paragraph.controller.js"></script> + <script src="components/navbar/navbar.controller.js"></script> + <script src="components/ngdelete/ngdelete.directive.js"></script> + <script src="components/popover-html-unsafe/popover-html-unsafe.directive.js"></script> + <script src="components/ngenter/ngenter.directive.js"></script> + <script src="components/dropdowninput/dropdowninput.directive.js"></script> + <script src="components/resizable/resizable.directive.js"></script> + <script src="components/websocketEvents/websocketMsg.service.js"></script> + <script src="components/websocketEvents/websocketEvents.factory.js"></script> + <script src="components/notebookListDataFactory/notebookList.datafactory.js"></script> + <script src="components/baseUrl/baseUrl.service.js"></script> + <!-- endbuild --> + </body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8c7424a1/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index ecdefd4..6934791 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -386,7 +386,7 @@ public class ZeppelinConfiguration extends XMLConfiguration { ZEPPELIN_SSL_TRUSTSTORE_PATH("zeppelin.ssl.truststore.path", null), ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null), ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null), - ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/src/main/webapp"), + ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/dist"), ZEPPELIN_API_WAR("zeppelin.api.war", "../zeppelin-docs/src/main/swagger"), ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "org.apache.zeppelin.spark.SparkInterpreter," + "org.apache.zeppelin.spark.PySparkInterpreter,"
