Skip to content

Commit

Permalink
Baseline design done, partially resolves issue #50
Browse files Browse the repository at this point in the history
  • Loading branch information
orjoola committed Dec 4, 2013
1 parent a331467 commit d34a880
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 417 deletions.
9 changes: 0 additions & 9 deletions lib/webserver/public/js/lib/angular/controllers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,3 @@ joolaControllers.controller('userCtrl', function ($scope, userService) {
}
});

joolaControllers.controller('logCtrl', function ($scope, logService) {
logService.getLog(function (list) {
$scope.log = log;
});
$scope.addRow = function (dsName) {
logService.addRow(dsName);
}

});
12 changes: 0 additions & 12 deletions lib/webserver/public/js/lib/angular/services.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,3 @@ joolaServices.service('userService', function (socket) {
});
};
});

joolaServices.service('logService', function (socket) {
this.getLog = function (callback) {
/*
joolaio.objects.users.list(function () {
socket.on('users/list:done', function (list) {
callback(list.users);
})
});
*/
};
});
1 change: 1 addition & 0 deletions lib/webserver/public/js/lib/core.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions lib/webserver/public/js/lib/jquery/jquery-ui-1.10.3.custom.min.js
View file

Large diffs are not rendered by default.

10 changes: 1 addition & 9 deletions lib/webserver/views/datasources/add.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,5 @@ body
button.btn.btn-default(type='button', data-dismiss='modal') Close
button.btn.btn-primary(type='button') Save changes
.clearfix
footer
p
span(style='text-align: left; float: left;')
| © 2013 creativeLabs.
a(href='http://bootstrapmaster.com') Admin Templates
| by BootstrapMaster
span.hidden-phone(style='text-align: right; float: right;')
| Powered by:
a(href='http://bootstrapmaster.com/demo/acme/', alt='Bootstrap Admin Templates') ACME Dashboard

include ../footer
10 changes: 1 addition & 9 deletions lib/webserver/views/datasources/index.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,5 @@ body
button.btn.btn-default(type='button', data-dismiss='modal') Close
button.btn.btn-primary(type='button') Save changes
.clearfix
footer
p
span(style='text-align: left; float: left;')
| © 2013 creativeLabs.
a(href='http://bootstrapmaster.com') Admin Templates
| by BootstrapMaster
span.hidden-phone(style='text-align: right; float: right;')
| Powered by:
a(href='http://bootstrapmaster.com/demo/acme/', alt='Bootstrap Admin Templates') ACME Dashboard

include ../footer
6 changes: 5 additions & 1 deletion lib/webserver/views/footer.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ script(src='/js/lib/angular/controllers.js')
script(src='/js/lib/angular/filters.js')
script(src='/js/lib/angular/directives.js')
script(src='/js/lib/retina.min.js')
script(src="http://code.jquery.com/jquery-1.10.1.min.js")
script(src='http://code.jquery.com/jquery-2.0.3.min.js')
script(src='http://code.jquery.com/jquery-migrate-1.2.1.min.js')
script(src='/js/lib/bootstrap/bootstrap.min.js')
script(src='/js/lib/jquery/jquery-ui-1.10.3.custom.min.js')
script(src='/js/lib/core.min.js')
176 changes: 3 additions & 173 deletions lib/webserver/views/index.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,171 +6,9 @@ body
.row
include sidebar.jade
#content.col-sm-11
.row
.stats-date.col-md-3
div Monthly Statistics
.range 02/10/2012 - 02/11/2012
.stats.col-md-9
.stat
.left
.number.green 1.324.996
.title
span.color.green
| Visits
.right
.arrow
img(src='/img/uparrow.png')
.percent +13%
.stat
.left
.number.yellow 12.894.765
.title
span.color.yellow
| Pageviews
.right
.arrow
img(src='/img/uparrow.png')
.percent +17%
.stat
.left
.number.blue 432.980
.title
span.color.blue
| Visitors
.right
.arrow
img(src='/img/downarrow.png')
.percent -33%
.stat
.left
.number.red.stats-eps 0
.title
span.color.red
| Events per second
.right
.arrow
img(src='/img/uparrow.png')
.percent +3%

.row
.col-xs-12(style="overflow:hidden")
#stats-chart2(style='height: 300px;')

hr
.row
.widget.col-md-5.col-sm-12
h2
i.glyphicons.globe
| Demographics
hr
.content
.verticalChart
.singleBar
.bar
.value
span 37%
.title US
.singleBar
.bar
.value
span 16%
.title PL
.singleBar
.bar
.value
span 12%
.title GB
.singleBar
.bar
.value
span 9%
.title DE
.singleBar
.bar
.value
span 7%
.title NL
.singleBar
.bar
.value
span 6%
.title CA
.singleBar
.bar
.value
span 5%
.title FI
.singleBar
.bar
.value
span 4%
.title RU
.singleBar
.bar
.value
span 3%
.title AU
.singleBar
.bar
.value
span 1%
.title N/A

.widget.col-md-3.col-sm-6
h2
span.glyphicons.pie_chart
i
| ACTIONS
hr
.content
div#actionDonut

.widget.col-md-4.col-sm-6
h2
span.glyphicons.charts
i
| CACHE
hr
.content
.leftSide
div#nextCacheTime
div#cacheHitPct
.rightSide(style="margin-top:10px;")
.sparkLineStats
ul.unstyled
li
span.sparkLineStats3
| Size:
span.number 2GB
li
span.sparkLineStats4
| Records:
span.number 21,081
li
span.sparkLineStats4
| Run time:
span.number 30ms

hr
.row
.widget.col-sm-6(style="overflow:hidden")
h2
span.social.facebook
i
| Facebook Fans
hr
.content
#facebookChart(style='height: 300px;')

.widget.col-sm-6(style="overflow:hidden")
h2
span.social.twitter
i
| Twitter Followers
hr
.content
#twitterChart(style='height: 300px;')



#widgets-area.col-sm-2
ul#myTab.nav.tab-menu.nav-tabs
li.active
Expand Down Expand Up @@ -316,15 +154,7 @@ body
button.btn.btn-primary(type='button') Save changes

.clearfix
footer
p
span(style='text-align: left; float: left;')
| © 2013 creativeLabs.
a(href='http://bootstrapmaster.com') Admin Templates
| by BootstrapMaster
span.hidden-phone(style='text-align: right; float: right;')
| Powered by:
a(href='http://bootstrapmaster.com/demo/acme/', alt='Bootstrap Admin Templates') ACME Dashboard

div(ng-controller="dsCtrl")
div {{datasourceList}}
include footer.jade
10 changes: 1 addition & 9 deletions lib/webserver/views/logger/index.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,5 @@ body
button.btn.btn-default(type='button', data-dismiss='modal') Close
button.btn.btn-primary(type='button') Save changes
.clearfix
footer
p
span(style='text-align: left; float: left;')
| © 2013 creativeLabs.
a(href='http://bootstrapmaster.com') Admin Templates
| by BootstrapMaster
span.hidden-phone(style='text-align: right; float: right;')
| Powered by:
a(href='http://bootstrapmaster.com/demo/acme/', alt='Bootstrap Admin Templates') ACME Dashboard

include ../footer

0 comments on commit d34a880

Please sign in to comment.