Merge branch 'master' of github.com:dorey/0bin

README.rst

@@ -48,7 +48,7 @@ Technologies used
 Known issues
 ============
 
-- 0bin use several HTML5/CSS3 features that are not widely supported. In that case we handle the degradation as gracefully as we can.
+- 0bin uses several HTML5/CSS3 features that are not widely supported. In that case we handle the degradation as gracefully as we can.
 - The "copy to clipboard" feature is buggy under linux. It's flash, so we won't fix it. Better wait for the HTML5 clipboard API to be implemented in major browsers.
 - The pasted content size limit check is not accurate. It's just a safety net, so we thinks it's ok.
 - Some url shorteners and other services storing URLs break the encryption key. We will sanitize the URL as much as we can, but there is a limit to what we can do.

zerobin/routes.py

@@ -123,7 +123,7 @@ def runserver(host='', port='', debug=None, serve_static='', user='',
     for d in reversed(settings.TEMPLATE_DIRS):
         bottle.TEMPLATE_PATH.insert(0, d)
 
-    if serve_static:
+    if settings.STATIC_FILES_ROOT:
         @app.route('/static/<filename:path>')
         def server_static(filename):
             return static_file(filename, root=settings.STATIC_FILES_ROOT)

zerobin/static/css/style.css

@@ -23,6 +23,18 @@
 	font-size: 27px;
 }
 
+.about {
+	line-height: 13px;
+	font-style: italic;
+	text-align: right;
+	padding-top: 9px;
+	margin-bottom: 0px !important;
+}
+
+.about span{
+	font-size: 10px;
+}
+
 /* body & other stuff */
 
 body {
@@ -304,6 +316,10 @@ line-height:24px;
 	padding-left:1em;
 }
 
+li.item {
+	margin-left: -13px;
+}
+
 .previous-pastes canvas {
 	display:block;
 	float:left;

zerobin/views/base.tpl

@@ -76,7 +76,10 @@
               %end
 
             </ul>
-            <p class="navbar-text pull-right"><i>"A client side encrypted PasteBin..."</i></p>
+            <p class="about pull-right">
+              "A client side encrypted PasteBin"<br>
+              <span>All pastes are AES256 encrypted, we cannot know what you paste...</span>
+            </p>
           </div><!--/.nav-collapse -->
         </div>
       </div>