diff --git a/images/appnet.png b/images/appnet.png
new file mode 100644
index 000000000..c51dbf8c4
Binary files /dev/null and b/images/appnet.png differ
diff --git a/images/blogger.png b/images/blogger.png
new file mode 100644
index 000000000..9b0b4e47b
Binary files /dev/null and b/images/blogger.png differ
diff --git a/images/diaspora-logo.png b/images/diaspora-logo.png
new file mode 100644
index 000000000..b385d4bda
Binary files /dev/null and b/images/diaspora-logo.png differ
diff --git a/images/facebook.png b/images/facebook.png
new file mode 100644
index 000000000..d8e598189
Binary files /dev/null and b/images/facebook.png differ
diff --git a/images/gnusocial.png b/images/gnusocial.png
new file mode 100644
index 000000000..be23e621b
Binary files /dev/null and b/images/gnusocial.png differ
diff --git a/images/googleplus.png b/images/googleplus.png
new file mode 100644
index 000000000..e51c3dd70
Binary files /dev/null and b/images/googleplus.png differ
diff --git a/images/libertree.png b/images/libertree.png
new file mode 100644
index 000000000..ff6bcddf4
Binary files /dev/null and b/images/libertree.png differ
diff --git a/images/mail.png b/images/mail.png
new file mode 100644
index 000000000..2e47fd844
Binary files /dev/null and b/images/mail.png differ
diff --git a/images/pumpio.png b/images/pumpio.png
new file mode 100644
index 000000000..39e8bc236
Binary files /dev/null and b/images/pumpio.png differ
diff --git a/images/tumblr.png b/images/tumblr.png
new file mode 100644
index 000000000..5c4e2e79d
Binary files /dev/null and b/images/tumblr.png differ
diff --git a/images/twitter.png b/images/twitter.png
new file mode 100644
index 000000000..513c59899
Binary files /dev/null and b/images/twitter.png differ
diff --git a/images/wordpress.png b/images/wordpress.png
new file mode 100644
index 000000000..da57a9a50
Binary files /dev/null and b/images/wordpress.png differ
diff --git a/include/nav.php b/include/nav.php
index d1d184650..108dbbf13 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -127,7 +127,9 @@ function nav_info(&$a) {
elseif(! get_config('system','no_community_page'))
$nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
- $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
+ $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
+
+ $nav['about'] = Array('friendica', t('Information'), "", t('Information about this friendica instance'));
/**
*
diff --git a/mod/settings.php b/mod/settings.php
index c85a3b33d..c86ca69bb 100644
--- a/mod/settings.php
+++ b/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);
- $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')));
+ 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,
diff --git a/view/global.css b/view/global.css
new file mode 100644
index 000000000..0191c7d7c
--- /dev/null
+++ b/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;
+}
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 1b01b71a0..6a1e71670 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -6,6 +6,7 @@
{{$h_imap}}
+ {{$h_imap}}