Merge pull request #941 from annando/master

Moved and renamed menu entries to improve the usability, global css, icons for social networks

include/nav.php

@@ -129,6 +129,8 @@ function nav_info(&$a) {
 
 	$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 
+	$nav['about'] = Array('friendica', t('Information'), "", t('Information about this friendica instance'));
+
 	/**
 	 *
 	 * The following nav links are only show to logged in users

mod/settings.php

@@ -32,7 +32,7 @@ function settings_init(&$a) {
 
 	$tabs = array(
 		array(
-			'label'	=> t('Account settings'),
+			'label'	=> t('Account'),
 			'url' 	=> $a->get_baseurl(true).'/settings',
 			'selected'	=> (($a->argc == 1)?'active':''),
 		),
@@ -42,21 +42,26 @@ function settings_init(&$a) {
 			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
 		),
 		array(
-			'label'	=> t('Display settings'),
+			'label'	=> t('Display'),
 			'url' 	=> $a->get_baseurl(true).'/settings/display',
 			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
 		),
 
 		array(
-			'label'	=> t('Connector settings'),
+			'label'	=> t('Social Networks'),
 			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
 			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
 		),
 		array(
-			'label'	=> t('Plugin settings'),
+			'label'	=> t('Plugins'),
 			'url' 	=> $a->get_baseurl(true).'/settings/addon',
 			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
 		),
+		array(
+			'label'	=> t('Delegations'),
+			'url' 	=> $a->get_baseurl(true).'/delegate',
+			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+		),
 		array(
 			'label' => t('Connected apps'),
 			'url' => $a->get_baseurl(true) . '/settings/oauth',
@@ -719,8 +724,13 @@ function settings_content(&$a) {
 
 		call_hooks('connector_settings', $settings_connectors);
 
+		if (is_site_admin()) {
 			$diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled')));
 			$ostat_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('StatusNet'), ((get_config('system','ostatus_disabled')) ? t('disabled') : t('enabled')));
+		} else {
+			$diasp_enabled = "";
+			$ostat_enabled = "";
+		}
 
 		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 		if(get_config('system','dfrn_only'))
@@ -759,7 +769,7 @@ function settings_content(&$a) {
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 
-			'$title'	=> t('Connector Settings'),
+			'$title'	=> t('Social Networks'),
 
 			'$diasp_enabled' => $diasp_enabled,
 			'$ostat_enabled' => $ostat_enabled,

view/global.css

@@ -0,0 +1,60 @@
+/* List of social Networks */
+img.connector {
+  height: 40px;
+  margin-right: 10px;
+  border-radius: 10px;
+}
+
+h3.connector {
+  display: inline-block;
+  vertical-align: bottom;
+}
+span.connector {
+  vertical-align: super;
+}
+
+/* Embedded link information */
+.type-link, .type-video {
+  border-top: 1px solid #D2D2D2;
+  border-bottom: 1px solid #D2D2D2;
+  display: block;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  margin-top: 10px;
+}
+.type-link:after, .type-video:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+.wall-item-container .wall-item-content .type-link img,
+.type-link img, .type-video img {
+  max-width: 160px;
+  max-height: 160px;
+  float: left;
+  margin-right: 10px;
+}
+.type-link blockquote, .type-video blockquote {
+  margin-left: 0px;
+  max-height: 160px;
+  overflow: hidden;
+  border-left: 0px;
+  padding-left: 0px;
+  font-size: 13px;
+  line-height: normal;
+}
+.type-link .oembed, .type-video .oembed {
+  font-size: 18px;
+  font-weight: 300;
+  line-height: normal;
+}
+.type-link img, .type-video img {
+}
+
+.type-link span.oembed + br, .type-video span.oembed + br,
+.type-link a + br, .type-video a + br,
+.type-link img + br, .type-video img + br{
+  display: none;
+}

view/templates/head.tpl

@@ -6,6 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
+<link rel="stylesheet" href="{{$baseurl}}/view/global.css" type="text/css" media="all" />
 {{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->*}}
 <link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />

view/templates/settings_connectors.tpl

@@ -17,11 +17,11 @@
 
 {{else}}
 	<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-		<h3 class="settings-heading">{{$h_imap}}</h3>
+		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
 	<div id="settings_mail_expanded" class="settings-block" style="display: none;">
 	<span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-		<h3 class="settings-heading">{{$h_imap}}</h3>
+		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
 	<p>{{$imap_desc}}</p>
 	{{include file="field_custom.tpl" field=$imap_lastcheck}}

view/theme/vier/style.css

@@ -1208,60 +1208,7 @@ section.minimal {
   width: 350px;
   float: left;
   font-size: 12px;
-}
-
-.type-link, .type-video {
-  border-top: 1px solid #D2D2D2;
-  border-bottom: 1px solid #D2D2D2;
-  display: block;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  margin-top: 10px;
-/*
-padding-left: 170px;
-min-height: 90px;
-position: relative;
-*/
-}
-.type-link:after, .type-video:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.wall-item-container .wall-item-content .type-link img,
-.type-link img, .type-video img {
-  max-width: 160px;
-  max-height: 160px;
-  float: left;
-  margin-right: 10px;
-}
-.type-link blockquote, .type-video blockquote {
-  /* margin-left: 160px; */
-  margin-left: 0px;
-  max-height: 160px;
-  overflow: hidden;
-  border-left: 0px;
-  padding-left: 0px;
-  font-size: 13px;
-  line-height: normal;
-}
-.type-link .oembed, .type-video .oembed {
-  font-size: 18px;
-  font-weight: 300;
-  line-height: normal;
-}
-.type-link img, .type-video img {
-/* position: absolute;
-left: 0;
-top: 0; */
-}
-.type-link span.oembed + br, .type-video span.oembed + br,
-.type-link a + br, .type-video a + br,
-.type-link img + br, .type-video img + br{
-  display: none;
-}
+}}
 
 h2 {
   line-height: normal;
@@ -2429,9 +2376,9 @@ a.mail-list-link {
 }
 
 .settings-block {
-        border: 1px solid #AAA;
-        margin: 10px;
-        padding: 10px;
+        /* border: 1px solid #AAA; */
+        padding-left: 5px;
+        padding-right: 5px;
 }
 
 .app-title {

view/theme/vier/templates/nav.tpl

@@ -44,11 +44,11 @@
 			<ul id="nav-site-menu" class="menu-popup">
 				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
 				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
-				<li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
 				<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
-				{{if $nav.delegations}}<li><a class="{{$nav.delegations.2}}" href="{{$nav.delegations.0}}" title="{{$nav.delegations.3}}">{{$nav.delegations.1}}</a></li>{{/if}}
+				<!-- {{if $nav.delegations}}<li><a class="{{$nav.delegations.2}}" href="{{$nav.delegations.0}}" title="{{$nav.delegations.3}}">{{$nav.delegations.1}}</a></li>{{/if}} -->
 				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
 				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
+				<li><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3}}" >{{$nav.about.1}}</a></li>
 
 				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
 				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}