add butterfly house

diff --git a/dash/app.js b/dash/app.js
index 2e36977..a641f27 100644 (file)
--- a/dash/app.js
+++ b/dash/app.js
@@ -112,4 +112,14 @@ $(document).ready(function(){
     var kbwList = new TaskListView({
         el: '#kbwList',
         collection: kbwTasks});
+
+    // Original Butterfly House
+    var butterflyTasks = new Tasks([
+    ]);
+    butterflyTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    butterflyTasks.fetch({cache: false, async:true, data: {pid: 4066, t: bTime}});
+    var butterflyList = new TaskListView({
+        el: '#butterflyList',
+        collection: butterflyTasks});
+
 });

diff --git a/index.html b/index.html
index 01766e4..81af423 100644 (file)
--- a/index.html
+++ b/index.html
@@ -108,8 +108,8 @@
             <div class="row">
 
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3><a href="../project.php?pid=3975" target="_blank">GLM Associate</a></h3>
-                    <table id="memberdbList"
+                    <h3><a href="../project.php?pid=4066" target="_blank">Original Butterflyhouse</a></h3>
+                    <table id="butterflyList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -121,6 +121,7 @@
                         </thead>
                     </table>
                 </div>
+
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
                     <h3><a href="../project.php?pid=4020" target="_blank">Events Plugin</a></h3>
                     <table id="eventsList"
@@ -137,10 +138,23 @@
                 </div>
 
 
-
             </div>
             <div class="row">
 
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3975" target="_blank">GLM Associate</a></h3>
+                    <table id="memberdbList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
 
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
                     <h3><a href="../project.php?pid=4047" target="_blank">Member Leads</a></h3>