Changeset 278

Timestamp:

02/21/12 17:40:49 (13 years ago)

Author:

tjcschipper

Message:

 

Location:

Dev/branches/Cartis/Tiles preview

Files:

• css/tile1.css (modified) (6 diffs)
• index.html (added)
• js/dashboardScripts.js (modified) (2 diffs)
• js/nav.js (modified) (2 diffs)
• pages/dataSelection.js (modified) (1 diff)
• pages/graphSelection.html (added)
• pages/graphSelection.js (added)
• pages/login.html (added)
• pages/login.js (added)
• pages/testPage.html (deleted)
• tiles1.html (deleted)

Dev/branches/Cartis/Tiles preview/css/tile1.css

@@ -85 +85 @@
 #header {
     width: 100%;
-    height: 95px;
+    height: 36px;
     margin-bottom: 20px;
 }
 
 #upperBar {
-    height: 68px;
-    background: #508fd2;
+    height: 12px;
+    background: #fff;
 }
 
 #lowerBar {
-    height: 20px;
+    height: 24px;
     background: #508fd2;
 }
@@ -120 +120 @@
     height: 50px;
     line-height: 50px;
-    color: #fff;
+    color: #000;
     font-size: 36px;
     font-family: 'Segoe', sans-serif;
@@ -211 +211 @@
     margin-bottom: 5px;
     background: #367ac3;
+    color: #fff;
 
     background-image: linear-gradient(left bottom, rgb(54,122,195) 44%, rgb(74,139,208) 72%);
@@ -229 +230 @@
 }
 
-.doubleHeight {
-    height: 465px;
-}
-
 .staticTile {
     width: 230px;
@@ -238 +235 @@
     border: none;
     float: left;
+    color: #fff;
     clear: none;
     margin-right: 5px;
     margin-bottom: 5px;
     background: #367ac3;
-
-}
+}
+
+.doubleHeight {
+    height: 465px;
+}
+
+.doubleWidth {
+    width: 465px;
+}
+
+
 
 .tile:hover {
@@ -309 +316 @@
 }
 
-.breadcrumbs{
-    float: left;
-    margin-top: 20px;
-    margin-bottom: -2px;
-    margin-left: 370px;
-
+#breadcrumbs{
+    line-height: 24px;
+    width: 940px;
+    margin: 0 auto;
+    color: #fff;
+}
+
+#breadcrumbs a {
+    color: #fff;
+    text-decoration: none;
+}
+
+#breadcrumbs a:hover {
+    color: #edd68b;
+}
+
+#breadcrumbs a.selected {
+    font-weight: bold;
+    text-decoration: underline;
 }
 

Dev/branches/Cartis/Tiles preview/js/dashboardScripts.js

@@ -263 +263 @@
     
 function configureDashboard() {
-    var data = JSON.stringify(shoppingCart);
-    var form = ce("form");
-    //changed to dashboardGraphSelection.php
-    form.action = "dashboardGraphSelection.php";
-    form.method = "POST";
-    var input = ce("input");
-    input.type = "hidden";
-    input.name = "selectedData";
-    input.value = data;
-    form.appendChild(input);
-    form.submit();
+    mockup.api.loadPage("graphSelection", false);
 }
 
@@ -393 +383 @@
     doorstuurData.count++;
 }
+

Dev/branches/Cartis/Tiles preview/js/nav.js

@@ -1 +1 @@
 $(function() {
-    //Switchpage
-    
+        
     mockup = {
         api: {
             clickTile: function(thisElement, url) {
-                // clear self
-                while (thisElement.firstChild) {
-                    thisElement.removeChild(thisElement.firstChild);
-                }
                 // clear frame
                 $(".basePanel").children().remove();
@@ -14 +9 @@
             
             },
-            loadPage: function(name) {
+            loadPage: function(name, conf) {
+                debugger;
+                if (conf) {
+                    if (!confirm("Are you sure you want to go back? You will lose your selected data.")) {
+                        return;
+                    }
+                }
+                
+                $(".basePanel").children().remove();
+                
                 $.get("pages/"+name+".html", function(responseText, textStatus, XMLHttpRequest) {
                     $(".basePanel").append(responseText);
                     $.getScript("pages/"+name+".js", function(responseText, textStatus, XMLHttpRequest){
-                        debugger;
-                    })
+                        
+                        })
                 });
-            
-            }
+                mockup.api.breadcrumbs.navTo(name);
+            },
+            breadcrumbs: new (function() {
+                var _crumbs = ["Home"];
+                var _element = document.getElementById('breadcrumbs');
+                this.init = function() {
+                    updateDiv();
+                }
+                
+                this.navTo = function(name) {
+                    // Check of 'name' al in crumbs staat.
+                    // Als wel: navBack, delete alle crumbs na 'name', update div.
+                    // Als niet: addCrumb, voeg 'name' toe aan crumbs en update de div.
+                    var index = _crumbs.indexOf(name);
+                    if (index != -1) {
+                        navBack(name, index);
+                    }
+                    else {
+                        addCrumb(name);
+                    }
+                }
+                
+                var addCrumb = function(name) {
+                    _crumbs.push(name);
+                    updateDiv();
+                }
+                
+                var navBack = function(name, index) {
+                    var i = index;
+                    _crumbs = _crumbs.slice(0, i+1);
+                    updateDiv();
+                }
+                
+                var updateDiv = function() {
+                    //format first
+                    _element.innerHTML = null || "";
+                    for (var n=0; n < _crumbs.length; n++) {
+                        if (_crumbs[n] == "Home") {
+                            var word = document.createTextNode("Home");
+                            _element.appendChild(word);
+                            
+                        }
+                        else{
+                        
+                            var link = document.createElement('a');
+                            link.innerHTML = _crumbs[n];
+                            link.setAttribute("onclick", "mockup.api.loadPage('"+_crumbs[n]+"', true);");
+                            link.setAttribute("href","#");
+                            _element.appendChild(link);
+                        }
+                        
+                        if (n != _crumbs.length-1) {
+                            _element.innerHTML += " > ";
+                        }
+                        else {
+                            link.className = "selected";
+                        }
+                    }
+                }
+            })()
         
         }

Dev/branches/Cartis/Tiles preview/pages/dataSelection.js

@@ -1 @@
-//COMMENT yo