Merge branch 'master' of https://github.com/sgreenlay/PYLONS

sgreenlay · Dec 4, 2012 · 45be12d · 45be12d
2 parents 83f01f6 + 338dc21
commit 45be12d
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 17 deletions.
diff --git a/iphone/Pylon/PYLViewController.m b/iphone/Pylon/PYLViewController.m
@@ -43,6 +43,23 @@ - (void)viewDidLoad
     [audioRecorder prepareToRecord];
     [self.glowView setHidden:YES];
     [self.glowProc setHidden:YES];
+
+    [self addNewWebViewWithURL:[NSURL URLWithString:@"http://searchapp.herokuapp.com/help.html"]];
+}
+
+- (void)addNewWebViewWithURL:(NSURL*)url {
+    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, _topY, 320, 1)];
+    [webView setDelegate:self];
+    [webView setOpaque:NO];
+    [webView setBackgroundColor:[UIColor clearColor]];
+    [[webView subviews] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        if ([obj isKindOfClass:[UIScrollView class]]) {
+            [(UIScrollView*)obj setScrollEnabled:NO];
+        }
+    }];
+    [webView.layer setOpacity:0];
+    [self.scrollView addSubview:webView];
+    [webView loadRequest:[NSURLRequest requestWithURL:url]];
 }
 
 - (void)didReceiveMemoryWarning
@@ -103,20 +120,7 @@ - (void)stopRecording {
             NSString * queryUrl = [NSString stringWithFormat:@"http://searchapp.herokuapp.com/?query=%@&token=%@", text, token];
             NSString *acceptableUrl = [queryUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
-            NSURL * url = [NSURL URLWithString:acceptableUrl];
-
-            UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, _topY, 320, 1)];
-            [webView setDelegate:self];
-            [webView setOpaque:NO];
-            [webView setBackgroundColor:[UIColor clearColor]];
-            [[webView subviews] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-                if ([obj isKindOfClass:[UIScrollView class]]) {
-                    [(UIScrollView*)obj setScrollEnabled:NO];
-                }
-            }];
-            [webView.layer setOpacity:0];
-            [self.scrollView addSubview:webView];
-            [webView loadRequest:[NSURLRequest requestWithURL:url]];
+            [self addNewWebViewWithURL:[NSURL URLWithString:acceptableUrl]];
         } else {
             [self fadeOut:self.glowProc];
         }

diff --git a/server/public/css/app.less b/server/public/css/app.less
@@ -67,4 +67,23 @@ BODY {
     height: 45px;
     width: 45px;
     }
-  }
+  }
+
+.title {
+  text-align: center;
+  font-size: 100px;
+}
+
+.subtitle {
+  height: 25px;
+  text-align: center;
+  font-size: 20px;
+}
+
+.help-section {
+  padding: 15px 0px;
+
+  LI {
+    margin: 15px 10px;
+  }
+}
diff --git a/server/public/help.html b/server/public/help.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC
+	      "-//W3C//DTD HTML 4.01 Transitional//EN"
+	      "http://www.w3.org/TR/html4/loose.dtd"
+	      >
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://www.facebook.com/2008/fbml">
+  <head>
+    <title></title>
+
+    <!-- Require css -->
+    <link rel="stylesheet" type="text/css" href="css/reset.css">
+    <link rel="stylesheet/less" type="text/css" href="css/app.less">
+
+    <!-- Require libraries -->
+    <script src="js/lib/jquery.min.js"></script>
+    <script src="js/lib/less.min.js"></script>
+
+    <script type="text/javascript">
+      function windowHeight() {
+        return $("BODY").height();
+      }
+      $(function($) {
+        window.location.href = "js-call:layoutWebview";
+      });
+    </script>
+  </head>
+  <body>
+    <div id="container">
+      <h1 class="subtitle">
+        Welcome to
+      </h1>
+      <div class="title">
+        Quin
+      </div>
+      <div class="help-section">
+        Press the button, ask about:
+        <ul>
+          <li>"Friends in {insert city}"</li>
+          <li>"Friends' relationship statuses"</li>
+          <li>"Mutual friends"</li>
+          <li>"Popularity of friends"</li>
+          <li>"Friends' genders"</li>
+        </ul>
+        and press the button again to see the result.
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/server/public/js/models/data.js b/server/public/js/models/data.js
@@ -40,6 +40,7 @@ $(function($) {
 
         parse: function(res) {
             this.set("data", res.data);
+            this.set("total", res.data.length);
         },
 
         extract: function(x) {

diff --git a/server/public/js/views/donut.js b/server/public/js/views/donut.js
@@ -79,7 +79,7 @@ $(function($) {
                     var perc;
                     perc = d.value / total;
                     perc = Math.floor(perc * 100);
-                    return d.type.capitalizeFirst() + " (" + perc + "%)";
+                    return d.type.capitalizeFirst() + " (" + d.value + ",  " + perc + "%)";
                 });
         }
     });

diff --git a/server/public/js/views/facepile.js b/server/public/js/views/facepile.js
@@ -7,7 +7,7 @@ $(function($) {
         initialize: function(a) {
             this.el = d3.select("#chart")
                 .append("div")
-                .attr("class", "clearfix");
+                .attr("class", "facepile clearfix");
         },
 
         render: function(model) {
@@ -22,6 +22,9 @@ $(function($) {
                 .attr("src", function(d) {
                     return "http://graph.facebook.com/" + d.uid + "/picture?type=square";
                 });
+
+            d3.select("#legend")
+                .text(model.get("total") + " total friends");
         }
     });
 });
diff --git a/server/server.js b/server/server.js
@@ -14,6 +14,10 @@ app.get('/', function(req, res){
     res.render("./public/index.html");
 });
 
+app.get('/help', function(req, res){
+    res.render("./public/help.html");
+});
+
 app.get('/typeify', function(req, res) {
     query = req.query.query.toLowerCase();
     type = tc.classify(query);