merge

nickgeoca · nickgeoca · commit cc6587133104 · 2014-09-28T16:18:41.000-05:00
diff --git a/resources/public/agent-chatb0x.html b/resources/public/agent-chatb0x.html
@@ -44,7 +44,7 @@ <h5 class="media-heading">Some User</h5> <!-- username -->
 
     <div class="list-group col-lg-2 pull-right">
       <a class="list-group-item active" href="#">
-        Some User
+        Visitor(s)
       </a>
       <a class="list-group-item" href="#">Waiting User 1</a>
       <a class="list-group-item" href="#">Waiting User 2</a>
diff --git a/resources/public/css/jumbotron.css b/resources/public/css/jumbotron.css
@@ -0,0 +1,20 @@
+.jumbotron {
+	background-position: center;
+	background-size: 100% auto;
+	background-image: url(/img/artistic.jpg);
+	border-radius: 6px;
+}
+
+.jumbotron h1 {
+	color: #fff;
+	/*text-shadow: 2px 2px #100e19;*/
+	font-size: 63px;
+	line-height: 75px;
+        font-weight: 700;
+}
+.jumbotron p {
+	color: #fff;
+	text-shadow: 2px 2px #100e19;
+	line-height: 1.5em;
+	/*-webkit-text-stroke: 1px black;*/
+}
diff --git a/resources/public/img/artistic.jpg b/resources/public/img/artistic.jpg
diff --git a/resources/public/landing.html b/resources/public/landing.html
@@ -9,6 +9,7 @@
 			@import url("css/bootstrap-theme.min.css");
 			@import url("css/layout.css");
 			@import url("css/style.css");
+			@import url("css/jumbotron.css");
 		</style>
   </head>
   <body>
diff --git a/resources/public/marketing.html b/resources/public/marketing.html
@@ -0,0 +1,28 @@
+<div class="marketing">
+  <div class="jumbotron">
+    <div class="container">
+      <h1>chatb&#216;x</h1>
+    </div> <!-- container -->
+  </div> <!-- jumbotron -->
+
+  <div class="container">
+    <div class="row">
+      <div class="col-md-4">
+        <h2>Communicate Effectively</h2>
+        <p>When customers land on your site they are presented with a simple window with which they can communicate with agents from your company.</p>
+        <p><a class="btn btn-default" href="#" role="button">Learn More</a></p>
+      </div>
+      <div class="col-md-4">
+        <h2>Bleeding Edge Tech</h2>
+        <p>We built this service using Clojure - a modern LISP for tackling modern problems.</p>
+        <p><a class="btn btn-default" href="#" role="button">See Our Tech</a></p>
+     </div>
+      <div class="col-md-4">
+        <h2>Sign Up</h2>
+        <p>Click the button below to sign up and see what chatb0x is all about!</p>
+        <p><a class="btn btn-default" href="#" role="button">Sign Up</a></p>
+      </div>
+    </div>
+  </div> <!-- container -->
+</div> <!-- marketing -->
+
diff --git a/src/chatb0x/core.clj b/src/chatb0x/core.clj
@@ -62,6 +62,9 @@
 (html/defsnippet admin-dash "public/admin-dashboard.html"
   [:div.container] [])
 
+(html/defsnippet marketing "public/marketing.html"
+  [:div.marketing] [])
+
 (html/defsnippet auth-profile (io/resource "public/welcome.html")
   [:body :div.user]
   [req]
@@ -93,7 +96,7 @@
 (html/deftemplate landing (io/resource "public/landing.html")
   [req]
   [:body :div.navbar] (html/substitute (navbar req))
-  [:body :#content] (html/substitute (non-app-content req))
+  [:body :#content] (html/substitute (marketing))
   [:body] (brepl-injection))
 
 ;;; Default page for erroneous logins 
@@ -194,3 +197,4 @@
       (wrap-session)
       ;;(wrap-lint)
       ))
+
