updated and working generation

martior · Oct 23, 2012 · f3de077 · f3de077
1 parent 41f94a3
commit f3de077
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
-*.DS_Store
+*.DS_Store
+public/javascripts/trumpet.js
diff --git a/build.py b/build.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 style = ""
 for line in open("src/stylesheets/trumpet.css"):
-  style += line.replace("\n"," ").replace("\t"," ").replace("  "," ").
+  style += line.replace("\n"," ").replace("\t"," ").replace("  "," ")
 
-
-
 javascript = ""
 for line in open("src/javascripts/trumpet.js"):
     javascript += line.replace("STYLEHERE",style)
 
-print javascript
+
+f = open("public/javascripts/trumpet.js",'w')
+f.write(javascript)
diff --git a/index.html b/index.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
- <LINK href="public/stylesheets/trumpet.css" title="compact" rel="stylesheet" type="text/css">
 
 <style type="text/css">
 body {padding-top:2em;}
@@ -28,12 +27,12 @@ <h2>Built on top of Cloudflare</h2>
 
 
 <script type="text/javascript"> var CloudFlare = CloudFlare || []; </script>
-<script type="text/javascript" src="public/javascripts/cloudflare.js" </script>
-<script type="text/javascript" src="public/javascripts/trumpet.js" </script>
+<script type="text/javascript" src="public/javascripts/cloudflare.js"> </script>
+<script type="text/javascript" src="public/javascripts/trumpet.js"> </script>
 <script type="text/javascript">
 
     var trumpetConfig = {
-        "message" : "A trumpet message for testing Lorem ipsum dolor sit amet", 
+    "message" : "A trumpet message for testing Lorem ipsum dolor sit amet", 
 		"link" : "http://www.vg.no",
 		"linktext" : "Read More...",
 		"colorbackground" : "#FFF",

diff --git a/src/javascripts/trumpet.js b/src/javascripts/trumpet.js
@@ -80,7 +80,7 @@ CloudFlare.define("trumpet", ["trumpet/config"], function(_config) {
 			var message = this.config.message;
 			console.log(this.config);
 			if (this.config.link != ""){
-				message = message + "<a href='"+this.config.link+"'>"+this.config.linktext+"</a>";
+				message = message + " <a href='"+this.config.link+"'>"+this.config.linktext+"</a>";
 			}
             document.getElementById("trumpet_message").innerHTML = message;
             this.animate(1);

diff --git a/src/stylesheets/trumpet.css b/src/stylesheets/trumpet.css
@@ -11,16 +11,16 @@
   top: -55px;
   left: 0;
   width: 100%;
-  color: '+colortext+';
+  color: "+colortext+";
   padding: 12px 5px;
   text-align: center;
-  background-color: '+colorbackground+';
+  background-color: "+colorbackground+";
   -moz-box-shadow:  1px 1px 2px 3px #999;
   -webkit-box-shadow: 1px 1px 2px 3px #999;
   box-shadow:         1px 1px 2px 3px #999;
 }
 .trumpet a{
- color: '+colorlink+';
+ color: "+colorlink+";
 }
 #trumpet_logo{
   position: absolute;