rebased

apache · Jul 4, 2015 · 929333d · 929333d
1 parent 64b8195
commit 929333d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 6 deletions.
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -276,11 +276,17 @@ public SparkContext createSparkContext() {
     String[] pythonLibs = new String[] {"pyspark.zip", "py4j-0.8.2.1-src.zip"};
     ArrayList<String> pythonLibUris = new ArrayList<>(); 
     for (String lib: pythonLibs) {
-      pythonLibUris.add(new File(zeppelinPythonLibPath, lib).toURI().toString());
+      File libFile = new File(zeppelinPythonLibPath, lib);
+      if(libFile.exists()) {
+        pythonLibUris.add(libFile.toURI().toString());
+      }
+    }
+    pythonLibUris.trimToSize();
+    if(pythonLibs.length == pythonLibUris.size()) {
+      conf.set("spark.yarn.dist.files", Joiner.on(",").join(pythonLibUris));
+      conf.set("spark.files", conf.get("spark.yarn.dist.files"));
+      conf.set("spark.submit.pyArchives", Joiner.on(":").join(pythonLibs));
     }
-    conf.set("spark.yarn.dist.files", Joiner.on(",").join(pythonLibUris));
-    conf.set("spark.files", conf.get("spark.yarn.dist.files"));
-    conf.set("spark.submit.pyArchives", Joiner.on(":").join(pythonLibs));
 
     SparkContext sparkContext = new SparkContext(conf);
     return sparkContext;

diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import url(//fonts.googleapis.com/css?family=Patua+One);
+/* @import url(//fonts.googleapis.com/css?family=Patua+One);
 @import url(//fonts.googleapis.com/css?family=Roboto);
-@import url(//fonts.googleapis.com/css?family=Source+Code+Pro);
+@import url(//fonts.googleapis.com/css?family=Source+Code+Pro); */
 
 body {
   padding-top: 60px;
@@ -236,7 +236,11 @@ h6.box-heading{
 }
 
 .zeppelin2 {
+<<<<<<< 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-repeat: no-repeat;
   background-position: right;
   background-position-y: 12px;

diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
@@ -51,9 +51,51 @@
   </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>