Commits

Scott Nixon committed 104b23a

Merged css and templates. Added new templates and removed two old templates.

  • Participants
  • Parent commits 546514f

Comments (0)

Files changed (8)

File inbounding/dispatch/static/css/love.css

 p.explain {
     margin-bottom: 50px;
     background: none repeat scroll 0 0 #D2CEE9;
-    padding: 0 16px;
+    padding: 16px 16px;
 }
 h2 {
     font-family: ff-meta-serif-web-pro;

File inbounding/dispatch/templates/form.html

+{% extends "site-template.html" %}
+
+{% block title %}{% endblock %}
+
+{% block extrahead %}
+{% endblock %}
+
+{% block main %}
+{% endblock %}

File inbounding/dispatch/templates/index.html

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- Free web templates by http://www.templatesdock.com; released for free under a Creative Commons Attribution 3.0 License -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<meta http-equiv="content-language" content="en" />
-	<meta name="description" content="[HERE PASTE YOUR DESCRIPTION]" />
-	<meta name="author" content="" />
-	<link rel="stylesheet" media="screen,projection" type="text/css" href="{{ STATIC_URL }}css/main.css" />
-	<link rel="stylesheet" media="screen,projection" type="text/css" href="{{ STATIC_URL }}css/skin.css" />
-	<script type="text/javascript" src="{{ STATIC_URL }}javascript/jquery.js"></script>	
-	<script type="text/javascript" src="{{ STATIC_URL }}javascript/jquery.loopedslider.js"></script>	
-	<script type="text/javascript" src="{{ STATIC_URL }}javascript/cufon-yui.js"></script>
-	<script type="text/javascript" src="{{ STATIC_URL }}javascript/font.font.js"></script>
-	<script type="text/javascript">Cufon.replace('.cufon, .nav, .slogan', {hover:true});</script>	
-	<!--[if IE 6]><script src="{{ STATIC_URL }}javascript/pngfix.js"></script><script>DD_belatedPNG.fix('.logo img, .nav a, .slider, .slider-pagination a');</script><![endif]--> 	
-	<title>CompanyName</title>
-</head>
-
-<body id="hp"> <!-- APPLY STYLE FOR HOMEPAGE -->
-
-<div class="bg">
-
-<div class="main">
-
-	<!-- HEADER -->
-	<div class="header box">
-
-		<p class="logo"><a href="./" title="CompanyName [Go to homepage]"><img src="{{ STATIC_URL }}design/contextkick.png" alt="" /></a></p>
-		
-		<!-- NAVIGATION -->
-		<ul class="nav box">
-			<li class="current"><a href="/">Home</a></li>
-			<li><a href="{% url dashboard-url %}">Dashboard</a></li>
-			<li><a href="#">About</a></li>
-			<li><a href="#">Contact</a></li>
-		</ul>
-
-	</div> <!-- /header -->
-	
-	<!-- SLOGAN -->
-	<div class="slogan">
-	
-		<h2>Be relevant. Prompt your visitors with Call-to-Actions in context.</h2>
-		
-	</div> <!-- /slogan -->
-	
-	<!-- SLIDER -->
-	<div class="slider">
-	
-		<div class="slider-container">
-		
-			<div class="slider-slides">
-
-				<!-- SLIDE -->
-				<div><div>
-					<h3 class="desc">National Geographic<br /><a href="#">www.ng.com</a></h3>
-					<a href="#" class="preview"><img src="{{ STATIC_URL }}tmp/slide-01.png" alt="" /></a>
-				</div></div>
-				
-				<!-- SLIDE -->
-				<div><div>
-					<h3 class="desc">CNN<br /><a href="#">www.cnn.com</a></h3>
-					<a href="#" class="preview"><img src="{{ STATIC_URL }}tmp/slide-02.png" alt="" /></a>
-				</div></div>
-				
-				<!-- SLIDE -->
-				<div><div>
-					<h3 class="desc">Yahoo!<br /><a href="#">www.yahoo.com</a></h3>
-					<a href="#" class="preview"><img src="{{ STATIC_URL }}tmp/slide-03.png" alt="" /></a>
-				</div></div>
-				
-			</div> <!-- /slider-slides -->
-			
-		</div> <!-- /slider-container -->
-		
-		<ul class="slider-pagination">
-			<li><a href="#"><span>1</span></a></li>
-			<li><a href="#"><span>2</span></a></li>
-			<li><a href="#"><span>3</span></a></li>
-		</ul>
-		
-	</div> <!-- /slider -->
-
-	<script type="text/javascript" charset="utf-8">
-	$(function(){
-		$('.slider').loopedSlider({
-			container: ".slider-container",
-			slides: ".slider-slides",
-			pagination: "slider-pagination",
-			containerClick: false,
-			autoStart: 5000,
-			slidespeed: 750,
-			fadespeed: 500,			
-			addPagination: true
-		});
-	});
-	</script>
-	
-	<!-- CONTENT -->
-	<div class="content box">
-
-	  {% block main %}
-	  {% endblock %}
-
-<!--	   
-		<ul class="cols3 box">
-			<li>
-				<h2 class="cufon">Configure your Call-to-Action</h2>
-				
-				<p class="thumb"><a href="#"><img src="{{ STATIC_URL }}tmp/img-01.jpg" alt="" /></a></p>
-				
-				<p>Lorem ipsum dolor sit amet, consectetur adipiscin lit vivamus <strong>elementum egestas</strong> adipis. Nullameg estas scelerisque libero pretium consequat. Maec ornare, est vitae dapibus blandit, libero a wuapuim lorem, ut pretium nisl <a href="#">purusa metus</a>. Pellentesque fa cilisis porta nisl, eget porta molestie ipsum.</p>
-				
-				<p class="more"><a href="#">More informations</a></p>
-			</li>
-			<li>
-				<h2 class="cufon">Add the Javascript</h2>
-				
-				<p class="thumb"><a href="#"><img src="{{ STATIC_URL }}tmp/img-02.jpg" alt="" /></a></p>
-				
-				<p>Lorem ipsum dolor sit amet, consectetur adipiscin lit vivamus <strong>elementum egestas</strong> adipis. Nullameg estas scelerisque libero pretium consequat. Maec ornare, est vitae dapibus blandit, libero a wuapuim lorem, ut pretium nisl <a href="#">purusa metus</a>. Pellentesque fa cilisis porta nisl, eget porta molestie ipsum.</p>
-				
-				<p class="more"><a href="#">More informations</a></p>
-			</li>
-			<li class="last">
-				<h2 class="cufon">Increase Conversation</h2>
-				
-				<p class="thumb"><a href="#"><img src="{{ STATIC_URL }}tmp/img-03.jpg" alt="" /></a></p>
-				
-				<p>Lorem ipsum dolor sit amet, consectetur adipiscin lit vivamus <strong>elementum egestas</strong> adipis. Nullameg estas scelerisque libero pretium consequat. Maec ornare, est vitae dapibus blandit, libero a wuapuim lorem, ut pretium nisl <a href="#">purusa metus</a>. Pellentesque fa cilisis porta nisl, eget porta molestie ipsum.</p>
-				
-				<p class="more"><a href="#">More informations</a></p>
-				
-			</li>
-		</ul>
-	   
-	</div> <!-- /content -->
--->
-	<!-- FOOTER -->
-	<div class="footer box">
-
-		<p class="f-right t-right">
-			ContextKick Inc.<br />
-			<a href="#">contextkick.com</a><br />
-			<a href="#">example@example.com</a><br />
-			Address: Street 123, New York City<br />
-			Phone: (012) 345-6789
-		</p>
-	
-		<p class="f-left">
-			Copyright &copy;&nbsp;2011 <a href="#">ContextKick Inc</a><br />
-
-
-		</p>
-
-	</div> <!-- /footer -->
-
-</div> <!-- /main -->
-
-</div> <!-- /bg -->
-
-<script type="text/javascript"> Cufon.now(); </script>
-
-</body>
-</html>

File inbounding/dispatch/templates/index2.html

 <head>
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <title>ContextKick</title>
+  <title>Turn New Visitors into Return Visitors - ContextKick</title>
   <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
   <link href="{{ STATIC_URL }}css/love.css" rel="stylesheet" type="text/css" media="screen" />
   
-  <script src="{{ STATIC_URL }}javascript/modernizr-1.1.min.js"></script>
+  <script src="{{ STATIC_URL }}js/modernizr-1.1.min.js"></script>
   <script type="text/javascript" src="http://use.typekit.com/onq3hhx.js"></script>
   <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	
         <ul class="nav">
 	  <li class="active" style="width:250px;"></li>
         </ul>
-        <form class="pull-right" action="">
-	  <input type="text" placeholder="Get Email Updates">
-	  <input type="button" class="label success" value="Join">
+        <form class="pull-right" action="http://contextkick.us2.list-manage1.com/subscribe/post?u=e90a2006ccc99ae7bcab745a2&amp;id=0a66cc769c" method="post">
+	  <input type="email" name="EMAIL" placeholder="Get Email Updates" required>
+	  <input type="submit" class="label success" value="Join">
         </form>
         
       </div>

File inbounding/dispatch/templates/index_old.html

-
-<style>
-#in_container {
-background: none;
-border: 0;
-border-radius: 0;
--webkit-border-radius: 0;
--moz-border-radius: 0;
-bottom: 0;
-height: auto;
-margin: 0;
-padding: 0;
-position: fixed;
-right: 30px;
-width: 291px;
-z-index: 9999;
-}
-</style>
-
-<div id="in_container"><p>My text an form.</p></div>

File inbounding/dispatch/templates/site-template.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title>{% block title %}{% endblock %}</title>
+  <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
+  <link href="{{ STATIC_URL }}css/love.css" rel="stylesheet" type="text/css" media="screen" />
+  
+  <script src="{{ STATIC_URL }}js/modernizr-1.1.min.js"></script>
+  <script type="text/javascript" src="http://use.typekit.com/onq3hhx.js"></script>
+  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+
+  {% block extrahead %}
+  {% endblock %}	
+</head>
+<body>
+
+
+<div class="topbar-wrapper" style="z-index: 5;">
+  <div class="topbar" data-dropdown="dropdown">
+    <div class="topbar-inner">
+      <div class="container">
+        <h3><a href="#">ContextKick</a></h3>
+        <ul class="nav">
+	  <li class="active" style="width:250px;"></li>
+        </ul>
+        <form class="pull-right" action="http://contextkick.us2.list-manage1.com/subscribe/post?u=e90a2006ccc99ae7bcab745a2&amp;id=0a66cc769c" method="post">
+	  <input type="email" name="EMAIL" placeholder="Get Email Updates" required>
+	  <input type="submit" class="label success" value="Join">
+        </form>
+        
+      </div>
+    </div><!-- /topbar-inner -->
+  </div><!-- /topbar -->
+ 
+
+</div>
+
+      {% block main %}
+      {% endblock %}
+   
+ 
+    <footer class="bottom">
+      <p>2011 ContextKick. | <a href="">Login</a></p>
+    </footer>
+
+
+
+
+</body>
+</html>

File inbounding/dispatch/views.py

     template_name = "index2.html"
 
 class Dashboard(ListView):
-    template_name = "dashboard.html"
+    template_name = "form.html"
 
     def get_queryset(self, *args, **kwargs):
         return Action.objects.filter(user=self.request.user)

File inbounding/settings.py

 import socket
 
-DEVELOPMENT_HOST = 'xdev2'
+DEVELOPMENT_HOST = 'xps'
 
 if socket.gethostname() == DEVELOPMENT_HOST:
     from settings_development import *