Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Cleanup codes

Browse source
This commit is contained in:
Jongyoul Lee 2015-07-03 12:49:36 +09:00
parent 4cd10b5b04
commit 248e3307de
5 changed files with 4 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/interpreter.sh
View file

@ -79,7 +79,6 @@ else
PYSPARKPATH="${ZEPPELIN_HOME}/interpreter/spark/pyspark/pyspark.zip:${ZEPPELIN_HOME}/interpreter/spark/pyspark/py4j-0.8.2.1-src.zip"
fi
if [[ x"" == x"${PYTHONPATH}" ]]; then
export PYTHONPATH="${PYSPARKPATH}"
else

1
pom.xml
View file

@ -430,7 +430,6 @@
<exclude>Roadmap.md</exclude>
<exclude>conf/interpreter.json</exclude>
<exclude>spark-*-bin*/**</exclude>
<exclude>python/**</exclude>
</excludes>
</configuration>

3
zeppelin-distribution/src/assemble/distribution.xml
View file

@ -73,9 +73,6 @@
<fileSet>
<directory>../notebook</directory>
</fileSet>
<fileSet>
<directory>../python</directory>
</fileSet>
</fileSets>
<!--<fileSet>
<directory>zeppelin-cli/target</directory>

16
zeppelin-web/src/app/home/home.css
View file

@ -184,7 +184,7 @@ a.navbar-brand:hover {
margin-bottom: 20px;
}
.box,
.box,
.well {
background-color: #ffffff;
border-color: #e5e5e5;
@ -236,15 +236,7 @@ h6.box-heading{
}
.zeppelin2 {
<<<<<<< HEAD:zeppelin-web/src/app/home/home.css
<<<<<<< HEAD:zeppelin-web/src/app/home/home.css
background-image: url('/assets/images/zepLogo.png');
=======
background-image: url('../images/zepLogo.png');
>>>>>>> [ZEPPELIN-18] Remove setting SPARK_HOME for PySpark:zeppelin-web/app/styles/main.css
=======
background-image: url('../images/zepLogo.png');
>>>>>>> Reset unwanted changes:zeppelin-web/app/styles/main.css
background-repeat: no-repeat;
background-position: right;
background-position-y: 12px;
@ -285,9 +277,9 @@ kbd {
}
/*
temporary fix for bootstrap issue (https://github.com/twbs/bootstrap/issues/5865)
This part should be removed when new version of bootstrap handles this issue.
/*
temporary fix for bootstrap issue (https://github.com/twbs/bootstrap/issues/5865)
This part should be removed when new version of bootstrap handles this issue.
*/
.btn-group > .tooltip + .btn,
.btn-group > .popover + .btn {

42
zeppelin-web/src/index.html
View file

@ -51,51 +51,9 @@ limitations under the License.
</head>
<body ng-class="{'bodyAsIframe': asIframe}" >
<!--[if lt IE 7]>
<<<<<<< HEAD:zeppelin-web/src/index.html
<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>
=======
<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 class="navbar navbar-inverse navbar-fixed-top" style="display: none;" role="navigation" ng-class="{'displayNavBar': !asIframe}">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#/"><img style="margin-top: -7px;s" src="images/zepLogoW.png" width="50" alt="I'm zeppelin"> Zeppelin</a>
</div>
<div class="collapse navbar-collapse" ng-controller="NavCtrl">
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="javascript:void(0);" ng-click="createNewNote()"><i class="fa fa-plus"></i> Create new note</a></li>
<li class="divider"></li>
<div id="notebook-list" class="scrollbar-container">
<li ng-repeat="note in notes track by $index" ng-class="{'active' : isActive(note.id)}"><a href="#/notebook/{{note.id}}">{{note.name || 'Note ' + note.id}} </a></li>
</div>
</ul>
</li>
<li>
<a href="#/interpreter">Interpreter</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right" style="margin-top:10px; margin-right:5px;">
<li class="server-status">
<i class="fa fa-circle" ng-class="{'server-connected':connected, 'server-disconnected':!connected }"></i>
<span ng-show="connected">Connected</span>
<span ng-show="!connected">Disconnected</span>
</li>
</ul>
</div>
</div>
</div>
>>>>>>> [ZEPPELIN-18] Remove setting SPARK_HOME for PySpark:zeppelin-web/app/index.html
<!-- Add your site or application content here -->
<div id="main" class="container">
<div ng-view></div>