More deloitte style updates

jwswj · jwswj · commit 73ace0635740 · 2011-08-31T13:47:24.000-07:00
diff --git a/app.yaml b/app.yaml
@@ -1,4 +1,4 @@
-application: yammerfall
+application: deloittewall
 version: 1-3
 runtime: python
 api_version: 1
@@ -9,9 +9,15 @@ handlers:
 
 - url: /images
   static_dir: static/images
-
+  
 - url: /js
   static_dir: static/js
-      
+        
 - url: .*
   script: main.py
+  secure: always
+
+- url: /
+  static_dir: /
+  secure: always
+  
diff --git a/static/styles/web.css b/static/styles/web.css
@@ -1,6 +1,7 @@
 body {
-	background-color: #BEC4CF;
-	font-family: "Helvetica Neue", "Helvetica", "Arial", Sans-serif;
+	background: rgb(1,0,102) url('../images/DeloitteLogo.png') no-repeat 38px 30px;
+	margin-top:100px;
+	font-family: sans-serif;
 }
 
 span.yammerfall {
@@ -9,7 +10,7 @@ span.yammerfall {
 
 span.userimg {
 	float:left;
-	padding: 15px;
+	padding: 10px 15px 15px 0;
 }
 
 
@@ -19,36 +20,44 @@ div.message {
 }
 
 .yammer {
-	-webkit-border-radius: 10px;
-	-khtml-border-radius: 10px;	
-	-moz-border-radius: 10px;
-	border-radius: 10px;
-	background-color: #FFFFFF;
+	background-color: #fff;
 	vertical-align: middle;
-	width: 625px;
 	padding-right: 20px;
 	padding-left: 20px;
 	padding-top: 5px;
 	padding-bottom: 5px;
 	font-size: 120%;
 	min-height: 80px;
-	color: #222222;
+	color: #333;
+	-webkit-border-radius: 6px;
+	 -khtml-border-radius: 6px;	
+	   -moz-border-radius: 6px;
+	        border-radius: 6px;
 }
 
+	.yammer h3 {
+		margin-bottom: 0;
+	}
+
+	.yammer span {
+		font-size: 70%;
+	}
+
 div.yammerer {
 	/*border-bottom: 2px solid #5B6F87;*/
 	padding-bottom: 0px;
-	margin-bottom: 15px;
+	margin-bottom: 10px;
+	margin-top: 5px;
 }
 
 strong.yammerer {
 	font-size: 80%;
-	color: #E91A38;
+	color: #00A1DE;
 	font-weight: bold;
 }
 
 span.creationdate {
-	padding-top: 10px;
+	padding-top: 15px;
 	font-size: 80%;
 	color: #999999;
 }
@@ -61,8 +70,12 @@ span.messageinfo {
 
 div.likedby {
 	font-size: 80%;
-	background-color: #FFFFFF;
+	background-color: #EEE;
 	color: #5B6F87;
+	-webkit-border-radius: 6px;
+	-khtml-border-radius: 6px;	
+	-moz-border-radius: 6px;
+	border-radius: 6px;
 }
 
 div.break-word {
diff --git a/templates/base.html b/templates/base.html
@@ -2,7 +2,8 @@
  "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-	<title>YammerFall</title>
+	<script type="text/javascript">var _sf_startpt=(new Date()).getTime()</script>
+	<title>YammerWall</title>
 	<link rel="stylesheet" href="/styles/web.css" type="text/css">
 	<script type="text/javascript" src="/js/jquery-1.3.min.js"></script>
 	<script type="text/javascript" src="/js/date.js"></script>
@@ -15,27 +16,52 @@
 		  });
 		});
 	</script>
+
+	<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-24830730-1']);
+	  _gaq.push(['_trackPageview']);
+
+	  (function() {
+	    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+	    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+
+	</script>
+
+
 </head>
 <body>
 	<span class="yammerfall">
+
 	<div class="message" id="logos">
-		  <div class="yammer">
-		    <!-- content goes here -->
-			<h2>
-			<img src="https://assets1.yammer.com/images/YammerIconApp126x126.jpg" height="50">
-			&nbsp;&nbsp;Yammerfall
-			</h2>
-			<div id="description">
-			<b>Yammer</b> is a verified social network. You can share info on your profile (like Facebook) and connect with others through updates (like Twitter.)
-			</br>
-			<b>Yammerfall</b> is an app that displays the latest updates of your entire network.
-			</div>
-			<!-- content went here -->
-		  </div>
 	</div>
 	</span>
 		
 	{% block mainpanel %}
 	{% endblock %}
+	
+	<script type="text/javascript">
+	var _sf_async_config={uid:26650,domain:"yammerwall.appspot.com"};
+	(function(){
+	  function loadChartbeat() {
+	    window._sf_endpt=(new Date()).getTime();
+	    var e = document.createElement('script');
+	    e.setAttribute('language', 'javascript');
+	    e.setAttribute('type', 'text/javascript');
+	    e.setAttribute('src',
+	       (("https:" == document.location.protocol) ? "https://a248.e.akamai.net/chartbeat.download.akamai.com/102508/" : "http://static.chartbeat.com/") +
+	       "js/chartbeat.js");
+	    document.body.appendChild(e);
+	  }
+	  var oldonload = window.onload;
+	  window.onload = (typeof window.onload != 'function') ?
+	     loadChartbeat : function() { oldonload(); loadChartbeat(); };
+	})();
+
+	</script>	
 </body>
+
 </html>
diff --git a/templates/home.html b/templates/home.html
@@ -16,4 +16,5 @@
 		//   -->
 	</script>
 	</span>
+	
 {% endblock %}
diff --git a/templates/login.html b/templates/login.html
@@ -15,7 +15,7 @@ <h2>Follow these 7 steps to authenticate this Yammerfall instance with yammer.co
 <div class="yammer">
 <!-- content goes here -->
 	 <h3>1) Click this <a href="{{user_auth_url}}?oauth_token={{oauth_token}}" onclick="window.open (this.href, 'child', 'height=600,width=450'); return false">link</a></h3>
-	(This will open up yammer.com in a new browser window.)
+	 <span class="helperText">(This will open up yammer.com in a new browser window.)</span>
 <!-- content went here -->
 </div>
 </div>
@@ -24,7 +24,7 @@ <h3>1) Click this <a href="{{user_auth_url}}?oauth_token={{oauth_token}}" onclic
 <div class="yammer">
 <!-- content goes here -->
 	<h3>2) Login using your yammer username and password.</h3>
-	(If you are already logged in, go to step 3. If you do not have an account with yammer, you can create one now.)
+	<span class="helperText">(If you are already logged in, go to step 3. If you do not have an account with yammer, you can create one now.)</span>
 <!-- content went here -->
 </div>
 </div>
diff --git a/yammerConfig.pyc b/yammerConfig.pyc
