Skip to content

Commit

Permalink
Merge pull request #1 from Madhuka/milestone-01
Browse files Browse the repository at this point in the history
adding milestone01css
  • Loading branch information
Madhuka committed Jun 3, 2015
2 parents ff57aca + 0b71266 commit 2b8764c
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 62 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Apache Zeppelin
# Apache Zeppelin
Zeppelin is a collaborative data analytic and visualization tool for distributed, general-purpose data processing systems such as Apache Spark and Apache Flink. It has two main features, the data analytic phase and the data visualization phase. This project is an improvement or a re-design of the Data Visualization Component. It successfully eliminates all the limitations and drawbacks of the existing charting visualization component.
5 changes: 5 additions & 0 deletions css/cover.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ body {
font-weight: bold;
}

.inx {
padding: 0 20px;
text-align: left;
}


/*
* Footer
Expand Down
42 changes: 21 additions & 21 deletions js/app.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
var zeppelinGsocApp = angular.module('zeppelinGsocApp', [
'ngRoute',
'chartControllers'
]);

zeppelinGsocApp.config(['$routeProvider',
function($routeProvider) {
$routeProvider.
when('/contact', {
templateUrl: 'partials/contact.html'
}).
when('/milestone01', {
templateUrl: 'partials/milestone01.html',
controller: 'chartCtrl'
}).
when('/home', {
templateUrl: 'partials/about.html'
}).
otherwise({
redirectTo: '/home'
});
var zeppelinGsocApp = angular.module('zeppelinGsocApp', [
'ngRoute',
'chartControllers'
]);

zeppelinGsocApp.config(['$routeProvider',
function($routeProvider) {
$routeProvider.
when('/contact', {
templateUrl: 'partials/contact.html'
}).
when('/milestone01', {
templateUrl: 'partials/milestone01.html',
controller: 'chartCtrl'
}).
when('/home', {
templateUrl: 'partials/about.html'
}).
otherwise({
redirectTo: '/home'
});
}]);
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"version": "0.0.1",
"name": "apache-zeppelin-gsoc",
"description": "Improving Apache Zeppelin Visualization",
"repository": "https://github.com/Madhuka/apache-zeppelin-gsoc",
"license": "MIT",
"author": "Madhuka Udantha <madhukaudantha@gmail.com>",
"devDependencies": {
"http-server": "^0.6.1"
},
"dependencies": {
"angular": "1.3.8",
"angular-route": "1.3.8",
"jquery": "~2.1.4",
"bootstrap": "~3.3.0"
},
"scripts": {
"prestart": "npm install",
"start": "http-server -a 0.0.0.0 -p 8080"
}
{
"version": "0.0.1",
"name": "apache-zeppelin-gsoc",
"description": "Improving Apache Zeppelin Visualization",
"repository": "https://github.com/Madhuka/apache-zeppelin-gsoc",
"license": "MIT",
"author": "Madhuka Udantha <madhukaudantha@gmail.com>",
"devDependencies": {
"http-server": "^0.6.1"
},
"dependencies": {
"angular": "1.3.8",
"angular-route": "1.3.8",
"jquery": "~2.1.4",
"bootstrap": "~3.3.0"
},
"scripts": {
"prestart": "npm install",
"start": "http-server -a 0.0.0.0 -p 8080"
}
}
12 changes: 6 additions & 6 deletions partials/about.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="inner cover">
<h1 class="cover-heading">Apache Zeppelin Gsoc 2015</h1>
<p class="lead">Zeppelin is a collaborative data analytics and visualization tool for distributed, general-purpose data processing systems such as Apache Spark and Apache Flink. It has two main features, the data analytic phase and the data visualization phase. This project is an improvement or a re-design of the Data Visualization Component.</p>
<p class="lead">
<a href="https://cwiki.apache.org/confluence/display/ZEPPELIN/GoogleSummerOfCode#GoogleSummerOfCode-COMDEV-119ZeppelinGSoCProject:addmoreD3visualization" class="btn btn-lg btn-default">Read more</a>
</p>
<div class="inner cover">
<h1 class="cover-heading">Apache Zeppelin Gsoc 2015</h1>
<p class="lead">Zeppelin is a collaborative data analytics and visualization tool for distributed, general-purpose data processing systems such as Apache Spark and Apache Flink. It has two main features, the data analytic phase and the data visualization phase. This project is an improvement or a re-design of the Data Visualization Component.</p>
<p class="lead">
<a href="https://cwiki.apache.org/confluence/display/ZEPPELIN/GoogleSummerOfCode#GoogleSummerOfCode-COMDEV-119ZeppelinGSoCProject:addmoreD3visualization" class="btn btn-lg btn-default">Read more</a>
</p>
</div>
16 changes: 8 additions & 8 deletions partials/contact.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="inner cover">
<h1 class="cover-heading">Contact</h1>
<p class="lead">madhukaudantha@gmail.com</p>
<p>users@zeppelin.incubator.apache.org</p>
<p>dev@zeppelin.incubator.apache.org</p>
<p class="lead">
<a href="https://zeppelin.incubator.apache.org/community.html" class="btn btn-lg btn-default">Community</a>
</p>
<div class="inner cover">
<h1 class="cover-heading">Contact</h1>
<p class="lead">madhukaudantha@gmail.com</p>
<p>users@zeppelin.incubator.apache.org</p>
<p>dev@zeppelin.incubator.apache.org</p>
<p class="lead">
<a href="https://zeppelin.incubator.apache.org/community.html" class="btn btn-lg btn-default">Community</a>
</p>
</div>
12 changes: 6 additions & 6 deletions partials/milestone01.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="inner cover">
<h1 class="cover-heading">MileStone - 01</h1>
<p class="lead"></p>
<p class="lead">
<a href="https://cwiki.apache.org/confluence/display/ZEPPELIN/GoogleSummerOfCode#GoogleSummerOfCode-COMDEV-119ZeppelinGSoCProject:addmoreD3visualization" class="btn btn-lg btn-default">Read more</a>
</p>
<div class="inner cover inx">
<h3 class="cover-heading">MileStone - 01</h3>
<p class="lead"></p>
<p class="lead">
<a href="https://cwiki.apache.org/confluence/display/ZEPPELIN/GoogleSummerOfCode#GoogleSummerOfCode-COMDEV-119ZeppelinGSoCProject:addmoreD3visualization" class="btn btn-lg btn-default">Read more</a>
</p>
</div>

0 comments on commit 2b8764c

Please sign in to comment.