Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:

6 files changed, 16 insertions, 11 deletions

diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
index 4bf7ce9d3..a3c98e2ce 100644
--- a/view/admin_aside.tpl
+++ b/view/admin_aside.tpl
@@ -20,6 +20,7 @@
 
 <ul class='admin linklist'>
 	<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+	<li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
 </ul>
 
 
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 2b9db9f35..852a2c0bf 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -80,6 +80,7 @@
 	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
index 146ad29fa..22c33d6b1 100644
--- a/view/common_tabs.tpl
+++ b/view/common_tabs.tpl
@@ -1,5 +1,5 @@
 <ul class="tabs">
 	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="tab button $tab.sel">$tab.label</a></li>
+		<li><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
 	{{ endfor }}
 </ul>
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 6ff44748f..8a7083d9d 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -1431,7 +1431,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-comment-wrapper {
   margin: 1px 5px 5px 80px;
-  background-color: #fff;
+  background-color: #444;
   width: 500px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
@@ -1442,14 +1442,14 @@ transition: all 0.2s ease-in-out;
   width: 100%;
   font-size: 10px;
   color: #999999;
-  border: 1px solid #DDD;
+  border: 1px solid #2e2e2f;
   padding: 0.3em;
   font-size: 14px;
 }
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
   height: 4em;
-  color: #2e2f2e;
+  color: #eec;
   border: 1px solid #2e2f2e;
 }
 .comment-edit-preview {
@@ -1596,8 +1596,8 @@ transition: all 0.2s ease-in-out;
   height: 2.0em;
   width: 99%;
   font-size: 15px;
-  color: #999999;
-  border: 1px solid #DDD;
+  color: #eec;
+  border: 1px solid #444;
   padding: 0.3em;
   margin-bottom: 10px;
 }
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index b052b77ff..3ecad85af 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -540,7 +540,7 @@ header #banner a:active,
 header #banner a:visited,
 header #banner a:link,
 header #banner a:hover {
-  color: #2e2f2e;
+  color: #eec;
   text-decoration: none;
   outline: none;
   vertical-align: middle;
@@ -661,7 +661,7 @@ nav .nav-menu-icon {
   border-radius: 5px 5px 0 0;
 }
 nav .nav-menu-icon:hover {
-  background-color: #eec;  
+  background-color: #308dbf;  
   position: relative;
   height: 22px;
   padding: 5px;
@@ -776,7 +776,7 @@ nav #nav-apps-link.selected {
 }
 
 .notify-seen {
-	background: none repeat scroll 0 0 #DDDDDD;
+	background: none repeat scroll 0 0 #666;
 	}
 
 ul.menu-popup {
@@ -1424,7 +1424,7 @@ transition: all 0.2s ease-in-out;
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
   height: 4em;
-  color: #2e302;
+  color: #eec;
   border: 1px solid #2e302;
 }
 .comment-edit-preview {
@@ -1571,10 +1571,11 @@ transition: all 0.2s ease-in-out;
   height: 2.0em;
   width: 99%;
   font-size: 15px;
-  color: #999999;
+  color: #eec;
   border: 1px solid #DDD;
   padding: 0.3em;
   margin-bottom: 10px;
+  background: #444;
 }
 .grey
 {
@@ -1667,6 +1668,7 @@ transition: all 0.2s ease-in-out;
     margin: 0 0 5px;
     width: 60%;
     border: 1px solid #d2d2d2;
+    background: #444;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 638aeb455..b59ab5dc1 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -1671,6 +1671,7 @@ body .pageheader{
   height: 2.0em;
   width: 100%;
   font-size: 10px;
+  background: #444;
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;