Merge branch 'v2' of ksamuel-github:/Tygs/0bin into v2

zerobin/default_settings.py

@@ -53,10 +53,11 @@ ADMIN_CREDENTIALS = {
 # Names/links to insert in the menu bar.
 # Any link with "mailto:" will be escaped to prevent spam
 MENU = (
-    ("Home", "/"),  # internal link. First link will be highlited
-    ("Download 0bin", "https://github.com/sametmax/0bin"),  # external link
+    ("Create paste", "/"),  # internal link. First link will be highlited
+    ("Github", "https://github.com/Tygs/0bin"),  # external link
     ("Faq", "/faq/"),  # faq
     ("Contact", "mailto:your@email.com"),  # email
+    ("Zerobin Pastebin", "https://www.0bin.net/"),  # Thanks the authors :)
 )
 
 # limit size of pasted text in bytes. Be careful allowing too much size can

zerobin/static/css/style.css

@@ -63,11 +63,7 @@ ol {
   padding: 0;
   margin: 0;
 }
-
-li {
-  margin-left: -9px;
-}
-
+ 
 a {
   color: #2ea1d7;
 }
@@ -111,6 +107,26 @@ blockquote {
   background-color: #424141;
 }
 
+.footer li {
+	list-style-type: none;
+	display: inline;
+}
+
+.footer li span{
+	color: #2ea1d7;
+}
+
+.footer li span:hover{
+	color: #1888bc;
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+.footer li:not(:last-child):after {
+    content:' -';
+}
+ 
+
 /* Home */
 
 .btn-group {
@@ -437,12 +453,15 @@ nav ul li a:hover {
   position: relative;
 }
 
-.submenu ul {
-  position: absolute;
-  margin: 8px 0 0px 9px;
-  display: none;
-  width: -webkit-fill-available;
-  z-index: 9999;
+.submenu ul { 
+	display: none;
+	position: absolute;
+	margin: 8px 0 0px 9px;
+	width: -webkit-fill-available;
+	z-index: 9999; 
+	border: 1px solid #666;
+	border-radius: 3px;
+	padding: 0;
 }
 
 .submenu li {

zerobin/views/base.tpl

@@ -34,7 +34,7 @@
 
       <nav>
         <ul>
-          <li class="submenu"><a href="#" @click="openPreviousPastesMenu = !openPreviousPastesMenu">Previous
+          <li class="submenu"><a href="#" @click.prevent="openPreviousPastesMenu = !openPreviousPastesMenu">Previous
               pastes +</a>
             <ul class="previous-pastes" id="topmenu" v-if="openPreviousPastesMenu"
               @mouseleave="openPreviousPastesMenu =false">
@@ -62,9 +62,21 @@
     </div>
 
     <footer class="footer">
-      <a href="https://www.0bin.net/">Create a paste</a> - <a href="/faq/">Faq</a> - <a
-        href="https://github.com/sametmax/0bin">Github</a>
-      <br>
+      <ul>
+        %for i, entry in enumerate(settings.MENU):
+          <li>
+            %if "mailto:" in entry[1]:
+              <span :title='formatEmail(`{{ entry[1].replace("mailto:", "").replace("@", "__AT__") }}`)'
+                    class="email-link" >
+                {{ entry[0] }}
+              </span>
+            %else:
+              <a href="{{ entry[1] }}">{{ entry[0] }}</a>
+            %end
+          </li>
+        %end
+      </ul>
+      
       %if settings.DISPLAY_COUNTER:
       <strong>{{ pastes_count }}</strong> pastes øbinned
       %end