Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated copyright notice

  • Loading branch information...
commit b11cb63f24a308fa4aa7ac7aec480f88b2c6fc9a 1 parent 5a4cb5b
@ckemmler ckemmler authored
View
13 .idea/libraries/Maven__commons_dbcp_commons_dbcp_1_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-dbcp:commons-dbcp:1.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
View
13 .idea/libraries/Maven__commons_pool_commons_pool_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: commons-pool:commons-pool:1.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.3/commons-pool-1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.3/commons-pool-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
View
2  LICENSE
@@ -1,4 +1,4 @@
-Copyright 2011-2012 Candide Kemmler
+Copyright 2011-2012 The BodyTrack Team @ CMU CREATE Lab & Candide Kemmler
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
2  README.md
@@ -50,7 +50,7 @@ export JAVA_OPTS="-XX:MaxPermSize=256m -Xms256m -Xmx2048m -Djavax.servlet.reques
Copyright and license
---------------------
-Copyright 2011-2012 Candide Kemmler
+Copyright 2011-2012 The BodyTrack Team @ CMU CREATE Lab & Candide Kemmler
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
43 fluxtream-web/src/main/webapp/js/applications/calendar/tabs/dashboards/AddWidget.js
@@ -0,0 +1,43 @@
+define(function() {
+
+ function show(){
+ $.ajax("/api/dashboards",{
+ success: function(data, textStatus, jqXHR){
+ dataLoaded(data,false);
+ }
+ });
+ }
+
+ function dataLoaded(data,update){
+ App.loadMustacheTemplate("applications/calendar/tabs/dashboards/manageDashboardsTemplate.html","mainDialog",function(template){
+ var html = template.render(data);
+ App.makeModal(html);
+ bindDialog();
+ });
+ }
+
+ function bindDialog(){
+ //for (var i = 0; i < connectors.length; i++){
+ // bindConnector(connectors[i]);
+ //}
+ //var syncAllBtn = $("#sync-all");
+ //syncAllBtn.click(function(){
+ // setAllToSyncing();
+ // event.preventDefault();
+ // $.ajax("/api/guest/" + App.getUsername() + "/connector/all/sync",{
+ // type:"POST"
+ // });
+ //});
+ //$.doTimeout("manageConnectorsUpdater", 10000, function(){
+ // updateContents();
+ // return true;
+ //});
+ //$("#modal").on("hide",function(){
+ // $.doTimeout("manageConnectorsUpdater");
+ //})
+ }
+
+ var ManageDashboards = {};
+ ManageDashboards.show = show;
+ return ManageDashboards;
+});
View
7 fluxtream-web/src/main/webapp/js/applications/calendar/tabs/dashboards/ManageDashboards.js
@@ -0,0 +1,7 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: candide
+ * Date: 15/06/12
+ * Time: 14:48
+ * To change this template use File | Settings | File Templates.
+ */
View
12 ...tream-web/src/main/webapp/js/applications/calendar/tabs/dashboards/addWidgetTemplate.html
@@ -0,0 +1,12 @@
+<template id="mainDialog">
+ <div class="modal fade" id="modal" style="width:1010px; margin-left:-505px;">
+ <div class="modal-header">
+ <h3>Manage Dashboards<a href="#" class="close" data-dismiss="modal">&times;</a></h3>
+ </div>
+ <div class="modal-body">
+ </div>
+ <div class="modal-footer">
+ <button class="btn" onclick="App.closeModal()">Close</button>
+ </div>
+ </div>
+</template>
View
103 fluxtream-web/src/main/webapp/js/applications/calendar/tabs/dashboards/dashboards.html
@@ -1,100 +1,15 @@
<div id="dashboardsTab" class="tabbable tabs-below">
<div class="tab-content" style="margin-bottom: 40px;">
- <div class="row-fluid ">
- <div class="flx-widget span4">
- <header>
- <div class="flx-widget-controls">
- <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
- <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
- </div>
- <h3 class="flx-title">Steps</h3>
- </header>
- <div class="flx-body">
- <div class="flx-stepsNmbr"><img src="/1.0-alpha-20120403/css/dashboardImgDummies/w1.png" alt="w1" width="" height="" /></div>
- </div>
- <footer>
- </footer>
- </div>
- <div class="flx-widget span4">
- <header>
- <div class="flx-widget-controls">
- <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
- <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
- </div>
- <h3 class="flx-title">Sleep</h3>
- </header>
- <div class="flx-body">
- <div class="flx-sleepStats"><img src="/1.0-alpha-20120403/css/dashboardImgDummies/w2.png" alt="w2" width="" height="" /></div>
- </div>
- <footer>
- </footer>
- </div>
- <div class="flx-widget span4">
- <header>
- <div class="flx-widget-controls">
- <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
- <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
- </div>
- <h3 class="flx-title">Food</h3>
- </header>
- <div class="flx-body">
- <div class="flx-foodthumbnails"><img src="/1.0-alpha-20120403/css/dashboardImgDummies/w3.png" alt="w3" width="" height="" /></div>
- </div>
- <footer>
- </footer>
- </div>
- </div>
-
- <div class="row-fluid">
-
- <div class="flx-widget span4">
- <header>
- <div class="flx-widget-controls">
- <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
- <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
- </div>
- <h3 class="flx-title">Activity</h3>
- </header>
- <div class="flx-body">
- <div class="flx-activity"><img src="/1.0-alpha-20120403/css/dashboardImgDummies/w4.png" alt="w4" width="" height="" /></div>
- </div>
- <footer>
- </footer>
- </div>
- <div class="flx-widget span4">
- <header>
- <div class="flx-widget-controls">
- <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
- <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
- </div>
- <h3 class="flx-title">Finance</h3>
- </header>
- <div class="flx-body">
- <div class="flx-finance"><img src="/1.0-alpha-20120403/css/dashboardImgDummies/w5.png" alt="w5" width="" height="" /></div>
- </div>
- <footer>
- </footer>
- </div>
- <div class="flx-widget span4">
- <header>
- <div class="flx-widget-controls">
- <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
- <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
- </div>
- <h3 class="flx-title">mffboston09</h3>
- </header>
- <div class="flx-body">
- <div class="flx-stepsNmbr"><img src="/1.0-alpha-20120403/css/dashboardImgDummies/w6.png" alt="w6" width="" height="" /></div>
- </div>
- <footer>
- </footer>
- </div>
- </div>
+ {{release}} {{test}}
</div>
- <ul class="nav nav-tabs" style="background: #EEEEE9; position:absolute; bottom: -10px; ">
- <li class="active"><a href="#A" data-toggle="tab">Untitled Dashboard</a></li>
- <li><a href="#B" data-toggle="tab">Sleep</a></li>
- <li><a href="#C" data-toggle="tab">Activity</a></li>
+ <ul class="nav nav-tabs">
+ <li>
+ <button id="addWidgetButton" class="btn btn-small">Add Widget&nbsp;<i class="icon-plus"></i></button>
+ <button id="addDashboardButton" class="btn btn-small">Add Dashboard&nbsp;<i class="icon-plus"></i></button>
+ </li>
+ {{#dashboards}}
+ <li id="dashboard-{{id}}" {{#active}}class="active"{{/active}}><a href="#" data-toggle="tab">{{name}}</a></li>
+ {{/dashboards}}
</ul>
</div>
View
77 ...eb/src/main/webapp/js/applications/calendar/tabs/dashboards/manageDashboardsTemplate.html
@@ -0,0 +1,77 @@
+<template id="mainDialog">
+ <div class="modal fade" id="modal" style="width:1010px; margin-left:-505px;">
+ <div class="modal-header">
+ <h3>Manage Connectors<a href="#" class="close" data-dismiss="modal">&times;</a></h3>
+ </div>
+ <div class="modal-body">
+ <div class="row">
+ <div class="span10">
+ <div class="synchAll">
+ <span>Though your data are supposedly up to date, you might want to <a id="sync-all" href="#" class="btn btn-info">sync all your devices now <i class="icon-refresh"></i></a></span>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span10">
+ <table class="table manageConnectors">
+ <thead>
+ <tr>
+ <th class="syncStatus">Sync status</th>
+ <th class="connectors">Connectors</th>
+ <th class="desc">Description</th>
+ <th class="lastSync">Last Sync.</th>
+ <th class="latestData">Latest Data</th>
+ <th class="remove">Remove</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#connectors}}
+ <tr id="connector-{{connectorName}}" {{#syncing}}class="nowSynchro"{{/syncing}}>
+ <td class="syncStatus">
+ <span id="syncLED-{{connectorName}}" class="syncLED-{{^errors}}yes{{/errors}}{{#errors}}no{{/errors}}" {{#syncing}}style="display:none;"{{/syncing}}></span>
+ {{#syncing}}
+ <span class="syncLED-waiting">
+ <img src="/css/devicesPictures/load.gif" alt="load">
+ </span>
+ {{/syncing}}
+ </td>
+ <td class="connectors"><img src="{{image}}" alt="{{connectorName}}"></td>
+ <td class="desc"><h4>{{name}}</h4><p>{{text}}</p><a href="#">Manage <i class="icon-cog"></i></a></td>
+ <td class="lastSync">
+ <p id="lastSync-{{connectorName}}" {{#syncing}}style="display:none;"{{/syncing}}>{{lastSync}}</p>
+ <a id="syncNow-{{connectorName}}" href="#" {{#syncing}}style="display:none;"{{/syncing}}>Sync now <i class="icon-refresh"></i></a>
+ {{#syncing}}
+ <p>Now synchronizing</p>
+ <span>Sync now <i class="icon-refresh"></i></span>
+ {{/syncing}}
+ </td>
+ <td class="latestData"><p>{{latestData}}</p><a href="#">View graph <i class="icon-bar-chart"></i></a></td>
+ <td class="remove"><a id="remove-{{connectorName}}" href="#"><i class="icon-trash"></i></a></td>
+ </tr>
+ {{/connectors}}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn" onclick="App.closeModal()">Close</button>
+ </div>
+ </div>
+</template>
+<template id="deleteConfirm">
+ <div class="modal fade" id="modal">
+ <div class="modal-header">
+ <h3>Confirm Removal<a href="#" class="close" data-dismiss="modal">&times;</a></h3>
+ </div>
+ <div class="modal-body" style="overflow:hidden">
+ <div class="alert alert-block"><h4 class="alert-heading">Warning!</h4>
+ You are about to remove {{name}} from your connectors. Are you sure you would like to remove this connector?
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button id="confirmDeleteBtn" class="btn">Confirm</button>
+ <button class="btn" onclick="App.closeModal()">Cancel</button>
+ </div>
+ </div>
+</template>
Please sign in to comment.
Something went wrong with that request. Please try again.