Merge https://github.com/friendica/friendica into pull

4 files changed, 18 insertions, 15 deletions

diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php
index 2a418909b..cc7da1b00 100644
--- a/view/theme/diabook/config.php
+++ b/view/theme/diabook/config.php
@@ -196,15 +196,15 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
 		'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),	
 		'$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm),	
 		'$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom),	
-		'$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX),	
-		'$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY),	
+		'$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX),	
+		'$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY),	
 		'$close_pages' => array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC),	
 		'$close_mapquery' => array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC),		
 		'$close_profiles' => array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_profilesC),		
 		'$close_helpers' => array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_helpersC),		
 		'$close_services' => array('diabook_close_services', t('Connect Services'), $close_services, '', $close_servicesC),			
 		'$close_friends' => array('diabook_close_friends', t('Find Friends'), $close_friends, '', $close_friendsC),				
-		'$close_twitter' => array('diabook_close_twitter', t('Last Tweets'), $close_twitter, '', $close_twitterC),				
+		'$close_twitter' => array('diabook_close_twitter', t('Last tweets'), $close_twitter, '', $close_twitterC),				
 		'$close_lastusers' => array('diabook_close_lastusers', t('Last users'), $close_lastusers, '', $close_lastusersC),				
 		'$close_lastphotos' => array('diabook_close_lastphotos', t('Last photos'), $close_lastphotos, '', $close_lastphotosC),				
 		'$close_lastlikes' => array('diabook_close_lastlikes', t('Last likes'), $close_lastlikes, '', $close_lastlikesC),				
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index d9e2d0094..678e8597c 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -831,7 +831,7 @@ ul.menu-popup .empty {
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 .acpopupitem {
-  color: #2e2f2e;
+  color: #eec;
   padding: 4px;
   clear: left;
 }
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 24d319f8a..189bd30bf 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -3,10 +3,7 @@
  * Additional Changes: Michael Vogel <icarus@dabo.de>
  **/
 
-/* ========= */
-/* = Admin = */
-/* ========= */
-
+/** Fancy Box **/
 #fancybox-content {
 	width: 0;
 	height: 0;
@@ -19,6 +16,11 @@
 	background: #2e2e2f !important;
 }
 
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
 #adminpage {
 /*        width: 80%;*/
 }
@@ -633,7 +635,7 @@ header #banner #logo-text {
     text-decoration: none;
 }
 .mail-list-wrapper {
-  background-color: #eec;
+  background-color: #333;
   margin-bottom: 5px;
   width: 100%;
   height: auto;
@@ -644,6 +646,7 @@ header #banner #logo-text {
   float: left;
   width: 20%;
   overflow: hidden;
+  background: #2e2e2f;
 }
 .mail-list-wrapper .mail-subject {
   width: 30%;
@@ -915,7 +918,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 {
@@ -1685,7 +1688,7 @@ body .pageheader{
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
   height: 4em;
-  color: #2e302e;
+  color: #eec;
   border: 1px solid #2e302e;
 }
 .comment-edit-preview {
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index f1e4d0ba0..7336383d7 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -608,9 +608,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' );
 	$ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' );
 	$ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' );
-	$aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom);
-	$aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX);	
-	$aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY);	
+	$aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layers'), $ELZoom, '', $ELZoom);
+	$aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layers'), $ELPosX, '', $ELPosX);	
+	$aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layers'), $ELPosY, '', $ELPosY);	
 	if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){	
 		set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']);
 		set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']);	
@@ -670,7 +670,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$close_lastusersC = array('1'=>t("don't show"),	'0'=>t("show"),);
 	$close_lastphotosC = array('1'=>t("don't show"),	'0'=>t("show"),);
 	$close_lastlikesC = array('1'=>t("don't show"),	'0'=>t("show"),);
-	$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand coloumn:'), "", "");
+	$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
 	$aside['$boxsettings'] = $boxsettings;
 	$aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_pagesC);	
 	$aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_mapqueryC);