Merge ok

views/base.tpl

@@ -22,6 +22,9 @@
     <script src="/static/js/sjcl.js"></script>
     <script src="/static/js/jquery-1.7.2.min.js"></script>
     <script src="/static/js/behavior.js"></script>
+    <script type="text/javascript">
+      zerobin.max_size = {{ max_size }};
+    </script>
 
   </head>
 
@@ -75,12 +78,18 @@
         <p>«Few persons can be made to believe that it is not quite an easy thing to invent a method of secret writing which shall baffle investigation. Yet it may be roundly asserted that human ingenuity cannot concoct a cipher which human ingenuity cannot resolve...»</p>
         <small>Edgar Allan Poe</small>
       </blockquote>
-      </br>
-        <p>
-            Based on an original idea from
-           <a href="http://sebsauvage.net/paste/">sebsauvage.net</a>
-       </p>
 
+      <h4 id="pixels-total" >
+        <p>ø</p>
+        <strong>41,017,923,819</strong> pastes øbinned
+      </h4>
+
+      </br> 
+        <p class="greetings span12">
+            Based on an original idea from
+           <a href="http://sebsauvage.net/paste/">sebsauvage.net</a><br>
+           <a href="http://sametmax.com">Sam &amp; Max</a>
+       </p>
       </footer>
 
 

views/home.tpl

@@ -1,3 +1,14 @@
+<div class="alert alert-error max-size-reached">
+  <a class="close" data-dismiss="alert" href="#">×</a>
+  <strong>Warning!</strong><br>
+  Your file is <strong class="file-size"></strong>KB You have reached the maximum size limit of {{ max_size_kb }}KB.
+</div>
+
+<p class="file-upload">
+	<input type="button" class="btn btn-upload"  value="Upload File"> 
+	<input type="file" class="hide-upload" id="file-upload" >
+</p> 
+
 <form class="well" method="post" action="/paste/create">
 <p class="paste-option">
 <label for="expiration" >Expiration:</label>
@@ -20,4 +31,4 @@
 </form>
 
 
-%rebase base
+%rebase base max_size=max_size

views/paste.tpl

@@ -21,12 +21,11 @@
 
 <div class="well paste-form">
 <form action="/" method="get" accept-charset="utf-8">
-<p>
-  <a id="clip-button">Copy To Clipboard</a>
-  |
-  <a id="short-url" href=""
-     target="_blank">Get short url</a>
-
+<p class="lnk-option"> 
+	  <a id="clip-button">Copy To Clipboard</a>
+	  |
+	  <a id="short-url" href=""
+	     target="_blank">Get short url</a> 
   <span class="paste-option btn-group top">
       <button class="btn btn-clone"><i class="icon-camera"></i>&nbsp;Clone</button>
       <button class="btn">New Paste</button>