aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-04-13 00:10:13 +0200
committerMichael <icarus@dabo.de>2012-04-13 00:10:13 +0200
commit7384786d4417ddd051b7daa71c019d3c551efc68 (patch)
tree56bc56ca94ae5d11db0c3e2f67620b15527236ad
parent39405c8056b4a1d55c97fb2963d8776695dbeb30 (diff)
parente3af552bbfff2632bbcf2ce94c3e08ad4a5142d2 (diff)
downloadvolse-hubzilla-7384786d4417ddd051b7daa71c019d3c551efc68.tar.gz
volse-hubzilla-7384786d4417ddd051b7daa71c019d3c551efc68.tar.bz2
volse-hubzilla-7384786d4417ddd051b7daa71c019d3c551efc68.zip
Merge remote branch 'upstream/master'
-rw-r--r--boot.php50
-rw-r--r--database.sql1103
-rw-r--r--include/Contact.php21
-rwxr-xr-x[-rw-r--r--]include/dba.php460
-rw-r--r--include/items.php11
-rwxr-xr-xjs/main.js19
-rw-r--r--mod/install.php2
-rw-r--r--mod/settings.php91
-rw-r--r--update.php11
-rw-r--r--util/messages.po888
-rw-r--r--view/generic_links_widget.tpl11
-rw-r--r--view/settings.tpl2
-rw-r--r--view/settings_addons.tpl2
-rw-r--r--view/settings_connectors.tpl2
-rw-r--r--view/settings_display.tpl2
-rw-r--r--view/settings_oauth.tpl2
-rw-r--r--view/settings_oauth_edit.tpl2
-rw-r--r--view/theme/diabook-aerith/comment_item.tpl4
-rw-r--r--view/theme/diabook-aerith/generic_links_widget.tpl11
-rw-r--r--view/theme/diabook-aerith/icons/com_side.pngbin680 -> 774 bytes
-rw-r--r--view/theme/diabook-aerith/icons/events.pngbin663 -> 723 bytes
-rw-r--r--view/theme/diabook-aerith/icons/home.pngbin722 -> 706 bytes
-rw-r--r--view/theme/diabook-aerith/icons/mess_side.pngbin664 -> 637 bytes
-rw-r--r--view/theme/diabook-aerith/icons/notes.pngbin739 -> 764 bytes
-rw-r--r--view/theme/diabook-aerith/icons/pscontacts.pngbin710 -> 664 bytes
-rw-r--r--view/theme/diabook-aerith/icons/pubgroups.pngbin781 -> 688 bytes
-rw-r--r--view/theme/diabook-aerith/nets.tpl11
-rw-r--r--view/theme/diabook-aerith/profile_side.tpl14
-rwxr-xr-xview/theme/diabook-aerith/rs_common_tabs.tpl6
-rw-r--r--view/theme/diabook-aerith/style-network.css55
-rw-r--r--view/theme/diabook-aerith/style-settings.css2615
-rw-r--r--view/theme/diabook-aerith/style.css89
-rwxr-xr-xview/theme/diabook-aerith/theme.php54
-rw-r--r--view/theme/diabook-blue/comment_item.tpl4
-rw-r--r--view/theme/diabook-blue/generic_links_widget.tpl11
-rw-r--r--view/theme/diabook-blue/icons/com_side.pngbin680 -> 774 bytes
-rw-r--r--view/theme/diabook-blue/icons/events.pngbin663 -> 723 bytes
-rw-r--r--view/theme/diabook-blue/icons/home.pngbin722 -> 706 bytes
-rw-r--r--view/theme/diabook-blue/icons/mess_side.pngbin664 -> 637 bytes
-rw-r--r--view/theme/diabook-blue/icons/notes.pngbin739 -> 764 bytes
-rw-r--r--view/theme/diabook-blue/icons/pscontacts.pngbin710 -> 664 bytes
-rw-r--r--view/theme/diabook-blue/icons/pubgroups.pngbin781 -> 688 bytes
-rw-r--r--view/theme/diabook-blue/nets.tpl11
-rw-r--r--view/theme/diabook-blue/profile_side.tpl14
-rwxr-xr-xview/theme/diabook-blue/rs_common_tabs.tpl6
-rw-r--r--view/theme/diabook-blue/style-network.css53
-rw-r--r--view/theme/diabook-blue/style-settings.css2573
-rw-r--r--view/theme/diabook-blue/style.css88
-rwxr-xr-xview/theme/diabook-blue/theme.php55
-rw-r--r--view/theme/diabook-red/comment_item.tpl6
-rw-r--r--view/theme/diabook-red/generic_links_widget.tpl11
-rw-r--r--view/theme/diabook-red/icons/com_side.pngbin680 -> 774 bytes
-rw-r--r--view/theme/diabook-red/icons/events.pngbin663 -> 723 bytes
-rw-r--r--view/theme/diabook-red/icons/home.pngbin722 -> 706 bytes
-rw-r--r--view/theme/diabook-red/icons/mess_side.pngbin664 -> 637 bytes
-rw-r--r--view/theme/diabook-red/icons/notes.pngbin739 -> 764 bytes
-rw-r--r--view/theme/diabook-red/icons/pscontacts.pngbin710 -> 664 bytes
-rw-r--r--view/theme/diabook-red/icons/pubgroups.pngbin781 -> 688 bytes
-rw-r--r--view/theme/diabook-red/nets.tpl11
-rw-r--r--view/theme/diabook-red/profile_side.tpl14
-rwxr-xr-xview/theme/diabook-red/rs_common_tabs.tpl6
-rw-r--r--view/theme/diabook-red/style-network.css54
-rw-r--r--view/theme/diabook-red/style-settings.css2590
-rw-r--r--view/theme/diabook-red/style.css89
-rwxr-xr-xview/theme/diabook-red/theme.php57
-rw-r--r--view/theme/diabook/comment_item.tpl8
-rw-r--r--view/theme/diabook/generic_links_widget.tpl11
-rw-r--r--view/theme/diabook/icons/com_side.pngbin680 -> 774 bytes
-rw-r--r--view/theme/diabook/icons/events.pngbin663 -> 723 bytes
-rw-r--r--view/theme/diabook/icons/home.pngbin722 -> 706 bytes
-rw-r--r--view/theme/diabook/icons/mess_side.pngbin664 -> 637 bytes
-rw-r--r--view/theme/diabook/icons/notes.pngbin739 -> 764 bytes
-rw-r--r--view/theme/diabook/icons/pscontacts.pngbin710 -> 664 bytes
-rw-r--r--view/theme/diabook/icons/pubgroups.pngbin781 -> 688 bytes
-rw-r--r--view/theme/diabook/nets.tpl11
-rw-r--r--view/theme/diabook/profile_side.tpl14
-rwxr-xr-xview/theme/diabook/rs_common_tabs.tpl6
-rw-r--r--view/theme/diabook/style-network.css54
-rw-r--r--view/theme/diabook/style-profile.css32
-rw-r--r--view/theme/diabook/style-settings.css2529
-rw-r--r--view/theme/diabook/style.css100
-rwxr-xr-xview/theme/diabook/theme.php58
-rw-r--r--view/theme/dispy-dark/style.css6
-rw-r--r--view/theme/dispy/style.css6
-rw-r--r--view/theme/quattro/dark/style.css23
-rw-r--r--view/theme/quattro/generic_links_widget.tpl11
-rw-r--r--view/theme/quattro/green/style.css23
-rw-r--r--view/theme/quattro/icons.less1
-rw-r--r--view/theme/quattro/nav.tpl40
-rw-r--r--view/theme/quattro/quattro.less6
-rw-r--r--view/theme/quattro/style.php16
-rw-r--r--view/theme/quattro/theme.php20
92 files changed, 2089 insertions, 12077 deletions
diff --git a/boot.php b/boot.php
index abc749493..09aabf5d8 100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1308' );
+define ( 'FRIENDICA_VERSION', '2.3.1309' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1137 );
+define ( 'DB_UPDATE_VERSION', 1138 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -657,32 +657,32 @@ if(! function_exists('check_config')) {
// call the specific update
- global $db;
- $db->excep(TRUE);
- try {
- $db->beginTransaction();
+// global $db;
+// $db->excep(TRUE);
+// try {
+// $db->beginTransaction();
$func = 'update_' . $x;
$func($a);
- $db->commit();
- } catch(Exception $ex) {
- $db->rollback();
- //send the administrator an e-mail
- $email_tpl = get_intltext_template("update_fail_eml.tpl");
- $email_tpl = replace_macros($email_tpl, array(
- '$sitename' => $a->config['sitename'],
- '$siteurl' => $a->get_baseurl(),
- '$update' => $x,
- '$error' => $ex->getMessage()));
- $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+// $db->commit();
+// } catch(Exception $ex) {
+// $db->rollback();
+// //send the administrator an e-mail
+// $email_tpl = get_intltext_template("update_fail_eml.tpl");
+// $email_tpl = replace_macros($email_tpl, array(
+// '$sitename' => $a->config['sitename'],
+// '$siteurl' => $a->get_baseurl(),
+// '$update' => $x,
+// '$error' => $ex->getMessage()));
+// $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
- mail($a->config['admin_email'], $subject, $text,
- 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
- //try the logger
- logger('update failed: '.$ex->getMessage().EOL);
- }
- $db->excep(FALSE);
+// mail($a->config['admin_email'], $subject, $text,
+// 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+// . 'Content-type: text/plain; charset=UTF-8' . "\n"
+// . 'Content-transfer-encoding: 8bit' );
+// //try the logger
+// logger('update failed: '.$ex->getMessage().EOL);
+// }
+// $db->excep(FALSE);
}
}
set_config('system','build', DB_UPDATE_VERSION);
diff --git a/database.sql b/database.sql
index 010c63bb2..eadb53cc6 100644
--- a/database.sql
+++ b/database.sql
@@ -1,19 +1,77 @@
-- phpMyAdmin SQL Dump
--- version 2.11.9.4
+-- version 3.3.10.4
-- http://www.phpmyadmin.net
--
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `addon`
+--
+
+CREATE TABLE IF NOT EXISTS `addon` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` char(255) NOT NULL,
+ `version` char(255) NOT NULL,
+ `installed` tinyint(1) NOT NULL DEFAULT '0',
+ `timestamp` bigint(20) NOT NULL DEFAULT '0',
+ `plugin_admin` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `attach`
+--
+
+CREATE TABLE IF NOT EXISTS `attach` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `hash` char(64) NOT NULL,
+ `filename` char(255) NOT NULL,
+ `filetype` char(64) NOT NULL,
+ `filesize` int(11) NOT NULL,
+ `data` longblob NOT NULL,
+ `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `allow_cid` mediumtext NOT NULL,
+ `allow_gid` mediumtext NOT NULL,
+ `deny_cid` mediumtext NOT NULL,
+ `deny_gid` mediumtext NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+-- --------------------------------------------------------
--
+-- Table structure for table `auth_codes`
--
+CREATE TABLE IF NOT EXISTS `auth_codes` (
+ `id` varchar(40) NOT NULL,
+ `client_id` varchar(20) NOT NULL,
+ `redirect_uri` varchar(200) NOT NULL,
+ `expires` int(11) NOT NULL,
+ `scope` varchar(250) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `cache`
+--
+
+CREATE TABLE IF NOT EXISTS `cache` (
+ `k` char(255) NOT NULL,
+ `v` text NOT NULL,
+ `updated` datetime NOT NULL,
+ PRIMARY KEY (`k`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
-- --------------------------------------------------------
--
@@ -32,17 +90,36 @@ CREATE TABLE IF NOT EXISTS `challenge` (
-- --------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `config` (
- `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
- `k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
- `v` text NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `access`(`cat`,`k`)
+--
+-- Table structure for table `clients`
+--
+
+CREATE TABLE IF NOT EXISTS `clients` (
+ `client_id` varchar(20) NOT NULL,
+ `pw` varchar(20) NOT NULL,
+ `redirect_uri` varchar(200) NOT NULL,
+ `name` text,
+ `icon` text,
+ `uid` int(11) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`client_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
+--
+-- Table structure for table `config`
+--
+
+CREATE TABLE IF NOT EXISTS `config` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `cat` char(255) CHARACTER SET ascii NOT NULL,
+ `k` char(255) CHARACTER SET ascii NOT NULL,
+ `v` text NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `access` (`cat`,`k`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
--
-- Table structure for table `contact`
@@ -52,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL COMMENT 'owner uid',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `self` tinyint(1) NOT NULL DEFAULT '0',
+ `self` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'boolean 1 == info for local UID, primarily name and photo to use in item displays.',
`remote_self` tinyint(1) NOT NULL DEFAULT '0',
`rel` tinyint(1) NOT NULL DEFAULT '0',
`duplex` tinyint(1) NOT NULL DEFAULT '0',
@@ -60,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
`name` char(255) NOT NULL,
`nick` char(255) NOT NULL,
`attag` char(255) NOT NULL,
- `photo` text NOT NULL,
+ `photo` text NOT NULL COMMENT 'remote photo URL initially until approved',
`thumb` text NOT NULL,
`micro` text NOT NULL,
`site-pubkey` text NOT NULL,
@@ -96,32 +173,219 @@ CREATE TABLE IF NOT EXISTS `contact` (
`forum` tinyint(1) NOT NULL DEFAULT '0',
`hidden` tinyint(1) NOT NULL DEFAULT '0',
`pending` tinyint(1) NOT NULL DEFAULT '1',
- `rating` tinyint(1) NOT NULL DEFAULT '0',
- `reason` text NOT NULL,
+ `rating` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0-5 reputation, 0 unknown, 1 call police, 5 inscrutable',
+ `reason` text NOT NULL COMMENT 'why a rating was given - will help friends decide to make friends or not',
`closeness` tinyint(2) NOT NULL DEFAULT '99',
`info` mediumtext NOT NULL,
- `profile-id` int(11) NOT NULL DEFAULT '0',
- `bdyear` CHAR( 4 ) NOT NULL COMMENT 'birthday notify flag',
+ `profile-id` int(11) NOT NULL DEFAULT '0' COMMENT 'which profile to display - 0 is public default',
+ `bdyear` char(4) NOT NULL COMMENT 'birthday notify flag',
`bd` date NOT NULL,
PRIMARY KEY (`id`),
KEY `uid` (`uid`),
KEY `self` (`self`),
+ KEY `issued-id` (`issued-id`),
+ KEY `dfrn-id` (`dfrn-id`),
+ KEY `blocked` (`blocked`),
+ KEY `readonly` (`readonly`),
KEY `network` (`network`),
KEY `name` (`name`),
KEY `nick` (`nick`),
KEY `attag` (`attag`),
- KEY `url` (`url`),
- KEY `nurl` (`nurl`),
KEY `addr` (`addr`),
+ KEY `url` (`url`),
KEY `batch` (`batch`),
- KEY `issued-id` (`issued-id`),
- KEY `dfrn-id` (`dfrn-id`),
- KEY `blocked` (`blocked`),
- KEY `readonly` (`readonly`),
- KEY `forum` (`forum`),
- KEY `hidden` (`hidden`),
+ KEY `nurl` (`nurl`),
KEY `pending` (`pending`),
- KEY `closeness` (`closeness`)
+ KEY `hidden` (`hidden`),
+ KEY `forum` (`forum`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `conv`
+--
+
+CREATE TABLE IF NOT EXISTS `conv` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `guid` char(64) NOT NULL,
+ `recips` mediumtext NOT NULL,
+ `uid` int(11) NOT NULL,
+ `creator` char(255) NOT NULL,
+ `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `subject` mediumtext NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `created` (`created`),
+ KEY `updated` (`updated`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `deliverq`
+--
+
+CREATE TABLE IF NOT EXISTS `deliverq` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `cmd` char(32) NOT NULL,
+ `item` int(11) NOT NULL,
+ `contact` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `event`
+--
+
+CREATE TABLE IF NOT EXISTS `event` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `cid` int(11) NOT NULL,
+ `uri` char(255) NOT NULL,
+ `created` datetime NOT NULL,
+ `edited` datetime NOT NULL,
+ `start` datetime NOT NULL,
+ `finish` datetime NOT NULL,
+ `desc` text NOT NULL,
+ `location` text NOT NULL,
+ `type` char(255) NOT NULL,
+ `nofinish` tinyint(1) NOT NULL DEFAULT '0',
+ `adjust` tinyint(1) NOT NULL DEFAULT '1',
+ `allow_cid` mediumtext NOT NULL,
+ `allow_gid` mediumtext NOT NULL,
+ `deny_cid` mediumtext NOT NULL,
+ `deny_gid` mediumtext NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fcontact`
+--
+
+CREATE TABLE IF NOT EXISTS `fcontact` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `url` char(255) NOT NULL,
+ `name` char(255) NOT NULL,
+ `photo` char(255) NOT NULL,
+ `request` char(255) NOT NULL,
+ `nick` char(255) NOT NULL,
+ `addr` char(255) NOT NULL,
+ `batch` char(255) NOT NULL,
+ `notify` char(255) NOT NULL,
+ `poll` char(255) NOT NULL,
+ `confirm` char(255) NOT NULL,
+ `priority` tinyint(1) NOT NULL,
+ `network` char(32) NOT NULL,
+ `alias` char(255) NOT NULL,
+ `pubkey` text NOT NULL,
+ `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`),
+ KEY `addr` (`addr`),
+ KEY `network` (`network`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ffinder`
+--
+
+CREATE TABLE IF NOT EXISTS `ffinder` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `uid` int(10) unsigned NOT NULL,
+ `cid` int(10) unsigned NOT NULL,
+ `fid` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fserver`
+--
+
+CREATE TABLE IF NOT EXISTS `fserver` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `server` char(255) NOT NULL,
+ `posturl` char(255) NOT NULL,
+ `key` text NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `server` (`server`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fsuggest`
+--
+
+CREATE TABLE IF NOT EXISTS `fsuggest` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `cid` int(11) NOT NULL,
+ `name` char(255) NOT NULL,
+ `url` char(255) NOT NULL,
+ `request` char(255) NOT NULL,
+ `photo` char(255) NOT NULL,
+ `note` text NOT NULL,
+ `created` datetime NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `gcign`
+--
+
+CREATE TABLE IF NOT EXISTS `gcign` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `gcid` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `uid` (`uid`),
+ KEY `gcid` (`gcid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `gcontact`
+--
+
+CREATE TABLE IF NOT EXISTS `gcontact` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` char(255) NOT NULL,
+ `url` char(255) NOT NULL,
+ `nurl` char(255) NOT NULL,
+ `photo` char(255) NOT NULL,
+ `connect` char(255) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `nurl` (`nurl`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `glink`
+--
+
+CREATE TABLE IF NOT EXISTS `glink` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `cid` int(11) NOT NULL,
+ `uid` int(11) NOT NULL,
+ `gcid` int(11) NOT NULL,
+ `updated` datetime NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `cid` (`cid`),
+ KEY `uid` (`uid`),
+ KEY `gcid` (`gcid`),
+ KEY `updated` (`updated`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
@@ -156,6 +420,33 @@ CREATE TABLE IF NOT EXISTS `group_member` (
-- --------------------------------------------------------
--
+-- Table structure for table `guid`
+--
+
+CREATE TABLE IF NOT EXISTS `guid` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `guid` char(64) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `guid` (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `hook`
+--
+
+CREATE TABLE IF NOT EXISTS `hook` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `hook` char(255) NOT NULL,
+ `file` char(255) NOT NULL,
+ `function` char(255) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `intro`
--
@@ -183,18 +474,18 @@ CREATE TABLE IF NOT EXISTS `intro` (
CREATE TABLE IF NOT EXISTS `item` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`guid` char(64) NOT NULL,
- `uri` char(255) NOT NULL,
+ `uri` char(255) CHARACTER SET ascii NOT NULL,
`uid` int(10) unsigned NOT NULL DEFAULT '0',
`contact-id` int(10) unsigned NOT NULL DEFAULT '0',
`type` char(255) NOT NULL,
`wall` tinyint(1) NOT NULL DEFAULT '0',
`gravity` tinyint(1) NOT NULL DEFAULT '0',
`parent` int(10) unsigned NOT NULL DEFAULT '0',
- `parent-uri` char(255) NOT NULL,
+ `parent-uri` char(255) CHARACTER SET ascii NOT NULL,
`extid` char(255) NOT NULL,
`thr-parent` char(255) NOT NULL,
- `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `created` datetime NOT NULL,
+ `edited` datetime NOT NULL,
`commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -213,9 +504,9 @@ CREATE TABLE IF NOT EXISTS `item` (
`target-type` char(255) NOT NULL,
`target` text NOT NULL,
`postopts` text NOT NULL,
- `plink` char(255) NOT NULL,
+ `plink` char(255) NOT NULL,
`resource-id` char(255) NOT NULL,
- `event-id` int(10) unsigned NOT NULL,
+ `event-id` int(11) NOT NULL,
`tag` mediumtext NOT NULL,
`attach` mediumtext NOT NULL,
`inform` mediumtext NOT NULL,
@@ -239,43 +530,60 @@ CREATE TABLE IF NOT EXISTS `item` (
`forum_mode` tinyint(1) NOT NULL DEFAULT '0',
`last-child` tinyint(1) unsigned NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
- KEY `guid` (`guid`),
KEY `uri` (`uri`),
KEY `uid` (`uid`),
KEY `contact-id` (`contact-id`),
KEY `type` (`type`),
KEY `parent` (`parent`),
KEY `parent-uri` (`parent-uri`),
- KEY `extid` (`extid`),
KEY `created` (`created`),
KEY `edited` (`edited`),
- KEY `received` (`received`),
- KEY `moderated` (`moderated`),
KEY `visible` (`visible`),
- KEY `spam` (`spam`),
- KEY `starred` (`starred`),
- KEY `bookmark` (`bookmark`),
KEY `deleted` (`deleted`),
- KEY `origin` (`origin`),
- KEY `forum_mode` (`forum_mode`),
KEY `last-child` (`last-child`),
KEY `unseen` (`unseen`),
+ KEY `extid` (`extid`),
+ KEY `received` (`received`),
+ KEY `starred` (`starred`),
+ KEY `guid` (`guid`),
+ KEY `origin` (`origin`),
KEY `wall` (`wall`),
- KEY `author-name` (`author-name`),
+ KEY `forum_mode` (`forum_mode`),
KEY `author-link` (`author-link`),
+ KEY `bookmark` (`bookmark`),
+ KEY `moderated` (`moderated`),
+ KEY `spam` (`spam`),
+ KEY `author-name` (`author-name`),
FULLTEXT KEY `title` (`title`),
FULLTEXT KEY `body` (`body`),
- FULLTEXT KEY `tag` (`tag`),
- FULLTEXT KEY `file` (`file`),
FULLTEXT KEY `allow_cid` (`allow_cid`),
FULLTEXT KEY `allow_gid` (`allow_gid`),
FULLTEXT KEY `deny_cid` (`deny_cid`),
- FULLTEXT KEY `deny_gid` (`deny_gid`)
+ FULLTEXT KEY `deny_gid` (`deny_gid`),
+ FULLTEXT KEY `tag` (`tag`),
+ FULLTEXT KEY `file` (`file`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
+-- Table structure for table `item_id`
+--
+
+CREATE TABLE IF NOT EXISTS `item_id` (
+ `iid` int(11) NOT NULL,
+ `uid` int(11) NOT NULL,
+ `sid` char(255) NOT NULL,
+ `service` char(255) NOT NULL,
+ PRIMARY KEY (`iid`),
+ KEY `uid` (`uid`),
+ KEY `sid` (`sid`),
+ KEY `service` (`service`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `mail`
--
@@ -287,26 +595,130 @@ CREATE TABLE IF NOT EXISTS `mail` (
`from-photo` char(255) NOT NULL,
`from-url` char(255) NOT NULL,
`contact-id` char(255) NOT NULL,
- `convid` int(10) unsigned NOT NULL,
+ `convid` int(11) NOT NULL,
`title` char(255) NOT NULL,
`body` mediumtext NOT NULL,
- `seen` tinyint(1) NOT NULL DEFAULT '0',
+ `seen` tinyint(1) NOT NULL,
`reply` tinyint(1) NOT NULL DEFAULT '0',
- `replied` tinyint(1) NOT NULL DEFAULT '0',
+ `replied` tinyint(1) NOT NULL,
`unknown` tinyint(1) NOT NULL DEFAULT '0',
`uri` char(255) NOT NULL,
`parent-uri` char(255) NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`),
+ KEY `reply` (`reply`),
KEY `uid` (`uid`),
KEY `guid` (`guid`),
- KEY `convid` (`convid`),
- KEY `reply` (`reply`),
- KEY `unknown` (`unknown`),
+ KEY `seen` (`seen`),
KEY `uri` (`uri`),
KEY `parent-uri` (`parent-uri`),
- KEY `created` (`created`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ KEY `created` (`created`),
+ KEY `convid` (`convid`),
+ KEY `unknown` (`unknown`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `mailacct`
+--
+
+CREATE TABLE IF NOT EXISTS `mailacct` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `server` char(255) NOT NULL,
+ `port` int(11) NOT NULL,
+ `ssltype` char(16) NOT NULL,
+ `mailbox` char(255) NOT NULL,
+ `user` char(255) NOT NULL,
+ `pass` text NOT NULL,
+ `action` int(11) NOT NULL,
+ `movetofolder` char(255) NOT NULL,
+ `reply_to` char(255) NOT NULL,
+ `pubmail` tinyint(1) NOT NULL DEFAULT '0',
+ `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `manage`
+--
+
+CREATE TABLE IF NOT EXISTS `manage` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `mid` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `uid` (`uid`),
+ KEY `mid` (`mid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `notify`
+--
+
+CREATE TABLE IF NOT EXISTS `notify` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `hash` char(64) NOT NULL,
+ `name` char(255) NOT NULL,
+ `url` char(255) NOT NULL,
+ `photo` char(255) NOT NULL,
+ `date` datetime NOT NULL,
+ `msg` mediumtext NOT NULL,
+ `uid` int(11) NOT NULL,
+ `link` char(255) NOT NULL,
+ `parent` int(11) NOT NULL,
+ `seen` tinyint(1) NOT NULL DEFAULT '0',
+ `type` int(11) NOT NULL,
+ `verb` char(255) NOT NULL,
+ `otype` char(16) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `type` (`type`),
+ KEY `seen` (`seen`),
+ KEY `uid` (`uid`),
+ KEY `date` (`date`),
+ KEY `hash` (`hash`),
+ KEY `parent` (`parent`),
+ KEY `link` (`link`),
+ KEY `otype` (`otype`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `notify-threads`
+--
+
+CREATE TABLE IF NOT EXISTS `notify-threads` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `notify-id` int(11) NOT NULL,
+ `master-parent-item` int(10) unsigned NOT NULL DEFAULT '0',
+ `parent-item` int(10) unsigned NOT NULL DEFAULT '0',
+ `receiver-uid` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `master-parent-item` (`master-parent-item`),
+ KEY `receiver-uid` (`receiver-uid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `pconfig` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL DEFAULT '0',
+ `cat` char(255) CHARACTER SET ascii NOT NULL,
+ `k` char(255) CHARACTER SET ascii NOT NULL,
+ `v` mediumtext NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `access` (`uid`,`cat`,`k`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
@@ -317,8 +729,8 @@ CREATE TABLE IF NOT EXISTS `mail` (
CREATE TABLE IF NOT EXISTS `photo` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(10) unsigned NOT NULL,
- `contact-id` int(10) unsigned NOT NULL,
- `guid` char(64) NOT NULL,
+ `contact-id` int(10) unsigned NOT NULL DEFAULT '0',
+ `guid` char(64) NOT NULL,
`resource-id` char(255) NOT NULL,
`created` datetime NOT NULL,
`edited` datetime NOT NULL,
@@ -340,13 +752,50 @@ CREATE TABLE IF NOT EXISTS `photo` (
KEY `resource-id` (`resource-id`),
KEY `album` (`album`),
KEY `scale` (`scale`),
- KEY `profile` (`profile`),
- KEY `guid` (`guid`)
+ KEY `profile` (`profile`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
+-- Table structure for table `poll`
+--
+
+CREATE TABLE IF NOT EXISTS `poll` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `q0` mediumtext NOT NULL,
+ `q1` mediumtext NOT NULL,
+ `q2` mediumtext NOT NULL,
+ `q3` mediumtext NOT NULL,
+ `q4` mediumtext NOT NULL,
+ `q5` mediumtext NOT NULL,
+ `q6` mediumtext NOT NULL,
+ `q7` mediumtext NOT NULL,
+ `q8` mediumtext NOT NULL,
+ `q9` mediumtext NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `uid` (`uid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `poll_result`
+--
+
+CREATE TABLE IF NOT EXISTS `poll_result` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `poll_id` int(11) NOT NULL,
+ `choice` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `poll_id` (`poll_id`),
+ KEY `choice` (`choice`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `profile`
--
@@ -366,7 +815,6 @@ CREATE TABLE IF NOT EXISTS `profile` (
`country-name` char(255) NOT NULL,
`gender` char(32) NOT NULL,
`marital` char(255) NOT NULL,
- `showwith` tinyint(1) NOT NULL DEFAULT '0',
`with` text NOT NULL,
`sexual` char(255) NOT NULL,
`politic` char(255) NOT NULL,
@@ -403,7 +851,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
CREATE TABLE IF NOT EXISTS `profile_check` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(10) unsigned NOT NULL,
- `cid` int(10) unsigned NOT NULL,
+ `cid` int(10) unsigned NOT NULL DEFAULT '0',
`dfrn_id` char(255) NOT NULL,
`sec` char(255) NOT NULL,
`expire` int(11) NOT NULL,
@@ -413,6 +861,59 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
-- --------------------------------------------------------
--
+-- Table structure for table `queue`
+--
+
+CREATE TABLE IF NOT EXISTS `queue` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `cid` int(11) NOT NULL,
+ `network` char(32) NOT NULL,
+ `created` datetime NOT NULL,
+ `last` datetime NOT NULL,
+ `content` mediumtext NOT NULL,
+ `batch` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `cid` (`cid`),
+ KEY `network` (`network`),
+ KEY `created` (`created`),
+ KEY `last` (`last`),
+ KEY `batch` (`batch`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `register`
+--
+
+CREATE TABLE IF NOT EXISTS `register` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `hash` char(255) NOT NULL,
+ `created` datetime NOT NULL,
+ `uid` int(10) unsigned NOT NULL,
+ `password` char(255) NOT NULL,
+ `language` char(16) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `search`
+--
+
+CREATE TABLE IF NOT EXISTS `search` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `term` char(255) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `uid` (`uid`),
+ KEY `term` (`term`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `session`
--
@@ -429,6 +930,58 @@ CREATE TABLE IF NOT EXISTS `session` (
-- --------------------------------------------------------
--
+-- Table structure for table `sign`
+--
+
+CREATE TABLE IF NOT EXISTS `sign` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `iid` int(10) unsigned NOT NULL,
+ `signed_text` mediumtext NOT NULL,
+ `signature` text NOT NULL,
+ `signer` char(255) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `iid` (`iid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `spam`
+--
+
+CREATE TABLE IF NOT EXISTS `spam` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `uid` int(11) NOT NULL,
+ `spam` int(11) NOT NULL DEFAULT '0',
+ `ham` int(11) NOT NULL DEFAULT '0',
+ `term` char(255) NOT NULL,
+ `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`),
+ KEY `uid` (`uid`),
+ KEY `spam` (`spam`),
+ KEY `ham` (`ham`),
+ KEY `term` (`term`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `tokens`
+--
+
+CREATE TABLE IF NOT EXISTS `tokens` (
+ `id` varchar(40) NOT NULL,
+ `secret` text NOT NULL,
+ `client_id` varchar(20) NOT NULL,
+ `expires` int(11) NOT NULL,
+ `scope` varchar(200) NOT NULL,
+ `uid` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `user`
--
@@ -441,7 +994,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`email` char(255) NOT NULL,
`openid` char(255) NOT NULL,
`timezone` char(128) NOT NULL,
- `language` char(32) NOT NULL DEFAULT 'en',
+ `language` char(16) NOT NULL DEFAULT 'en',
`register_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`login_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`default-location` char(255) NOT NULL,
@@ -451,427 +1004,47 @@ CREATE TABLE IF NOT EXISTS `user` (
`prvkey` text NOT NULL,
`spubkey` text NOT NULL,
`sprvkey` text NOT NULL,
- `verified` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `unkmail` tinyint(1) unsigned NOT NULL DEFAULT '0',
- `cntunkmail` int(11) unsigned NOT NULL DEFAULT '10',
- `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535',
- `page-flags` int(11) unsigned NOT NULL DEFAULT '0',
+ `verified` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `blockwall` tinyint(1) NOT NULL DEFAULT '0',
+ `hidewall` tinyint(1) NOT NULL DEFAULT '0',
+ `blocktags` tinyint(1) NOT NULL DEFAULT '0',
+ `unkmail` tinyint(1) NOT NULL DEFAULT '0',
+ `cntunkmail` int(11) NOT NULL DEFAULT '10',
+ `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535',
+ `page-flags` int(11) NOT NULL DEFAULT '0',
`prvnets` tinyint(1) NOT NULL DEFAULT '0',
`pwdreset` char(255) NOT NULL,
`maxreq` int(11) NOT NULL DEFAULT '10',
- `expire` int(11) unsigned NOT NULL DEFAULT '0',
- `account_expired` tinyint( 1 ) NOT NULL DEFAULT '0',
+ `expire` int(10) unsigned NOT NULL DEFAULT '0',
+ `account_expired` tinyint(1) NOT NULL DEFAULT '0',
`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `allow_cid` mediumtext NOT NULL,
+ `allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
+ `deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
`openidserver` text NOT NULL,
- PRIMARY KEY (`uid`),
+ PRIMARY KEY (`uid`),
KEY `nickname` (`nickname`),
+ KEY `login_date` (`login_date`),
KEY `account_expired` (`account_expired`),
KEY `hidewall` (`hidewall`),
KEY `blockwall` (`blockwall`),
- KEY `unkmail` (`unkmail`),
- KEY `cntunkmail` (`cntunkmail`),
KEY `blocked` (`blocked`),
KEY `verified` (`verified`),
- KEY `login_date` (`login_date`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `register` (
- `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
- `hash` CHAR( 255 ) NOT NULL ,
- `created` DATETIME NOT NULL ,
- `uid` INT(11) UNSIGNED NOT NULL,
- `password` CHAR(255) NOT NULL,
- `language` CHAR(16) NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `clients` (
-`client_id` VARCHAR( 20 ) NOT NULL ,
-`pw` VARCHAR( 20 ) NOT NULL ,
-`redirect_uri` VARCHAR( 200 ) NOT NULL ,
-`name` VARCHAR( 128 ) NULL DEFAULT NULL,
-`icon` VARCHAR( 255 ) NULL DEFAULT NULL,
-`uid` INT NOT NULL DEFAULT 0,
-PRIMARY KEY ( `client_id` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `tokens` (
-`id` VARCHAR( 40 ) NOT NULL ,
-`secret` VARCHAR( 40 ) NOT NULL ,
-`client_id` VARCHAR( 20 ) NOT NULL ,
-`expires` INT NOT NULL ,
-`scope` VARCHAR( 200 ) NOT NULL ,
-`uid` INT NOT NULL ,
-PRIMARY KEY ( `id` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `auth_codes` (
-`id` VARCHAR( 40 ) NOT NULL ,
-`client_id` VARCHAR( 20 ) NOT NULL ,
-`redirect_uri` VARCHAR( 200 ) NOT NULL ,
-`expires` INT NOT NULL ,
-`scope` VARCHAR( 250 ) NOT NULL ,
-PRIMARY KEY ( `id` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `queue` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`cid` INT NOT NULL ,
-`network` CHAR( 32 ) NOT NULL,
-`created` DATETIME NOT NULL ,
-`last` DATETIME NOT NULL ,
-`content` MEDIUMTEXT NOT NULL,
-`batch` TINYINT( 1 ) NOT NULL DEFAULT '0',
-INDEX ( `cid` ),
-INDEX ( `created` ),
-INDEX ( `last` ),
-INDEX ( `network` ),
-INDEX ( `batch` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `pconfig` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL DEFAULT '0',
-`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
-`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
-`v` MEDIUMTEXT NOT NULL,
-UNIQUE KEY `access`(`cat`, `k`)
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `hook` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`hook` CHAR( 255 ) NOT NULL ,
-`file` CHAR( 255 ) NOT NULL ,
-`function` CHAR( 255 ) NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `addon` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`name` CHAR( 255 ) NOT NULL ,
-`version` CHAR( 255 ) NOT NULL ,
-`installed` TINYINT( 1 ) NOT NULL DEFAULT '0' ,
-`timestamp` BIGINT NOT NULL DEFAULT '0' ,
-`plugin_admin` TINYINT( 1 ) NOT NULL DEFAULT '0'
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `event` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`cid` INT NOT NULL ,
-`uri` CHAR( 255 ) NOT NULL,
-`created` DATETIME NOT NULL ,
-`edited` DATETIME NOT NULL ,
-`start` DATETIME NOT NULL ,
-`finish` DATETIME NOT NULL ,
-`desc` TEXT NOT NULL ,
-`location` TEXT NOT NULL ,
-`type` CHAR( 255 ) NOT NULL ,
-`nofinish` TINYINT( 1 ) NOT NULL DEFAULT '0',
-`adjust` TINYINT( 1 ) NOT NULL DEFAULT '1',
-`allow_cid` MEDIUMTEXT NOT NULL ,
-`allow_gid` MEDIUMTEXT NOT NULL ,
-`deny_cid` MEDIUMTEXT NOT NULL ,
-`deny_gid` MEDIUMTEXT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `cache` (
- `k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
- `v` TEXT NOT NULL,
- `updated` DATETIME NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `fcontact` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`url` CHAR( 255 ) NOT NULL ,
-`name` CHAR( 255 ) NOT NULL ,
-`photo` CHAR( 255 ) NOT NULL ,
-`request` CHAR( 255 ) NOT NULL,
-`nick` CHAR( 255 ) NOT NULL ,
-`addr` CHAR( 255 ) NOT NULL ,
-`batch` CHAR( 255) NOT NULL,
-`notify` CHAR( 255 ) NOT NULL ,
-`poll` CHAR( 255 ) NOT NULL ,
-`confirm` CHAR( 255 ) NOT NULL ,
-`priority` TINYINT( 1 ) NOT NULL ,
-`network` CHAR( 32 ) NOT NULL ,
-`alias` CHAR( 255 ) NOT NULL ,
-`pubkey` TEXT NOT NULL ,
-`updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-INDEX ( `addr` ),
-INDEX ( `network` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `ffinder` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT UNSIGNED NOT NULL ,
-`cid` INT UNSIGNED NOT NULL ,
-`fid` INT UNSIGNED NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `fsuggest` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`cid` INT NOT NULL ,
-`name` CHAR( 255 ) NOT NULL ,
-`url` CHAR( 255 ) NOT NULL ,
-`request` CHAR( 255 ) NOT NULL,
-`photo` CHAR( 255 ) NOT NULL ,
-`note` TEXT NOT NULL ,
-`created` DATETIME NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `mailacct` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL,
-`server` CHAR( 255 ) NOT NULL ,
-`port` INT NOT NULL,
-`ssltype` CHAR( 16 ) NOT NULL,
-`mailbox` CHAR( 255 ) NOT NULL,
-`user` CHAR( 255 ) NOT NULL ,
-`pass` TEXT NOT NULL ,
-`reply_to` CHAR( 255 ) NOT NULL ,
-`action` INT NOT NULL ,
-`movetofolder` CHAR(255) NOT NULL ,
-`pubmail` TINYINT(1) NOT NULL DEFAULT '0',
-`last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `attach` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`hash` CHAR(64) NOT NULL,
-`filename` CHAR(255) NOT NULL,
-`filetype` CHAR( 64 ) NOT NULL ,
-`filesize` INT NOT NULL ,
-`data` LONGBLOB NOT NULL ,
-`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-`edited` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-`allow_cid` MEDIUMTEXT NOT NULL ,
-`allow_gid` MEDIUMTEXT NOT NULL ,
-`deny_cid` MEDIUMTEXT NOT NULL ,
-`deny_gid` MEDIUMTEXT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `guid` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`guid` CHAR( 64 ) NOT NULL ,
-INDEX ( `guid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `sign` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`iid` INT UNSIGNED NOT NULL ,
-`signed_text` MEDIUMTEXT NOT NULL ,
-`signature` TEXT NOT NULL ,
-`signer` CHAR( 255 ) NOT NULL ,
-INDEX ( `iid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `deliverq` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`cmd` CHAR( 32 ) NOT NULL ,
-`item` INT NOT NULL ,
-`contact` INT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `search` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`term` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-INDEX ( `uid` ),
-INDEX ( `term` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `fserver` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`server` CHAR( 255 ) NOT NULL ,
-`posturl` CHAR( 255 ) NOT NULL ,
-`key` TEXT NOT NULL,
-INDEX ( `server` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `gcontact` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`name` CHAR( 255 ) NOT NULL ,
-`url` CHAR( 255 ) NOT NULL ,
-`nurl` CHAR( 255 ) NOT NULL ,
-`photo` CHAR( 255 ) NOT NULL,
-`connect` CHAR( 255 ) NOT NULL,
-INDEX ( `nurl` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `glink` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`cid` INT NOT NULL ,
-`uid` INT NOT NULL ,
-`gcid` INT NOT NULL,
-`updated` DATETIME NOT NULL,
-INDEX ( `cid` ),
-INDEX ( `uid` ),
-INDEX ( `gcid` ),
-INDEX ( `updated` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `gcign` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`gcid` INT NOT NULL,
-INDEX ( `uid` ),
-INDEX ( `gcid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `conv` (
- `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
- `guid` CHAR( 64 ) NOT NULL ,
- `recips` MEDIUMTEXT NOT NULL ,
- `uid` INT NOT NULL,
- `creator` CHAR( 255 ) NOT NULL ,
- `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
- `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
- `subject` MEDIUMTEXT NOT NULL,
- INDEX ( `created` ),
- INDEX ( `updated` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `notify` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`hash` CHAR( 64 ) NOT NULL,
-`type` INT( 11 ) NOT NULL ,
-`name` CHAR( 255 ) NOT NULL ,
-`url` CHAR( 255 ) NOT NULL ,
-`photo` CHAR( 255 ) NOT NULL ,
-`date` DATETIME NOT NULL ,
-`msg` MEDIUMTEXT NOT NULL ,
-`uid` INT NOT NULL ,
-`link` CHAR( 255 ) NOT NULL ,
-`parent` INT( 11 ) NOT NULL,
-`seen` TINYINT( 1 ) NOT NULL DEFAULT '0',
-`verb` CHAR( 255 ) NOT NULL,
-`otype` CHAR( 16 ) NOT NULL,
-INDEX ( `hash` ),
-INDEX ( `type` ),
-INDEX ( `uid` ),
-INDEX ( `link` ),
-INDEX ( `parent` ),
-INDEX ( `seen` ),
-INDEX ( `date` ),
-INDEX ( `otype` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `item_id` (
-`iid` INT NOT NULL ,
-`uid` INT NOT NULL ,
-`face` CHAR( 255 ) NOT NULL ,
-`dspr` CHAR( 255 ) NOT NULL ,
-`twit` CHAR( 255 ) NOT NULL ,
-`stat` CHAR( 255 ) NOT NULL ,
-PRIMARY KEY ( `iid` ),
-INDEX ( `uid` ),
-INDEX ( `face` ),
-INDEX ( `dspr` ),
-INDEX ( `twit` ),
-INDEX ( `stat` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `manage` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`mid` INT NOT NULL,
-INDEX ( `uid` ),
-INDEX ( `mid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `poll_result` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`poll_id` INT NOT NULL ,
-`choice` INT NOT NULL ,
-INDEX ( `poll_id` ),
-INDEX ( `choice` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `poll` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`q0` MEDIUMTEXT NOT NULL ,
-`q1` MEDIUMTEXT NOT NULL ,
-`q2` MEDIUMTEXT NOT NULL ,
-`q3` MEDIUMTEXT NOT NULL ,
-`q4` MEDIUMTEXT NOT NULL ,
-`q5` MEDIUMTEXT NOT NULL ,
-`q6` MEDIUMTEXT NOT NULL ,
-`q7` MEDIUMTEXT NOT NULL ,
-`q8` MEDIUMTEXT NOT NULL ,
-`q9` MEDIUMTEXT NOT NULL ,
-INDEX ( `uid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+ KEY `unkmail` (`unkmail`),
+ KEY `cntunkmail` (`cntunkmail`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- --------------------------------------------------------
--
--- Table structure for table `notify-threads`
---
--- notify-id: notify.id of the first notification of this thread
--- master-parent-item: item.id of the parent item
--- parent-item: item.id of the imediate parent (only for multi-thread)
--- not used yet.
--- receiver-uid: user.uid of the receiver of this notification.
+-- Table structure for table `userd`
--
--- If we query for a master-parent-item and receiver-uid...
--- * Returns 1 item: this is not the parent notification,
--- so just "follow" the thread (references to this notification)
--- * Returns no item: this is the first notification related to
--- this parent item. So, create the record and use the message-id
--- header.
-
-
-CREATE TABLE IF NOT EXISTS `notify-threads` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`notify-id` INT NOT NULL,
-`master-parent-item` INT( 10 ) unsigned NOT NULL DEFAULT '0',
-`parent-item` INT( 10 ) unsigned NOT NULL DEFAULT '0',
-`receiver-uid` INT NOT NULL,
-INDEX ( `master-parent-item` ),
-INDEX ( `receiver-uid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `spam` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL,
-`spam` INT NOT NULL DEFAULT '0',
-`ham` INT NOT NULL DEFAULT '0',
-`term` CHAR(255) NOT NULL,
-`date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-INDEX ( `uid` ),
-INDEX ( `spam` ),
-INDEX ( `ham` ),
-INDEX ( `term` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
CREATE TABLE IF NOT EXISTS `userd` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`username` CHAR( 255 ) NOT NULL,
-INDEX ( `username` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `username` char(255) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/include/Contact.php b/include/Contact.php
index 532ea2f95..8d893cf70 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -23,16 +23,24 @@ function user_remove($uid) {
);
q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `intro` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `event` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `item` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `item_id` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `mailacct` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `manage` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `notify` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `attach` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `search` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
if($uid == local_user()) {
unset($_SESSION['authenticated']);
@@ -165,4 +173,15 @@ function random_profile() {
if(count($r))
return dirname($r[0]['url']);
return '';
-} \ No newline at end of file
+}
+
+
+function contacts_not_grouped($uid) {
+ $r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ",
+ intval($uid),
+ intval($uid)
+ );
+
+ return $r;
+}
+
diff --git a/include/dba.php b/include/dba.php
index 1421a703d..76cc0bc7b 100644..100755
--- a/include/dba.php
+++ b/include/dba.php
@@ -8,273 +8,189 @@ require_once('include/datetime.php');
*
* For debugging, insert 'dbg(1);' anywhere in the program flow.
* dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
- * When logging, all binary info is converted to
- * text and html entities are escaped so that
- * the debugging stream is safe to view
- * within both terminals and web pages.
+ * When logging, all binary info is converted to text and html entities are escaped so that
+ * the debugging stream is safe to view within both terminals and web pages.
*
*/
-
-if(! class_exists('dba')) {
-
- class dba {
-
- private $debug = 0;
- private $db;
- private $exceptions;
+
+if(! class_exists('dba')) {
+class dba {
+
+ private $debug = 0;
+ private $db;
+ public $mysqli = true;
+ public $connected = false;
+ public $error = false;
+
+ function __construct($server,$user,$pass,$db,$install = false) {
+
+ $server = trim($server);
+ $user = trim($user);
+ $pass = trim($pass);
+ $db = trim($db);
+
+ if (!(strlen($server) && strlen($user))){
+ $this->connected = false;
+ $this->db = null;
+ return;
+ }
- public $mysqli = true;
- public $connected = false;
- public $error = false;
-
- function __construct($server,$user,$pass,$db,$install = false) {
-
- $server = trim($server);
- $user = trim($user);
- $pass = trim($pass);
- $db = trim($db);
-
- //we need both, server and username, so fail if one is missing
- if (!(strlen($server) && strlen($user))){
- $this->connected = false;
- $this->db = null;
- throw new InvalidArgumentException(t("Server name of user name are missing. "));
- }
-
- //when we are installing
- if($install) {
- if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
- if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
- $this->connected = false;
- $this->db = null;
- throw new InvalidArgumentException( t('Cannot locate DNS info for database server \'%s\''), $server);
- }
+ if($install) {
+ if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
+ if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
+ $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
+ $this->connected = false;
+ $this->db = null;
+ return;
}
}
+ }
- if(class_exists('mysqli')) {
- $this->db = new mysqli($server,$user,$pass,$db);
- if(NULL === $this->db->connect_error) {
- $this->connected = true;
- } else {
- throw new RuntimeException($this->db->connect_error);
- }
- } else {
- $this->mysqli = false;
- $this->db = mysql_connect($server,$user,$pass);
- if($this->db && mysql_select_db($db,$this->db)) {
- $this->connected = true;
- } else {
- throw new RuntimeException(mysql_error());
- }
+ if(class_exists('mysqli')) {
+ $this->db = @new mysqli($server,$user,$pass,$db);
+ if(! mysqli_connect_errno()) {
+ $this->connected = true;
}
}
-
- public function excep($excep) {
- $this->exceptions=$excep;
+ else {
+ $this->mysqli = false;
+ $this->db = mysql_connect($server,$user,$pass);
+ if($this->db && mysql_select_db($db,$this->db)) {
+ $this->connected = true;
+ }
}
-
- public function getdb() {
- return $this->db;
+ if(! $this->connected) {
+ $this->db = null;
+ if(! $install)
+ system_unavailable();
}
+ }
- public function q($sql) {
-
- if((! $this->db) || (! $this->connected)) {
- $this->throwOrLog(new RuntimeException(t("There is no db connection. ")));
- return;
- }
-
- if($this->mysqli) {
- $result = $this->db->query($sql);
- } else {
- $result = mysql_query($sql,$this->db);
- }
+ public function getdb() {
+ return $this->db;
+ }
- //on debug mode or fail, the query is written to the log.
- //this won't work if logger can not read it's logging level
- //from the db.
- if($this->debug || FALSE === $result) {
-
- $mesg = '';
-
- if($result === false) {
- $mesg = 'false '.$this->error();
- } elseif($result === true) {
- $mesg = 'true';
- } else {
- if($this->mysqli) {
- $mesg = $result->num_rows . t(' results') . EOL;
- } else {
- $mesg = mysql_num_rows($result) . t(' results') . EOL;
- }
- }
+ public function q($sql) {
+
+ if((! $this->db) || (! $this->connected))
+ return false;
+
+ if($this->mysqli)
+ $result = @$this->db->query($sql);
+ else
+ $result = @mysql_query($sql,$this->db);
- $str = 'SQL = ' . printable($sql) . EOL . t('SQL returned ') . $mesg . EOL;
+ if($this->debug) {
+ $mesg = '';
- // If dbfail.out exists, we will write any failed calls directly to it,
- // regardless of any logging that may or may nor be in effect.
- // These usually indicate SQL syntax errors that need to be resolved.
- if(file_exists('dbfail.out')) {
- file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
- }
- logger('dba: ' . $str );
- if(FALSE===$result) {
- $this->throwOrLog(new RuntimeException('dba: ' . $str));
- return;
- }
+ if($this->mysqli) {
+ if($this->db->errno)
+ logger('dba: ' . $this->db->error);
}
-
-
- if($result === true) {
- return $result;
+ elseif(mysql_errno($this->db))
+ logger('dba: ' . mysql_error($this->db));
+
+ if($result === false)
+ $mesg = 'false';
+ elseif($result === true)
+ $mesg = 'true';
+ else {
+ if($this->mysqli)
+ $mesg = $result->num_rows . ' results' . EOL;
+ else
+ $mesg = mysql_num_rows($result) . ' results' . EOL;
}
+
+ $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
- $r = array();
- if($this->mysqli) {
- if($result->num_rows) {
- while($x = $result->fetch_array(MYSQLI_ASSOC)) {
- $r[] = $x;
- }
- $result->free_result();
- }
- } else {
- if(mysql_num_rows($result)) {
- while($x = mysql_fetch_array($result, MYSQL_ASSOC)) {
- $r[] = $x;
- }
- mysql_free_result($result);
- }
- }
+ logger('dba: ' . $str );
+ }
+ /**
+ * If dbfail.out exists, we will write any failed calls directly to it,
+ * regardless of any logging that may or may nor be in effect.
+ * These usually indicate SQL syntax errors that need to be resolved.
+ */
- if($this->debug) {
- logger('dba: ' . printable(print_r($r, true)));
- }
- return($r);
+ if($result === false) {
+ logger('dba: ' . printable($sql) . ' returned false.');
+ if(file_exists('dbfail.out'))
+ file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
}
- private function error() {
- if($this->mysqli) {
- return $this->db->error;
- } else {
- return mysql_error($this->db);
- }
- }
-
- private function throwOrLog(Exception $ex) {
- if($this->exceptions) {
- throw $ex;
- } else {
- logger('dba: '.$ex->getMessage());
+ if(($result === true) || ($result === false))
+ return $result;
+
+ $r = array();
+ if($this->mysqli) {
+ if($result->num_rows) {
+ while($x = $result->fetch_array(MYSQLI_ASSOC))
+ $r[] = $x;
+ $result->free_result();
}
}
-
- /**
- * starts a transaction. Transactions need to be finished with
- * commit() or rollback(). Please mind that the db table engine may
- * not support this.
- */
- public function beginTransaction() {
- if($this->mysqli) {
- return $this->db->autocommit(false);
- } else {
- //no transaction support in mysql module...
- mysql_query('SET AUTOCOMMIT = 0;', $db);
- }
- }
-
- /**
- * rollback a transaction. So, rollback anything that was done since the last call
- * to beginTransaction().
- */
- public function rollback() {
- if($this->mysqli) {
- return $this->db->rollback();
- } else {
- //no transaction support in mysql module...
- mysql_query('ROLLBACK;', $db);
+ else {
+ if(mysql_num_rows($result)) {
+ while($x = mysql_fetch_array($result, MYSQL_ASSOC))
+ $r[] = $x;
+ mysql_free_result($result);
}
- $this->stopTransaction();
}
- /**
- * commit a transaction. So, write any query to the database.
- */
- public function commit() {
- if($this->mysqli) {
- return $this->db->commit();
- } else {
- //no transaction support in mysql module...
- mysql_query('COMMIT;', $db);
- }
- $this->stopTransaction();
- }
-
- private function stopTransaction() {
- if($this->mysqli) {
- return $this->db->autocommit(true);
- } else {
- //no transaction support in mysql module...
- mysql_query('SET AUTOCOMMIT = 1;', $db);
- }
- }
-
- public function dbg($dbg) {
- $this->debug = $dbg;
- }
+
+ if($this->debug)
+ logger('dba: ' . printable(print_r($r, true)));
+ return($r);
+ }
- public function escape($str) {
- if($this->db && $this->connected) {
- if($this->mysqli) {
- return $this->db->real_escape_string($str);
- } else {
- return mysql_real_escape_string($str,$this->db);
- }
- }
+ public function dbg($dbg) {
+ $this->debug = $dbg;
+ }
+
+ public function escape($str) {
+ if($this->db && $this->connected) {
+ if($this->mysqli)
+ return @$this->db->real_escape_string($str);
+ else
+ return @mysql_real_escape_string($str,$this->db);
}
+ }
- function __destruct() {
- if ($this->db) {
- if($this->mysqli) {
- $this->db->close();
- }
- } else {
+ function __destruct() {
+ if ($this->db)
+ if($this->mysqli)
+ $this->db->close();
+ else
mysql_close($this->db);
- }
- }
}
-}
+}}
if(! function_exists('printable')) {
- function printable($s) {
- $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
- $s = str_replace("\x00",'.',$s);
- if(x($_SERVER,'SERVER_NAME'))
- $s = escape_tags($s);
- return $s;
- }
-}
+function printable($s) {
+ $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
+ $s = str_replace("\x00",'.',$s);
+ if(x($_SERVER,'SERVER_NAME'))
+ $s = escape_tags($s);
+ return $s;
+}}
// Procedural functions
-if(! function_exists('dbg')) {
- function dbg($state) {
- global $db;
- if($db)
- $db->dbg($state);
- }
-}
+if(! function_exists('dbg')) {
+function dbg($state) {
+ global $db;
+ if($db)
+ $db->dbg($state);
+}}
-if(! function_exists('dbesc')) {
- function dbesc($str) {
- global $db;
- if($db && $db->connected)
- return($db->escape($str));
- else
- return(str_replace("'","\\'",$str));
- }
-}
+if(! function_exists('dbesc')) {
+function dbesc($str) {
+ global $db;
+ if($db && $db->connected)
+ return($db->escape($str));
+ else
+ return(str_replace("'","\\'",$str));
+}}
@@ -283,31 +199,30 @@ if(! function_exists('dbesc')) {
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
// 'user', 1);
-if(! function_exists('q')) {
- function q($sql) {
+if(! function_exists('q')) {
+function q($sql) {
- global $db;
- $args = func_get_args();
- unset($args[0]);
+ global $db;
+ $args = func_get_args();
+ unset($args[0]);
- if($db && $db->connected) {
- $stmt = vsprintf($sql,$args);
- if($stmt === false)
- logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
- return $db->q($stmt);
- }
+ if($db && $db->connected) {
+ $stmt = vsprintf($sql,$args);
+ if($stmt === false)
+ logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+ return $db->q($stmt);
+ }
- /**
- *
- * This will happen occasionally trying to store the
- * session data after abnormal program termination
- *
- */
- logger('dba: no database: ' . print_r($args,true));
- return false;
+ /**
+ *
+ * This will happen occasionally trying to store the
+ * session data after abnormal program termination
+ *
+ */
+ logger('dba: no database: ' . print_r($args,true));
+ return false;
- }
-}
+}}
/**
*
@@ -315,39 +230,36 @@ if(! function_exists('q')) {
*
*/
-if(! function_exists('dbq')) {
- function dbq($sql) {
+if(! function_exists('dbq')) {
+function dbq($sql) {
- global $db;
- if($db && $db->connected)
- $ret = $db->q($sql);
- else
- $ret = false;
- return $ret;
- }
-}
+ global $db;
+ if($db && $db->connected)
+ $ret = $db->q($sql);
+ else
+ $ret = false;
+ return $ret;
+}}
-// Caller is responsible for ensuring that any integer arguments to
+// Caller is responsible for ensuring that any integer arguments to
// dbesc_array are actually integers and not malformed strings containing
-// SQL injection vectors. All integer array elements should be specifically
-// cast to int to avoid trouble.
+// SQL injection vectors. All integer array elements should be specifically
+// cast to int to avoid trouble.
if(! function_exists('dbesc_array_cb')) {
- function dbesc_array_cb(&$item, $key) {
- if(is_string($item))
- $item = dbesc($item);
- }
-}
+function dbesc_array_cb(&$item, $key) {
+ if(is_string($item))
+ $item = dbesc($item);
+}}
if(! function_exists('dbesc_array')) {
- function dbesc_array(&$arr) {
- if(is_array($arr) && count($arr)) {
- array_walk($arr,'dbesc_array_cb');
- }
+function dbesc_array(&$arr) {
+ if(is_array($arr) && count($arr)) {
+ array_walk($arr,'dbesc_array_cb');
}
-}
+}}
diff --git a/include/items.php b/include/items.php
index 3a931b68c..05c0d5016 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2974,12 +2974,23 @@ function item_expire($uid,$days) {
if($expire_items==0 && $item['type']!='note')
continue;
+
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
+ $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d) and uid = %d",
+ intval($item['id']),
+ intval($uid)
+ );
+
+ $r = q("DELETE FROM sign where iid in (select id from item where parent = %d) and uid = %d",
+ intval($item['id']),
+ intval($uid)
+ );
+
// kill the kids
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
diff --git a/js/main.js b/js/main.js
index 7f0428b5b..7a90fa910 100755
--- a/js/main.js
+++ b/js/main.js
@@ -137,13 +137,12 @@
$('#mail-update-li').html(mail);
var eNotif = $(data).find('notif')
- notif = eNotif.attr('count');
- if (notif>=0){
- $("#nav-notifications-linkmenu").addClass("on");
+
+ if (eNotif.children("note").length==0){
+ $("#nav-notifications-menu").html(notifications_empty);
+ } else {
nnm = $("#nav-notifications-menu");
-
nnm.html(notifications_all + notifications_mark);
-
//nnm.attr('popup','true');
eNotif.children("note").each(function(){
e = $(this);
@@ -151,10 +150,12 @@
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
nnm.append(html);
});
-
+ }
+ notif = eNotif.attr('count');
+ if (notif>0){
+ $("#nav-notifications-linkmenu").addClass("on");
} else {
- // $("#nav-notifications-linkmenu").removeClass("on");
- // $("#nav-notifications-menu").html(notifications_empty);
+ $("#nav-notifications-linkmenu").removeClass("on");
}
if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
$('#notify-update').html(notif);
@@ -609,4 +610,4 @@ function previewTheme(elm) {
$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
});
-} \ No newline at end of file
+}
diff --git a/mod/install.php b/mod/install.php
index d1142248a..2eb98ee91 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -451,7 +451,7 @@ function load_database_rem($v, $i){
function load_database($db) {
$str = file_get_contents('database.sql');
- $str = array_reduce(explode("\n", $str),"load_database_rem","");
+// $str = array_reduce(explode("\n", $str),"load_database_rem","");
$arr = explode(';',$str);
$errors = false;
foreach($arr as $a) {
diff --git a/mod/settings.php b/mod/settings.php
index 6879da285..2dd9fb9a6 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -15,10 +15,6 @@ function get_theme_config_file($theme){
}
function settings_init(&$a) {
- if(local_user()) {
- profile_load($a,$a->user['nickname']);
- }
-
// These lines provide the javascript needed by the acl selector
$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
@@ -47,6 +43,47 @@ function settings_init(&$a) {
EOT;
+
+ $tabs = array(
+ array(
+ 'label' => t('Account settings'),
+ 'url' => $a->get_baseurl(true).'/settings',
+ 'selected' => (($a->argc == 1)?'active':''),
+ ),
+ array(
+ 'label' => t('Display settings'),
+ 'url' => $a->get_baseurl(true).'/settings/display',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+ ),
+
+ array(
+ 'label' => t('Connector settings'),
+ 'url' => $a->get_baseurl(true).'/settings/connectors',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+ ),
+ array(
+ 'label' => t('Plugin settings'),
+ 'url' => $a->get_baseurl(true).'/settings/addon',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+ ),
+ array(
+ 'label' => t('Connected apps'),
+ 'url' => $a->get_baseurl(true) . '/settings/oauth',
+ 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+ ),
+ array(
+ 'label' => t('Export personal data'),
+ 'url' => $a->get_baseurl(true) . '/uexport',
+ 'selected' => ''
+ )
+ );
+
+ $tabtpl = get_markup_template("generic_links_widget.tpl");
+ $a->page['aside'] = replace_macros($tabtpl, array(
+ '$title' => t('Settings'),
+ '$items' => $tabs,
+ ));
+
}
@@ -479,44 +516,7 @@ function settings_content(&$a) {
return;
}
- $tabs = array(
- array(
- 'label' => t('Account settings'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'sel' => (($a->argc == 1)?'active':''),
- ),
- array(
- 'label' => t('Display settings'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- ),
-
- array(
- 'label' => t('Connector settings'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- ),
- array(
- 'label' => t('Plugin settings'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- ),
- array(
- 'label' => t('Connections'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'sel' => ''
- )
- );
-
- $tabtpl = get_markup_template("common_tabs.tpl");
- $tabs = replace_macros($tabtpl, array(
- '$tabs' => $tabs,
- ));
+
if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
@@ -524,7 +524,6 @@ function settings_content(&$a) {
$tpl = get_markup_template("settings_oauth_edit.tpl");
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$tabs' => $tabs,
'$title' => t('Add application'),
'$submit' => t('Submit'),
'$cancel' => t('Cancel'),
@@ -551,7 +550,6 @@ function settings_content(&$a) {
$tpl = get_markup_template("settings_oauth_edit.tpl");
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$tabs' => $tabs,
'$title' => t('Add application'),
'$submit' => t('Update'),
'$cancel' => t('Cancel'),
@@ -594,7 +592,6 @@ function settings_content(&$a) {
'$consumerkey' => t('Client key starts with'),
'$noname' => t('No name'),
'$remove' => t('Remove authorization'),
- '$tabs' => $tabs,
'$apps' => $r,
));
return $o;
@@ -614,7 +611,6 @@ function settings_content(&$a) {
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_addon"),
'$title' => t('Plugin Settings'),
- '$tabs' => $tabs,
'$settings_addons' => $settings_addons
));
return $o;
@@ -658,7 +654,6 @@ function settings_content(&$a) {
'$form_security_token' => get_form_security_token("settings_connectors"),
'$title' => t('Connector Settings'),
- '$tabs' => $tabs,
'$diasp_enabled' => $diasp_enabled,
'$ostat_enabled' => $ostat_enabled,
@@ -735,7 +730,6 @@ function settings_content(&$a) {
$tpl = get_markup_template("settings_display.tpl");
$o = replace_macros($tpl, array(
- '$tabs' => $tabs,
'$ptitle' => t('Display Settings'),
'$form_security_token' => get_form_security_token("settings_display"),
'$submit' => t('Submit'),
@@ -920,7 +914,6 @@ function settings_content(&$a) {
);
$o .= replace_macros($stpl,array(
- '$tabs' => $tabs,
'$ptitle' => t('Account Settings'),
'$submit' => t('Submit'),
diff --git a/update.php b/update.php
index 1a36c754d..5ab321b33 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1137 );
+define( 'UPDATE_VERSION' , 1138 );
/**
*
@@ -1205,4 +1205,11 @@ function update_1136() {
q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) ");
q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )");
-} \ No newline at end of file
+}
+
+
+function update_1137() {
+ q("alter table item_id DROP `face` , DROP `dspr` , DROP `twit` , DROP `stat` ");
+ q("ALTER TABLE `item_id` ADD `sid` CHAR( 255 ) NOT NULL AFTER `uid` , ADD `service` CHAR( 255 ) NOT NULL AFTER `sid` , add index (`sid`), add index ( `service`) ");
+}
+
diff --git a/util/messages.po b/util/messages.po
index 2f02d0d8c..09c3dec92 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.1308\n"
+"Project-Id-Version: 2.3.1309\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 10:00-0700\n"
+"POT-Creation-Date: 2012-04-11 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,13 +49,13 @@ msgstr ""
#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
-#: ../../mod/message.php:91 ../../mod/allfriends.php:9
+#: ../../mod/message.php:90 ../../mod/allfriends.php:9
#: ../../mod/wall_upload.php:46 ../../mod/follow.php:8 ../../mod/common.php:9
#: ../../mod/display.php:138 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:232 ../../mod/delegate.php:6
+#: ../../mod/profiles.php:233 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:460
-#: ../../include/items.php:3118 ../../index.php:306
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:461
+#: ../../include/items.php:3121 ../../index.php:305
msgid "Permission denied."
msgstr ""
@@ -85,7 +85,7 @@ msgid "Return to contact editor"
msgstr ""
#: ../../mod/crepair.php:148 ../../mod/settings.php:531
-#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
+#: ../../mod/settings.php:558 ../../mod/admin.php:524 ../../mod/admin.php:533
msgid "Name"
msgstr ""
@@ -126,22 +126,23 @@ msgstr ""
#: ../../mod/photos.php:1194 ../../mod/photos.php:1234
#: ../../mod/photos.php:1274 ../../mod/photos.php:1305
#: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
#: ../../mod/settings.php:529 ../../mod/settings.php:679
#: ../../mod/settings.php:741 ../../mod/settings.php:926
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
-#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
-#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
-#: ../../addon/facebook/facebook.php:551 ../../addon/yourls/yourls.php:76
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:354
+#: ../../mod/admin.php:521 ../../mod/admin.php:650 ../../mod/admin.php:822
+#: ../../mod/admin.php:902 ../../mod/profiles.php:402 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/planets/planets.php:180
#: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
+#: ../../addon/gravatar/gravatar.php:86
#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
#: ../../addon/statusnet/statusnet.php:278
#: ../../addon/statusnet/statusnet.php:292
@@ -166,11 +167,11 @@ msgstr ""
msgid "Help"
msgstr ""
-#: ../../mod/help.php:38 ../../index.php:225
+#: ../../mod/help.php:38 ../../index.php:224
msgid "Not Found"
msgstr ""
-#: ../../mod/help.php:41 ../../index.php:228
+#: ../../mod/help.php:41 ../../index.php:227
msgid "Page not found."
msgstr ""
@@ -275,7 +276,7 @@ msgid "Share this event"
msgstr ""
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:530
+#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:530
#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45
msgid "Cancel"
msgstr ""
@@ -296,7 +297,7 @@ msgstr ""
msgid "Remove"
msgstr ""
-#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
#, php-format
msgid "%s welcomes %s"
msgstr ""
@@ -319,25 +320,25 @@ msgid ""
"and/or create new posts for you?"
msgstr ""
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:695
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
#: ../../mod/settings.php:841 ../../mod/settings.php:847
#: ../../mod/settings.php:855 ../../mod/settings.php:859
#: ../../mod/settings.php:864 ../../mod/settings.php:870
#: ../../mod/settings.php:876 ../../mod/settings.php:882
#: ../../mod/settings.php:916 ../../mod/settings.php:917
#: ../../mod/settings.php:918 ../../mod/settings.php:919
-#: ../../mod/register.php:536 ../../mod/profiles.php:369
+#: ../../mod/register.php:532 ../../mod/profiles.php:379
msgid "Yes"
msgstr ""
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:696
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
#: ../../mod/settings.php:841 ../../mod/settings.php:847
#: ../../mod/settings.php:855 ../../mod/settings.php:859
#: ../../mod/settings.php:864 ../../mod/settings.php:870
#: ../../mod/settings.php:876 ../../mod/settings.php:882
#: ../../mod/settings.php:916 ../../mod/settings.php:917
#: ../../mod/settings.php:918 ../../mod/settings.php:919
-#: ../../mod/register.php:537 ../../mod/profiles.php:370
+#: ../../mod/register.php:533 ../../mod/profiles.php:380
msgid "No"
msgstr ""
@@ -368,8 +369,8 @@ msgid "Contact information unavailable"
msgstr ""
#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:339
-#: ../../mod/register.php:346 ../../mod/register.php:353
+#: ../../mod/photos.php:966 ../../mod/register.php:335
+#: ../../mod/register.php:342 ../../mod/register.php:349
#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
@@ -431,7 +432,7 @@ msgid "Image upload failed."
msgstr ""
#: ../../mod/photos.php:760 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
msgid "Public access denied."
msgstr ""
@@ -537,8 +538,8 @@ msgid "Share"
msgstr ""
#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:189
-#: ../../mod/message.php:358 ../../include/conversation.php:362
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
+#: ../../mod/message.php:357 ../../include/conversation.php:362
#: ../../include/conversation.php:702 ../../include/conversation.php:979
msgid "Please wait"
msgstr ""
@@ -560,7 +561,7 @@ msgid "Preview"
msgstr ""
#: ../../mod/photos.php:1332 ../../mod/settings.php:593
-#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532
+#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:528
#: ../../include/conversation.php:318 ../../include/conversation.php:576
msgid "Delete"
msgstr ""
@@ -638,7 +639,7 @@ msgid "Edit"
msgstr ""
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
-#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../mod/message.php:186 ../../mod/message.php:355
#: ../../include/conversation.php:961
msgid "Upload photo"
msgstr ""
@@ -648,7 +649,7 @@ msgid "Attach file"
msgstr ""
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
-#: ../../mod/message.php:188 ../../mod/message.php:357
+#: ../../mod/message.php:187 ../../mod/message.php:356
#: ../../include/conversation.php:965
msgid "Insert web link"
msgstr ""
@@ -701,19 +702,19 @@ msgstr ""
msgid "This introduction has already been accepted."
msgstr ""
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427
msgid "Profile location is not valid or does not contain profile information."
msgstr ""
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432
msgid "Warning: profile location has no identifiable owner name."
msgstr ""
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434
msgid "Warning: profile location has no profile photo."
msgstr ""
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437
#, php-format
msgid "%d required parameter was not found at the given location"
msgid_plural "%d required parameters were not found at the given location"
@@ -745,132 +746,140 @@ msgstr ""
msgid "Friends are advised to please try again in 24 hours."
msgstr ""
-#: ../../mod/dfrn_request.php:307
+#: ../../mod/dfrn_request.php:309
msgid "Invalid locator"
msgstr ""
-#: ../../mod/dfrn_request.php:327
+#: ../../mod/dfrn_request.php:318
+msgid "Invalid email address."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:344
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:372
msgid "Unable to resolve your name at the provided location."
msgstr ""
-#: ../../mod/dfrn_request.php:340
+#: ../../mod/dfrn_request.php:385
msgid "You have already introduced yourself here."
msgstr ""
-#: ../../mod/dfrn_request.php:344
+#: ../../mod/dfrn_request.php:389
#, php-format
msgid "Apparently you are already friends with %s."
msgstr ""
-#: ../../mod/dfrn_request.php:365
+#: ../../mod/dfrn_request.php:410
msgid "Invalid profile URL."
msgstr ""
-#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20
msgid "Disallowed profile URL."
msgstr ""
-#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102
msgid "Failed to update contact record."
msgstr ""
-#: ../../mod/dfrn_request.php:461
+#: ../../mod/dfrn_request.php:506
msgid "Your introduction has been sent."
msgstr ""
-#: ../../mod/dfrn_request.php:514
+#: ../../mod/dfrn_request.php:559
msgid "Please login to confirm introduction."
msgstr ""
-#: ../../mod/dfrn_request.php:528
+#: ../../mod/dfrn_request.php:573
msgid ""
"Incorrect identity currently logged in. Please login to <strong>this</"
"strong> profile."
msgstr ""
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:585
#, php-format
msgid "Welcome home %s."
msgstr ""
-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:586
#, php-format
msgid "Please confirm your introduction/connection request to %s."
msgstr ""
-#: ../../mod/dfrn_request.php:542
+#: ../../mod/dfrn_request.php:587
msgid "Confirm"
msgstr ""
-#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2652
msgid "[Name Withheld]"
msgstr ""
-#: ../../mod/dfrn_request.php:670
+#: ../../mod/dfrn_request.php:715
msgid ""
"Please enter your 'Identity Address' from one of the following supported "
"communications networks:"
msgstr ""
-#: ../../mod/dfrn_request.php:686
+#: ../../mod/dfrn_request.php:731
msgid "<strike>Connect as an email follower</strike> (Coming soon)"
msgstr ""
-#: ../../mod/dfrn_request.php:688
+#: ../../mod/dfrn_request.php:733
msgid ""
"If you are not yet a member of the free social web, <a href=\"http://dir."
"friendica.com/siteinfo\">follow this link to find a public Friendica site "
"and join us today</a>."
msgstr ""
-#: ../../mod/dfrn_request.php:691
+#: ../../mod/dfrn_request.php:736
msgid "Friend/Connection Request"
msgstr ""
-#: ../../mod/dfrn_request.php:692
+#: ../../mod/dfrn_request.php:737
msgid ""
"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
"testuser@identi.ca"
msgstr ""
-#: ../../mod/dfrn_request.php:693
+#: ../../mod/dfrn_request.php:738
msgid "Please answer the following:"
msgstr ""
-#: ../../mod/dfrn_request.php:694
+#: ../../mod/dfrn_request.php:739
#, php-format
msgid "Does %s know you?"
msgstr ""
-#: ../../mod/dfrn_request.php:697
+#: ../../mod/dfrn_request.php:742
msgid "Add a personal note:"
msgstr ""
-#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76
msgid "Friendica"
msgstr ""
-#: ../../mod/dfrn_request.php:700
+#: ../../mod/dfrn_request.php:745
msgid "StatusNet/Federated Social Web"
msgstr ""
-#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629
+#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
#: ../../include/contact_selectors.php:80
msgid "Diaspora"
msgstr ""
-#: ../../mod/dfrn_request.php:702
+#: ../../mod/dfrn_request.php:747
#, php-format
msgid ""
" - please do not use this form. Instead, enter %s into your Diaspora search "
"bar."
msgstr ""
-#: ../../mod/dfrn_request.php:703
+#: ../../mod/dfrn_request.php:748
msgid "Your Identity Address:"
msgstr ""
-#: ../../mod/dfrn_request.php:706
+#: ../../mod/dfrn_request.php:751
msgid "Submit Request"
msgstr ""
@@ -1196,8 +1205,8 @@ msgid "Discard"
msgstr ""
#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:302
-#: ../../mod/contacts.php:345
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:308
+#: ../../mod/contacts.php:351
msgid "Ignore"
msgstr ""
@@ -1225,7 +1234,7 @@ msgstr ""
msgid "Introductions"
msgstr ""
-#: ../../mod/notifications.php:100 ../../mod/message.php:103
+#: ../../mod/notifications.php:100 ../../mod/message.php:102
#: ../../include/nav.php:128
msgid "Messages"
msgstr ""
@@ -1252,7 +1261,7 @@ msgid "suggested by %s"
msgstr ""
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356
msgid "Hide this contact from others"
msgstr ""
@@ -1265,7 +1274,7 @@ msgid "if applicable"
msgstr ""
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:530
+#: ../../mod/admin.php:526
msgid "Approve"
msgstr ""
@@ -1410,207 +1419,206 @@ msgstr ""
msgid "Contact has been removed."
msgstr ""
-#: ../../mod/contacts.php:245
+#: ../../mod/contacts.php:251
#, php-format
msgid "You are mutual friends with %s"
msgstr ""
-#: ../../mod/contacts.php:249
+#: ../../mod/contacts.php:255
#, php-format
msgid "You are sharing with %s"
msgstr ""
-#: ../../mod/contacts.php:254
+#: ../../mod/contacts.php:260
#, php-format
msgid "%s is sharing with you"
msgstr ""
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:277
msgid "Private communications are not available for this contact."
msgstr ""
-#: ../../mod/contacts.php:274
+#: ../../mod/contacts.php:280
msgid "Never"
msgstr ""
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
msgid "(Update was successful)"
msgstr ""
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
msgid "(Update was not successful)"
msgstr ""
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:286
msgid "Suggest friends"
msgstr ""
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:290
#, php-format
msgid "Network type: %s"
msgstr ""
-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:293
#, php-format
msgid "%d contact in common"
msgid_plural "%d contacts in common"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:298
msgid "View all contacts"
msgstr ""
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:534
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:530
msgid "Unblock"
msgstr ""
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:533
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:529
msgid "Block"
msgstr ""
-#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:351
msgid "Unignore"
msgstr ""
-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:313
msgid "Repair"
msgstr ""
-#: ../../mod/contacts.php:317
+#: ../../mod/contacts.php:323
msgid "Contact Editor"
msgstr ""
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:326
msgid "Profile Visibility"
msgstr ""
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:327
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../mod/contacts.php:322
+#: ../../mod/contacts.php:328
msgid "Contact Information / Notes"
msgstr ""
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:329
msgid "Edit contact notes"
msgstr ""
-#: ../../mod/contacts.php:328 ../../mod/contacts.php:501
+#: ../../mod/contacts.php:334 ../../mod/contacts.php:507
#: ../../mod/viewcontacts.php:62
#, php-format
msgid "Visit %s's profile [%s]"
msgstr ""
-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:335
msgid "Block/Unblock contact"
msgstr ""
-#: ../../mod/contacts.php:330
+#: ../../mod/contacts.php:336
msgid "Ignore contact"
msgstr ""
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:337
msgid "Repair URL settings"
msgstr ""
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:338
msgid "View conversations"
msgstr ""
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:340
msgid "Delete contact"
msgstr ""
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:344
msgid "Last update:"
msgstr ""
-#: ../../mod/contacts.php:339
+#: ../../mod/contacts.php:345
msgid "Update public posts"
msgstr ""
-#: ../../mod/contacts.php:341 ../../mod/admin.php:955
+#: ../../mod/contacts.php:347 ../../mod/admin.php:951
msgid "Update now"
msgstr ""
-#: ../../mod/contacts.php:348
+#: ../../mod/contacts.php:354
msgid "Currently blocked"
msgstr ""
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:355
msgid "Currently ignored"
msgstr ""
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr ""
-#: ../../mod/contacts.php:399
+#: ../../mod/contacts.php:405
msgid "Suggestions"
msgstr ""
-#: ../../mod/contacts.php:404 ../../mod/group.php:191
+#: ../../mod/contacts.php:410 ../../mod/group.php:191
msgid "All Contacts"
msgstr ""
-#: ../../mod/contacts.php:409
+#: ../../mod/contacts.php:415
msgid "Unblocked Contacts"
msgstr ""
-#: ../../mod/contacts.php:415
+#: ../../mod/contacts.php:421
msgid "Blocked Contacts"
msgstr ""
-#: ../../mod/contacts.php:421
+#: ../../mod/contacts.php:427
msgid "Ignored Contacts"
msgstr ""
-#: ../../mod/contacts.php:427
+#: ../../mod/contacts.php:433
msgid "Hidden Contacts"
msgstr ""
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:483
msgid "Mutual Friendship"
msgstr ""
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:487
msgid "is a fan of yours"
msgstr ""
-#: ../../mod/contacts.php:485
+#: ../../mod/contacts.php:491
msgid "you are a fan of"
msgstr ""
-#: ../../mod/contacts.php:502 ../../include/Contact.php:141
-#: ../../include/conversation.php:817
+#: ../../mod/contacts.php:508
msgid "Edit contact"
msgstr ""
-#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:242
+#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:139
msgid "Contacts"
msgstr ""
-#: ../../mod/contacts.php:527
+#: ../../mod/contacts.php:533
msgid "Search your contacts"
msgstr ""
-#: ../../mod/contacts.php:528 ../../mod/directory.php:57
+#: ../../mod/contacts.php:534 ../../mod/directory.php:57
msgid "Finding: "
msgstr ""
-#: ../../mod/contacts.php:529 ../../mod/directory.php:59
-#: ../../include/contact_widgets.php:32
+#: ../../mod/contacts.php:535 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33
msgid "Find"
msgstr ""
@@ -1628,10 +1636,11 @@ msgid "Password reset requested at %s"
msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:392 ../../mod/register.php:446
+#: ../../mod/register.php:388 ../../mod/register.php:442
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:621
-#: ../../addon/facebook/facebook.php:1073 ../../include/items.php:2658
+#: ../../addon/facebook/facebook.php:622
+#: ../../addon/facebook/facebook.php:1076
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2661
#: ../../boot.php:679
msgid "Administrator"
msgstr ""
@@ -1734,7 +1743,7 @@ msgstr ""
msgid " Cannot change to that email."
msgstr ""
-#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:449
+#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:450
#: ../../addon/impressum/impressum.php:75
#: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
@@ -1949,7 +1958,7 @@ msgstr ""
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506
+#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:502
msgid "Normal Account"
msgstr ""
@@ -1957,7 +1966,7 @@ msgstr ""
msgid "This account is a normal personal profile"
msgstr ""
-#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
+#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:503
msgid "Soapbox Account"
msgstr ""
@@ -1965,7 +1974,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr ""
-#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
+#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:504
msgid "Community/Celebrity Account"
msgstr ""
@@ -1973,7 +1982,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-write fans"
msgstr ""
-#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
+#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:505
msgid "Automatic Friend Account"
msgstr ""
@@ -2264,7 +2273,7 @@ msgid "Personal Notes"
msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:677 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:680 ../../include/text.php:652
msgid "Save"
msgstr ""
@@ -2273,7 +2282,7 @@ msgstr ""
msgid "Number of daily wall messages for %s exceeded. Message failed."
msgstr ""
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:60
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
msgid "No recipient selected."
msgstr ""
@@ -2281,15 +2290,15 @@ msgstr ""
msgid "Unable to check your home location."
msgstr ""
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:67
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
msgid "Message could not be sent."
msgstr ""
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:70
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
msgid "Message collection failure."
msgstr ""
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:73
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
msgid "Message sent."
msgstr ""
@@ -2297,12 +2306,12 @@ msgstr ""
msgid "No recipient."
msgstr ""
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:170
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
#: ../../include/conversation.php:914
msgid "Please enter a link URL:"
msgstr ""
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:178
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:177
msgid "Send Private Message"
msgstr ""
@@ -2313,18 +2322,18 @@ msgid ""
"your site allow private mail from unknown senders."
msgstr ""
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:179
-#: ../../mod/message.php:348
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:178
+#: ../../mod/message.php:347
msgid "To:"
msgstr ""
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:180
-#: ../../mod/message.php:349
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:179
+#: ../../mod/message.php:348
msgid "Subject:"
msgstr ""
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:184
-#: ../../mod/message.php:352 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:183
+#: ../../mod/message.php:351 ../../mod/invite.php:113
msgid "Your message:"
msgstr ""
@@ -2466,7 +2475,7 @@ msgstr ""
msgid "Group name changed."
msgstr ""
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:304
msgid "Permission denied"
msgstr ""
@@ -2599,91 +2608,91 @@ msgstr ""
msgid "An error occurred creating your default profile. Please try again."
msgstr ""
-#: ../../mod/register.php:390 ../../mod/regmod.php:52
+#: ../../mod/register.php:386 ../../mod/regmod.php:52
#, php-format
msgid "Registration details for %s"
msgstr ""
-#: ../../mod/register.php:398
+#: ../../mod/register.php:394
msgid ""
"Registration successful. Please check your email for further instructions."
msgstr ""
-#: ../../mod/register.php:402
+#: ../../mod/register.php:398
msgid "Failed to send email message. Here is the message that failed."
msgstr ""
-#: ../../mod/register.php:407
+#: ../../mod/register.php:403
msgid "Your registration can not be processed."
msgstr ""
-#: ../../mod/register.php:444
+#: ../../mod/register.php:440
#, php-format
msgid "Registration request at %s"
msgstr ""
-#: ../../mod/register.php:453
+#: ../../mod/register.php:449
msgid "Your registration is pending approval by the site owner."
msgstr ""
-#: ../../mod/register.php:491
+#: ../../mod/register.php:487
msgid ""
"This site has exceeded the number of allowed daily account registrations. "
"Please try again tomorrow."
msgstr ""
-#: ../../mod/register.php:517
+#: ../../mod/register.php:513
msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'."
msgstr ""
-#: ../../mod/register.php:518
+#: ../../mod/register.php:514
msgid ""
"If you are not familiar with OpenID, please leave that field blank and fill "
"in the rest of the items."
msgstr ""
-#: ../../mod/register.php:519
+#: ../../mod/register.php:515
msgid "Your OpenID (optional): "
msgstr ""
-#: ../../mod/register.php:533
+#: ../../mod/register.php:529
msgid "Include your profile in member directory?"
msgstr ""
-#: ../../mod/register.php:553
+#: ../../mod/register.php:549
msgid "Membership on this site is by invitation only."
msgstr ""
-#: ../../mod/register.php:554
+#: ../../mod/register.php:550
msgid "Your invitation ID: "
msgstr ""
-#: ../../mod/register.php:557 ../../mod/admin.php:358
+#: ../../mod/register.php:553 ../../mod/admin.php:355
msgid "Registration"
msgstr ""
-#: ../../mod/register.php:565
+#: ../../mod/register.php:561
msgid "Your Full Name (e.g. Joe Smith): "
msgstr ""
-#: ../../mod/register.php:566
+#: ../../mod/register.php:562
msgid "Your Email Address: "
msgstr ""
-#: ../../mod/register.php:567
+#: ../../mod/register.php:563
msgid ""
"Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be '<strong>nickname@$sitename</"
"strong>'."
msgstr ""
-#: ../../mod/register.php:568
+#: ../../mod/register.php:564
msgid "Choose a nickname: "
msgstr ""
-#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:774
+#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:774
msgid "Register"
msgstr ""
@@ -2692,7 +2701,7 @@ msgid "People Search"
msgstr ""
#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1546
+#: ../../addon/facebook/facebook.php:1549
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook-red/theme.php:81
@@ -2708,7 +2717,7 @@ msgstr ""
msgid "status"
msgstr ""
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1550
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook-red/theme.php:95
#: ../../view/theme/diabook-blue/theme.php:95
@@ -2725,8 +2734,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3030
+#: ../../mod/admin.php:562 ../../mod/admin.php:741 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3033
msgid "Item not found."
msgstr ""
@@ -2755,34 +2764,34 @@ msgstr ""
msgid "Empty post discarded."
msgstr ""
-#: ../../mod/item.php:373 ../../mod/wall_upload.php:85
+#: ../../mod/item.php:372 ../../mod/wall_upload.php:85
#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
#: ../../include/message.php:144
msgid "Wall Photos"
msgstr ""
-#: ../../mod/item.php:763
+#: ../../mod/item.php:762
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:788
+#: ../../mod/item.php:787
#, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendica social network."
msgstr ""
-#: ../../mod/item.php:790
+#: ../../mod/item.php:789
#, php-format
msgid "You may visit them online at %s"
msgstr ""
-#: ../../mod/item.php:791
+#: ../../mod/item.php:790
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
"receive these messages."
msgstr ""
-#: ../../mod/item.php:793
+#: ../../mod/item.php:792
#, php-format
msgid "%s posted an update."
msgstr ""
@@ -2870,67 +2879,67 @@ msgstr ""
msgid "New Message"
msgstr ""
-#: ../../mod/message.php:64
+#: ../../mod/message.php:63
msgid "Unable to locate contact information."
msgstr ""
-#: ../../mod/message.php:118
+#: ../../mod/message.php:117
msgid "Message deleted."
msgstr ""
-#: ../../mod/message.php:148
+#: ../../mod/message.php:147
msgid "Conversation removed."
msgstr ""
-#: ../../mod/message.php:220
+#: ../../mod/message.php:219
msgid "No messages."
msgstr ""
-#: ../../mod/message.php:227
+#: ../../mod/message.php:226
#, php-format
msgid "Unknown sender - %s"
msgstr ""
-#: ../../mod/message.php:230
+#: ../../mod/message.php:229
#, php-format
msgid "You and %s"
msgstr ""
-#: ../../mod/message.php:233
+#: ../../mod/message.php:232
#, php-format
msgid "%s and You"
msgstr ""
-#: ../../mod/message.php:243 ../../mod/message.php:341
+#: ../../mod/message.php:242 ../../mod/message.php:340
msgid "Delete conversation"
msgstr ""
-#: ../../mod/message.php:246
+#: ../../mod/message.php:245
msgid "D, d M Y - g:i A"
msgstr ""
-#: ../../mod/message.php:248
+#: ../../mod/message.php:247
#, php-format
msgid "%d message"
msgid_plural "%d messages"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/message.php:283
+#: ../../mod/message.php:282
msgid "Message not available."
msgstr ""
-#: ../../mod/message.php:325
+#: ../../mod/message.php:324
msgid "Delete message"
msgstr ""
-#: ../../mod/message.php:343
+#: ../../mod/message.php:342
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr ""
-#: ../../mod/message.php:347
+#: ../../mod/message.php:346
msgid "Send Reply"
msgstr ""
@@ -2943,23 +2952,23 @@ msgstr ""
msgid "No friends to display."
msgstr ""
-#: ../../mod/admin.php:71 ../../mod/admin.php:356
+#: ../../mod/admin.php:71 ../../mod/admin.php:353
msgid "Site"
msgstr ""
-#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
+#: ../../mod/admin.php:72 ../../mod/admin.php:520 ../../mod/admin.php:532
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
+#: ../../mod/admin.php:73 ../../mod/admin.php:609 ../../mod/admin.php:649
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
+#: ../../mod/admin.php:74 ../../mod/admin.php:787 ../../mod/admin.php:821
msgid "Themes"
msgstr ""
-#: ../../mod/admin.php:89 ../../mod/admin.php:905
+#: ../../mod/admin.php:89 ../../mod/admin.php:901
msgid "Logs"
msgstr ""
@@ -2967,9 +2976,9 @@ msgstr ""
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../mod/admin.php:157 ../../mod/admin.php:355 ../../mod/admin.php:523
-#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790
-#: ../../mod/admin.php:824 ../../mod/admin.php:904
+#: ../../mod/admin.php:157 ../../mod/admin.php:352 ../../mod/admin.php:519
+#: ../../mod/admin.php:608 ../../mod/admin.php:648 ../../mod/admin.php:786
+#: ../../mod/admin.php:820 ../../mod/admin.php:900
msgid "Administration"
msgstr ""
@@ -2993,437 +3002,429 @@ msgstr ""
msgid "Active plugins"
msgstr ""
-#: ../../mod/admin.php:298
+#: ../../mod/admin.php:295
msgid "Site settings updated."
msgstr ""
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:339
msgid "Closed"
msgstr ""
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:340
msgid "Requires approval"
msgstr ""
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:341
msgid "Open"
msgstr ""
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:345
msgid "No SSL policy, links will track page SSL state"
msgstr ""
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:346
msgid "Force all links to use SSL"
msgstr ""
-#: ../../mod/admin.php:350
+#: ../../mod/admin.php:347
msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr ""
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:356
msgid "File upload"
msgstr ""
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:357
msgid "Policies"
msgstr ""
-#: ../../mod/admin.php:361
+#: ../../mod/admin.php:358
msgid "Advanced"
msgstr ""
-#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:362 ../../addon/statusnet/statusnet.php:544
msgid "Site name"
msgstr ""
-#: ../../mod/admin.php:366
+#: ../../mod/admin.php:363
msgid "Banner/Logo"
msgstr ""
-#: ../../mod/admin.php:367
+#: ../../mod/admin.php:364
msgid "System language"
msgstr ""
-#: ../../mod/admin.php:368
+#: ../../mod/admin.php:365
msgid "System theme"
msgstr ""
-#: ../../mod/admin.php:368
+#: ../../mod/admin.php:365
msgid "Default system theme - may be over-ridden by user profiles"
msgstr ""
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:366
msgid "SSL link policy"
msgstr ""
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:366
msgid "Determines whether generated links should be forced to use SSL"
msgstr ""
-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:367
msgid "Maximum image size"
msgstr ""
-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:367
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: ../../mod/admin.php:372
+#: ../../mod/admin.php:369
msgid "Register policy"
msgstr ""
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:370
msgid "Register text"
msgstr ""
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:370
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: ../../mod/admin.php:374
+#: ../../mod/admin.php:371
msgid "Accounts abandoned after x days"
msgstr ""
-#: ../../mod/admin.php:374
+#: ../../mod/admin.php:371
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:372
msgid "Allowed friend domains"
msgstr ""
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:372
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr ""
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:373
msgid "Allowed email domains"
msgstr ""
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:373
msgid ""
"Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains"
msgstr ""
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:374
msgid "Block public"
msgstr ""
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:374
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr ""
-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:375
msgid "Force publish"
msgstr ""
-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:375
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: ../../mod/admin.php:379
+#: ../../mod/admin.php:376
msgid "Global directory update URL"
msgstr ""
-#: ../../mod/admin.php:379
+#: ../../mod/admin.php:376
msgid ""
"URL to update the global directory. If this is not set, the global directory "
"is completely unavailable to the application."
msgstr ""
-#: ../../mod/admin.php:381
+#: ../../mod/admin.php:378
msgid "Block multiple registrations"
msgstr ""
-#: ../../mod/admin.php:381
+#: ../../mod/admin.php:378
msgid "Disallow users to register additional accounts for use as pages."
msgstr ""
-#: ../../mod/admin.php:382
+#: ../../mod/admin.php:379
msgid "OpenID support"
msgstr ""
-#: ../../mod/admin.php:382
+#: ../../mod/admin.php:379
msgid "OpenID support for registration and logins."
msgstr ""
-#: ../../mod/admin.php:383
-msgid "Gravatar support"
-msgstr ""
-
-#: ../../mod/admin.php:383
-msgid "Search new user's photo on Gravatar."
-msgstr ""
-
-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:380
msgid "Fullname check"
msgstr ""
-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:380
msgid ""
"Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure"
msgstr ""
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:381
msgid "UTF-8 Regular expressions"
msgstr ""
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:381
msgid "Use PHP UTF8 regular expressions"
msgstr ""
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:382
msgid "Show Community Page"
msgstr ""
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:382
msgid ""
"Display a Community page showing all recent public postings on this site."
msgstr ""
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:383
msgid "Enable OStatus support"
msgstr ""
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:383
msgid ""
"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be "
"occasionally displayed."
msgstr ""
-#: ../../mod/admin.php:388
+#: ../../mod/admin.php:384
msgid "Enable Diaspora support"
msgstr ""
-#: ../../mod/admin.php:388
+#: ../../mod/admin.php:384
msgid "Provide built-in Diaspora network compatibility."
msgstr ""
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:385
msgid "Only allow Friendica contacts"
msgstr ""
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:385
msgid ""
"All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled."
msgstr ""
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:386
msgid "Verify SSL"
msgstr ""
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:386
msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you "
"cannot connect (at all) to self-signed SSL sites."
msgstr ""
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:387
msgid "Proxy user"
msgstr ""
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:388
msgid "Proxy URL"
msgstr ""
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:389
msgid "Network timeout"
msgstr ""
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:389
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:410
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:417
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:451
#, php-format
msgid "User '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:458
#, php-format
msgid "User '%s' unblocked"
msgstr ""
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:458
#, php-format
msgid "User '%s' blocked"
msgstr ""
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:522
msgid "select all"
msgstr ""
-#: ../../mod/admin.php:527
+#: ../../mod/admin.php:523
msgid "User registrations waiting for confirm"
msgstr ""
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:524
msgid "Request date"
msgstr ""
-#: ../../mod/admin.php:528 ../../mod/admin.php:537
+#: ../../mod/admin.php:524 ../../mod/admin.php:533
#: ../../include/contact_selectors.php:79
msgid "Email"
msgstr ""
-#: ../../mod/admin.php:529
+#: ../../mod/admin.php:525
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:527
msgid "Deny"
msgstr ""
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:533
msgid "Register date"
msgstr ""
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:533
msgid "Last login"
msgstr ""
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:533
msgid "Last item"
msgstr ""
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:533
msgid "Account"
msgstr ""
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:535
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:536
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:576
+#: ../../mod/admin.php:572
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:580
+#: ../../mod/admin.php:576
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:590 ../../mod/admin.php:769
+#: ../../mod/admin.php:586 ../../mod/admin.php:765
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:592 ../../mod/admin.php:771
+#: ../../mod/admin.php:588 ../../mod/admin.php:767
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:614 ../../mod/admin.php:792
+#: ../../mod/admin.php:610 ../../mod/admin.php:788
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
+#: ../../mod/admin.php:611 ../../mod/admin.php:789 ../../include/nav.php:137
msgid "Settings"
msgstr ""
-#: ../../mod/admin.php:622 ../../mod/admin.php:802
+#: ../../mod/admin.php:618 ../../mod/admin.php:798
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:623 ../../mod/admin.php:803
+#: ../../mod/admin.php:619 ../../mod/admin.php:799
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:734
+#: ../../mod/admin.php:730
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:784
+#: ../../mod/admin.php:780
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:830
+#: ../../mod/admin.php:826
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:831
+#: ../../mod/admin.php:827
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:850
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:907
+#: ../../mod/admin.php:903
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:909
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:910
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:910
msgid ""
"Must be writable by web server. Relative to your Friendica top-level "
"directory."
msgstr ""
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:911
msgid "Log level"
msgstr ""
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:952
msgid "Close"
msgstr ""
-#: ../../mod/admin.php:962
+#: ../../mod/admin.php:958
msgid "FTP Host"
msgstr ""
-#: ../../mod/admin.php:963
+#: ../../mod/admin.php:959
msgid "FTP Path"
msgstr ""
-#: ../../mod/admin.php:964
+#: ../../mod/admin.php:960
msgid "FTP User"
msgstr ""
-#: ../../mod/admin.php:965
+#: ../../mod/admin.php:961
msgid "FTP Password"
msgstr ""
@@ -3567,8 +3568,8 @@ msgstr ""
msgid "Search This Site"
msgstr ""
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:242
-#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:243
+#: ../../mod/profiles.php:357 ../../mod/dfrn_confirm.php:62
msgid "Profile not found."
msgstr ""
@@ -3576,213 +3577,213 @@ msgstr ""
msgid "Profile Name is required."
msgstr ""
-#: ../../mod/profiles.php:201
+#: ../../mod/profiles.php:202
msgid "Profile updated."
msgstr ""
-#: ../../mod/profiles.php:261
+#: ../../mod/profiles.php:262
msgid "Profile deleted."
msgstr ""
-#: ../../mod/profiles.php:279 ../../mod/profiles.php:313
+#: ../../mod/profiles.php:280 ../../mod/profiles.php:314
msgid "Profile-"
msgstr ""
-#: ../../mod/profiles.php:298 ../../mod/profiles.php:340
+#: ../../mod/profiles.php:299 ../../mod/profiles.php:341
msgid "New profile created."
msgstr ""
-#: ../../mod/profiles.php:319
+#: ../../mod/profiles.php:320
msgid "Profile unavailable to clone."
msgstr ""
-#: ../../mod/profiles.php:368
+#: ../../mod/profiles.php:378
msgid "Hide your contact/friend list from viewers of this profile?"
msgstr ""
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:401
msgid "Edit Profile Details"
msgstr ""
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:403
msgid "View this profile"
msgstr ""
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:404
msgid "Create a new profile using these settings"
msgstr ""
-#: ../../mod/profiles.php:393
+#: ../../mod/profiles.php:405
msgid "Clone this profile"
msgstr ""
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:406
msgid "Delete this profile"
msgstr ""
-#: ../../mod/profiles.php:395
+#: ../../mod/profiles.php:407
msgid "Profile Name:"
msgstr ""
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:408
msgid "Your Full Name:"
msgstr ""
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:409
msgid "Title/Description:"
msgstr ""
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:410
msgid "Your Gender:"
msgstr ""
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:411
#, php-format
msgid "Birthday (%s):"
msgstr ""
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:412
msgid "Street Address:"
msgstr ""
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:413
msgid "Locality/City:"
msgstr ""
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:414
msgid "Postal/Zip Code:"
msgstr ""
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:415
msgid "Country:"
msgstr ""
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:416
msgid "Region/State:"
msgstr ""
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:417
msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
msgstr ""
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:418
msgid "Who: (if applicable)"
msgstr ""
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:419
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr ""
-#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:420 ../../include/profile_advanced.php:43
msgid "Sexual Preference:"
msgstr ""
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:421
msgid "Homepage URL:"
msgstr ""
-#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:422 ../../include/profile_advanced.php:49
msgid "Political Views:"
msgstr ""
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:423
msgid "Religious Views:"
msgstr ""
-#: ../../mod/profiles.php:412
+#: ../../mod/profiles.php:424
msgid "Public Keywords:"
msgstr ""
-#: ../../mod/profiles.php:413
+#: ../../mod/profiles.php:425
msgid "Private Keywords:"
msgstr ""
-#: ../../mod/profiles.php:414
+#: ../../mod/profiles.php:426
msgid "Example: fishing photography software"
msgstr ""
-#: ../../mod/profiles.php:415
+#: ../../mod/profiles.php:427
msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr ""
-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:428
msgid "(Used for searching profiles, never shown to others)"
msgstr ""
-#: ../../mod/profiles.php:417
+#: ../../mod/profiles.php:429
msgid "Tell us about yourself..."
msgstr ""
-#: ../../mod/profiles.php:418
+#: ../../mod/profiles.php:430
msgid "Hobbies/Interests"
msgstr ""
-#: ../../mod/profiles.php:419
+#: ../../mod/profiles.php:431
msgid "Contact information and Social Networks"
msgstr ""
-#: ../../mod/profiles.php:420
+#: ../../mod/profiles.php:432
msgid "Musical interests"
msgstr ""
-#: ../../mod/profiles.php:421
+#: ../../mod/profiles.php:433
msgid "Books, literature"
msgstr ""
-#: ../../mod/profiles.php:422
+#: ../../mod/profiles.php:434
msgid "Television"
msgstr ""
-#: ../../mod/profiles.php:423
+#: ../../mod/profiles.php:435
msgid "Film/dance/culture/entertainment"
msgstr ""
-#: ../../mod/profiles.php:424
+#: ../../mod/profiles.php:436
msgid "Love/romance"
msgstr ""
-#: ../../mod/profiles.php:425
+#: ../../mod/profiles.php:437
msgid "Work/employment"
msgstr ""
-#: ../../mod/profiles.php:426
+#: ../../mod/profiles.php:438
msgid "School/education"
msgstr ""
-#: ../../mod/profiles.php:431
+#: ../../mod/profiles.php:443
msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet."
msgstr ""
-#: ../../mod/profiles.php:441 ../../mod/directory.php:111
+#: ../../mod/profiles.php:453 ../../mod/directory.php:111
msgid "Age: "
msgstr ""
-#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:298
+#: ../../mod/profiles.php:488 ../../view/theme/diabook-red/theme.php:298
#: ../../view/theme/diabook-blue/theme.php:297
#: ../../view/theme/diabook/theme.php:308
#: ../../view/theme/diabook-aerith/theme.php:298
msgid "Edit/Manage Profiles"
msgstr ""
-#: ../../mod/profiles.php:477 ../../boot.php:1047
+#: ../../mod/profiles.php:489 ../../boot.php:1047
msgid "Change profile photo"
msgstr ""
-#: ../../mod/profiles.php:478 ../../boot.php:1048
+#: ../../mod/profiles.php:490 ../../boot.php:1048
msgid "Create New Profile"
msgstr ""
-#: ../../mod/profiles.php:489 ../../boot.php:1058
+#: ../../mod/profiles.php:501 ../../boot.php:1058
msgid "Profile Image"
msgstr ""
-#: ../../mod/profiles.php:491 ../../boot.php:1061
+#: ../../mod/profiles.php:503 ../../boot.php:1061
msgid "visible to everybody"
msgstr ""
-#: ../../mod/profiles.php:492 ../../boot.php:1062
+#: ../../mod/profiles.php:504 ../../boot.php:1062
msgid "Edit visibility"
msgstr ""
@@ -3838,7 +3839,7 @@ msgstr ""
#: ../../view/theme/diabook-blue/theme.php:150
#: ../../view/theme/diabook/theme.php:153
#: ../../view/theme/diabook-aerith/theme.php:151
-#: ../../include/contact_widgets.php:33
+#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr ""
@@ -4041,71 +4042,71 @@ msgstr ""
msgid "Connection accepted at %s"
msgstr ""
-#: ../../addon/facebook/facebook.php:466
+#: ../../addon/facebook/facebook.php:467
msgid "Facebook disabled"
msgstr ""
-#: ../../addon/facebook/facebook.php:471
+#: ../../addon/facebook/facebook.php:472
msgid "Updating contacts"
msgstr ""
-#: ../../addon/facebook/facebook.php:492
+#: ../../addon/facebook/facebook.php:493
msgid "Facebook API key is missing."
msgstr ""
-#: ../../addon/facebook/facebook.php:499
+#: ../../addon/facebook/facebook.php:500
msgid "Facebook Connect"
msgstr ""
-#: ../../addon/facebook/facebook.php:505
+#: ../../addon/facebook/facebook.php:506
msgid "Install Facebook connector for this account."
msgstr ""
-#: ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:513
msgid "Remove Facebook connector"
msgstr ""
-#: ../../addon/facebook/facebook.php:517
+#: ../../addon/facebook/facebook.php:518
msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]"
msgstr ""
-#: ../../addon/facebook/facebook.php:524
+#: ../../addon/facebook/facebook.php:525
msgid "Post to Facebook by default"
msgstr ""
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:529
msgid "Link all your Facebook friends and conversations on this website"
msgstr ""
-#: ../../addon/facebook/facebook.php:530
+#: ../../addon/facebook/facebook.php:531
msgid ""
"Facebook conversations consist of your <em>profile wall</em> and your friend "
"<em>stream</em>."
msgstr ""
-#: ../../addon/facebook/facebook.php:531
+#: ../../addon/facebook/facebook.php:532
msgid "On this website, your Facebook friend stream is only visible to you."
msgstr ""
-#: ../../addon/facebook/facebook.php:532
+#: ../../addon/facebook/facebook.php:533
msgid ""
"The following settings determine the privacy of your Facebook profile wall "
"on this website."
msgstr ""
-#: ../../addon/facebook/facebook.php:536
+#: ../../addon/facebook/facebook.php:537
msgid ""
"On this website your Facebook profile wall conversations will only be "
"visible to you"
msgstr ""
-#: ../../addon/facebook/facebook.php:541
+#: ../../addon/facebook/facebook.php:542
msgid "Do not import your Facebook profile wall conversations"
msgstr ""
-#: ../../addon/facebook/facebook.php:543
+#: ../../addon/facebook/facebook.php:544
msgid ""
"If you choose to link conversations and leave both of these boxes unchecked, "
"your Facebook profile wall will be merged with your profile wall on this "
@@ -4113,114 +4114,114 @@ msgid ""
"who may see the conversations."
msgstr ""
-#: ../../addon/facebook/facebook.php:548
+#: ../../addon/facebook/facebook.php:549
msgid "Comma separated applications to ignore"
msgstr ""
-#: ../../addon/facebook/facebook.php:619
+#: ../../addon/facebook/facebook.php:620
msgid "Problems with Facebook Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:643
+#: ../../addon/facebook/facebook.php:644
#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:644
+#: ../../addon/facebook/facebook.php:645
msgid "Facebook Connector Settings"
msgstr ""
-#: ../../addon/facebook/facebook.php:653
+#: ../../addon/facebook/facebook.php:656
msgid "Facebook API Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:662
+#: ../../addon/facebook/facebook.php:665
msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ."
"htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>"
msgstr ""
-#: ../../addon/facebook/facebook.php:667
+#: ../../addon/facebook/facebook.php:670
msgid ""
"Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)."
msgstr ""
-#: ../../addon/facebook/facebook.php:669
+#: ../../addon/facebook/facebook.php:672
msgid "The given API Key seems to work correctly."
msgstr ""
-#: ../../addon/facebook/facebook.php:671
+#: ../../addon/facebook/facebook.php:674
msgid ""
"The correctness of the API Key could not be detected. Somthing strange's "
"going on."
msgstr ""
-#: ../../addon/facebook/facebook.php:674
+#: ../../addon/facebook/facebook.php:677
msgid "App-ID / API-Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:675
+#: ../../addon/facebook/facebook.php:678
msgid "Application secret"
msgstr ""
-#: ../../addon/facebook/facebook.php:676
+#: ../../addon/facebook/facebook.php:679
#, php-format
msgid "Polling Interval (min. %1$s minutes)"
msgstr ""
-#: ../../addon/facebook/facebook.php:680
+#: ../../addon/facebook/facebook.php:683
msgid "Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:684
+#: ../../addon/facebook/facebook.php:687
msgid "Real-Time Updates are activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:685
+#: ../../addon/facebook/facebook.php:688
msgid "Deactivate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:687
+#: ../../addon/facebook/facebook.php:690
msgid "Real-Time Updates not activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:687
+#: ../../addon/facebook/facebook.php:690
msgid "Activate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:701
+#: ../../addon/facebook/facebook.php:704
msgid "The new values have been saved."
msgstr ""
-#: ../../addon/facebook/facebook.php:720
+#: ../../addon/facebook/facebook.php:723
msgid "Post to Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:812
+#: ../../addon/facebook/facebook.php:815
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
-#: ../../addon/facebook/facebook.php:1030
+#: ../../addon/facebook/facebook.php:1033
msgid "View on Friendica"
msgstr ""
-#: ../../addon/facebook/facebook.php:1055
+#: ../../addon/facebook/facebook.php:1058
msgid "Facebook post failed. Queued for retry."
msgstr ""
-#: ../../addon/facebook/facebook.php:1091
+#: ../../addon/facebook/facebook.php:1094
msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr ""
-#: ../../addon/facebook/facebook.php:1092
+#: ../../addon/facebook/facebook.php:1095
msgid "Facebook connection became invalid"
msgstr ""
-#: ../../addon/facebook/facebook.php:1093
+#: ../../addon/facebook/facebook.php:1096
#, php-format
msgid ""
"Hi %1$s,\n"
@@ -4473,11 +4474,11 @@ msgstr ""
msgid "I won!"
msgstr ""
-#: ../../addon/randplace/randplace.php:171
+#: ../../addon/randplace/randplace.php:169
msgid "Randplace Settings"
msgstr ""
-#: ../../addon/randplace/randplace.php:173
+#: ../../addon/randplace/randplace.php:171
msgid "Enable Randplace Plugin"
msgstr ""
@@ -4754,6 +4755,68 @@ msgstr ""
msgid "Disable richtext status editor"
msgstr ""
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:85
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:86
+msgid "Your Friendica test account is about to expire."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:87
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you "
+"enjoyed this test drive and use this opportunity to find a permanent "
+"Friendica website for your integrated social communications. A list of "
+"public sites is available at http://dir.friendica.com/siteinfo - and for "
+"more information on setting up your own Friendica server please see the "
+"Friendica project website at http://friendica.com."
+msgstr ""
+
#: ../../addon/pageheader/pageheader.php:50
msgid "\"pageheader\" Settings"
msgstr ""
@@ -5192,7 +5255,6 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:27
#: ../../view/theme/diabook-blue/theme.php:27
#: ../../view/theme/diabook/theme.php:30
-#: ../../view/theme/dispy-dark/theme.php:120
#: ../../view/theme/diabook-aerith/theme.php:28
msgid "Last users"
msgstr ""
@@ -5229,7 +5291,7 @@ msgstr ""
#: ../../view/theme/diabook-blue/theme.php:149
#: ../../view/theme/diabook/theme.php:152
#: ../../view/theme/diabook-aerith/theme.php:150
-#: ../../include/contact_widgets.php:34
+#: ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr ""
@@ -5237,7 +5299,7 @@ msgstr ""
#: ../../view/theme/diabook-blue/theme.php:151
#: ../../view/theme/diabook/theme.php:154
#: ../../view/theme/diabook-aerith/theme.php:152
-#: ../../include/contact_widgets.php:35
+#: ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr ""
@@ -5911,7 +5973,7 @@ msgstr ""
msgid "[Relayed] Comment authored by %s from network %s"
msgstr ""
-#: ../../include/network.php:817
+#: ../../include/network.php:822
msgid "view full size"
msgstr ""
@@ -6074,46 +6136,50 @@ msgstr ""
msgid "Example: bob@example.com, http://example.com/barbara"
msgstr ""
-#: ../../include/contact_widgets.php:22
+#: ../../include/contact_widgets.php:23
#, php-format
msgid "%d invitation available"
msgid_plural "%d invitations available"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/contact_widgets.php:28
+#: ../../include/contact_widgets.php:29
msgid "Find People"
msgstr ""
-#: ../../include/contact_widgets.php:29
+#: ../../include/contact_widgets.php:30
msgid "Enter name or interest"
msgstr ""
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:31
msgid "Connect/Follow"
msgstr ""
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:32
msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
-#: ../../include/contact_widgets.php:66
+#: ../../include/contact_widgets.php:36
+msgid "Random Profile"
+msgstr ""
+
+#: ../../include/contact_widgets.php:68
msgid "Networks"
msgstr ""
-#: ../../include/contact_widgets.php:69
+#: ../../include/contact_widgets.php:71
msgid "All Networks"
msgstr ""
-#: ../../include/contact_widgets.php:96
+#: ../../include/contact_widgets.php:98
msgid "Saved Folders"
msgstr ""
-#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
msgid "Everything"
msgstr ""
-#: ../../include/contact_widgets.php:124
+#: ../../include/contact_widgets.php:126
msgid "Categories"
msgstr ""
@@ -6441,11 +6507,11 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
-#: ../../include/items.php:2656
+#: ../../include/items.php:2659
msgid "A new person is sharing with you at "
msgstr ""
-#: ../../include/items.php:2656
+#: ../../include/items.php:2659
msgid "You have a new follower at "
msgstr ""
@@ -6477,20 +6543,24 @@ msgid ""
msgstr ""
#: ../../include/Contact.php:137 ../../include/conversation.php:813
-msgid "View status"
+msgid "View Status"
msgstr ""
#: ../../include/Contact.php:138 ../../include/conversation.php:814
-msgid "View profile"
+msgid "View Profile"
msgstr ""
#: ../../include/Contact.php:139 ../../include/conversation.php:815
-msgid "View photos"
+msgid "View Photos"
msgstr ""
#: ../../include/Contact.php:140 ../../include/Contact.php:153
#: ../../include/conversation.php:816
-msgid "View recent"
+msgid "Network Posts"
+msgstr ""
+
+#: ../../include/Contact.php:141 ../../include/conversation.php:817
+msgid "Edit Contact"
msgstr ""
#: ../../include/Contact.php:142 ../../include/Contact.php:153
diff --git a/view/generic_links_widget.tpl b/view/generic_links_widget.tpl
new file mode 100644
index 000000000..45813b876
--- /dev/null
+++ b/view/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+ {{if $title}}<h3>$title</h3>{{endif}}
+ {{if $desc}}<div class="desc">$desc</div>{{endif}}
+
+ <ul>
+ {{ for $items as $item }}
+ <li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/settings.tpl b/view/settings.tpl
index 8753474af..ebca4875f 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,5 +1,3 @@
-$tabs
-
<h1>$ptitle</h1>
$nickname_block
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
index 28fca5362..84171dc8d 100644
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
@@ -1,5 +1,3 @@
-$tabs
-
<h1>$title</h1>
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
index 43c0346bb..bd3d60f0f 100644
--- a/view/settings_connectors.tpl
+++ b/view/settings_connectors.tpl
@@ -1,5 +1,3 @@
-$tabs
-
<h1>$title</h1>
<div class="connector_statusmsg">$diasp_enabled</div>
diff --git a/view/settings_display.tpl b/view/settings_display.tpl
index fc7a56c8a..70895a1f8 100644
--- a/view/settings_display.tpl
+++ b/view/settings_display.tpl
@@ -1,5 +1,3 @@
-$tabs
-
<h1>$ptitle</h1>
<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl
index da1398ab9..890c4ee6c 100644
--- a/view/settings_oauth.tpl
+++ b/view/settings_oauth.tpl
@@ -1,5 +1,3 @@
-$tabs
-
<h1>$title</h1>
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
index d29341386..e6f2abdc2 100644
--- a/view/settings_oauth_edit.tpl
+++ b/view/settings_oauth_edit.tpl
@@ -1,5 +1,3 @@
-$tabs
-
<h1>$title</h1>
<form method="POST">
diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl
index 6e455b726..225a5dd5c 100644
--- a/view/theme/diabook-aerith/comment_item.tpl
+++ b/view/theme/diabook-aerith/comment_item.tpl
@@ -15,10 +15,10 @@
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>
- <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
- <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option>
diff --git a/view/theme/diabook-aerith/generic_links_widget.tpl b/view/theme/diabook-aerith/generic_links_widget.tpl
new file mode 100644
index 000000000..001c1395e
--- /dev/null
+++ b/view/theme/diabook-aerith/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div id="widget_$title">
+ {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
+ {{if $desc}}<div class="desc">$desc</div>{{endif}}
+
+ <ul class="rs_tabs">
+ {{ for $items as $item }}
+ <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/theme/diabook-aerith/icons/com_side.png b/view/theme/diabook-aerith/icons/com_side.png
index bc5969ef1..00186ba05 100644
--- a/view/theme/diabook-aerith/icons/com_side.png
+++ b/view/theme/diabook-aerith/icons/com_side.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/events.png b/view/theme/diabook-aerith/icons/events.png
index 4a0b3f3f1..cf195fbb6 100644
--- a/view/theme/diabook-aerith/icons/events.png
+++ b/view/theme/diabook-aerith/icons/events.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/home.png b/view/theme/diabook-aerith/icons/home.png
index be47a48fc..5c610805f 100644
--- a/view/theme/diabook-aerith/icons/home.png
+++ b/view/theme/diabook-aerith/icons/home.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/mess_side.png b/view/theme/diabook-aerith/icons/mess_side.png
index 49ef896bc..5295e2e74 100644
--- a/view/theme/diabook-aerith/icons/mess_side.png
+++ b/view/theme/diabook-aerith/icons/mess_side.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/notes.png b/view/theme/diabook-aerith/icons/notes.png
index 7d4afca90..28dca30a3 100644
--- a/view/theme/diabook-aerith/icons/notes.png
+++ b/view/theme/diabook-aerith/icons/notes.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/pscontacts.png b/view/theme/diabook-aerith/icons/pscontacts.png
index acf857f32..23a78bcac 100644
--- a/view/theme/diabook-aerith/icons/pscontacts.png
+++ b/view/theme/diabook-aerith/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook-aerith/icons/pubgroups.png b/view/theme/diabook-aerith/icons/pubgroups.png
index 6d9539610..ae04194b1 100644
--- a/view/theme/diabook-aerith/icons/pubgroups.png
+++ b/view/theme/diabook-aerith/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
new file mode 100644
index 000000000..fe4baf8d1
--- /dev/null
+++ b/view/theme/diabook-aerith/nets.tpl
@@ -0,0 +1,11 @@
+<div id="nets-sidebar" class="widget">
+ <h3>$title</h3>
+ <div id="nets-desc">$desc</div>
+
+ <ul class="nets-ul">
+ <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ {{ for $nets as $net }}
+ <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ {{ endfor }}
+ </ul>
+</div>
diff --git a/view/theme/diabook-aerith/profile_side.tpl b/view/theme/diabook-aerith/profile_side.tpl
index 94396300f..01e80f238 100644
--- a/view/theme/diabook-aerith/profile_side.tpl
+++ b/view/theme/diabook-aerith/profile_side.tpl
@@ -7,13 +7,13 @@
</div>
<ul id="profile-side-menu" class="menu-profile-side">
- <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
- <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
- <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+ <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
+ <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
+ <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul>
</div>
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
- {{ for $tabs as $tab }}
- <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
- {{ endfor }}
-</ul>
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 385b58ac4..b9754ac32 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -482,8 +482,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+ background: aliceBlue;
}
.tool .label {
float: left;
@@ -940,44 +941,58 @@ ul.menu-popup .empty {
}
.menu-profile-list{
height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
+ overflow: auto;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: aliceBlue;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
+
/* aside */
aside {
display: table-cell;
diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook-aerith/style-settings.css
deleted file mode 100644
index 8963065ca..000000000
--- a/view/theme/diabook-aerith/style-settings.css
+++ /dev/null
@@ -1,2615 +0,0 @@
-/**
- * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
- * Additional Changes: Michael Vogel <icarus@dabo.de>
- **/
-
-/* ========= */
-/* = Admin = */
-/* ========= */
-
-#adminpage {
-/* width: 80%;*/
-}
-
-#pending-update {
- float:right;
- color: #ffffff;
- font-weight: bold;
- background-color: #FF0000;
- padding: 0em 0.3em;
-}
-
-.admin.linklist {
- border: 0px; padding: 0px;
-}
-
-.admin.link {
- list-style-position: inside;
- font-size: 1em;
- padding: 5px;
- width: 100px;
- margin: 5px;
-}
-
-#adminpage dl {
- clear: left;
- margin-bottom: 2px;
- padding-bottom: 2px;
- border-bottom: 1px solid black;
-}
-
-#adminpage dt {
- width: 200px;
- float: left;
- font-weight: bold;
-}
-
-#adminpage dd {
- margin-left: 200px;
-}
-#adminpage h3 {
- border-bottom: 1px solid #898989;
- margin-bottom: 5px;
- margin-top: 10px;
-}
-
-#adminpage .submit {
- clear:left;
-}
-
-#adminpage #pluginslist {
- margin: 0px; padding: 0px;
-}
-
-#adminpage .plugin {
- list-style: none;
- display: block;
- /* border: 1px solid #888888; */
- padding: 1em;
- margin-bottom: 5px;
- clear: left;
-}
-
-#adminpage .toggleplugin {
- float:left;
- margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #eeeeee; }
-#adminpage .selectall { text-align: right; }
-/* icons */
-
-.icon.contacts {
- background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
-.icon.notifications {
- background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
-.icon.notify {
- background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
-.icon.messages {
- background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
-.icon.community {
- background-image: url("../../../view/theme/diabook-aerith/icons/community.png");}
-
-.icon.drop { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.drophide { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.dislike { background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");}
-.icon.like { background-image: url("../../../view/theme/diabook-aerith/icons/like.png");}
-.icon.pencil { background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");}
-.icon.recycle { background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");}
-.icon.tagged { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");}
-.icon.link { background-image: url("../../../view/theme/diabook-aerith/icons/link.png");}
-.icon.lock { background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");}
-.icon.unlock { background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");}
-.icon.language { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");}
-
-
-.camera { background-image: url("../../../view/theme/diabook-aerith/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.attach { background-image: url("../../../view/theme/diabook-aerith/icons/attach.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video2 { background-image: url("../../../view/theme/diabook-aerith/icons/video.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video { background-image: url("../../../view/theme/diabook-aerith/icons/video.png");
- display: block; width: 100%; height: 28px; background-repeat: no-repeat;
- }
-.audio2 { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.audio { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.weblink { background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.globe { background-image: url("../../../view/theme/diabook-aerith/icons/globe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.unglobe { background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
-
-
-
-.article { background-position: -50px 0px;}
-/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
-/*.drop { background-position: -110px 0px;}*/
-/*.drophide { background-position: -130px 0px;}*/
-/*.edit { background-position: -150px 0px;}*/
-/*.camera { background-position: -170px 0px;}*/
-/*.dislike { background-position: -190px 0px;}*/
-/*.like { background-position: -210px 0px;}*/
-/*.link { background-position: -230px 0px;}*/
-
-/*.globe { background-position: -50px -20px;}*/
-/*.noglobe { background-position: -70px -20px;}*/
-.no { background-position: -90px -20px;}
-.pause { background-position: -110px -20px;}
-.play { background-position: -130px -20px;}
-/*.pencil { background-position: -150px -20px;}*/
-.small-pencil { background-position: -170px -20px;}
-/*.recycle { background-position: -190px -20px;}*/
-/*.remote-link { background-position: -210px -20px;}*/
-.share { background-position: -230px -20px;}
-
-.tools { background-position: -50px -40px;}
-/*.lock { background-position: -70px -40px;}*/
-
-/*.video { background-position: -110px -40px;}*/
-.youtube { background-position: -130px -40px;}
-
-/*.attach { background-position: -190px -40px;}*/
-/*.language { background-position: -210px -40px;}*/
-
-
-.icon.on { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
-.prev { background-position: -90px -60px;}
-.next { background-position: -110px -60px;}
-/*.tagged { background-position: -130px -60px;}*/
-
-.attachtype {
- display: block; width: 20px; height: 23px;
- background-image: url('../../../images/content-types.png');
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text { background-position: -60px 0px; }
-.type-unkn { background-position: -80px 0px; }
-
-.icon.drop, .icon.drophide {
- float: left;
-}
-
-.icon {
- display: block;
- width: 20px;
- height: 20px;
- /*background-image: url('icons.png');*/
-}
-
-.icon {
- background-color: transparent ;
- background-repeat: no-repeat;
- /* background-position: left center; */
- display: block;
- overflow: hidden;
- text-indent: -9999px;
- padding: 1px;
-}
-
-.icon.border.camera{
- background-image: url("../../../view/theme/diabook-aerith/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-
-.icon.border.link{
- background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- margin-left: 10px;
- }
-
-.icon.text {
- text-indent: 0px;
-}
-.icon.s10 {
- min-width: 10px;
- height: 10px;
-}
-.icon.s10.notify {
- background-image: url("../../../images/icons/10/notify_off.png");
-}
-.icon.s10.gear {
- background-image: url("../../../images/icons/10/gear.png");
-}
-.icon.s10.add {
- background-image: url("../../../images/icons/10/add.png");
-}
-.icon.s10.delete {
- background-image: url("../../../images/icons/10/delete.png");
-}
-.icon.s10.edit {
- background-image: url("../../../images/icons/10/edit.png");
-}
-.icon.s10.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s10.menu {
- background-image: url("../../../images/icons/10/menu.png");
-}
-.icon.s10.link {
- background-image: url("../../../images/icons/10/link.png");
-}
-.icon.s10.lock {
- background-image: url("../../../images/icons/10/lock.png");
-}
-.icon.s10.unlock {
- background-image: url("../../../images/icons/10/unlock.png");
-}
-.icon.s10.text {
- padding: 2px 0px 0px 15px;
- font-size: 10px;
-}
-.icon.s16 {
- min-width: 16px;
- height: 16px;
-}
-.icon.s16.notify {
- background-image: url("../../../images/icons/16/notify_off.png");
-}
-.icon.s16.gear {
- background-image: url("../../../images/icons/16/gear.png");
-}
-.icon.s16.add {
- background-image: url("../../../images/icons/16/add.png");
-}
-.icon.s16.delete {
- background-image: url("../../../images/icons/16/delete.png");
-}
-/*.icon.s16.edit {
- background-image: url("../../../images/icons/16/edit.png");
-}*/
-.icon.s16.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s16.menu {
- background-image: url("../../../images/icons/16/menu.png");
-}
-/*.icon.s16.link {
- background-image: url("../../../images/icons/16/link.png");
-}*/
-.icon.s16.lock {
- background-image: url("../../../images/icons/16/lock.png");
-}
-.icon.s16.unlock {
- background-image: url("../../../images/icons/16/unlock.png");
-}
-.icon.s16.text {
- padding: 4px 0px 0px 20px;
- font-size: 10px;
-}
-.icon.s22 {
- min-width: 22px;
- height: 22px;
-}
-.icon.s22.notify {
- background-image: url("../../../images/icons/22/notify_off.png");
-}
-.icon.s22.gear {
- background-image: url("../../../images/icons/22/gear.png");
-}
-.icon.s22.add {
- background-image: url("../../../images/icons/22/add.png");
-}
-.icon.s22.delete {
- background-image: url("../../../images/icons/22/delete.png");
-}
-.icon.s22.edit {
- background-image: url("../../../images/icons/22/edit.png");
-}
-.icon.s22.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s22.menu {
- background-image: url("../../../images/icons/22/menu.png");
-}
-.icon.s22.link {
- background-image: url("../../../images/icons/22/link.png");
-}
-.icon.s22.lock {
- background-image: url("../../../images/icons/22/lock.png");
-}
-.icon.s22.unlock {
- background-image: url("../../../images/icons/22/unlock.png");
-}
-.icon.s22.text {
- padding: 10px 0px 0px 25px;
- width: 200px;
-}
-.icon.s48 {
- width: 48px;
- height: 48px;
-}
-.icon.s48.notify {
- background-image: url("../../../images/icons/48/notify_off.png");
-}
-.icon.s48.gear {
- background-image: url("../../../images/icons/48/gear.png");
-}
-.icon.s48.add {
- background-image: url("../../../images/icons/48/add.png");
-}
-.icon.s48.delete {
- background-image: url("../../../images/icons/48/delete.png");
-}
-.icon.s48.edit {
- background-image: url("../../../images/icons/48/edit.png");
-}
-.icon.s48.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s48.menu {
- background-image: url("../../../images/icons/48/menu.png");
-}
-.icon.s48.link {
- background-image: url("../../../images/icons/48/link.png");
-}
-.icon.s48.lock {
- background-image: url("../../../images/icons/48/lock.png");
-}
-.icon.s48.unlock {
- background-image: url("../../../images/icons/48/unlock.png");
-}
-
-#contact-edit-links ul {
- list-style: none;
- list-style-type: none;
-}
-
-.hide-comments-outer {
- margin-left: 80px;
- margin-bottom: 1px;
- width: 484px;
- border-bottom: 1px solid #BDCDD4;
- background-color: #fff;
- padding: 8px;
-}
-
-/* global */
-body {
- font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 12.5px;
- background-color: #ffffff;
- color: #2d2d2d;
- margin: 50px auto auto;
- display: table;
-}
-
-h4 {
- font-size: 1.1em;
-}
-
-a {
- color: #333333;
- /* color: #3e3e8c; */
- text-decoration: none;
-}
-a:hover {
- /* color: blue; */
- text-decoration: underline
-}
-
-.wall-item-name-link {
-/* float: left;*/
-}
-
-.wall-item-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-
-.left {
- float: left;
-}
-.right {
- float: right;
-}
-.hidden {
- display: none;
-}
-.clear {
- clear: both;
-}
-.fakelink {
- color: #3465A4;
- /* color: #3e3e8c; */
- text-decoration: none;
- cursor: pointer;
-}
-.fakelink:hover {
- /* color: blue; */
- /*color: #005c94; */
- text-decoration: underline;
-}
-code {
- font-family: Courier, monospace;
- white-space: pre;
- display: block;
- overflow: auto;
- border: 1px solid #444;
- background: #EEE;
- color: #444;
- padding: 10px;
- margin-top: 20px;
-}
-#panel {
- position: absolute;
- width: 12em;
- background: #ffffff;
- color: #2d2d2d;
- margin: 0px;
- padding: 1em;
- list-style: none;
- border: 3px solid #364e59;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-/* tool */
-.tool {
- height: auto;
- overflow: auto;
- padding: 3px;
-}
-#saved-search-ul .tool:hover,
-#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
-}
-.tool .label {
- float: left;
-}
-.tool .action {
- float: right;
-}
-.tool a {
- color: #3465A4;
-}
-.tool a:hover {
- text-decoration: none;
-}
-/* popup notifications */
-div.jGrowl div.notice {
- background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-div.jGrowl div.info {
- background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-/* header */
-header {
- position: fixed;
- left: 0%;
- right: 80%;
- top: 0px;
- margin: 0px;
- padding: 0px;
- width: 22%;
- height: 32px;
- background: #ff500f;
- background-color: #ff500f;
- z-index: 100;
- border-bottom: 1px;
- border-bottom-color: black;
- border-bottom-style: inset;
- background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-
-background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0.26, rgb(215,227,241)),
- color-stop(0.82, rgb(255,255,255))
-);
-}
-header #site-location {
- display: none;
-}
-header #banner {
- overflow: hidden;
- text-align: left;
- width: 82%%;
- margin-left: 25%;
-}
-header #banner a,
-header #banner a:active,
-header #banner a:visited,
-header #banner a:link,
-header #banner a:hover {
- color: black;
- text-decoration: none;
- outline: none;
- vertical-align: middle;
- font-weight: bolder;
- margin-left: 3px;
-}
-header #banner #logo-img {
- height: 25px;
- margin-top: 3px;
-}
-header #banner #logo-text {
- font-size: 20px;
- position: absolute;
- top: 10%;
-}
-/* nav */
-nav {
- width: 80%;
- height: 32px;
- position: fixed;
- left: 22%;
- top: 0px;
- padding: 0px;
- background: #ff500f;
- color: #000;
- z-index: 99;
- border-bottom: 1px;
- border-bottom-color: black;
- border-bottom-style: inset;
- background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
-
-background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0.26, rgb(215,227,241)),
- color-stop(0.82, rgb(255,255,255))
-);
-}
-nav a,
-nav a:active,
-nav a:visited,
-nav a:link,
-nav a:hover {
- /*color: #1f1f1f;*/
- text-decoration: none;
- outline: none;
-}
-nav #banner {
- overflow: hidden;
- /*text-align: center;*/
- width: 100%;
-}
-nav #banner a,
-nav #banner a:active,
-nav #banner a:visited,
-nav #banner a:link,
-nav #banner a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
- vertical-align: bottom;
-}
-nav #banner #logo-img {
- height: 22px;
- margin-top: 5px;
-}
-nav #banner #logo-text {
- font-size: 22px;
-}
-nav #navbar{
- }
-nav ul {
- margin: 0px;
- padding: 0px 20px;
-}
-nav ul li {
- list-style: none;
- margin: 0px;
- /* padding: 1px 1px 3px 1px; */
- float: left;
-}
-nav ul li .menu-popup {
- left: 0px;
- right: auto;
-}
-
-nav #logo-img {
- height: 25px;
- margin-top: 4px;
- margin-left: 30px;
-}
-
-nav #logo-text {
- font-size: 22px;
- margin-top: 3px;
- margin-right: 15px;
-}
-nav .nav-menu-search {
- position: relative;
-
- margin: 4px 17px;
- margin-right: 0px;
- height: 17px;
- width: 180px;
-
-}
-
-nav #search-box #search-text {
- background-image: url('icons/lupe.png');
- background-repeat:no-repeat;
- padding-left:20px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
- }
-
-
-nav .nav-menu-icon {
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 5px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-nav .nav-menu-icon:hover {
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 5px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-
-nav .nav-menu-icon.selected {
- background-color: #fff;
-}
-nav .nav-menu-icon img {
- width: 22px;
- height: 22px;
-}
-nav .nav-menu-icon .nav-notify {
- top: 3px;
-}
-nav .nav-menu {
- position: relative;
- height: 16px;
- padding: 5px;
- margin: 3px 15px 0px;
- font-size: 13px;
- /*border: 3px solid #364A84;*/
-}
-nav .nav-menu.selected {
- /*border-bottom: 3px solid #9eabb0;*/
-}
-nav .nav-notify {
- display: none;
- position: absolute;
- background-color: #fff;
- /* background-color: #19aeff; */
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- font-size: 10px;
- font-weight: 900;
- padding: 1px 4px;
- top: 0px;
- right: -6px;
- min-width: 10px;
- text-align: center;
- border: 1px solid black;
-}
-nav .nav-notify.show {
- display: block;
-}
-nav #nav-help-link,
-nav #nav-search-link,
-nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-site-linkmenu,
-nav #nav-home-link,
-nav #nav-user-linkmenu
-{
- float: right;
-}
-nav #nav-user-linkmenu{
- margin-right: 0px;
- }
-nav #nav-home-link, #nav-directory-link, #nav-apps-link{
- margin-left: 0px;
- margin-right: 0px;
- font-weight: bold;
- margin: 3px 5px;
- font-size: 14px;
- }
-nav #nav-directory-link{
- margin-right: 0px;
- }
-nav #nav-home-link{
- margin-left: 0px;
- }
-nav #nav-help-link .menu-popup,
-nav #nav-search-link .menu-popup,
-nav #nav-directory-link .menu-popup,
-nav #nav-apps-link .menu-popup,
-nav #nav-site-linkmenu .menu-popup {
- right: 0px;
- left: auto;
-}
-
-nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
- background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");
- }
-
-/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
- background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");
- }
-
-nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
- background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");
- }
-
-nav #nav-apps-link.selected {
- background-color: #fff;
- moz-border-radius: 5px 5px 0 0;
--webkit-border-radius: 5px 5px 0 0;
-border-radius: 5px 5px 0 0;
-}
-
-#nav-notifications-mark-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-#nav-notifications-see-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-.notify-seen {
- background: none repeat scroll 0 0 #DDDDDD;
- }
-
-ul.menu-popup {
- position: absolute;
- display: none;
- width: 11em;
- background: #fff;
- color: #2d2d2d;
- margin: 0px;
- padding: 0px;
- list-style: none;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
- display: block;
- color: #2d2d2d;
- padding: 5px 10px;
- text-decoration: none;
-}
-ul.menu-popup a:hover {
- background-color: #3465A4; /*bdcdd4;*/
- color: #fff;
-}
-ul.menu-popup .menu-sep {
- border-top: 1px solid #9eabb0;
-}
-ul.menu-popup li {
- float: none;
- overflow: auto;
- height: auto;
- display: block;
-}
-ul.menu-popup li img {
- float: left;
- width: 16px;
- height: 16px;
- padding-right: 5px;
-}
-ul.menu-popup .empty {
- padding: 5px;
- text-align: center;
- color: #9eabb0;
-}
-/* autocomplete popup */
-.acpopup {
- max-height: 150px;
- background-color: #ffffff;
- color: #2d2d2d;
- border: 1px solid #MenuBorder;
- overflow: auto;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-.acpopupitem {
- color: #2d2d2d;
- padding: 4px;
- clear: left;
-}
-.acpopupitem img {
- float: left;
- margin-right: 4px;
-}
-.acpopupitem.selected {
- background-color: #bdcdd4;
-}
-#nav-notifications-menu {
- width: 400px;
- max-height: 550px;
- overflow: auto;
-}
-/* #nav-notifications-menu a {
- display: inline;
- padding: 5px 0px;
- margin: 0px 0px 2px 0px;
-}
-#nav-notifications-menu li:hover {
- background-color: #bdcdd4;
-}*/
-
-#nav-notifications-menu img {
- float: left;
- margin-right: 5px;
-}
-#nav-notifications-menu .contactname {
- font-weight: bold;
-}
-#nav-notifications-menu .notif-when {
- font-size: 10px;
- color: #9eabb0;
- display: block;
-}
-
-.notif-image {
- width: 32px;
- height: 32px;
- padding: 7px 7px 0px 0px;
-}
-
-/*profile_side*/
-#profile_side {
- margin-bottom: 30px;
-
-}
-#profile_side a{
- color: #333;
-}
-#ps-usericon{
- height: 25px
- }
-#ps-username{
- font-size: 1.17em;
- font-weight: bold;
- vertical-align: top;
- position: absolute;
- padding-top: 4px;
- padding-left: 5px;
- word-wrap: break-word;
- width: 130px;
- }
-#ps-username:hover{
- text-decoration: none;
- }
-.menu-profile-side{
- list-style: none;
- padding-left: 0px;
- min-height: 0px;
- }
-.menu-profile-list{
- height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
- }
-.menu-profile-list:hover{
- background: #EEE;
- }
-.menu-profile-list-item{
- padding-left: 5px;
- }
-.menu-profile-list-item:hover{
- text-decoration: none;
- }
-/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
- background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
- }
-.menu-profile-list.photos{
- background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
- background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
- background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
- background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
- background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
- background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
- }
-/* aside */
-aside {
- display: table-cell;
- vertical-align: top;
- width: 200px;
- padding: 0px 10px 0px 10px;
- border-right: 1px solid #D2D2D2;
- float: left;
- /* background: #F1F1F1; */
-}
-aside #page-sidebar{display: none;}
-aside .vcard {display: none;}
-aside .vcard .title {
- margin-bottom: 5px;
-}
-aside .vcard dl {
- height: auto;
- overflow: auto;
-}
-aside .vcard dt {
- float: left;
- margin-left: 0px;
- /*width: 35%;*/
- text-align: right;
- color: #999999;
-}
-aside .vcard dd {
- float: left;
- margin-left: 5px;
- /*width: 60%;*/
-}
-aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
-}
-aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
- list-style: none;
-}
-aside #dfrn-request-link {
- display: block;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- color: #ffffff;
- background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
- font-weight: bold;
- text-transform: uppercase;
- padding: 4px 2px 2px 35px;
-}
-aside #dfrn-request-link:hover {
- text-decoration: none;
- background-color: #36c;
- /* background-color: #19aeff; */
-}
-aside #profiles-menu {
- width: 20em;
-}
-aside #search-text {
- width: 150px;
- height: 17px;
- padding-left: 10px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
-}
-aside #side-follow-url {
- width: 150px;
- }
-aside #side-peoplefind-url {
- width: 150px;
- }
-#contact-block {display: none;}
-#contact-block .contact-block-h4 {
- float: left;
- margin: 5px 0px;
-}
-#contact-block .allcontact-link {
- float: right;
- margin: 5px 0px;
-}
-#contact-block .contact-block-content {
- clear: both;
- overflow: auto;
- height: auto;
-}
-#contact-block .contact-block-link {
- float: left;
- margin: 0px 2px 2px 0px;
-}
-#contact-block .contact-block-link img {
- widht: 55px;
- height: 55px;
-}
-#lost-password-link {
- float: left;
- margin-right: 20px;
- }
-/* widget */
-.widget {
- margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-/* font-size: 12px; */
-}
-.widget h3 {
- padding: 0px;
- margin: 2px;
-}
-.widget .action {
- opacity: 0.1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget input.action {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget:hover .title .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action.ticked {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget ul {
- padding: 0px;
-}
-.widget ul li {
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums ul li a{
- color: #3465A4;
-}
-.widget .tool.selected {
- background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center;
-}
-/* widget: search */
-span.sbox_l {
- background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-left: 10px;
- margin-top: 5px;
-
-}
-
-span.sbox_r {
- background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-top: 5px;
-}
-
-span.sbox input {
- background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
- float: left;
- margin-top: 5px;
- border: 0;
- height: 13px; width: 100px;
- padding: 3px;
- font: 11px/13px arial;
- color: #000;
-}
-#add-search-popup {
- width: 200px;
- top: 18px;
-}
-/* section */
-section {
- display: table-cell;
- vertical-align: top;
- width: 650px;
- padding: 0px 0px 0px 20px;
-}
-
-body .pageheader{
- text-align: center;
- font-size: 20px;
- margin-bottom: 20px;
- margin-top: 0px;
- max-width: 575px;
- }
-
-#id_username {
- width: 173px;
- }
-#id_password {
- width: 173px;
- }
-#id_openid_url {
- width: 173px;
- }
-#contact-edit-end {
- }
-.pager {
- padding: 10px;
- text-align: center;
- font-size: 1.0em;
- clear: both;
- display: block;
-}
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
-
- background-position: 0 -20px;
- background-repeat: repeat-x;
- height: 27px;
- padding: 0;
- }
-.rs_tab.button {
- /*background: none repeat scroll 0 0 #F8F8F8;*/
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- font-weight: bolder;
- padding: 3px;
- color: #333333;
- text-decoration: none;
- }
-
-#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
- margin-bottom: 10px;
- }
-#birthday-wrapper a {
- color: #3465A4;
- }
-
-right_aside {
- display: table-cell;
- vertical-align: top;
- width: 170px;
-
- /*border-left: 1px solid #D2D2D2;*/
-
- /* background: #F1F1F1; */
-}
-right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
-margin-top:30px;}
-right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
-right_aside .directory-photo { margin: 0px; }
-right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
-right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto; width: 100%; }
-right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
-right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
-#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
-#page-sidebar-right_aside ul {margin-top: 0px;}
-#page-sidebar-right_aside .label {max-width: 128px;}
-right_aside .icon {width: 10px; height: 10px;}
-.close_box {
- background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 0.1;
- }
-.close_box:hover {
- background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 1;
--webkit-transition: all 0.2s ease-in-out;
--moz-transition: all 0.2s ease-in-out;
--o-transition: all 0.2s ease-in-out;
--ms-transition: all 0.2s ease-in-out;
-transition: all 0.2s ease-in-out;
- }
-
-
-/* wall item */
-.tread-wrapper {
- border-bottom: 1px solid #D2D2D2;
- position: relative;
- padding: 5px;
- margin-bottom: 0px;
- width: 575px;
-}
-.tread-wrapper a{
- color: #3465A4;
-}
-
-.wall-item-decor {
- position: absolute;
- left: 790px;
- top: -10px;
- width: 16px;
-}
-
-.wall-item-container {
- display: table;
- width: 580px;
-}
-
-
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
- display: table-row;
-}
-
-.wall-item-bottom {
- font-size: 13px;
-}
-.wall-item-container .wall-item-bottom {
-/* opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container:hover .wall-item-bottom {
-/* opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container .wall-item-info {
- display: table-cell;
- vertical-align: top;
- text-align: left;
- width: 80px;
-}
-.wall-item-container .wall-item-location {
- padding-right: 40px;
- display: table-cell;
-}
-.wall-item-container .wall-item-ago {
- word-wrap: break-word;
- width: 50px;
- margin-left: 10px;
- color: #999;
-}
-.wall-item-location {
-
- clear: both;
- overflow: hidden;
-
- margin-bottom: 5px;
-}
-
-.wall-item-container .wall-item-content {
- font-size: 12.5px;
- max-width: 420px;
- word-wrap: break-word;
- line-height: 1.2;
-}
-
-.wall-item-container .wall-item-content img {
- max-width: 400px;
-}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
- display: table-cell;
- vertical-align: middle;
-}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-name {
- font-weight: bold;
-}
-.wall-item-container .wall-item-actions-author {
- width: 100%;
- margin-bottom: 0.3em;
-}
-.wall-item-container .wall-item-actions-social {
- float: left;
- margin-bottom: 1px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-social a {
- margin-right: 1em;
-}
-.wall-item-actions-social a {
- float: left;
-}
-.wall-item-container .wall-item-actions-tools {
- float: right;
- width: 80px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-tools a {
- float: right;
-}
-.wall-item-container .wall-item-actions-tools input {
- float: right;
-}
-.wall-item-container.comment {
- margin-top: 5px;
- margin-bottom: 5px;
- margin-left: 80px;
- width: 500px;
- border-bottom: 1px solid hsl(198, 21%, 79%);
-}
-.wall-item-container.comment .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.wall-item-container.comment {
- top: 15px !important;
- left: 15px !important;
-}
-.wall-item-container.comment .wall-item-links {
- padding-left: 12px;
-}
-
-.wall-item-comment-wrapper {
- margin: 1px 0px 0px 80px;
- background-color: #fff;
- width: 500px;
-}
-.wall-item-comment-wrapper .comment-edit-photo {
- display: none;
-}
-.wall-item-comment-wrapper textarea {
- height: 2.0em;
- width: 93%;
- font-size: 10px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- font-size: 14px;
- margin-left: 20px;
-}
-.wall-item-comment-wrapper .comment-edit-text-full {
- font-size: 14px;
- height: 4em;
- color: #2d2d2d;
- border: 1px solid #2d2d2d;
-}
-.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
- margin-top: 10px;
-}
-.comment-edit-preview .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.comment-edit-preview {
- top: 15px !important;
- left: 15px !important;
-}
-.comment-edit-preview .wall-item-links {
- padding-left: 12px;
-}
-.comment-edit-preview .wall-item-container {
- width: 700px;
-}
-.comment-edit-preview .tread-wrapper {
- width: 700px;
- padding: 0;
- margin: 10px 0;
-}
-
-.shiny {
- /* border-right: 10px solid #fce94f; */
- border-right: 1px solid #A7C7F7;
- padding-right: 12px;
-}
-
-#jot-preview-content{
- margin-top: 30px;}
-
-#jot-preview-content .tread-wrapper {
- background-color: #fff797;
-}
-
-.wall-item-tags {
- padding-top: 1px;
- padding-bottom: 2px;
-}
-.tag {
- /*background: url("../../../images/tag_b.png") repeat-x center left;*/
- color: #999;
- padding-left: 3px;
- font-size: 12px;
-}
-.tag a {
- padding-right: 5px;
- /*background: url("../../../images/tag.png") no-repeat center right;*/
- color: #999;
-}
-.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
- background: #FFFFFF;
- border: 2px solid #364e59;
- height: 25px;
- width: 25px;
- overflow: hidden;
- padding: 1px;
- position: absolute !important;
- top: 40px;
- left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-}
-.wwto .contact-photo {
- width: auto;
- height: 25px;
-}
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
- width: 80px;
-}
-
-.contact-photo-wrapper.wwto {
- width: 25px;
-}
-
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper {
- left: 0px;
- top: 63px;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-name {
- /* text-align: center; */
- /*font-weight: bold;*/
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-/* editor */
-.jothidden {
- display: none;
-}
-#jot {
- width: 585px;
- margin: 0px 2em 20px 0px;
-}
-#profile-jot-form #profile-jot-text {
- height: 2.0em;
- width: 99%;
- font-size: 15px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- margin-bottom: 10px;
-}
-#jot #jot-tools {
- margin: 0px;
- padding: 0px;
- height: 40px;
- overflow: none;
- width: 583px;
- background-color: #fff;
- border-bottom: 2px solid #9eabb0;
-}
-
-#jot #jot-tools li {
- list-style: none;
- float: left;
- width: 80px;
- height: 40px;
- border-bottom: 2px solid #9eabb0;
-}
-#jot #jot-tools li a {
- display: block;
- color: #cccccc;
- width: 100%;
- height: 40px;
- text-align: center;
- line-height: 40px;
- overflow: hidden;
-}
-#jot #jot-tools li:hover {
- background-color: #364e59;
- border-bottom: 2px solid #bdcdd4;
-}
-#jot #jot-tools li.perms {
- float: right;
- width: 40px;
-}
-#jot #jot-tools li.perms a.unlock {
- width: 30px;
- border-left: 10px solid #cccccc;
- background-color: #cccccc;
- background-position: left center;
-}
-#jot #jot-tools li.perms a.lock {
- width: 30px;
- border-left: 10px solid #666666;
- background-color: #666666;
-}
-#jot #jot-tools li.submit {
- float: right;
- background-color: #cccccc;
- border-bottom: 2px solid #cccccc;
- border-right: 1px solid #666666;
- border-left: 1px solid #666666;
-}
-#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
- background-color: #cccccc;
- color: #666666;
- width: 80px;
- height: 40px;
- line-height: 40px;
-}
-#jot #jot-tools li.submit input:hover {
- background-color: #bdcdd4;
- color: #666666;
-}
-#jot #jot-tools li.loading {
- float: right;
- background-color: #ffffff;
- width: 20px;
- vertical-align: center;
- text-align: center;
- border-top: 2px solid #9eabb0;
- height: 38px;
-}
-#jot #jot-tools li.loading img {
- margin-top: 10px;
-}
-#profile-jot-form #jot-title {
-
- border-radius: 5px 5px 5px 5px;
- font-weight: bold;
- height: 20px;
- margin: 0 0 5px;
- width: 60%;
- border: 1px solid #ffffff;
-}
-#profile-jot-form #jot-title:-webkit-input-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #jot-title:-moz-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
- width: 585px;
- height: 100px;
- }
-#jot #jot-title:hover {
- border: 1px solid #999999;
-}
-#jot #jot-title:focus {
- border: 1px solid #999999;
-}
-#jot #character-counter {
- width: 80px;
- float: right;
- text-align: right;
- height: 20px;
- line-height: 20px;
- padding-right: 20px;
-}
-#jot-perms-icon,
-#profile-location,
-#profile-nolocation,
-#profile-youtube,
-#profile-video,
-#profile-audio,
-#profile-link,
-#profile-title,
-#wall-image-upload,
-#wall-file-upload,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
- cursor: pointer;
- margin-top: 2px;
-}
-#profile-jot-wrapper{
- margin: 0 2em 20px 0;
- width: 585px;
- }
-
-#profile-jot-submit-wrapper {
- margin-bottom: 50px;
- width: 585px;
-}
-
-#profile-jot-submit {
- float: right;
- margin-top: 2px;
- font-size: 14px;
-
-}
-#profile-upload-wrapper {
- float: left;
- margin-top: 2px;
- margin-left: 10px;
-
-}
-#profile-attach-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-rotator {
- float: left;
- margin-left: 30px;
- margin-top: 2px;
-}
-#profile-link-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-youtube-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-video-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-audio-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-location-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-jot-perms {
- float: left;
- margin-left: 45px;
- margin-top: 2px;
-}
-#jot-preview-link {
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- font-size: 9px;
- font-weight: bolder;
- cursor: pointer;
-}
-#profile-jot-perms{
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- }
-/** buttons **/
-.button.creation1 {
- background-color: #fff;
- border: 1px solid #777777;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- cursor: pointer;
- font-weight: bolder;
-}
-.button.creation2 {
- background-color: #3465A4;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- margin-left: 5px;
- cursor: pointer;
- font-weight: bolder;
-}
-/*input[type="submit"] {
- border: 0px;
- background-color: @ButtonBackgroundColor;
- color: @ButtonColor;
- padding: 0px 10px;
- .rounded(5px);
- height: 18px;
-}*/
-/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
- display: block!important;
-}
-#acl-wrapper {
- width: 690px;
- float: left;
-}
-#acl-search {
- float: right;
- background: #ffffff url("../../../images/search_18.png") no-repeat right center;
- padding-right: 20px;
-}
-#acl-showall {
- float: left;
- display: block;
- width: auto;
- height: 18px;
- background-color: #cccccc;
- background-image: url("../../../images/show_all_off.png");
- background-position: 7px 7px;
- background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
- color: #999999;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
-}
-#acl-showall.selected {
- color: #000000;
- background-color: #ff9900;
- background-image: url("../../../images/show_all_on.png");
-}
-#acl-list {
- height: 210px;
- border: 1px solid #cccccc;
- clear: both;
- margin-top: 30px;
- overflow: auto;
-}
-.acl-list-item {
- display: block;
- width: 150px;
- height: 30px;
- border: 1px solid #cccccc;
- margin: 5px;
- float: left;
-}
-.acl-list-item img {
- width: 22px;
- height: 22px;
- float: left;
- margin: 4px;
-}
-.acl-list-item p {
- height: 12px;
- font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
- overflow: hidden;
-}
-.acl-list-item a {
- font-size: 8px;
- display: block;
- width: 40px;
- height: 10px;
- float: left;
- color: #999999;
- background-color: #cccccc;
- background-position: 3px 3px;
- background-repeat: no-repeat;
- margin-right: 5px;
- -webkit-border-radius: 2px ;
- -moz-border-radius: 2px;
- border-radius: 2px;
- padding-left: 15px;
-}
-#acl-wrapper a:hover {
- text-decoration: none;
- color: #000000;
-}
-.acl-button-show {
- background-image: url("../../../images/show_off.png");
-}
-.acl-button-hide {
- background-image: url("../../../images/hide_off.png");
-}
-.acl-button-show.selected {
- color: #000000;
- background-color: #9ade00;
- background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
- color: #000000;
- background-color: #ff4141;
- background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow {
- border-color: #9ade00;
-}
-.acl-list-item.grouphide {
- border-color: #ff4141;
-}
-/** /acl **/
-/** tab buttons 14618a**/
-ul.rs_tabs {
- list-style-type: none;
-
- font-size: 11px;
-}
-ul.rs_tabs li {
- float: left;
- margin-bottom: 30px;
- clear: both;
-}
-ul.rs_tabs li .active {
- background-color: #3465A4;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 2px 2px 2px #CFCFCF;
- font-size: 13px;
-}
-/**
- * Form fields
- */
-.field {
- margin-bottom: 10px;
- padding-bottom: 10px;
- overflow: auto;
- width: 100%;
-}
-.field label {
- float: left;
- width: 200px;
-}
-.field input, .field textarea {
- width: 400px;
-}
-.field textarea {
- height: 100px;
-}
-.field .field_help {
- display: block;
- margin-left: 200px;
- color: #666666;
-}
-.field .onoff {
- float: left;
- width: 80px;
-}
-.field .onoff a {
- display: block;
- border: 1px solid #666666;
- background-image: url("../../../images/onoff.jpg");
- background-repeat: no-repeat;
- padding: 4px 2px 2px 2px;
- height: 16px;
- text-decoration: none;
-}
-.field .onoff .off {
- border-color: #666666;
- padding-left: 40px;
- background-position: left center;
- background-color: #cccccc;
- color: #666666;
- text-align: right;
-}
-.field .onoff .on {
- border-color: #204A87;
- padding-right: 40px;
- background-position: right center;
- background-color: #D7E3F1;
- color: #204A87;
- text-align: left;
-}
-.field .hidden {
- display: none!important;
-}
-.field.radio .field_help {
- margin-left: 0px;
-}
-#directory-search-form{
- margin-bottom: 50px;
- }
-#profile-edit-links-end {
- clear: both;
- margin-bottom: 15px;
-}
-
-#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
-
-#profile-edit-links li {
- float: left;
- list-style: none;
- margin-left: 10px;
-}
-
-.profile-edit-side-div {
- display: none;
-}
-
-#register-form label,
-#profile-edit-form label {
- width: 300px; float: left;
-}
-
-.required {
- display: inline;
- color: #B20202;
-}
-
-/* oauth */
-.oauthapp {
- height: auto;
- overflow: auto;
- border-bottom: 2px solid #cccccc;
- padding-bottom: 1em;
- margin-bottom: 1em;
-}
-.oauthapp img {
- float: left;
- width: 48px;
- height: 48px;
- margin: 10px;
-}
-.oauthapp img.noicon {
- background-image: url("../../../images/icons/48/plugin.png");
- background-position: center center;
- background-repeat: no-repeat;
-}
-.oauthapp a {
- float: left;
-}
-/* contacts */
-.contact-entry-wrapper {
- width: 120px;
- height: 120px;
- float: left;
-}
-/* photo */
-.photo {
-box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
-}
-.lframe {
- float: left;
- /*margin: 0px 10px 10px 0px;*/
-}
-/* profile match wrapper */
-.profile-match-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 20px;
-}
-.profile-match-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper {
- left: 0px;
- top: 63px;
-}
-
-.contact-photo-menu-button {
- position: relative;
- background-image: url("../../../images/icons/16/menu.png");
- background-position: top left;
- background-repeat: no-repeat;
- margin: 0px 0px -16px 0px;
- padding: 0px;
- width: 16px;
- height: 16px;
- top: -20px; left:0px;
- overflow: hidden;
- text-indent: 40px;
- display: none;
-
-}
-.contact-photo-menu {
- width: 11em;
- border: 3px solid #364e59;
- color: #2d2d2d;
- background: #FFFFFF;
-/* position: absolute;*/
- position: relative;
- left: 0px; top: 0px;
- display: none;
- z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a {
- display: block;
- padding: 5px 10px;
- color: #2d2d2d;
- text-decoration: none;
-}
-.contact-photo-menu li a:hover {
- background-color: #bdcdd4;
-}
-
-/* page footer */
-footer {
- height: 100px;
- display: table-row;
-}
-
-blockquote {
- border-left: 1px solid #D2D2D2;
- padding-left: 9px;
- margin: 0 0 0 .8ex;
-}
-.aprofile dt{
-box-shadow: 1px 1px 5px 0;
- color: #666666;
- margin: 15px 0 5px;
- padding-left: 5px;
- }
-/* ================== */
-/* = Contacts Block = */
-/* ================== */
-
-.contact-block-img {
- width: 55px;
- height: 55px;
- padding-right: 3px;
-}
-.contact-block-div {
- float: left;
-}
-
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
-
-#group-edit-wrapper {
- margin-bottom: 10px;
-}
-
-#group-members-end {
- clear: both;
-}
-#group-edit-desc {
- margin-top: 15px;
-}
-
-/*
-#group-separator,
-#prof-separator { display: none;}
-*/
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
- margin-bottom: 10px;
- margin-top: 20px;
-}
-
-#prvmail-submit {
- float: right;
- margin-top: 10px;
-}
-
-#prvmail-subject
-{
-background: none repeat scroll 0 0 #FFFFFF;
-border: 1px solid #CCCCCC;
-border-radius: 5px 5px 5px 5px;
-font-weight: bold;
-height: 20px;
-margin: 0 0 5px;
-vertical-align: middle;
-}
-#prvmail-form{
- width: 597px;
- }
-
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
- float: left;
- margin-top: 10px;
- margin-right: 10px;
- width: 24px;
-}
-
-#prvmail-end {
- clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
- float: left;
-}
-.mail-list-detail {
- margin-left: 20px;
-}
-
-.mail-list-subject {
- font-size: 1.1em;
- margin-top: 10px;
-}
-a.mail-list-link {
- display: block;
- font-size: 1.3em;
- padding: 4px 0;
-}
-
-/*
-*a.mail-list-link:hover {
-* background-color: #15607B;
-* color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
- clear: both;
-}
-
-.mail-list-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-
-.mail-list-delete-icon {
- border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
-}
-
-.mail-conv-delete-icon {
- border: none;
-}
-
-/* ========== */
-/* = Events = */
-/* ========== */
-.eventcal {
- float: left;
- font-size: 20px;
-}
-
-.vevent {
- border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
- margin-left: 10px;
- margin-right: 10px;
-}
-.vevent .event-start {
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#new-event-link {
- margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
-}
-
-.event-description:before {
- content: url('../../../images/calendar.png');
- margin-right: 15px;
-}
-
-.event-start, .event-end {
- margin-left: 10px;
- width: 330px;
- clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
- float: right;
-}
-
-.event-list-date {
- margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
- float: left;
- margin-left: 32px;
- margin-right: 32px;
- margin-top: 64px;
-}
-.event-calendar-end {
- clear: both;
-}
-
-
-.calendar {
- font-family: Courier, monospace;
-}
-.calendar.eventcal a {
- color: #3465A4;
- }
-.today {
- font-weight: bold;
- color: #FF0000;
-}
-
-.settings-block {
- border: 1px solid #AAA;
- margin: 10px;
- padding: 10px;
-}
-
-.app-title {
- margin: 10px;
-}
-
-#identity-manage-desc {
- margin-top:15px;
- margin-bottom: 15px;
-}
-
-#identity-manage-choose {
- margin-bottom: 15px;
-}
-
-#identity-submit {
- margin-top: 20px;
-}
-
-#photo-prev-link, #photo-next-link {
- padding: 10px;
- float: left;
-}
-.lightbox{
- float: left;
- }
-
-#photo-photo {
- float: left;
-}
-#photo-like-div .wall-item-like-buttons {
- float: left;
- margin-right: 5px;
- margin-top: 30px;
- }
-.comment-edit-text-empty {
- margin: 10px 0 0;
- width: 85%;
-}
-.comment-edit-photo {
- margin: 10px 0 0;
-}
-.wall-item-like-buttons .icon.like {
-float: left;
-}
-
-#photo-photo-end {
- clear: both;
-}
-
-.tabs .comment-wwedit-wrapper {
- display: block;
- margin-top: 30px;
- margin-left: 50px;
- }
-
-.profile-match-photo {
- float: left;
- text-align: center;
- width: 120px;
-}
-
-.profile-match-name {
- float: left;
- text-align: center;
- width: 120px;
- overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
- clear: both;
-}
-
-.profile-match-connect {
- text-align: center;
- font-weight: bold;
-}
-
-.profile-match-wrapper {
- float: left;
- padding: 10px;
- width: 120px;
- height: 120px;
- scroll: auto;
-}
-#profile-match-wrapper-end {
- clear: both;
-}
-
-/* ============= */
-/* = Directory = */
-/* ============= */
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-photo-menu-button {
- display: none;
- /* position: absolute; */
- /* position: absolute; */
- left: -2px;
- top: -20px;
-}
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo-menu-button {
- left: 0px;
- top: 63px;
-}
-.directory-item {
- float: left;
- width: 200px;
- height: 200px;
-}
-.directory-item .contact-photo {
- width: 175px;
- height: 175px;
-}
-.directory-item .contact-photo img {
- width: 175px;
- height: 175px;
-}
-.contact-name {
- text-align: left;
- font-weight: bold;
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums{
- margin-top: 15px;
- }
-.photo-top-photo, .photo-album-photo {
- -webkit-border-radius: 5px 5px 0 0;
- -moz-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-.photo-album-image-wrapper, .photo-top-image-wrapper {
- float: left;
- -moz-box-shadow: 0 0 5px #888;
- -webkit-box-shadow: 0 0 5px #888;
- box-shadow: 0 0 5px #888;
- background-color: #000;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- padding-bottom: 20px;
- position: relative;
- margin: 0 10px 10px 0;
- width: 200px; height: 140px;
- overflow: hidden;
-}
-.photo-top-album-name {
- width: 100%;
- position: absolute;
- bottom: 0px;
- padding-left: 3px;
- background-color: #EEE;
-}
-.photo-top-album-link{
- color: #3465A4;
- }
-.photo-top-album-img{
-
- }
-/*.photo-top-image-wrapper {
- position: relative;
- float: left;
- margin-top: 15px;
- margin-right: 15px;
- width: 200px; height: 200px;
- overflow: hidden;
-}
-.photo-top-album-name {
- width: 100%;
- min-height: 2em;
- position: absolute;
- bottom: 0px;
- padding: 0px 3px;
- padding-top: 0.5em;
- background-color: rgb(255, 255, 255);
-}*/
-#photo-top-end {
- clear: both;
-}
-
-#photo-top-links {
- margin-bottom: 30px;
- margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
- float: left;
- width: 175px;
-}
-
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index d1611d326..b26c76910 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -527,8 +527,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: aliceBlue;
}
.tool .label {
float: left;
@@ -1061,44 +1062,57 @@ ul.menu-popup .empty {
}
.menu-profile-list{
height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
+ overflow: auto;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: aliceBlue;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
display: table-cell;
@@ -2147,6 +2161,41 @@ ul.tabs li .active {
box-shadow: 2px 2px 2px #CFCFCF;
margin-left: 5px;
}
+//settings tabs
+ul.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+}
+ul.rs_tabs li {
+ float: left;
+ margin-bottom: 30px;
+ clear: both;
+}
+ul.rs_tabs li .selected {
+ background-color: #3465A4;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 2px 2px 2px #CFCFCF;
+ font-size: 13px;
+}
+.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+ background-position: 0 -20px;
+ background-repeat: repeat-x;
+ height: 27px;
+ padding: 0;
+ }
+.rs_tab.button {
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ font-weight: bolder;
+ padding: 3px;
+ color: #333333;
+ text-decoration: none;
+ }
/**
* Form fields
*/
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index c0537b010..a7d20a7ce 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.016)
+ * Version: (Version: 1.017)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.016)";
+$diabook_version = "Diabook-aerith (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@@ -22,7 +22,6 @@ $cssFile = null;
*/
function diabook_aerith_community_info(){
$a = get_app();
- //right_aside at networkpages
// last 12 users
$aside['$lastusers_title'] = t('Last users');
@@ -280,55 +279,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-
- $tabs = array(
- array(
- 'label' => t('Account settings'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'sel' => (($a->argc == 1)?'active':''),
- ),
- array(
- 'label' => t('Display settings'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- ),
- array(
- 'label' => t('Edit/Manage Profiles'),
- 'url' => $a->get_baseurl(true).'/profiles',
- ),
- array(
- 'label' => t('Connector settings'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- ),
- array(
- 'label' => t('Plugin settings'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- ),
- array(
- 'label' => t('Connections'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'sel' => ''
- )
- );
- $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['aside'] = replace_macros($tabtpl, array(
- '$tabs' => $tabs,
- ));
-
-
- // CUSTOM CSS
- $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css";
-
-}
// custom css
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
index 6e455b726..225a5dd5c 100644
--- a/view/theme/diabook-blue/comment_item.tpl
+++ b/view/theme/diabook-blue/comment_item.tpl
@@ -15,10 +15,10 @@
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>
- <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
- <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option>
diff --git a/view/theme/diabook-blue/generic_links_widget.tpl b/view/theme/diabook-blue/generic_links_widget.tpl
new file mode 100644
index 000000000..001c1395e
--- /dev/null
+++ b/view/theme/diabook-blue/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div id="widget_$title">
+ {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
+ {{if $desc}}<div class="desc">$desc</div>{{endif}}
+
+ <ul class="rs_tabs">
+ {{ for $items as $item }}
+ <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png
index bc5969ef1..00186ba05 100644
--- a/view/theme/diabook-blue/icons/com_side.png
+++ b/view/theme/diabook-blue/icons/com_side.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/events.png b/view/theme/diabook-blue/icons/events.png
index 4a0b3f3f1..cf195fbb6 100644
--- a/view/theme/diabook-blue/icons/events.png
+++ b/view/theme/diabook-blue/icons/events.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png
index be47a48fc..5c610805f 100644
--- a/view/theme/diabook-blue/icons/home.png
+++ b/view/theme/diabook-blue/icons/home.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png
index 49ef896bc..5295e2e74 100644
--- a/view/theme/diabook-blue/icons/mess_side.png
+++ b/view/theme/diabook-blue/icons/mess_side.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png
index 7d4afca90..28dca30a3 100644
--- a/view/theme/diabook-blue/icons/notes.png
+++ b/view/theme/diabook-blue/icons/notes.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png
index acf857f32..23a78bcac 100644
--- a/view/theme/diabook-blue/icons/pscontacts.png
+++ b/view/theme/diabook-blue/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
index 6d9539610..ae04194b1 100644
--- a/view/theme/diabook-blue/icons/pubgroups.png
+++ b/view/theme/diabook-blue/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
new file mode 100644
index 000000000..fe4baf8d1
--- /dev/null
+++ b/view/theme/diabook-blue/nets.tpl
@@ -0,0 +1,11 @@
+<div id="nets-sidebar" class="widget">
+ <h3>$title</h3>
+ <div id="nets-desc">$desc</div>
+
+ <ul class="nets-ul">
+ <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ {{ for $nets as $net }}
+ <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ {{ endfor }}
+ </ul>
+</div>
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index 94396300f..01e80f238 100644
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -7,13 +7,13 @@
</div>
<ul id="profile-side-menu" class="menu-profile-side">
- <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
- <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
- <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+ <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
+ <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
+ <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul>
</div>
diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook-blue/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
- {{ for $tabs as $tab }}
- <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
- {{ endfor }}
-</ul>
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index b37d82968..021edc45e 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -482,8 +482,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: #308DBF;
}
.tool .label {
float: left;
@@ -907,43 +908,57 @@ ul.menu-popup .empty {
.menu-profile-list{
height: auto;
overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: #308DBF;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
+
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
display: table-cell;
diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook-blue/style-settings.css
deleted file mode 100644
index e07962bc7..000000000
--- a/view/theme/diabook-blue/style-settings.css
+++ /dev/null
@@ -1,2573 +0,0 @@
-/**
- * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
- * Additional Changes: Michael Vogel <icarus@dabo.de>
- **/
-
-/* ========= */
-/* = Admin = */
-/* ========= */
-
-#adminpage {
-/* width: 80%;*/
-}
-
-#pending-update {
- float:right;
- color: #ffffff;
- font-weight: bold;
- background-color: #FF0000;
- padding: 0em 0.3em;
-}
-
-.admin.linklist {
- border: 0px; padding: 0px;
-}
-
-.admin.link {
- list-style-position: inside;
- font-size: 1em;
- padding: 5px;
- width: 100px;
- margin: 5px;
-}
-
-#adminpage dl {
- clear: left;
- margin-bottom: 2px;
- padding-bottom: 2px;
- border-bottom: 1px solid black;
-}
-
-#adminpage dt {
- width: 200px;
- float: left;
- font-weight: bold;
-}
-
-#adminpage dd {
- margin-left: 200px;
-}
-#adminpage h3 {
- border-bottom: 1px solid #898989;
- margin-bottom: 5px;
- margin-top: 10px;
-}
-
-#adminpage .submit {
- clear:left;
-}
-
-#adminpage #pluginslist {
- margin: 0px; padding: 0px;
-}
-
-#adminpage .plugin {
- list-style: none;
- display: block;
- /* border: 1px solid #888888; */
- padding: 1em;
- margin-bottom: 5px;
- clear: left;
-}
-
-#adminpage .toggleplugin {
- float:left;
- margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #eeeeee; }
-#adminpage .selectall { text-align: right; }
-/* icons */
-
-.icon.contacts {
- background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
-.icon.notifications {
- background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
-.icon.notify {
- background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
-.icon.messages {
- background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
-.icon.community {
- background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
-
-.icon.drop { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.drophide { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.dislike { background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
-.icon.like { background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
-.icon.pencil { background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
-.icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
-.icon.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
-.icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
-.icon.lock { background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
-.icon.unlock { background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
-.icon.language { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
-
-
-.camera { background-image: url("../../../view/theme/diabook-blue/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.attach { background-image: url("../../../view/theme/diabook-blue/icons/attach.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video2 { background-image: url("../../../view/theme/diabook-blue/icons/video.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video { background-image: url("../../../view/theme/diabook-blue/icons/video.png");
- display: block; width: 100%; height: 28px; background-repeat: no-repeat;
- }
-.audio2 { background-image: url("../../../view/theme/diabook-blue/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.audio { background-image: url("../../../view/theme/diabook-blue/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.weblink { background-image: url("../../../view/theme/diabook-blue/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.globe { background-image: url("../../../view/theme/diabook-blue/icons/globe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.unglobe { background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.edit {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
-
-
-
-.article { background-position: -50px 0px;}
-/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
-/*.drop { background-position: -110px 0px;}*/
-/*.drophide { background-position: -130px 0px;}*/
-/*.edit { background-position: -150px 0px;}*/
-/*.camera { background-position: -170px 0px;}*/
-/*.dislike { background-position: -190px 0px;}*/
-/*.like { background-position: -210px 0px;}*/
-/*.link { background-position: -230px 0px;}*/
-
-/*.globe { background-position: -50px -20px;}*/
-/*.noglobe { background-position: -70px -20px;}*/
-.no { background-position: -90px -20px;}
-.pause { background-position: -110px -20px;}
-.play { background-position: -130px -20px;}
-/*.pencil { background-position: -150px -20px;}*/
-.small-pencil { background-position: -170px -20px;}
-/*.recycle { background-position: -190px -20px;}*/
-/*.remote-link { background-position: -210px -20px;}*/
-.share { background-position: -230px -20px;}
-
-.tools { background-position: -50px -40px;}
-/*.lock { background-position: -70px -40px;}*/
-
-/*.video { background-position: -110px -40px;}*/
-.youtube { background-position: -130px -40px;}
-
-/*.attach { background-position: -190px -40px;}*/
-/*.language { background-position: -210px -40px;}*/
-
-
-.icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
-.prev { background-position: -90px -60px;}
-.next { background-position: -110px -60px;}
-/*.tagged { background-position: -130px -60px;}*/
-
-.attachtype {
- display: block; width: 20px; height: 23px;
- background-image: url('../../../images/content-types.png');
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text { background-position: -60px 0px; }
-.type-unkn { background-position: -80px 0px; }
-
-.icon.drop, .icon.drophide {
- float: left;
-}
-
-.icon {
- display: block;
- width: 20px;
- height: 20px;
- /*background-image: url('icons.png');*/
-}
-
-.icon {
- background-color: transparent ;
- background-repeat: no-repeat;
- /* background-position: left center; */
- display: block;
- overflow: hidden;
- text-indent: -9999px;
- padding: 1px;
-}
-
-.icon.border.camera{
- background-image: url("../../../view/theme/diabook-blue/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-
-.icon.border.link{
- background-image: url("../../../view/theme/diabook-blue/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- margin-left: 10px;
- }
-
-.icon.text {
- text-indent: 0px;
-}
-.icon.s10 {
- min-width: 10px;
- height: 10px;
-}
-.icon.s10.notify {
- background-image: url("../../../images/icons/10/notify_off.png");
-}
-.icon.s10.gear {
- background-image: url("../../../images/icons/10/gear.png");
-}
-.icon.s10.add {
- background-image: url("../../../images/icons/10/add.png");
-}
-.icon.s10.delete {
- background-image: url("../../../images/icons/10/delete.png");
-}
-.icon.s10.edit {
- background-image: url("../../../images/icons/10/edit.png");
-}
-.icon.s10.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s10.menu {
- background-image: url("../../../images/icons/10/menu.png");
-}
-.icon.s10.link {
- background-image: url("../../../images/icons/10/link.png");
-}
-.icon.s10.lock {
- background-image: url("../../../images/icons/10/lock.png");
-}
-.icon.s10.unlock {
- background-image: url("../../../images/icons/10/unlock.png");
-}
-.icon.s10.text {
- padding: 2px 0px 0px 15px;
- font-size: 10px;
-}
-.icon.s16 {
- min-width: 16px;
- height: 16px;
-}
-.icon.s16.notify {
- background-image: url("../../../images/icons/16/notify_off.png");
-}
-.icon.s16.gear {
- background-image: url("../../../images/icons/16/gear.png");
-}
-.icon.s16.add {
- background-image: url("../../../images/icons/16/add.png");
-}
-.icon.s16.delete {
- background-image: url("../../../images/icons/16/delete.png");
-}
-/*.icon.s16.edit {
- background-image: url("../../../images/icons/16/edit.png");
-}*/
-.icon.s16.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s16.menu {
- background-image: url("../../../images/icons/16/menu.png");
-}
-/*.icon.s16.link {
- background-image: url("../../../images/icons/16/link.png");
-}*/
-.icon.s16.lock {
- background-image: url("../../../images/icons/16/lock.png");
-}
-.icon.s16.unlock {
- background-image: url("../../../images/icons/16/unlock.png");
-}
-.icon.s16.text {
- padding: 4px 0px 0px 20px;
- font-size: 10px;
-}
-.icon.s22 {
- min-width: 22px;
- height: 22px;
-}
-.icon.s22.notify {
- background-image: url("../../../images/icons/22/notify_off.png");
-}
-.icon.s22.gear {
- background-image: url("../../../images/icons/22/gear.png");
-}
-.icon.s22.add {
- background-image: url("../../../images/icons/22/add.png");
-}
-.icon.s22.delete {
- background-image: url("../../../images/icons/22/delete.png");
-}
-.icon.s22.edit {
- background-image: url("../../../images/icons/22/edit.png");
-}
-.icon.s22.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s22.menu {
- background-image: url("../../../images/icons/22/menu.png");
-}
-.icon.s22.link {
- background-image: url("../../../images/icons/22/link.png");
-}
-.icon.s22.lock {
- background-image: url("../../../images/icons/22/lock.png");
-}
-.icon.s22.unlock {
- background-image: url("../../../images/icons/22/unlock.png");
-}
-.icon.s22.text {
- padding: 10px 0px 0px 25px;
- width: 200px;
-}
-.icon.s48 {
- width: 48px;
- height: 48px;
-}
-.icon.s48.notify {
- background-image: url("../../../images/icons/48/notify_off.png");
-}
-.icon.s48.gear {
- background-image: url("../../../images/icons/48/gear.png");
-}
-.icon.s48.add {
- background-image: url("../../../images/icons/48/add.png");
-}
-.icon.s48.delete {
- background-image: url("../../../images/icons/48/delete.png");
-}
-.icon.s48.edit {
- background-image: url("../../../images/icons/48/edit.png");
-}
-.icon.s48.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s48.menu {
- background-image: url("../../../images/icons/48/menu.png");
-}
-.icon.s48.link {
- background-image: url("../../../images/icons/48/link.png");
-}
-.icon.s48.lock {
- background-image: url("../../../images/icons/48/lock.png");
-}
-.icon.s48.unlock {
- background-image: url("../../../images/icons/48/unlock.png");
-}
-
-#contact-edit-links ul {
- list-style: none;
- list-style-type: none;
-}
-
-.hide-comments-outer {
- margin-left: 80px;
- margin-bottom: 5px;
- width: 484px;
- border-bottom: 1px solid #BDCDD4;
- border-top: 1px solid #BDCDD4;
-
- padding: 8px;
-}
-
-/* global */
-body {
- font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 12.5px;
- background-color: #ffffff;
- color: #2d2d2d;
- margin: 50px auto auto;
- display: table;
-}
-
-h4 {
- font-size: 1.1em;
-}
-
-a {
- color: #333333;
- /* color: #3e3e8c; */
- text-decoration: none;
-}
-a:hover {
- /* color: blue; */
- text-decoration: underline
-}
-
-.wall-item-name-link {
-/* float: left;*/
-}
-
-.wall-item-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-
-.left {
- float: left;
-}
-.right {
- float: right;
-}
-.hidden {
- display: none;
-}
-.clear {
- clear: both;
-}
-.fakelink {
- color: #1872A2;
- /* color: #3e3e8c; */
- text-decoration: none;
- cursor: pointer;
-}
-.fakelink:hover {
- /* color: blue; */
- /*color: #005c94; */
- text-decoration: underline;
-}
-code {
- font-family: Courier, monospace;
- white-space: pre;
- display: block;
- overflow: auto;
- border: 1px solid #444;
- background: #EEE;
- color: #444;
- padding: 10px;
- margin-top: 20px;
-}
-#panel {
- position: absolute;
- width: 12em;
- background: #ffffff;
- color: #2d2d2d;
- margin: 0px;
- padding: 1em;
- list-style: none;
- border: 3px solid #364e59;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-/* tool */
-.tool {
- height: auto;
- overflow: auto;
- padding: 3px;
-}
-#saved-search-ul .tool:hover,
-#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
-}
-.tool .label {
- float: left;
-}
-.tool .action {
- float: right;
-}
-.tool a {
- color: ##3F8FBA;
-}
-.tool a:hover {
- text-decoration: none;
-}
-/* popup notifications */
-div.jGrowl div.notice {
- background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-div.jGrowl div.info {
- background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-/* header */
-header {
- position: fixed;
- left: 0%;
- right: 80%;
- top: 0px;
- margin: 0px;
- padding: 0px;
- width: 22%;
- height: 32px;
- background: #1872a2;
- background-color: #1872a2;
- z-index: 100;
- border-bottom: 1px;
- border-bottom-color: black;
- border-bottom-style: inset;
-}
-header #site-location {
- display: none;
-}
-header #banner {
- overflow: hidden;
- text-align: left;
- width: 82%%;
- margin-left: 25%;
-}
-header #banner a,
-header #banner a:active,
-header #banner a:visited,
-header #banner a:link,
-header #banner a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
- vertical-align: middle;
- font-weight: bolder;
- margin-left: 3px;
-}
-header #banner #logo-img {
- height: 25px;
- margin-top: 3px;
-}
-header #banner #logo-text {
- font-size: 20px;
- position: absolute;
- top: 10%;
-}
-/* nav */
-nav {
- width: 80%;
- height: 32px;
- position: fixed;
- left: 22%;
- top: 0px;
- padding: 0px;
- background: #1872a2;
- color: #ffffff;
- z-index: 99;
- border-bottom: 1px;
- border-bottom-color: black;
- border-bottom-style: inset;
-}
-nav a,
-nav a:active,
-nav a:visited,
-nav a:link,
-nav a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
-}
-nav #banner {
- overflow: hidden;
- /*text-align: center;*/
- width: 100%;
-}
-nav #banner a,
-nav #banner a:active,
-nav #banner a:visited,
-nav #banner a:link,
-nav #banner a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
- vertical-align: bottom;
-}
-nav #banner #logo-img {
- height: 22px;
- margin-top: 5px;
-}
-nav #banner #logo-text {
- font-size: 22px;
-}
-nav #navbar{
- }
-nav ul {
- margin: 0px;
- padding: 0px 20px;
-}
-nav ul li {
- list-style: none;
- margin: 0px;
- /* padding: 1px 1px 3px 1px; */
- float: left;
-}
-nav ul li .menu-popup {
- left: 0px;
- right: auto;
-}
-
-nav #logo-img {
- height: 25px;
- margin-top: 4px;
- margin-left: 30px;
-}
-
-nav #logo-text {
- font-size: 22px;
- margin-top: 3px;
- margin-right: 15px;
-}
-nav .nav-menu-search {
- position: relative;
-
- margin: 4px 17px;
- margin-right: 0px;
- height: 17px;
- width: 180px;
-
-}
-
-nav #search-box #search-text {
- background-image: url('icons/lupe.png');
- background-repeat:no-repeat;
- padding-left:20px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
- }
-
-
-nav .nav-menu-icon {
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 5px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-nav .nav-menu-icon:hover {
- background-color: #308dbf;
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 5px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-
-nav .nav-menu-icon.selected {
- background-color: #fff;
-}
-nav .nav-menu-icon img {
- width: 22px;
- height: 22px;
-}
-nav .nav-menu-icon .nav-notify {
- top: 3px;
-}
-nav .nav-menu {
- position: relative;
- height: 16px;
- padding: 5px;
- margin: 3px 15px 0px;
- font-size: 13px;
- /*border-bottom: 3px solid #364A84;*/
-}
-nav .nav-menu.selected {
- /*border-bottom: 3px solid #9eabb0;*/
-}
-nav .nav-notify {
- display: none;
- position: absolute;
- background-color: #ff0000;
- /* background-color: #19aeff; */
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- font-size: 10px;
- font-weight: 900;
- padding: 1px 4px;
- top: 0px;
- right: -6px;
- min-width: 10px;
- text-align: center;
-}
-nav .nav-notify.show {
- display: block;
-}
-nav #nav-help-link,
-nav #nav-search-link,
-nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-site-linkmenu,
-nav #nav-home-link,
-nav #nav-user-linkmenu
-{
- float: right;
-}
-nav #nav-user-linkmenu{
- margin-right: 0px;
- }
-nav #nav-home-link, #nav-directory-link, #nav-apps-link{
- margin-left: 0px;
- margin-right: 0px;
- font-weight: bold;
- margin: 3px 5px;
- }
-nav #nav-directory-link{
- margin-right: 0px;
- }
-nav #nav-home-link{
- margin-left: 0px;
- }
-nav #nav-help-link .menu-popup,
-nav #nav-search-link .menu-popup,
-nav #nav-directory-link .menu-popup,
-nav #nav-apps-link .menu-popup,
-nav #nav-site-linkmenu .menu-popup {
- right: 0px;
- left: auto;
-}
-
-nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
- background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
- }
-
-/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
- background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
- }
-
-nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
- background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
- }
-
-nav #nav-apps-link.selected {
- background-color: #364e59;
-}
-
-#nav-notifications-mark-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-#nav-notifications-see-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-.notify-seen {
- background: none repeat scroll 0 0 #DDDDDD;
- }
-
-ul.menu-popup {
- position: absolute;
- display: none;
- width: 11em;
- background: #ffffff;
- color: #2d2d2d;
- margin: 0px;
- padding: 0px;
- list-style: none;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
- display: block;
- color: #2d2d2d;
- padding: 5px 10px;
- text-decoration: none;
-}
-ul.menu-popup a:hover {
- background-color: #308DBF; /*bdcdd4;*/
- color: #fff;
-}
-ul.menu-popup .menu-sep {
- border-top: 1px solid #9eabb0;
-}
-ul.menu-popup li {
- float: none;
- overflow: auto;
- height: auto;
- display: block;
-}
-ul.menu-popup li img {
- float: left;
- width: 16px;
- height: 16px;
- padding-right: 5px;
-}
-ul.menu-popup .empty {
- padding: 5px;
- text-align: center;
- color: #9eabb0;
-}
-/* autocomplete popup */
-.acpopup {
- max-height: 150px;
- background-color: #ffffff;
- color: #2d2d2d;
- border: 1px solid #MenuBorder;
- overflow: auto;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-.acpopupitem {
- color: #2d2d2d;
- padding: 4px;
- clear: left;
-}
-.acpopupitem img {
- float: left;
- margin-right: 4px;
-}
-.acpopupitem.selected {
- background-color: #bdcdd4;
-}
-#nav-notifications-menu {
- width: 400px;
- max-height: 550px;
- overflow: auto;
-}
-/* #nav-notifications-menu a {
- display: inline;
- padding: 5px 0px;
- margin: 0px 0px 2px 0px;
-}
-#nav-notifications-menu li:hover {
- background-color: #bdcdd4;
-}*/
-
-#nav-notifications-menu img {
- float: left;
- margin-right: 5px;
-}
-#nav-notifications-menu .contactname {
- font-weight: bold;
-}
-#nav-notifications-menu .notif-when {
- font-size: 10px;
- color: #9eabb0;
- display: block;
-}
-
-.notif-image {
- width: 32px;
- height: 32px;
- padding: 7px 7px 0px 0px;
-}
-
-/*profile_side*/
-#profile_side {
- margin-bottom: 30px;
-}
-#ps-usericon{
- height: 25px
- }
-#ps-username{
- font-size: 1.17em;
- font-weight: bold;
- vertical-align: top;
- position: absolute;
- padding-top: 4px;
- padding-left: 5px;
- word-wrap: break-word;
- width: 130px;
- }
-#ps-username:hover{
- text-decoration: none;
- }
-.menu-profile-side{
- list-style: none;
- padding-left: 0px;
- min-height: 0px;
- }
-.menu-profile-list{
- height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
- }
-.menu-profile-list:hover{
- background: #EEE;
- }
-.menu-profile-list-item{
- padding-left: 5px;
- }
-.menu-profile-list-item:hover{
- text-decoration: none;
- }
-/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
- background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
- }
-.menu-profile-list.photos{
- background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
- background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
- background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
- background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
- background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
- }
-
-/* aside */
-aside {
- display: table-cell;
- vertical-align: top;
- width: 200px;
- padding: 0px 10px 0px 10px;
- border-right: 1px solid #D2D2D2;
- float: left;
- /* background: #F1F1F1; */
-}
-
-aside .vcard {
- display: none;
-}
-aside .vcard .title {
- margin-bottom: 5px;
-}
-aside .vcard dl {
- height: auto;
- overflow: auto;
-}
-aside .vcard dt {
- float: left;
- margin-left: 0px;
- /*width: 35%;*/
- text-align: right;
- color: #999999;
-}
-aside .vcard dd {
- float: left;
- margin-left: 5px;
- /*width: 60%;*/
-}
-aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
-}
-aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
- list-style: none;
-}
-aside #dfrn-request-link {
- display: block;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- color: #ffffff;
- background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
- font-weight: bold;
- text-transform: uppercase;
- padding: 4px 2px 2px 35px;
-}
-aside #dfrn-request-link:hover {
- text-decoration: none;
- background-color: #36c;
- /* background-color: #19aeff; */
-}
-aside #profiles-menu {
- width: 20em;
-}
-aside #search-text {
- width: 150px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
-}
-aside #side-follow-url {
- width: 150px;
- }
-aside #side-peoplefind-url {
- width: 150px;
- }
-#contact-block {
- display: none;
-}
-#contact-block .contact-block-h4 {
- float: left;
- margin: 5px 0px;
-}
-#contact-block .allcontact-link {
- float: right;
- margin: 5px 0px;
-}
-#contact-block .contact-block-content {
- clear: both;
- overflow: auto;
- height: auto;
-}
-#contact-block .contact-block-link {
- float: left;
- margin: 0px 2px 2px 0px;
-}
-#contact-block .contact-block-link img {
- widht: 48px;
- height: 48px;
-}
-#lost-password-link {
- float: left;
- margin-right: 20px;
- }
-/* widget */
-.widget {
- margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-/* font-size: 12px; */
-}
-.widget h3 {
- padding: 0px;
- margin: 2px;
-}
-.widget .action {
- opacity: 0.1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget input.action {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget:hover .title .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action.ticked {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget ul {
- padding: 0px;
-}
-.widget ul li {
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums ul li a{
- color: #1872A2;
-}
-.widget .tool.selected {
- background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
-}
-/* widget: search */
-span.sbox_l {
- background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-left: 10px;
- margin-top: 5px;
-
-}
-
-span.sbox_r {
- background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-top: 5px;
-}
-
-span.sbox input {
- background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
- float: left;
- margin-top: 5px;
- border: 0;
- height: 13px; width: 100px;
- padding: 3px;
- font: 11px/13px arial;
- color: #000;
-}
-#add-search-popup {
- width: 200px;
- top: 18px;
-}
-/* section */
-section {
- display: table-cell;
- vertical-align: top;
- width: 650px;
- padding: 0px 0px 0px 20px;
-}
-
-body .pageheader{
- text-align: center;
- font-size: 20px;
- margin-bottom: 20px;
- margin-top: 0px;
- max-width: 575px;
- }
-
-#id_username {
- width: 173px;
- }
-#id_password {
- width: 173px;
- }
-#id_openid_url {
- width: 173px;
- }
-#contact-edit-end {
- }
-.pager {
- padding: 10px;
- text-align: center;
- font-size: 1.0em;
- clear: both;
- display: block;
-}
-
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
-
- background-position: 0 -20px;
- background-repeat: repeat-x;
- height: 27px;
- padding: 0;
- }
-.rs_tab.button {
- /*background: none repeat scroll 0 0 #F8F8F8;*/
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- font-weight: bolder;
- padding: 3px;
- color: #333333;
- text-decoration: none;
- }
-
-#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
- margin-bottom: 10px;
- }
-
-right_aside {
- display: table-cell;
- vertical-align: top;
- width: 170px;
- /*padding-right: 10px;*/
- /*border-left: 1px solid #D2D2D2;*/
-
- /* background: #F1F1F1; */
-}
-right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
-margin-top:30px;}
-right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
-right_aside .directory-photo { margin: 0px; }
-right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
-right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto; width: 100%; }
-right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
-right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
-#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
-#page-sidebar-right_aside ul {margin-top: 0px;}
-#page-sidebar-right_aside .label {max-width: 128px;}
-right_aside .icon {width: 10px; height: 10px;}
-.close_box {
- background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 0.1;
- }
-.close_box:hover {
- background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 1;
--webkit-transition: all 0.2s ease-in-out;
--moz-transition: all 0.2s ease-in-out;
--o-transition: all 0.2s ease-in-out;
--ms-transition: all 0.2s ease-in-out;
-transition: all 0.2s ease-in-out;
- }
-/* wall item */
-.tread-wrapper {
- border-bottom: 1px solid #D2D2D2;
- position: relative;
- padding: 5px;
- margin-bottom: 0px;
- width: 575px;
-}
-.tread-wrapper a{
- color: #1872A2;
-}
-
-.wall-item-decor {
- position: absolute;
- left: 790px;
- top: -10px;
- width: 16px;
-}
-
-.wall-item-container {
- display: table;
- width: 580px;
-}
-
-
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
- display: table-row;
-}
-
-.wall-item-bottom {
- font-size: 13px;
-}
-.wall-item-container .wall-item-bottom {
-/* opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container:hover .wall-item-bottom {
-/* opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container .wall-item-info {
- display: table-cell;
- vertical-align: top;
- text-align: left;
- width: 80px;
-}
-.wall-item-container .wall-item-location {
- padding-right: 40px;
- display: table-cell;
-}
-.wall-item-container .wall-item-ago {
- word-wrap: break-word;
- width: 50px;
- margin-left: 10px;
- color: #999;
-}
-.wall-item-location {
-
- clear: both;
- overflow: hidden;
-
- margin-bottom: 5px;
-}
-
-.wall-item-container .wall-item-content {
- font-size: 12.5px;
- max-width: 420px;
- word-wrap: break-word;
- line-height: 1.2;
-}
-
-.wall-item-container .wall-item-content img {
- max-width: 400px;
-}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
- display: table-cell;
- vertical-align: middle;
-}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-name {
- font-weight: bold;
-}
-.wall-item-container .wall-item-actions-author {
- width: 100%;
- margin-bottom: 0.3em;
-}
-.wall-item-container .wall-item-actions-social {
- float: left;
- margin-bottom: 1px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-social a {
- margin-right: 1em;
-}
-.wall-item-actions-social a {
- float: left;
-}
-.wall-item-container .wall-item-actions-tools {
- float: right;
- width: 80px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-tools a {
- float: right;
-}
-.wall-item-container .wall-item-actions-tools input {
- float: right;
-}
-.wall-item-container.comment {
- margin-top: 5px;
- margin-bottom: 5px;
- margin-left: 80px;
- width: 500px;
- border-bottom: 1px solid hsl(198, 21%, 79%);
-}
-.wall-item-container.comment .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.wall-item-container.comment {
- top: 15px !important;
- left: 15px !important;
-}
-.wall-item-container.comment .wall-item-links {
- padding-left: 12px;
-}
-.wall-item-comment-wrapper {
- margin: 1px 5px 1px 80px;
-}
-.wall-item-comment-wrapper .comment-edit-photo {
- display: none;
-}
-.wall-item-comment-wrapper textarea {
- height: 2.0em;
- width: 100%;
- font-size: 10px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- font-size: 14px;
-}
-.wall-item-comment-wrapper .comment-edit-text-full {
- font-size: 14px;
- height: 4em;
- color: #2d2d2d;
- border: 1px solid #2d2d2d;
-}
-.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
- margin-top: 10px;
-}
-.comment-edit-preview .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.comment-edit-preview {
- top: 15px !important;
- left: 15px !important;
-}
-.comment-edit-preview .wall-item-links {
- padding-left: 12px;
-}
-.comment-edit-preview .wall-item-container {
- width: 700px;
-}
-.comment-edit-preview .tread-wrapper {
- width: 700px;
- padding: 0;
- margin: 10px 0;
-}
-
-.shiny {
- /* border-right: 10px solid #fce94f; */
- border-right: 1px solid #A7C7F7;
- padding-right: 12px;
-}
-
-#jot-preview-content{
- margin-top: 30px;}
-
-#jot-preview-content .tread-wrapper {
- background-color: #fff797;
-}
-
-.wall-item-tags {
- padding-top: 1px;
- padding-bottom: 2px;
-}
-.tag {
- /*background: url("../../../images/tag_b.png") repeat-x center left;*/
- color: #999;
- padding-left: 3px;
- font-size: 12px;
-}
-.tag a {
- padding-right: 5px;
- /*background: url("../../../images/tag.png") no-repeat center right;*/
- color: #999;
-}
-.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
- background: #FFFFFF;
- border: 2px solid #364e59;
- height: 25px;
- width: 25px;
- overflow: hidden;
- padding: 1px;
- position: absolute !important;
- top: 40px;
- left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-}
-.wwto .contact-photo {
- width: auto;
- height: 25px;
-}
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
- width: 80px;
-}
-
-.contact-photo-wrapper.wwto {
- width: 25px;
-}
-
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper {
- left: 0px;
- top: 63px;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-name {
- /* text-align: center; */
- /*font-weight: bold;*/
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-/* editor */
-.jothidden {
- display: none;
-}
-#jot {
- width: 585px;
- margin: 0px 2em 20px 0px;
-}
-#profile-jot-form #profile-jot-text {
- height: 2.0em;
- width: 99%;
- font-size: 15px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- margin-bottom: 10px;
-}
-#jot #jot-tools {
- margin: 0px;
- padding: 0px;
- height: 40px;
- overflow: none;
- width: 583px;
- background-color: #fff;
- border-bottom: 2px solid #9eabb0;
-}
-
-#jot #jot-tools li {
- list-style: none;
- float: left;
- width: 80px;
- height: 40px;
- border-bottom: 2px solid #9eabb0;
-}
-#jot #jot-tools li a {
- display: block;
- color: #cccccc;
- width: 100%;
- height: 40px;
- text-align: center;
- line-height: 40px;
- overflow: hidden;
-}
-#jot #jot-tools li:hover {
- background-color: #364e59;
- border-bottom: 2px solid #bdcdd4;
-}
-#jot #jot-tools li.perms {
- float: right;
- width: 40px;
-}
-#jot #jot-tools li.perms a.unlock {
- width: 30px;
- border-left: 10px solid #cccccc;
- background-color: #cccccc;
- background-position: left center;
-}
-#jot #jot-tools li.perms a.lock {
- width: 30px;
- border-left: 10px solid #666666;
- background-color: #666666;
-}
-#jot #jot-tools li.submit {
- float: right;
- background-color: #cccccc;
- border-bottom: 2px solid #cccccc;
- border-right: 1px solid #666666;
- border-left: 1px solid #666666;
-}
-#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
- background-color: #cccccc;
- color: #666666;
- width: 80px;
- height: 40px;
- line-height: 40px;
-}
-#jot #jot-tools li.submit input:hover {
- background-color: #bdcdd4;
- color: #666666;
-}
-#jot #jot-tools li.loading {
- float: right;
- background-color: #ffffff;
- width: 20px;
- vertical-align: center;
- text-align: center;
- border-top: 2px solid #9eabb0;
- height: 38px;
-}
-#jot #jot-tools li.loading img {
- margin-top: 10px;
-}
-#profile-jot-form #jot-title {
-
- border-radius: 5px 5px 5px 5px;
- font-weight: bold;
- height: 20px;
- margin: 0 0 5px;
- width: 60%;
- border: 1px solid #ffffff;
-}
-#profile-jot-form #jot-title:-webkit-input-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #jot-title:-moz-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
- width: 585px;
- height: 100px;
- }
-#jot #jot-title:hover {
- border: 1px solid #999999;
-}
-#jot #jot-title:focus {
- border: 1px solid #999999;
-}
-#jot #character-counter {
- width: 80px;
- float: right;
- text-align: right;
- height: 20px;
- line-height: 20px;
- padding-right: 20px;
-}
-#jot-perms-icon,
-#profile-location,
-#profile-nolocation,
-#profile-youtube,
-#profile-video,
-#profile-audio,
-#profile-link,
-#profile-title,
-#wall-image-upload,
-#wall-file-upload,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
- cursor: pointer;
- margin-top: 2px;
-}
-#profile-jot-wrapper{
- margin: 0 2em 20px 0;
- width: 585px;
- }
-
-#profile-jot-submit-wrapper {
- margin-bottom: 50px;
- width: 585px;
-}
-
-#profile-jot-submit {
- float: right;
- margin-top: 2px;
- font-size: 14px;
-}
-#profile-upload-wrapper {
- float: left;
- margin-top: 2px;
- margin-left: 10px;
-
-}
-#profile-attach-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-rotator {
- float: left;
- margin-left: 30px;
- margin-top: 2px;
-}
-#profile-link-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-youtube-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-video-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-audio-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-location-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-jot-perms {
- float: left;
- margin-left: 45px;
- margin-top: 2px;
-}
-#jot-preview-link {
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- font-size: 9px;
- font-weight: bolder;
- cursor: pointer;
-}
-#profile-jot-perms{
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- }
-/** buttons **/
-.button.creation1 {
- background-color: #fff;
- border: 1px solid #777777;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- cursor: pointer;
- font-weight: bolder;
-}
-.button.creation2 {
- background-color: #055580;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- margin-left: 5px;
- cursor: pointer;
- font-weight: bolder;
-}
-/*input[type="submit"] {
- border: 0px;
- background-color: @ButtonBackgroundColor;
- color: @ButtonColor;
- padding: 0px 10px;
- .rounded(5px);
- height: 18px;
-}*/
-/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
- display: block!important;
-}
-#acl-wrapper {
- width: 690px;
- float: left;
-}
-#acl-search {
- float: right;
- background: #ffffff url("../../../images/search_18.png") no-repeat right center;
- padding-right: 20px;
-}
-#acl-showall {
- float: left;
- display: block;
- width: auto;
- height: 18px;
- background-color: #cccccc;
- background-image: url("../../../images/show_all_off.png");
- background-position: 7px 7px;
- background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
- color: #999999;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
-}
-#acl-showall.selected {
- color: #000000;
- background-color: #ff9900;
- background-image: url("../../../images/show_all_on.png");
-}
-#acl-list {
- height: 210px;
- border: 1px solid #cccccc;
- clear: both;
- margin-top: 30px;
- overflow: auto;
-}
-.acl-list-item {
- display: block;
- width: 150px;
- height: 30px;
- border: 1px solid #cccccc;
- margin: 5px;
- float: left;
-}
-.acl-list-item img {
- width: 22px;
- height: 22px;
- float: left;
- margin: 4px;
-}
-.acl-list-item p {
- height: 12px;
- font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
- overflow: hidden;
-}
-.acl-list-item a {
- font-size: 8px;
- display: block;
- width: 40px;
- height: 10px;
- float: left;
- color: #999999;
- background-color: #cccccc;
- background-position: 3px 3px;
- background-repeat: no-repeat;
- margin-right: 5px;
- -webkit-border-radius: 2px ;
- -moz-border-radius: 2px;
- border-radius: 2px;
- padding-left: 15px;
-}
-#acl-wrapper a:hover {
- text-decoration: none;
- color: #000000;
-}
-.acl-button-show {
- background-image: url("../../../images/show_off.png");
-}
-.acl-button-hide {
- background-image: url("../../../images/hide_off.png");
-}
-.acl-button-show.selected {
- color: #000000;
- background-color: #9ade00;
- background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
- color: #000000;
- background-color: #ff4141;
- background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow {
- border-color: #9ade00;
-}
-.acl-list-item.grouphide {
- border-color: #ff4141;
-}
-/** /acl **/
-/** tab buttons 14618a**/
-ul.rs_tabs {
- list-style-type: none;
-
- font-size: 11px;
-}
-ul.rs_tabs li {
- float: left;
- margin-bottom: 30px;
- clear: both;
-}
-ul.rs_tabs li .active {
- background-color: #055580;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 2px 2px 2px #CFCFCF;
- font-size: 13px;
-}
-/**
- * Form fields
- */
-.field {
- margin-bottom: 10px;
- padding-bottom: 10px;
- overflow: auto;
- width: 100%;
-}
-.field label {
- float: left;
- width: 200px;
-}
-.field input, .field textarea {
- width: 400px;
-}
-.field textarea {
- height: 100px;
-}
-.field .field_help {
- display: block;
- margin-left: 200px;
- color: #666666;
-}
-.field .onoff {
- float: left;
- width: 80px;
-}
-.field .onoff a {
- display: block;
- border: 1px solid #666666;
- background-image: url("../../../images/onoff.jpg");
- background-repeat: no-repeat;
- padding: 4px 2px 2px 2px;
- height: 16px;
- text-decoration: none;
-}
-.field .onoff .off {
- border-color: #666666;
- padding-left: 40px;
- background-position: left center;
- background-color: #cccccc;
- color: #666666;
- text-align: right;
-}
-.field .onoff .on {
- border-color: #204A87;
- padding-right: 40px;
- background-position: right center;
- background-color: #D7E3F1;
- color: #204A87;
- text-align: left;
-}
-.field .hidden {
- display: none!important;
-}
-.field.radio .field_help {
- margin-left: 0px;
-}
-#directory-search-form{
- margin-bottom: 50px;
- }
-#profile-edit-links-end {
- clear: both;
- margin-bottom: 15px;
-}
-
-#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
-
-#profile-edit-links li {
- float: left;
- list-style: none;
- margin-left: 10px;
-}
-
-.profile-edit-side-div {
- display: none;
-}
-
-#register-form label,
-#profile-edit-form label {
- width: 300px; float: left;
-}
-
-.required {
- display: inline;
- color: #B20202;
-}
-
-/* oauth */
-.oauthapp {
- height: auto;
- overflow: auto;
- border-bottom: 2px solid #cccccc;
- padding-bottom: 1em;
- margin-bottom: 1em;
-}
-.oauthapp img {
- float: left;
- width: 48px;
- height: 48px;
- margin: 10px;
-}
-.oauthapp img.noicon {
- background-image: url("../../../images/icons/48/plugin.png");
- background-position: center center;
- background-repeat: no-repeat;
-}
-.oauthapp a {
- float: left;
-}
-/* contacts */
-.contact-entry-wrapper {
- width: 120px;
- height: 120px;
- float: left;
-}
-/* photo */
-.photo {
-box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
-}
-.lframe {
- float: left;
- /*margin: 0px 10px 10px 0px;*/
-}
-/* profile match wrapper */
-.profile-match-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 20px;
-}
-.profile-match-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper {
- left: 0px;
- top: 63px;
-}
-
-.contact-photo-menu-button {
- position: relative;
- background-image: url("../../../images/icons/16/menu.png");
- background-position: top left;
- background-repeat: no-repeat;
- margin: 0px 0px -16px 0px;
- padding: 0px;
- width: 16px;
- height: 16px;
- top: -20px; left:0px;
- overflow: hidden;
- text-indent: 40px;
- display: none;
-
-}
-.contact-photo-menu {
- width: 11em;
- border: 3px solid #364e59;
- color: #2d2d2d;
- background: #FFFFFF;
-/* position: absolute;*/
- position: relative;
- left: 0px; top: 0px;
- display: none;
- z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a {
- display: block;
- padding: 5px 10px;
- color: #2d2d2d;
- text-decoration: none;
-}
-.contact-photo-menu li a:hover {
- background-color: #bdcdd4;
-}
-
-/* page footer */
-footer {
- height: 100px;
- display: table-row;
-}
-
-blockquote {
- border-left: 1px solid #D2D2D2;
- padding-left: 9px;
- margin: 0 0 0 .8ex;
-}
-.aprofile dt{
-box-shadow: 1px 1px 5px 0;
- color: #666666;
- margin: 15px 0 5px;
- padding-left: 5px;
- }
-/* ================== */
-/* = Contacts Block = */
-/* ================== */
-
-.contact-block-img {
- width: 48px;
- height: 48px;
- padding-right: 3px;
-}
-.contact-block-div {
- float: left;
-}
-
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
-
-#group-edit-wrapper {
- margin-bottom: 10px;
-}
-
-#group-members-end {
- clear: both;
-}
-#group-edit-desc {
- margin-top: 15px;
-}
-
-/*
-#group-separator,
-#prof-separator { display: none;}
-*/
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
- margin-bottom: 10px;
- margin-top: 20px;
-}
-
-#prvmail-submit {
- float: right;
- margin-top: 10px;
-}
-
-#prvmail-subject
-{
-background: none repeat scroll 0 0 #FFFFFF;
-border: 1px solid #CCCCCC;
-border-radius: 5px 5px 5px 5px;
-font-weight: bold;
-height: 20px;
-margin: 0 0 5px;
-vertical-align: middle;
-}
-#prvmail-form{
- width: 597px;
- }
-
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
- float: left;
- margin-top: 10px;
- margin-right: 10px;
- width: 24px;
-}
-
-#prvmail-end {
- clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
- float: left;
-}
-.mail-list-detail {
- margin-left: 20px;
-}
-
-.mail-list-subject {
- font-size: 1.1em;
- margin-top: 10px;
-}
-a.mail-list-link {
- display: block;
- font-size: 1.3em;
- padding: 4px 0;
-}
-
-/*
-*a.mail-list-link:hover {
-* background-color: #15607B;
-* color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
- clear: both;
-}
-
-.mail-list-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-
-.mail-list-delete-icon {
- border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
-}
-
-.mail-conv-delete-icon {
- border: none;
-}
-
-/* ========== */
-/* = Events = */
-/* ========== */
-.eventcal {
- float: left;
- font-size: 20px;
-}
-
-.vevent {
- border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
- margin-left: 10px;
- margin-right: 10px;
-}
-.vevent .event-start {
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#new-event-link {
- margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
-}
-
-.event-description:before {
- content: url('../../../images/calendar.png');
- margin-right: 15px;
-}
-
-.event-start, .event-end {
- margin-left: 10px;
- width: 330px;
- clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
- float: right;
-}
-
-.event-list-date {
- margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
- float: left;
- margin-left: 32px;
- margin-right: 32px;
- margin-top: 64px;
-}
-.event-calendar-end {
- clear: both;
-}
-
-
-.calendar {
- font-family: Courier, monospace;
-}
-.calendar.eventcal a {
- color: #1872A2;
- }
-.today {
- font-weight: bold;
- color: #FF0000;
-}
-
-.settings-block {
- border: 1px solid #AAA;
- margin: 10px;
- padding: 10px;
-}
-
-.app-title {
- margin: 10px;
-}
-
-#identity-manage-desc {
- margin-top:15px;
- margin-bottom: 15px;
-}
-
-#identity-manage-choose {
- margin-bottom: 15px;
-}
-
-#identity-submit {
- margin-top: 20px;
-}
-
-#photo-prev-link, #photo-next-link {
- padding: 10px;
- float: left;
-}
-.lightbox{
- float: left;
- }
-
-#photo-photo {
- float: left;
-}
-#photo-like-div .wall-item-like-buttons {
- float: left;
- margin-right: 5px;
- margin-top: 30px;
- }
-.comment-edit-text-empty {
- margin: 10px 0 0;
- width: 85%;
-}
-.comment-edit-photo {
- margin: 10px 0 0;
-}
-.wall-item-like-buttons .icon.like {
-float: left;
-}
-
-#photo-photo-end {
- clear: both;
-}
-
-.tabs .comment-wwedit-wrapper {
- display: block;
- margin-top: 30px;
- margin-left: 50px;
- }
-
-.profile-match-photo {
- float: left;
- text-align: center;
- width: 120px;
-}
-
-.profile-match-name {
- float: left;
- text-align: center;
- width: 120px;
- overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
- clear: both;
-}
-
-.profile-match-connect {
- text-align: center;
- font-weight: bold;
-}
-
-.profile-match-wrapper {
- float: left;
- padding: 10px;
- width: 120px;
- height: 120px;
- scroll: auto;
-}
-#profile-match-wrapper-end {
- clear: both;
-}
-
-/* ============= */
-/* = Directory = */
-/* ============= */
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-photo-menu-button {
- display: none;
- /* position: absolute; */
- /* position: absolute; */
- left: -2px;
- top: -20px;
-}
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo-menu-button {
- left: 0px;
- top: 63px;
-}
-.directory-item {
- float: left;
- width: 200px;
- height: 200px;
-}
-.directory-item .contact-photo {
- width: 175px;
- height: 175px;
-}
-.directory-item .contact-photo img {
- width: 175px;
- height: 175px;
-}
-.contact-name {
- text-align: left;
- font-weight: bold;
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums{
- margin-top: 15px;
- }
-.photo-top-photo, .photo-album-photo {
- -webkit-border-radius: 5px 5px 0 0;
- -moz-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-.photo-album-image-wrapper, .photo-top-image-wrapper {
- float: left;
- -moz-box-shadow: 0 0 5px #888;
- -webkit-box-shadow: 0 0 5px #888;
- box-shadow: 0 0 5px #888;
- background-color: #000;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- padding-bottom: 20px;
- position: relative;
- margin: 0 10px 10px 0;
- width: 200px; height: 140px;
- overflow: hidden;
-}
-.photo-top-album-name {
- width: 100%;
- position: absolute;
- bottom: 0px;
- padding-left: 3px;
- background-color: #EEE;
-}
-.photo-top-album-link{
- color: #1872A2;
- }
-.photo-top-album-img{
-
- }
-/*.photo-top-image-wrapper {
- position: relative;
- float: left;
- margin-top: 15px;
- margin-right: 15px;
- width: 200px; height: 200px;
- overflow: hidden;
-}
-.photo-top-album-name {
- width: 100%;
- min-height: 2em;
- position: absolute;
- bottom: 0px;
- padding: 0px 3px;
- padding-top: 0.5em;
- background-color: rgb(255, 255, 255);
-}*/
-#photo-top-end {
- clear: both;
-}
-
-#photo-top-links {
- margin-bottom: 30px;
- margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
- float: left;
- width: 175px;
-}
-
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index f4eebe072..1b8fe1e72 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -526,8 +526,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: #308DBF;
}
.tool .label {
float: left;
@@ -1031,43 +1032,57 @@ ul.menu-popup .empty {
.menu-profile-list{
height: auto;
overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: #308DBF;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
+
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
display: table-cell;
@@ -2103,6 +2118,41 @@ ul.tabs li .active {
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
}
+//settings tabs
+ul.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+}
+ul.rs_tabs li {
+ float: left;
+ margin-bottom: 30px;
+ clear: both;
+}
+ul.rs_tabs li .selected {
+ background-color: #055580;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 2px 2px 2px #CFCFCF;
+ font-size: 13px;
+}
+.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+ background-position: 0 -20px;
+ background-repeat: repeat-x;
+ height: 27px;
+ padding: 0;
+ }
+.rs_tab.button {
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ font-weight: bolder;
+ padding: 3px;
+ color: #333333;
+ text-decoration: none;
+ }
/**
* Form fields
*/
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 435ecaf92..379f67008 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.016)
+ * Version: (Version: 1.017)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.016)";
+$diabook_version = "Diabook-blue (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -21,7 +21,6 @@ $cssFile = null;
*/
function diabook_blue_community_info(){
$a = get_app();
- //right_aside at networkpages
// last 12 users
$aside['$lastusers_title'] = t('Last users');
@@ -279,56 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-
- $tabs = array(
- array(
- 'label' => t('Account settings'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'sel' => (($a->argc == 1)?'active':''),
- ),
- array(
- 'label' => t('Display settings'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- ),
- array(
- 'label' => t('Edit/Manage Profiles'),
- 'url' => $a->get_baseurl(true).'/profiles',
- ),
- array(
- 'label' => t('Connector settings'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- ),
- array(
- 'label' => t('Plugin settings'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- ),
- array(
- 'label' => t('Connections'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'sel' => ''
- )
- );
- $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['aside'] = replace_macros($tabtpl, array(
- '$tabs' => $tabs,
- ));
-
-
- // CUSTOM CSS
- $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
-
-}
-
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl
index 64e4fb802..225a5dd5c 100644
--- a/view/theme/diabook-red/comment_item.tpl
+++ b/view/theme/diabook-red/comment_item.tpl
@@ -13,12 +13,12 @@
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
- <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
+ <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>
- <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
- <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option>
diff --git a/view/theme/diabook-red/generic_links_widget.tpl b/view/theme/diabook-red/generic_links_widget.tpl
new file mode 100644
index 000000000..001c1395e
--- /dev/null
+++ b/view/theme/diabook-red/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div id="widget_$title">
+ {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
+ {{if $desc}}<div class="desc">$desc</div>{{endif}}
+
+ <ul class="rs_tabs">
+ {{ for $items as $item }}
+ <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/theme/diabook-red/icons/com_side.png b/view/theme/diabook-red/icons/com_side.png
index bc5969ef1..00186ba05 100644
--- a/view/theme/diabook-red/icons/com_side.png
+++ b/view/theme/diabook-red/icons/com_side.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/events.png b/view/theme/diabook-red/icons/events.png
index 4a0b3f3f1..cf195fbb6 100644
--- a/view/theme/diabook-red/icons/events.png
+++ b/view/theme/diabook-red/icons/events.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/home.png b/view/theme/diabook-red/icons/home.png
index be47a48fc..5c610805f 100644
--- a/view/theme/diabook-red/icons/home.png
+++ b/view/theme/diabook-red/icons/home.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/mess_side.png b/view/theme/diabook-red/icons/mess_side.png
index 49ef896bc..5295e2e74 100644
--- a/view/theme/diabook-red/icons/mess_side.png
+++ b/view/theme/diabook-red/icons/mess_side.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/notes.png b/view/theme/diabook-red/icons/notes.png
index 7d4afca90..28dca30a3 100644
--- a/view/theme/diabook-red/icons/notes.png
+++ b/view/theme/diabook-red/icons/notes.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/pscontacts.png b/view/theme/diabook-red/icons/pscontacts.png
index acf857f32..23a78bcac 100644
--- a/view/theme/diabook-red/icons/pscontacts.png
+++ b/view/theme/diabook-red/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook-red/icons/pubgroups.png b/view/theme/diabook-red/icons/pubgroups.png
index 6d9539610..ae04194b1 100644
--- a/view/theme/diabook-red/icons/pubgroups.png
+++ b/view/theme/diabook-red/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
new file mode 100644
index 000000000..fe4baf8d1
--- /dev/null
+++ b/view/theme/diabook-red/nets.tpl
@@ -0,0 +1,11 @@
+<div id="nets-sidebar" class="widget">
+ <h3>$title</h3>
+ <div id="nets-desc">$desc</div>
+
+ <ul class="nets-ul">
+ <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ {{ for $nets as $net }}
+ <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ {{ endfor }}
+ </ul>
+</div>
diff --git a/view/theme/diabook-red/profile_side.tpl b/view/theme/diabook-red/profile_side.tpl
index 94396300f..01e80f238 100644
--- a/view/theme/diabook-red/profile_side.tpl
+++ b/view/theme/diabook-red/profile_side.tpl
@@ -7,13 +7,13 @@
</div>
<ul id="profile-side-menu" class="menu-profile-side">
- <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
- <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
- <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+ <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
+ <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
+ <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul>
</div>
diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook-red/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
- {{ for $tabs as $tab }}
- <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
- {{ endfor }}
-</ul>
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 8be39e374..ca32be231 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -482,8 +482,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: #FFE499;
}
.tool .label {
float: left;
@@ -941,44 +942,57 @@ ul.menu-popup .empty {
}
.menu-profile-list{
height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
+ overflow: auto;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: #FFE499;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
display: table-cell;
diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook-red/style-settings.css
deleted file mode 100644
index 43bb3d037..000000000
--- a/view/theme/diabook-red/style-settings.css
+++ /dev/null
@@ -1,2590 +0,0 @@
-/**
- * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
- * Additional Changes: Michael Vogel <icarus@dabo.de>
- **/
-
-/* ========= */
-/* = Admin = */
-/* ========= */
-
-#adminpage {
-/* width: 80%;*/
-}
-
-#pending-update {
- float:right;
- color: #ffffff;
- font-weight: bold;
- background-color: #FF0000;
- padding: 0em 0.3em;
-}
-
-.admin.linklist {
- border: 0px; padding: 0px;
-}
-
-.admin.link {
- list-style-position: inside;
- font-size: 1em;
- padding: 5px;
- width: 100px;
- margin: 5px;
-}
-
-#adminpage dl {
- clear: left;
- margin-bottom: 2px;
- padding-bottom: 2px;
- border-bottom: 1px solid black;
-}
-
-#adminpage dt {
- width: 200px;
- float: left;
- font-weight: bold;
-}
-
-#adminpage dd {
- margin-left: 200px;
-}
-#adminpage h3 {
- border-bottom: 1px solid #898989;
- margin-bottom: 5px;
- margin-top: 10px;
-}
-
-#adminpage .submit {
- clear:left;
-}
-
-#adminpage #pluginslist {
- margin: 0px; padding: 0px;
-}
-
-#adminpage .plugin {
- list-style: none;
- display: block;
- /* border: 1px solid #888888; */
- padding: 1em;
- margin-bottom: 5px;
- clear: left;
-}
-
-#adminpage .toggleplugin {
- float:left;
- margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #eeeeee; }
-#adminpage .selectall { text-align: right; }
-/* icons */
-
-.icon.contacts {
- background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
-.icon.notifications {
- background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
-.icon.notify {
- background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
-.icon.messages {
- background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
-.icon.community {
- background-image: url("../../../view/theme/diabook-red/icons/community.png");}
-
-.icon.drop { background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.drophide { background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.dislike { background-image: url("../../../view/theme/diabook-red/icons/dislike.png");}
-.icon.like { background-image: url("../../../view/theme/diabook-red/icons/like.png");}
-.icon.pencil { background-image: url("../../../view/theme/diabook-red/icons/pencil.png");}
-.icon.recycle { background-image: url("../../../view/theme/diabook-red/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-red/icons/remote.png");}
-.icon.tagged { background-image: url("../../../view/theme/diabook-red/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-red/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-red/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-red/icons/starred.png");}
-.icon.link { background-image: url("../../../view/theme/diabook-red/icons/link.png");}
-.icon.lock { background-image: url("../../../view/theme/diabook-red/icons/lock.png");}
-.icon.unlock { background-image: url("../../../view/theme/diabook-red/icons/unlock.png");}
-.icon.language { background-image: url("../../../view/theme/diabook-red/icons/language.png");}
-
-
-.camera { background-image: url("../../../view/theme/diabook-red/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.attach { background-image: url("../../../view/theme/diabook-red/icons/attach.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video2 { background-image: url("../../../view/theme/diabook-red/icons/video.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video { background-image: url("../../../view/theme/diabook-red/icons/video.png");
- display: block; width: 100%; height: 28px; background-repeat: no-repeat;
- }
-.audio2 { background-image: url("../../../view/theme/diabook-red/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.audio { background-image: url("../../../view/theme/diabook-red/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.weblink { background-image: url("../../../view/theme/diabook-red/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.globe { background-image: url("../../../view/theme/diabook-red/icons/globe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.unglobe { background-image: url("../../../view/theme/diabook-red/icons/unglobe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.edit {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
-
-
-
-.article { background-position: -50px 0px;}
-/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
-/*.drop { background-position: -110px 0px;}*/
-/*.drophide { background-position: -130px 0px;}*/
-/*.edit { background-position: -150px 0px;}*/
-/*.camera { background-position: -170px 0px;}*/
-/*.dislike { background-position: -190px 0px;}*/
-/*.like { background-position: -210px 0px;}*/
-/*.link { background-position: -230px 0px;}*/
-
-/*.globe { background-position: -50px -20px;}*/
-/*.noglobe { background-position: -70px -20px;}*/
-.no { background-position: -90px -20px;}
-.pause { background-position: -110px -20px;}
-.play { background-position: -130px -20px;}
-/*.pencil { background-position: -150px -20px;}*/
-.small-pencil { background-position: -170px -20px;}
-/*.recycle { background-position: -190px -20px;}*/
-/*.remote-link { background-position: -210px -20px;}*/
-.share { background-position: -230px -20px;}
-
-.tools { background-position: -50px -40px;}
-/*.lock { background-position: -70px -40px;}*/
-
-/*.video { background-position: -110px -40px;}*/
-.youtube { background-position: -130px -40px;}
-
-/*.attach { background-position: -190px -40px;}*/
-/*.language { background-position: -210px -40px;}*/
-
-
-.icon.on { background-image: url("../../../view/theme/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off { background-image: url("../../../view/theme/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
-.prev { background-position: -90px -60px;}
-.next { background-position: -110px -60px;}
-/*.tagged { background-position: -130px -60px;}*/
-
-.attachtype {
- display: block; width: 20px; height: 23px;
- background-image: url('../../../images/content-types.png');
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text { background-position: -60px 0px; }
-.type-unkn { background-position: -80px 0px; }
-
-.icon.drop, .icon.drophide {
- float: left;
-}
-
-.icon {
- display: block;
- width: 20px;
- height: 20px;
- /*background-image: url('icons.png');*/
-}
-
-.icon {
- background-color: transparent ;
- background-repeat: no-repeat;
- /* background-position: left center; */
- display: block;
- overflow: hidden;
- text-indent: -9999px;
- padding: 1px;
-}
-
-.icon.border.camera{
- background-image: url("../../../view/theme/diabook-red/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-
-.icon.border.link{
- background-image: url("../../../view/theme/diabook-red/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- margin-left: 10px;
- }
-
-.icon.text {
- text-indent: 0px;
-}
-.icon.s10 {
- min-width: 10px;
- height: 10px;
-}
-.icon.s10.notify {
- background-image: url("../../../images/icons/10/notify_off.png");
-}
-.icon.s10.gear {
- background-image: url("../../../images/icons/10/gear.png");
-}
-.icon.s10.add {
- background-image: url("../../../images/icons/10/add.png");
-}
-.icon.s10.delete {
- background-image: url("../../../images/icons/10/delete.png");
-}
-.icon.s10.edit {
- background-image: url("../../../images/icons/10/edit.png");
-}
-.icon.s10.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s10.menu {
- background-image: url("../../../images/icons/10/menu.png");
-}
-.icon.s10.link {
- background-image: url("../../../images/icons/10/link.png");
-}
-.icon.s10.lock {
- background-image: url("../../../images/icons/10/lock.png");
-}
-.icon.s10.unlock {
- background-image: url("../../../images/icons/10/unlock.png");
-}
-.icon.s10.text {
- padding: 2px 0px 0px 15px;
- font-size: 10px;
-}
-.icon.s16 {
- min-width: 16px;
- height: 16px;
-}
-.icon.s16.notify {
- background-image: url("../../../images/icons/16/notify_off.png");
-}
-.icon.s16.gear {
- background-image: url("../../../images/icons/16/gear.png");
-}
-.icon.s16.add {
- background-image: url("../../../images/icons/16/add.png");
-}
-.icon.s16.delete {
- background-image: url("../../../images/icons/16/delete.png");
-}
-/*.icon.s16.edit {
- background-image: url("../../../images/icons/16/edit.png");
-}*/
-.icon.s16.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s16.menu {
- background-image: url("../../../images/icons/16/menu.png");
-}
-/*.icon.s16.link {
- background-image: url("../../../images/icons/16/link.png");
-}*/
-.icon.s16.lock {
- background-image: url("../../../images/icons/16/lock.png");
-}
-.icon.s16.unlock {
- background-image: url("../../../images/icons/16/unlock.png");
-}
-.icon.s16.text {
- padding: 4px 0px 0px 20px;
- font-size: 10px;
-}
-.icon.s22 {
- min-width: 22px;
- height: 22px;
-}
-.icon.s22.notify {
- background-image: url("../../../images/icons/22/notify_off.png");
-}
-.icon.s22.gear {
- background-image: url("../../../images/icons/22/gear.png");
-}
-.icon.s22.add {
- background-image: url("../../../images/icons/22/add.png");
-}
-.icon.s22.delete {
- background-image: url("../../../images/icons/22/delete.png");
-}
-.icon.s22.edit {
- background-image: url("../../../images/icons/22/edit.png");
-}
-.icon.s22.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s22.menu {
- background-image: url("../../../images/icons/22/menu.png");
-}
-.icon.s22.link {
- background-image: url("../../../images/icons/22/link.png");
-}
-.icon.s22.lock {
- background-image: url("../../../images/icons/22/lock.png");
-}
-.icon.s22.unlock {
- background-image: url("../../../images/icons/22/unlock.png");
-}
-.icon.s22.text {
- padding: 10px 0px 0px 25px;
- width: 200px;
-}
-.icon.s48 {
- width: 48px;
- height: 48px;
-}
-.icon.s48.notify {
- background-image: url("../../../images/icons/48/notify_off.png");
-}
-.icon.s48.gear {
- background-image: url("../../../images/icons/48/gear.png");
-}
-.icon.s48.add {
- background-image: url("../../../images/icons/48/add.png");
-}
-.icon.s48.delete {
- background-image: url("../../../images/icons/48/delete.png");
-}
-.icon.s48.edit {
- background-image: url("../../../images/icons/48/edit.png");
-}
-.icon.s48.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s48.menu {
- background-image: url("../../../images/icons/48/menu.png");
-}
-.icon.s48.link {
- background-image: url("../../../images/icons/48/link.png");
-}
-.icon.s48.lock {
- background-image: url("../../../images/icons/48/lock.png");
-}
-.icon.s48.unlock {
- background-image: url("../../../images/icons/48/unlock.png");
-}
-
-#contact-edit-links ul {
- list-style: none;
- list-style-type: none;
-}
-
-.hide-comments-outer {
- margin-left: 80px;
- margin-bottom: 5px;
- width: 484px;
- border-bottom: 1px solid #BDCDD4;
- border-top: 1px solid #BDCDD4;
-
- padding: 8px;
-}
-
-/* global */
-body {
- font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 12.5px;
- background-color: #ffffff;
- color: #2d2d2d;
- margin: 50px auto auto;
- display: table;
-}
-
-h4 {
- font-size: 1.1em;
-}
-
-a {
- color: #333333;
- /* color: #3e3e8c; */
- text-decoration: none;
-}
-a:hover {
- /* color: blue; */
- text-decoration: underline
-}
-
-.wall-item-name-link {
-/* float: left;*/
-}
-
-.wall-item-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-
-.left {
- float: left;
-}
-.right {
- float: right;
-}
-.hidden {
- display: none;
-}
-.clear {
- clear: both;
-}
-.fakelink {
- color: #333;
- /* color: #3e3e8c; */
- text-decoration: none;
- cursor: pointer;
-}
-.fakelink:hover {
- /* color: blue; */
- /*color: #005c94; */
- text-decoration: underline;
-}
-code {
- font-family: Courier, monospace;
- white-space: pre;
- display: block;
- overflow: auto;
- border: 1px solid #444;
- background: #EEE;
- color: #444;
- padding: 10px;
- margin-top: 20px;
-}
-#panel {
- position: absolute;
- width: 12em;
- background: #ffffff;
- color: #2d2d2d;
- margin: 0px;
- padding: 1em;
- list-style: none;
- border: 3px solid #364e59;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-/* tool */
-.tool {
- height: auto;
- overflow: auto;
- padding: 3px;
-}
-#saved-search-ul .tool:hover,
-#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
-}
-.tool .label {
- float: left;
-}
-.tool .action {
- float: right;
-}
-.tool a {
- color: ##3F8FBA;
-}
-.tool a:hover {
- text-decoration: none;
-}
-/* popup notifications */
-div.jGrowl div.notice {
- background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-div.jGrowl div.info {
- background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-/* header */
-header {
- position: fixed;
- left: 0%;
- right: 80%;
- top: 0px;
- margin: 0px;
- padding: 0px;
- width: 22%;
- height: 32px;
- background: #ff500f;
- background-color: #ff500f;
- z-index: 100;
- border-bottom: 1px;
- border-bottom-color: black;
- border-bottom-style: inset;
- background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-}
-header #site-location {
- display: none;
-}
-header #banner {
- overflow: hidden;
- text-align: left;
- width: 82%%;
- margin-left: 25%;
-}
-header #banner a,
-header #banner a:active,
-header #banner a:visited,
-header #banner a:link,
-header #banner a:hover {
- color: #1f1f1f;
- text-decoration: none;
- outline: none;
- vertical-align: middle;
- font-weight: bolder;
-}
-header #banner #logo-img {
- height: 25px;
- margin-top: 3px;
-}
-header #banner #logo-text {
- font-size: 20px;
- position: absolute;
- top: 10%;
- margin-left: 3px;
-}
-/* nav */
-nav {
- width: 80%;
- height: 32px;
- position: fixed;
- left: 22%;
- top: 0px;
- padding: 0px;
- background: #ff500f;
- color: #1f1f1f;
- z-index: 99;
- border-bottom: 1px;
- border-bottom-color: black;
- border-bottom-style: inset;
- background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
-}
-nav a,
-nav a:active,
-nav a:visited,
-nav a:link,
-nav a:hover {
- color: #1f1f1f;
- text-decoration: none;
- outline: none;
-}
-nav #banner {
- overflow: hidden;
- /*text-align: center;*/
- width: 100%;
-}
-nav #banner a,
-nav #banner a:active,
-nav #banner a:visited,
-nav #banner a:link,
-nav #banner a:hover {
- color: #1f1f1f;
- text-decoration: none;
- outline: none;
- vertical-align: bottom;
-}
-nav #banner #logo-img {
- height: 22px;
- margin-top: 5px;
-}
-nav #banner #logo-text {
- font-size: 22px;
-}
-nav #navbar{
- }
-nav ul {
- margin: 0px;
- padding: 0px 20px;
-}
-nav ul li {
- list-style: none;
- margin: 0px;
- /* padding: 1px 1px 3px 1px; */
- float: left;
-}
-nav ul li .menu-popup {
- left: 0px;
- right: auto;
-}
-
-nav #logo-img {
- height: 25px;
- margin-top: 4px;
- margin-left: 30px;
-}
-
-nav #logo-text {
- font-size: 22px;
- margin-top: 3px;
- margin-right: 15px;
-}
-nav .nav-menu-search {
- position: relative;
-
- margin: 4px 17px;
- margin-right: 0px;
- height: 17px;
- width: 180px;
-
-}
-
-nav #search-box #search-text {
- background-image: url('icons/lupe.png');
- background-repeat:no-repeat;
- padding-left:20px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
- }
-
-
-nav .nav-menu-icon {
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 5px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-nav .nav-menu-icon:hover {
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 5px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-
-nav .nav-menu-icon.selected {
- background-color: #fff4d6;
-}
-nav .nav-menu-icon img {
- width: 22px;
- height: 22px;
-}
-nav .nav-menu-icon .nav-notify {
- top: 3px;
-}
-nav .nav-menu {
- position: relative;
- height: 16px;
- padding: 5px;
- margin: 3px 15px 0px;
- font-size: 13px;
- /*border-bottom: 3px solid #364A84;*/
-}
-nav .nav-menu.selected {
- /*border-bottom: 3px solid #9eabb0;*/
-}
-nav .nav-notify {
- display: none;
- position: absolute;
- background-color: #fff;
- /* background-color: #19aeff; */
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- font-size: 10px;
- font-weight: 900;
- padding: 1px 4px;
- top: 0px;
- right: -6px;
- min-width: 10px;
- text-align: center;
-}
-nav .nav-notify.show {
- display: block;
-}
-nav #nav-help-link,
-nav #nav-search-link,
-nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-site-linkmenu,
-nav #nav-home-link,
-nav #nav-user-linkmenu
-{
- float: right;
-}
-nav #nav-user-linkmenu{
- margin-right: 0px;
- }
-nav #nav-home-link, #nav-directory-link, #nav-apps-link{
- margin-left: 0px;
- margin-right: 0px;
- font-weight: bold;
- margin: 3px 5px;
- font-size: 15px;
- }
-nav #nav-directory-link{
- margin-right: 0px;
- }
-nav #nav-home-link{
- margin-left: 0px;
- }
-nav #nav-help-link .menu-popup,
-nav #nav-search-link .menu-popup,
-nav #nav-directory-link .menu-popup,
-nav #nav-apps-link .menu-popup,
-nav #nav-site-linkmenu .menu-popup {
- right: 0px;
- left: auto;
-}
-
-nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
- background-image: url("../../../view/theme/diabook-red/icons/messages2.png");
- }
-
-/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
- background-image: url("../../../view/theme/diabook-red/icons/notify2.png");
- }
-
-nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
- background-image: url("../../../view/theme/diabook-red/icons/contacts2.png");
- }
-
-nav #nav-apps-link.selected {
- background-color: #fff4d6;
- moz-border-radius: 5px 5px 0 0;
--webkit-border-radius: 5px 5px 0 0;
-border-radius: 5px 5px 0 0;
-}
-
-#nav-notifications-mark-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-#nav-notifications-see-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-.notify-seen {
- background: none repeat scroll 0 0 #DDDDDD;
- }
-
-ul.menu-popup {
- position: absolute;
- display: none;
- width: 11em;
- background: #fff4d6;
- color: #2d2d2d;
- margin: 0px;
- padding: 0px;
- list-style: none;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
- display: block;
- color: #2d2d2d;
- padding: 5px 10px;
- text-decoration: none;
-}
-ul.menu-popup a:hover {
- background-color: #ffe499; /*bdcdd4;*/
- color: #000;
-}
-ul.menu-popup .menu-sep {
- border-top: 1px solid #9eabb0;
-}
-ul.menu-popup li {
- float: none;
- overflow: auto;
- height: auto;
- display: block;
-}
-ul.menu-popup li img {
- float: left;
- width: 16px;
- height: 16px;
- padding-right: 5px;
-}
-ul.menu-popup .empty {
- padding: 5px;
- text-align: center;
- color: #9eabb0;
-}
-/* autocomplete popup */
-.acpopup {
- max-height: 150px;
- background-color: #ffffff;
- color: #2d2d2d;
- border: 1px solid #MenuBorder;
- overflow: auto;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-.acpopupitem {
- color: #2d2d2d;
- padding: 4px;
- clear: left;
-}
-.acpopupitem img {
- float: left;
- margin-right: 4px;
-}
-.acpopupitem.selected {
- background-color: #bdcdd4;
-}
-#nav-notifications-menu {
- width: 400px;
- max-height: 550px;
- overflow: auto;
-}
-/* #nav-notifications-menu a {
- display: inline;
- padding: 5px 0px;
- margin: 0px 0px 2px 0px;
-}
-#nav-notifications-menu li:hover {
- background-color: #bdcdd4;
-}*/
-
-#nav-notifications-menu img {
- float: left;
- margin-right: 5px;
-}
-#nav-notifications-menu .contactname {
- font-weight: bold;
-}
-#nav-notifications-menu .notif-when {
- font-size: 10px;
- color: #9eabb0;
- display: block;
-}
-
-.notif-image {
- width: 32px;
- height: 32px;
- padding: 7px 7px 0px 0px;
-}
-
-/*profile_side*/
-#profile_side {
- margin-bottom: 30px;
-}
-#ps-usericon{
- height: 25px
- }
-#ps-username{
- font-size: 1.17em;
- font-weight: bold;
- vertical-align: top;
- position: absolute;
- padding-top: 4px;
- padding-left: 5px;
- word-wrap: break-word;
- width: 130px;
- }
-#ps-username:hover{
- text-decoration: none;
- }
-.menu-profile-side{
- list-style: none;
- padding-left: 0px;
- min-height: 0px;
- }
-.menu-profile-list{
- height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
- }
-.menu-profile-list:hover{
- background: #EEE;
- }
-.menu-profile-list-item{
- padding-left: 5px;
- }
-.menu-profile-list-item:hover{
- text-decoration: none;
- }
-/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
- background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
- }
-.menu-profile-list.photos{
- background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
- background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
- background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
- background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
- background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
- }
-
-/* aside */
-aside {
- display: table-cell;
- vertical-align: top;
- width: 200px;
- padding: 0px 10px 0px 10px;
- border-right: 1px solid #D2D2D2;
- float: left;
- /* background: #F1F1F1; */
-}
-
-aside .vcard {
- display: none;
-}
-aside .vcard .title {
- margin-bottom: 5px;
-}
-aside .vcard dl {
- height: auto;
- overflow: auto;
-}
-aside .vcard dt {
- float: left;
- margin-left: 0px;
- /*width: 35%;*/
- text-align: right;
- color: #999999;
-}
-aside .vcard dd {
- float: left;
- margin-left: 5px;
- /*width: 60%;*/
-}
-aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
-}
-aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
- list-style: none;
-}
-aside #dfrn-request-link {
- display: block;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- color: #ffffff;
- background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
- font-weight: bold;
- text-transform: uppercase;
- padding: 4px 2px 2px 35px;
-}
-aside #dfrn-request-link:hover {
- text-decoration: none;
- background-color: #36c;
- /* background-color: #19aeff; */
-}
-aside #profiles-menu {
- width: 20em;
-}
-aside #search-text {
- width: 150px;
- height: 17px;
- padding-left: 10px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
-}
-aside #side-follow-url {
- width: 150px;
- }
-aside #side-peoplefind-url {
- width: 150px;
- }
-#contact-block {
- display: none;
-}
-#contact-block .contact-block-h4 {
- float: left;
- margin: 5px 0px;
-}
-#contact-block .allcontact-link {
- float: right;
- margin: 5px 0px;
-}
-#contact-block .contact-block-content {
- clear: both;
- overflow: auto;
- height: auto;
-}
-#contact-block .contact-block-link {
- float: left;
- margin: 0px 2px 2px 0px;
-}
-#contact-block .contact-block-link img {
- widht: 48px;
- height: 48px;
-}
-#lost-password-link {
- float: left;
- margin-right: 20px;
- }
-/* widget */
-.widget {
- margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-/* font-size: 12px; */
-}
-.widget h3 {
- padding: 0px;
- margin: 2px;
-}
-.widget .action {
- opacity: 0.1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget input.action {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget:hover .title .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action.ticked {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget ul {
- padding: 0px;
-}
-.widget ul li {
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums ul li a{
- color: #1872A2;
-}
-.widget .tool.selected {
- background: url("../../../view/theme/diabook-red/icons/selected.png") no-repeat left center;
-}
-/* widget: search */
-span.sbox_l {
- background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-left: 10px;
- margin-top: 5px;
-
-}
-
-span.sbox_r {
- background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-top: 5px;
-}
-
-span.sbox input {
- background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
- float: left;
- margin-top: 5px;
- border: 0;
- height: 13px; width: 100px;
- padding: 3px;
- font: 11px/13px arial;
- color: #000;
-}
-#add-search-popup {
- width: 200px;
- top: 18px;
-}
-/* section */
-section {
- display: table-cell;
- vertical-align: top;
- width: 650px;
- padding: 0px 0px 0px 20px;
-}
-
-body .pageheader{
- text-align: center;
- font-size: 20px;
- margin-bottom: 20px;
- margin-top: 0px;
- max-width: 575px;
- }
-
-#id_username {
- width: 173px;
- }
-#id_password {
- width: 173px;
- }
-#id_openid_url {
- width: 173px;
- }
-#contact-edit-end {
- }
-.pager {
- padding: 10px;
- text-align: center;
- font-size: 1.0em;
- clear: both;
- display: block;
-}
-
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
-
- background-position: 0 -20px;
- background-repeat: repeat-x;
- height: 27px;
- padding: 0;
- }
-.rs_tab.button {
- /*background: none repeat scroll 0 0 #F8F8F8;*/
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- font-weight: bolder;
- padding: 3px;
- color: #333333;
- text-decoration: none;
- }
-
-
-#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
- margin-bottom: 10px;
- }
-
-right_aside {
- display: table-cell;
- vertical-align: top;
- width: 170px;
- /*padding-right: 10px;*/
- /*border-left: 1px solid #D2D2D2;*/
-
- /* background: #F1F1F1; */
-}
-right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
-margin-top:30px;}
-right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
-right_aside .directory-photo { margin: 0px; }
-right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
-right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto; width: 100%; }
-right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
-right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
-#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
-#page-sidebar-right_aside ul {margin-top: 0px;}
-#page-sidebar-right_aside .label {max-width: 128px;}
-right_aside .icon {width: 10px; height: 10px;}
-.close_box {
- background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 0.1;
- }
-.close_box:hover {
- background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 1;
--webkit-transition: all 0.2s ease-in-out;
--moz-transition: all 0.2s ease-in-out;
--o-transition: all 0.2s ease-in-out;
--ms-transition: all 0.2s ease-in-out;
-transition: all 0.2s ease-in-out;
- }
-/* wall item */
-.tread-wrapper {
- border-bottom: 1px solid #D2D2D2;
- position: relative;
- padding: 5px;
- margin-bottom: 0px;
- width: 575px;
-}
-.tread-wrapper a{
- color: red;
-}
-
-.wall-item-decor {
- position: absolute;
- left: 790px;
- top: -10px;
- width: 16px;
-}
-
-.wall-item-container {
- display: table;
- width: 580px;
-}
-
-
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
- display: table-row;
-}
-
-.wall-item-bottom {
- font-size: 13px;
-}
-.wall-item-container .wall-item-bottom {
-/* opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container:hover .wall-item-bottom {
-/* opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container .wall-item-info {
- display: table-cell;
- vertical-align: top;
- text-align: left;
- width: 80px;
-}
-.wall-item-container .wall-item-location {
- padding-right: 40px;
- display: table-cell;
-}
-.wall-item-container .wall-item-ago {
- word-wrap: break-word;
- width: 50px;
- margin-left: 10px;
- color: #999;
-}
-.wall-item-location {
-
- clear: both;
- overflow: hidden;
-
- margin-bottom: 5px;
-}
-
-.wall-item-container .wall-item-content {
- font-size: 12.5px;
- max-width: 420px;
- word-wrap: break-word;
- line-height: 1.2;
-}
-
-.wall-item-container .wall-item-content img {
- max-width: 400px;
-}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
- display: table-cell;
- vertical-align: middle;
-}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-name {
- font-weight: bold;
-}
-.wall-item-container .wall-item-actions-author {
- width: 100%;
- margin-bottom: 0.3em;
-}
-.wall-item-container .wall-item-actions-social {
- float: left;
- margin-bottom: 1px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-social a {
- margin-right: 1em;
-}
-.wall-item-actions-social a {
- float: left;
-}
-.wall-item-container .wall-item-actions-tools {
- float: right;
- width: 80px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-tools a {
- float: right;
-}
-.wall-item-container .wall-item-actions-tools input {
- float: right;
-}
-.wall-item-container.comment {
- margin-top: 5px;
- margin-bottom: 5px;
- margin-left: 80px;
- width: 500px;
- border-bottom: 1px solid hsl(198, 21%, 79%);
-}
-.wall-item-container.comment .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.wall-item-container.comment {
- top: 15px !important;
- left: 15px !important;
-}
-.wall-item-container.comment .wall-item-links {
- padding-left: 12px;
-}
-.wall-item-comment-wrapper {
- margin: 1px 5px 1px 80px;
-}
-.wall-item-comment-wrapper .comment-edit-photo {
- display: none;
-}
-.wall-item-comment-wrapper textarea {
- height: 2.0em;
- width: 100%;
- font-size: 10px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- font-size: 14px;
-}
-.wall-item-comment-wrapper .comment-edit-text-full {
- font-size: 14px;
- height: 4em;
- color: #2d2d2d;
- border: 1px solid #2d2d2d;
-}
-.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
- margin-top: 10px;
-}
-.comment-edit-preview .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.comment-edit-preview {
- top: 15px !important;
- left: 15px !important;
-}
-.comment-edit-preview .wall-item-links {
- padding-left: 12px;
-}
-.comment-edit-preview .wall-item-container {
- width: 700px;
-}
-.comment-edit-preview .tread-wrapper {
- width: 700px;
- padding: 0;
- margin: 10px 0;
-}
-
-.shiny {
- /* border-right: 10px solid #fce94f; */
- border-right: 1px solid #A7C7F7;
- padding-right: 12px;
-}
-
-#jot-preview-content{
- margin-top: 30px;}
-
-#jot-preview-content .tread-wrapper {
- background-color: #fff797;
-}
-
-.wall-item-tags {
- padding-top: 1px;
- padding-bottom: 2px;
-}
-.tag {
- /*background: url("../../../images/tag_b.png") repeat-x center left;*/
- color: #999;
- padding-left: 3px;
- font-size: 12px;
-}
-.tag a {
- padding-right: 5px;
- /*background: url("../../../images/tag.png") no-repeat center right;*/
- color: #999;
-}
-.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
- background: #FFFFFF;
- border: 2px solid #364e59;
- height: 25px;
- width: 25px;
- overflow: hidden;
- padding: 1px;
- position: absolute !important;
- top: 40px;
- left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-}
-.wwto .contact-photo {
- width: auto;
- height: 25px;
-}
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
- width: 80px;
-}
-
-.contact-photo-wrapper.wwto {
- width: 25px;
-}
-
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper {
- left: 0px;
- top: 63px;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-name {
- /* text-align: center; */
- /*font-weight: bold;*/
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-/* editor */
-.jothidden {
- display: none;
-}
-#jot {
- width: 585px;
- margin: 0px 2em 20px 0px;
-}
-#profile-jot-form #profile-jot-text {
- height: 2.0em;
- width: 99%;
- font-size: 15px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- margin-bottom: 10px;
-}
-#jot #jot-tools {
- margin: 0px;
- padding: 0px;
- height: 40px;
- overflow: none;
- width: 583px;
- background-color: #fff;
- border-bottom: 2px solid #9eabb0;
-}
-
-#jot #jot-tools li {
- list-style: none;
- float: left;
- width: 80px;
- height: 40px;
- border-bottom: 2px solid #9eabb0;
-}
-#jot #jot-tools li a {
- display: block;
- color: #cccccc;
- width: 100%;
- height: 40px;
- text-align: center;
- line-height: 40px;
- overflow: hidden;
-}
-#jot #jot-tools li:hover {
- background-color: #364e59;
- border-bottom: 2px solid #bdcdd4;
-}
-#jot #jot-tools li.perms {
- float: right;
- width: 40px;
-}
-#jot #jot-tools li.perms a.unlock {
- width: 30px;
- border-left: 10px solid #cccccc;
- background-color: #cccccc;
- background-position: left center;
-}
-#jot #jot-tools li.perms a.lock {
- width: 30px;
- border-left: 10px solid #666666;
- background-color: #666666;
-}
-#jot #jot-tools li.submit {
- float: right;
- background-color: #cccccc;
- border-bottom: 2px solid #cccccc;
- border-right: 1px solid #666666;
- border-left: 1px solid #666666;
-}
-#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
- background-color: #cccccc;
- color: #666666;
- width: 80px;
- height: 40px;
- line-height: 40px;
-}
-#jot #jot-tools li.submit input:hover {
- background-color: #bdcdd4;
- color: #666666;
-}
-#jot #jot-tools li.loading {
- float: right;
- background-color: #ffffff;
- width: 20px;
- vertical-align: center;
- text-align: center;
- border-top: 2px solid #9eabb0;
- height: 38px;
-}
-#jot #jot-tools li.loading img {
- margin-top: 10px;
-}
-#profile-jot-form #jot-title {
-
- border-radius: 5px 5px 5px 5px;
- font-weight: bold;
- height: 20px;
- margin: 0 0 5px;
- width: 60%;
- border: 1px solid #ffffff;
-}
-#profile-jot-form #jot-title:-webkit-input-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #jot-title:-moz-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
- width: 585px;
- height: 100px;
- }
-#jot #jot-title:hover {
- border: 1px solid #999999;
-}
-#jot #jot-title:focus {
- border: 1px solid #999999;
-}
-#jot #character-counter {
- width: 80px;
- float: right;
- text-align: right;
- height: 20px;
- line-height: 20px;
- padding-right: 20px;
-}
-#jot-perms-icon,
-#profile-location,
-#profile-nolocation,
-#profile-youtube,
-#profile-video,
-#profile-audio,
-#profile-link,
-#profile-title,
-#wall-image-upload,
-#wall-file-upload,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
- cursor: pointer;
- margin-top: 2px;
-}
-#profile-jot-wrapper{
- margin: 0 2em 20px 0;
- width: 585px;
- }
-
-#profile-jot-submit-wrapper {
- margin-bottom: 50px;
- width: 585px;
-}
-
-#profile-jot-submit {
- float: right;
- margin-top: 2px;
- font-size: 14px;
-
-}
-#profile-upload-wrapper {
- float: left;
- margin-top: 2px;
- margin-left: 10px;
-
-}
-#profile-attach-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-rotator {
- float: left;
- margin-left: 30px;
- margin-top: 2px;
-}
-#profile-link-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-youtube-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-video-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-audio-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-location-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-jot-perms {
- float: left;
- margin-left: 45px;
- margin-top: 2px;
-}
-#jot-preview-link {
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- font-size: 9px;
- font-weight: bolder;
- cursor: pointer;
-}
-#profile-jot-perms{
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- }
-/** buttons **/
-.button.creation1 {
- background-color: #fff;
- border: 1px solid #777777;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- font-weight: bolder;
- cursor: pointer;
-}
-.button.creation2 {
- background-color: #FF500F;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- margin-left: 5px;
- font-weight: bolder;
- cursor: pointer;
-}
-/*input[type="submit"] {
- border: 0px;
- background-color: @ButtonBackgroundColor;
- color: @ButtonColor;
- padding: 0px 10px;
- .rounded(5px);
- height: 18px;
-}*/
-/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
- display: block!important;
-}
-#acl-wrapper {
- width: 690px;
- float: left;
-}
-#acl-search {
- float: right;
- background: #ffffff url("../../../images/search_18.png") no-repeat right center;
- padding-right: 20px;
-}
-#acl-showall {
- float: left;
- display: block;
- width: auto;
- height: 18px;
- background-color: #cccccc;
- background-image: url("../../../images/show_all_off.png");
- background-position: 7px 7px;
- background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
- color: #999999;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
-}
-#acl-showall.selected {
- color: #000000;
- background-color: #ff9900;
- background-image: url("../../../images/show_all_on.png");
-}
-#acl-list {
- height: 210px;
- border: 1px solid #cccccc;
- clear: both;
- margin-top: 30px;
- overflow: auto;
-}
-.acl-list-item {
- display: block;
- width: 150px;
- height: 30px;
- border: 1px solid #cccccc;
- margin: 5px;
- float: left;
-}
-.acl-list-item img {
- width: 22px;
- height: 22px;
- float: left;
- margin: 4px;
-}
-.acl-list-item p {
- height: 12px;
- font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
- overflow: hidden;
-}
-.acl-list-item a {
- font-size: 8px;
- display: block;
- width: 40px;
- height: 10px;
- float: left;
- color: #999999;
- background-color: #cccccc;
- background-position: 3px 3px;
- background-repeat: no-repeat;
- margin-right: 5px;
- -webkit-border-radius: 2px ;
- -moz-border-radius: 2px;
- border-radius: 2px;
- padding-left: 15px;
-}
-#acl-wrapper a:hover {
- text-decoration: none;
- color: #000000;
-}
-.acl-button-show {
- background-image: url("../../../images/show_off.png");
-}
-.acl-button-hide {
- background-image: url("../../../images/hide_off.png");
-}
-.acl-button-show.selected {
- color: #000000;
- background-color: #9ade00;
- background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
- color: #000000;
- background-color: #ff4141;
- background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow {
- border-color: #9ade00;
-}
-.acl-list-item.grouphide {
- border-color: #ff4141;
-}
-/** /acl **/
-/** tab buttons 14618a**/
-ul.rs_tabs {
- list-style-type: none;
-
- font-size: 11px;
-}
-ul.rs_tabs li {
- float: left;
- margin-bottom: 30px;
- clear: both;
-}
-ul.rs_tabs li .active {
- background-color: #535353;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 2px 2px 2px #CFCFCF;
- font-size: 13px;
-}
-/**
- * Form fields
- */
-.field {
- margin-bottom: 10px;
- padding-bottom: 10px;
- overflow: auto;
- width: 100%;
-}
-.field label {
- float: left;
- width: 200px;
-}
-.field input, .field textarea {
- width: 400px;
-}
-.field textarea {
- height: 100px;
-}
-.field .field_help {
- display: block;
- margin-left: 200px;
- color: #666666;
-}
-.field .onoff {
- float: left;
- width: 80px;
-}
-.field .onoff a {
- display: block;
- border: 1px solid #666666;
- background-image: url("../../../images/onoff.jpg");
- background-repeat: no-repeat;
- padding: 4px 2px 2px 2px;
- height: 16px;
- text-decoration: none;
-}
-.field .onoff .off {
- border-color: #666666;
- padding-left: 40px;
- background-position: left center;
- background-color: #cccccc;
- color: #666666;
- text-align: right;
-}
-.field .onoff .on {
- border-color: #204A87;
- padding-right: 40px;
- background-position: right center;
- background-color: #D7E3F1;
- color: #204A87;
- text-align: left;
-}
-.field .hidden {
- display: none!important;
-}
-.field.radio .field_help {
- margin-left: 0px;
-}
-#directory-search-form{
- margin-bottom: 50px;
- }
-#profile-edit-links-end {
- clear: both;
- margin-bottom: 15px;
-}
-
-#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
-
-#profile-edit-links li {
- float: left;
- list-style: none;
- margin-left: 10px;
-}
-
-.profile-edit-side-div {
- display: none;
-}
-
-#register-form label,
-#profile-edit-form label {
- width: 300px; float: left;
-}
-
-.required {
- display: inline;
- color: #B20202;
-}
-
-/* oauth */
-.oauthapp {
- height: auto;
- overflow: auto;
- border-bottom: 2px solid #cccccc;
- padding-bottom: 1em;
- margin-bottom: 1em;
-}
-.oauthapp img {
- float: left;
- width: 48px;
- height: 48px;
- margin: 10px;
-}
-.oauthapp img.noicon {
- background-image: url("../../../images/icons/48/plugin.png");
- background-position: center center;
- background-repeat: no-repeat;
-}
-.oauthapp a {
- float: left;
-}
-/* contacts */
-.contact-entry-wrapper {
- width: 120px;
- height: 120px;
- float: left;
-}
-/* photo */
-.photo {
-box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
-}
-.lframe {
- float: left;
- /*margin: 0px 10px 10px 0px;*/
-}
-/* profile match wrapper */
-.profile-match-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 20px;
-}
-.profile-match-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper {
- left: 0px;
- top: 63px;
-}
-
-.contact-photo-menu-button {
- position: relative;
- background-image: url("../../../images/icons/16/menu.png");
- background-position: top left;
- background-repeat: no-repeat;
- margin: 0px 0px -16px 0px;
- padding: 0px;
- width: 16px;
- height: 16px;
- top: -20px; left:0px;
- overflow: hidden;
- text-indent: 40px;
- display: none;
-
-}
-.contact-photo-menu {
- width: 11em;
- border: 3px solid #364e59;
- color: #2d2d2d;
- background: #FFFFFF;
-/* position: absolute;*/
- position: relative;
- left: 0px; top: 0px;
- display: none;
- z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a {
- display: block;
- padding: 5px 10px;
- color: #2d2d2d;
- text-decoration: none;
-}
-.contact-photo-menu li a:hover {
- background-color: #bdcdd4;
-}
-
-/* page footer */
-footer {
- height: 100px;
- display: table-row;
-}
-
-blockquote {
- border-left: 1px solid #D2D2D2;
- padding-left: 9px;
- margin: 0 0 0 .8ex;
-}
-.aprofile dt{
-box-shadow: 1px 1px 5px 0;
- color: #666666;
- margin: 15px 0 5px;
- padding-left: 5px;
- }
-/* ================== */
-/* = Contacts Block = */
-/* ================== */
-
-.contact-block-img {
- width: 48px;
- height: 48px;
- padding-right: 3px;
-}
-.contact-block-div {
- float: left;
-}
-
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
-
-#group-edit-wrapper {
- margin-bottom: 10px;
-}
-
-#group-members-end {
- clear: both;
-}
-#group-edit-desc {
- margin-top: 15px;
-}
-
-/*
-#group-separator,
-#prof-separator { display: none;}
-*/
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
- margin-bottom: 10px;
- margin-top: 20px;
-}
-
-#prvmail-submit {
- float: right;
- margin-top: 10px;
-}
-
-#prvmail-subject
-{
-background: none repeat scroll 0 0 #FFFFFF;
-border: 1px solid #CCCCCC;
-border-radius: 5px 5px 5px 5px;
-font-weight: bold;
-height: 20px;
-margin: 0 0 5px;
-vertical-align: middle;
-}
-#prvmail-form{
- width: 597px;
- }
-
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
- float: left;
- margin-top: 10px;
- margin-right: 10px;
- width: 24px;
-}
-
-#prvmail-end {
- clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
- float: left;
-}
-.mail-list-detail {
- margin-left: 20px;
-}
-
-.mail-list-subject {
- font-size: 1.1em;
- margin-top: 10px;
-}
-a.mail-list-link {
- display: block;
- font-size: 1.3em;
- padding: 4px 0;
-}
-
-/*
-*a.mail-list-link:hover {
-* background-color: #15607B;
-* color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
- clear: both;
-}
-
-.mail-list-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-
-.mail-list-delete-icon {
- border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
-}
-
-.mail-conv-delete-icon {
- border: none;
-}
-
-/* ========== */
-/* = Events = */
-/* ========== */
-.eventcal {
- float: left;
- font-size: 20px;
-}
-
-.vevent {
- border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
- margin-left: 10px;
- margin-right: 10px;
-}
-.vevent .event-start {
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#new-event-link {
- margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
-}
-
-.event-description:before {
- content: url('../../../images/calendar.png');
- margin-right: 15px;
-}
-
-.event-start, .event-end {
- margin-left: 10px;
- width: 330px;
- clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
- float: right;
-}
-
-.event-list-date {
- margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
- float: left;
- margin-left: 32px;
- margin-right: 32px;
- margin-top: 64px;
-}
-.event-calendar-end {
- clear: both;
-}
-
-
-.calendar {
- font-family: Courier, monospace;
-}
-.calendar.eventcal a {
- color: #1872A2;
- }
-.today {
- font-weight: bold;
- color: #FF0000;
-}
-
-.settings-block {
- border: 1px solid #AAA;
- margin: 10px;
- padding: 10px;
-}
-
-.app-title {
- margin: 10px;
-}
-
-#identity-manage-desc {
- margin-top:15px;
- margin-bottom: 15px;
-}
-
-#identity-manage-choose {
- margin-bottom: 15px;
-}
-
-#identity-submit {
- margin-top: 20px;
-}
-
-#photo-prev-link, #photo-next-link {
- padding: 10px;
- float: left;
-}
-.lightbox{
- float: left;
- }
-
-#photo-photo {
- float: left;
-}
-#photo-like-div .wall-item-like-buttons {
- float: left;
- margin-right: 5px;
- margin-top: 30px;
- }
-.comment-edit-text-empty {
- margin: 10px 0 0;
- width: 85%;
-}
-.comment-edit-photo {
- margin: 10px 0 0;
-}
-.wall-item-like-buttons .icon.like {
-float: left;
-}
-
-#photo-photo-end {
- clear: both;
-}
-
-.tabs .comment-wwedit-wrapper {
- display: block;
- margin-top: 30px;
- margin-left: 50px;
- }
-
-.profile-match-photo {
- float: left;
- text-align: center;
- width: 120px;
-}
-
-.profile-match-name {
- float: left;
- text-align: center;
- width: 120px;
- overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
- clear: both;
-}
-
-.profile-match-connect {
- text-align: center;
- font-weight: bold;
-}
-
-.profile-match-wrapper {
- float: left;
- padding: 10px;
- width: 120px;
- height: 120px;
- scroll: auto;
-}
-#profile-match-wrapper-end {
- clear: both;
-}
-
-/* ============= */
-/* = Directory = */
-/* ============= */
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-photo-menu-button {
- display: none;
- /* position: absolute; */
- /* position: absolute; */
- left: -2px;
- top: -20px;
-}
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo-menu-button {
- left: 0px;
- top: 63px;
-}
-.directory-item {
- float: left;
- width: 200px;
- height: 200px;
-}
-.directory-item .contact-photo {
- width: 175px;
- height: 175px;
-}
-.directory-item .contact-photo img {
- width: 175px;
- height: 175px;
-}
-.contact-name {
- text-align: left;
- font-weight: bold;
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums{
- margin-top: 15px;
- }
-.photo-top-photo, .photo-album-photo {
- -webkit-border-radius: 5px 5px 0 0;
- -moz-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-.photo-album-image-wrapper, .photo-top-image-wrapper {
- float: left;
- -moz-box-shadow: 0 0 5px #888;
- -webkit-box-shadow: 0 0 5px #888;
- box-shadow: 0 0 5px #888;
- background-color: #000;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- padding-bottom: 20px;
- position: relative;
- margin: 0 10px 10px 0;
- width: 200px; height: 140px;
- overflow: hidden;
-}
-.photo-top-album-name {
- width: 100%;
- position: absolute;
- bottom: 0px;
- padding-left: 3px;
- background-color: #EEE;
-}
-.photo-top-album-link{
- color: #1872A2;
- }
-.photo-top-album-img{
-
- }
-/*.photo-top-image-wrapper {
- position: relative;
- float: left;
- margin-top: 15px;
- margin-right: 15px;
- width: 200px; height: 200px;
- overflow: hidden;
-}
-.photo-top-album-name {
- width: 100%;
- min-height: 2em;
- position: absolute;
- bottom: 0px;
- padding: 0px 3px;
- padding-top: 0.5em;
- background-color: rgb(255, 255, 255);
-}*/
-#photo-top-end {
- clear: both;
-}
-
-#photo-top-links {
- margin-bottom: 30px;
- margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
- float: left;
- width: 175px;
-}
-
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 0acc12dd3..8cca19801 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -526,8 +526,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: #FFE499;
}
.tool .label {
float: left;
@@ -1060,44 +1061,57 @@ ul.menu-popup .empty {
}
.menu-profile-list{
height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
+ overflow: auto;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: #FFE499;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
display: table-cell;
@@ -2132,6 +2146,41 @@ ul.tabs li .active {
box-shadow: 2px 2px 2px #CFCFCF;
margin-left: 5px;
}
+//settings tabs
+ul.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+}
+ul.rs_tabs li {
+ float: left;
+ margin-bottom: 30px;
+ clear: both;
+}
+ul.rs_tabs li .selected {
+ background-color: #535353;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 2px 2px 2px #CFCFCF;
+ font-size: 13px;
+}
+.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+ background-position: 0 -20px;
+ background-repeat: repeat-x;
+ height: 27px;
+ padding: 0;
+ }
+.rs_tab.button {
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ font-weight: bolder;
+ padding: 3px;
+ color: #333333;
+ text-decoration: none;
+ }
/**
* Form fields
*/
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index d1b932f1c..22956f4f9 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.016)
+ * Version: (Version: 1.017)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.016)";
+$diabook_version = "Diabook-red (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -21,7 +21,6 @@ $cssFile = null;
*/
function diabook_red_community_info(){
$a = get_app();
- //right_aside at networkpages
// last 12 users
$aside['$lastusers_title'] = t('Last users');
@@ -279,58 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
-
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-
- $tabs = array(
- array(
- 'label' => t('Account settings'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'sel' => (($a->argc == 1)?'active':''),
- ),
- array(
- 'label' => t('Display settings'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- ),
- array(
- 'label' => t('Edit/Manage Profiles'),
- 'url' => $a->get_baseurl(true).'/profiles',
- ),
- array(
- 'label' => t('Connector settings'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- ),
- array(
- 'label' => t('Plugin settings'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- ),
- array(
- 'label' => t('Connections'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'sel' => ''
- )
- );
- $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['aside'] = replace_macros($tabtpl, array(
- '$tabs' => $tabs,
- ));
-
-
- // CUSTOM CSS
- $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css";
-
-}
-
-
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index 535134256..c5231be40 100644
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -12,13 +12,13 @@
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
- <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
- <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>
- <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
- <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+ <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>
+ <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+ <a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+ <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option>
diff --git a/view/theme/diabook/generic_links_widget.tpl b/view/theme/diabook/generic_links_widget.tpl
new file mode 100644
index 000000000..001c1395e
--- /dev/null
+++ b/view/theme/diabook/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div id="widget_$title">
+ {{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
+ {{if $desc}}<div class="desc">$desc</div>{{endif}}
+
+ <ul class="rs_tabs">
+ {{ for $items as $item }}
+ <li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/theme/diabook/icons/com_side.png b/view/theme/diabook/icons/com_side.png
index bc5969ef1..00186ba05 100644
--- a/view/theme/diabook/icons/com_side.png
+++ b/view/theme/diabook/icons/com_side.png
Binary files differ
diff --git a/view/theme/diabook/icons/events.png b/view/theme/diabook/icons/events.png
index 4a0b3f3f1..cf195fbb6 100644
--- a/view/theme/diabook/icons/events.png
+++ b/view/theme/diabook/icons/events.png
Binary files differ
diff --git a/view/theme/diabook/icons/home.png b/view/theme/diabook/icons/home.png
index be47a48fc..5c610805f 100644
--- a/view/theme/diabook/icons/home.png
+++ b/view/theme/diabook/icons/home.png
Binary files differ
diff --git a/view/theme/diabook/icons/mess_side.png b/view/theme/diabook/icons/mess_side.png
index 49ef896bc..5295e2e74 100644
--- a/view/theme/diabook/icons/mess_side.png
+++ b/view/theme/diabook/icons/mess_side.png
Binary files differ
diff --git a/view/theme/diabook/icons/notes.png b/view/theme/diabook/icons/notes.png
index 7d4afca90..28dca30a3 100644
--- a/view/theme/diabook/icons/notes.png
+++ b/view/theme/diabook/icons/notes.png
Binary files differ
diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
index acf857f32..23a78bcac 100644
--- a/view/theme/diabook/icons/pscontacts.png
+++ b/view/theme/diabook/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index 6d9539610..ae04194b1 100644
--- a/view/theme/diabook/icons/pubgroups.png
+++ b/view/theme/diabook/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
new file mode 100644
index 000000000..fe4baf8d1
--- /dev/null
+++ b/view/theme/diabook/nets.tpl
@@ -0,0 +1,11 @@
+<div id="nets-sidebar" class="widget">
+ <h3>$title</h3>
+ <div id="nets-desc">$desc</div>
+
+ <ul class="nets-ul">
+ <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ {{ for $nets as $net }}
+ <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ {{ endfor }}
+ </ul>
+</div>
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 0762dbe44..01e80f238 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -7,13 +7,13 @@
</div>
<ul id="profile-side-menu" class="menu-profile-side">
- <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
- <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
- <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+ <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
+ <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
+ <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
+ <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul>
</div>
diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
- {{ for $tabs as $tab }}
- <li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
- {{ endfor }}
-</ul>
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ed7c76cbe..e9fa9d8ba 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -484,8 +484,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: #E7F2F7;
}
.tool .label {
float: left;
@@ -898,44 +899,57 @@ ul.menu-popup .empty {
}
.menu-profile-list{
height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
+ overflow: auto;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: #E7F2F7;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
- }
-.menu-profile-list.pscontacts{
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 51eb61253..31e1f056c 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -483,8 +483,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover{
+ background: #E7F2F7;
}
.tool .label {
float: left;
@@ -897,8 +898,6 @@ ul.menu-popup .empty {
.menu-profile-list{
height: auto;
overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
padding-left: 16px;
min-height: 16px;
list-style: none;
@@ -908,28 +907,29 @@ ul.menu-popup .empty {
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
- background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+.menu-profile-icon.home{
+ background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
}
-.menu-profile-list.photos{
- background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+.menu-profile-icon.photos{
+ background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
}
-.menu-profile-list.events{
- background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+.menu-profile-icon.events{
+ background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
}
-.menu-profile-list.notes{
- background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+.menu-profile-icon.notes{
+ background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
}
-.menu-profile-list.foren{
- background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+.menu-profile-icon.foren{
+ background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
}
-.menu-profile-list.com_side{
- background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.com_side{
+ background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
}
/* aside */
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
deleted file mode 100644
index fdb4f24c7..000000000
--- a/view/theme/diabook/style-settings.css
+++ /dev/null
@@ -1,2529 +0,0 @@
-/**
- * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
- * Additional Changes: Michael Vogel <icarus@dabo.de>
- **/
-
-/* ========= */
-/* = Admin = */
-/* ========= */
-
-#adminpage {
-/* width: 80%;*/
-}
-
-#pending-update {
- float:right;
- color: #ffffff;
- font-weight: bold;
- background-color: #FF0000;
- padding: 0em 0.3em;
-}
-
-.admin.linklist {
- border: 0px; padding: 0px;
-}
-
-.admin.link {
- list-style-position: inside;
- font-size: 1em;
- padding: 5px;
- width: 100px;
- margin: 5px;
-}
-
-#adminpage dl {
- clear: left;
- margin-bottom: 2px;
- padding-bottom: 2px;
- border-bottom: 1px solid black;
-}
-
-#adminpage dt {
- width: 200px;
- float: left;
- font-weight: bold;
-}
-
-#adminpage dd {
- margin-left: 200px;
-}
-#adminpage h3 {
- border-bottom: 1px solid #898989;
- margin-bottom: 5px;
- margin-top: 10px;
-}
-
-#adminpage .submit {
- clear:left;
-}
-
-#adminpage #pluginslist {
- margin: 0px; padding: 0px;
-}
-
-#adminpage .plugin {
- list-style: none;
- display: block;
- /* border: 1px solid #888888; */
- padding: 1em;
- margin-bottom: 5px;
- clear: left;
-}
-
-#adminpage .toggleplugin {
- float:left;
- margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #eeeeee; }
-#adminpage .selectall { text-align: right; }
-/* icons */
-
-.icon.contacts {
- background-image: url("../../../view/theme/diabook/icons/contacts.png");}
-.icon.notifications {
- background-image: url("../../../view/theme/diabook/icons/notifications.png");}
-.icon.notify {
- background-image: url("../../../view/theme/diabook/icons/notify.png");}
-.icon.messages {
- background-image: url("../../../view/theme/diabook/icons/messages.png");}
-.icon.community {
- background-image: url("../../../view/theme/diabook/icons/community.png");}
-
-.icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");}
-.icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");}
-.icon.dislike { background-image: url("../../../view/theme/diabook/icons/dislike.png");}
-.icon.like { background-image: url("../../../view/theme/diabook/icons/like.png");}
-.icon.pencil { background-image: url("../../../view/theme/diabook/icons/pencil.png");}
-.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
-.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
-.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");}
-.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");}
-.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");}
-.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");}
-
-
-.camera { background-image: url("../../../view/theme/diabook/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.attach { background-image: url("../../../view/theme/diabook/icons/attach.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video2 { background-image: url("../../../view/theme/diabook/icons/video.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.video { background-image: url("../../../view/theme/diabook/icons/video.png");
- display: block; width: 100%; height: 28px; background-repeat: no-repeat;
- }
-.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.audio { background-image: url("../../../view/theme/diabook/icons/audio.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.weblink { background-image: url("../../../view/theme/diabook/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.globe { background-image: url("../../../view/theme/diabook/icons/globe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
-
-
-
-.article { background-position: -50px 0px;}
-/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
-/*.drop { background-position: -110px 0px;}*/
-/*.drophide { background-position: -130px 0px;}*/
-/*.edit { background-position: -150px 0px;}*/
-/*.camera { background-position: -170px 0px;}*/
-/*.dislike { background-position: -190px 0px;}*/
-/*.like { background-position: -210px 0px;}*/
-/*.link { background-position: -230px 0px;}*/
-
-/*.globe { background-position: -50px -20px;}*/
-/*.noglobe { background-position: -70px -20px;}*/
-.no { background-position: -90px -20px;}
-.pause { background-position: -110px -20px;}
-.play { background-position: -130px -20px;}
-/*.pencil { background-position: -150px -20px;}*/
-.small-pencil { background-position: -170px -20px;}
-/*.recycle { background-position: -190px -20px;}*/
-/*.remote-link { background-position: -210px -20px;}*/
-.share { background-position: -230px -20px;}
-
-.tools { background-position: -50px -40px;}
-/*.lock { background-position: -70px -40px;}*/
-
-/*.video { background-position: -110px -40px;}*/
-.youtube { background-position: -130px -40px;}
-
-/*.attach { background-position: -190px -40px;}*/
-/*.language { background-position: -210px -40px;}*/
-
-
-.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
-.icon.prev { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;}
-.icon.next { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;}
-/*.tagged { background-position: -130px -60px;}*/
-
-.attachtype {
- display: block; width: 20px; height: 23px;
- background-image: url('../../../images/content-types.png');
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text { background-position: -60px 0px; }
-.type-unkn { background-position: -80px 0px; }
-
-.icon.drop, .icon.drophide {
- float: left;
-}
-
-.icon {
- display: block;
- width: 20px;
- height: 20px;
- /*background-image: url('icons.png');*/
-}
-
-.icon {
- background-color: transparent ;
- background-repeat: no-repeat;
- /* background-position: left center; */
- display: block;
- overflow: hidden;
- text-indent: -9999px;
- padding: 1px;
-}
-
-.icon.border.camera{
- background-image: url("../../../view/theme/diabook/icons/camera.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- }
-
-.icon.border.link{
- background-image: url("../../../view/theme/diabook/icons/weblink.png");
- display: block; width: 28px; height: 28px; background-repeat: no-repeat;
- margin-left: 10px;
- }
-
-.icon.text {
- text-indent: 0px;
-}
-.icon.s10 {
- min-width: 10px;
- height: 10px;
-}
-.icon.s10.notify {
- background-image: url("../../../images/icons/10/notify_off.png");
-}
-.icon.s10.gear {
- background-image: url("../../../images/icons/10/gear.png");
-}
-.icon.s10.add {
- background-image: url("../../../images/icons/10/add.png");
-}
-.icon.s10.delete {
- background-image: url("../../../images/icons/10/delete.png");
-}
-.icon.s10.edit {
- background-image: url("../../../images/icons/10/edit.png");
-}
-.icon.s10.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s10.menu {
- background-image: url("../../../images/icons/10/menu.png");
-}
-.icon.s10.link {
- background-image: url("../../../images/icons/10/link.png");
-}
-.icon.s10.lock {
- background-image: url("../../../images/icons/10/lock.png");
-}
-.icon.s10.unlock {
- background-image: url("../../../images/icons/10/unlock.png");
-}
-.icon.s10.text {
- padding: 2px 0px 0px 15px;
- font-size: 10px;
-}
-.icon.s16 {
- min-width: 16px;
- height: 16px;
-}
-.icon.s16.notify {
- background-image: url("../../../images/icons/16/notify_off.png");
-}
-.icon.s16.gear {
- background-image: url("../../../images/icons/16/gear.png");
-}
-.icon.s16.add {
- background-image: url("../../../images/icons/16/add.png");
-}
-.icon.s16.delete {
- background-image: url("../../../images/icons/16/delete.png");
-}
-/*.icon.s16.edit {
- background-image: url("../../../images/icons/16/edit.png");
-}*/
-.icon.s16.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s16.menu {
- background-image: url("../../../images/icons/16/menu.png");
-}
-/*.icon.s16.link {
- background-image: url("../../../images/icons/16/link.png");
-}*/
-.icon.s16.lock {
- background-image: url("../../../images/icons/16/lock.png");
-}
-.icon.s16.unlock {
- background-image: url("../../../images/icons/16/unlock.png");
-}
-.icon.s16.text {
- padding: 4px 0px 0px 20px;
- font-size: 10px;
-}
-.icon.s22 {
- min-width: 22px;
- height: 22px;
-}
-.icon.s22.notify {
- background-image: url("../../../images/icons/22/notify_off.png");
-}
-.icon.s22.gear {
- background-image: url("../../../images/icons/22/gear.png");
-}
-.icon.s22.add {
- background-image: url("../../../images/icons/22/add.png");
-}
-.icon.s22.delete {
- background-image: url("../../../images/icons/22/delete.png");
-}
-.icon.s22.edit {
- background-image: url("../../../images/icons/22/edit.png");
-}
-.icon.s22.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s22.menu {
- background-image: url("../../../images/icons/22/menu.png");
-}
-.icon.s22.link {
- background-image: url("../../../images/icons/22/link.png");
-}
-.icon.s22.lock {
- background-image: url("../../../images/icons/22/lock.png");
-}
-.icon.s22.unlock {
- background-image: url("../../../images/icons/22/unlock.png");
-}
-.icon.s22.text {
- padding: 10px 0px 0px 25px;
- width: 200px;
-}
-.icon.s48 {
- width: 48px;
- height: 48px;
-}
-.icon.s48.notify {
- background-image: url("../../../images/icons/48/notify_off.png");
-}
-.icon.s48.gear {
- background-image: url("../../../images/icons/48/gear.png");
-}
-.icon.s48.add {
- background-image: url("../../../images/icons/48/add.png");
-}
-.icon.s48.delete {
- background-image: url("../../../images/icons/48/delete.png");
-}
-.icon.s48.edit {
- background-image: url("../../../images/icons/48/edit.png");
-}
-.icon.s48.star {
- background-image: url("../../../images/star_dummy.png");
-}
-.icon.s48.menu {
- background-image: url("../../../images/icons/48/menu.png");
-}
-.icon.s48.link {
- background-image: url("../../../images/icons/48/link.png");
-}
-.icon.s48.lock {
- background-image: url("../../../images/icons/48/lock.png");
-}
-.icon.s48.unlock {
- background-image: url("../../../images/icons/48/unlock.png");
-}
-
-#contact-edit-links ul {
- list-style: none;
- list-style-type: none;
-}
-
-.hide-comments-outer {
- margin-left: 80px;
- margin-bottom: 5px;
- width: 484px;
- border-bottom: 1px solid #BDCDD4;
- border-top: 1px solid #BDCDD4;
-
- padding: 8px;
-}
-
-/* global */
-body {
- font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 12.5px;
- background-color: #ffffff;
- color: #2d2d2d;
- margin: 50px auto auto;
- display: table;
-}
-
-h4 {
- font-size: 1.1em;
-}
-
-a {
- color: #3465A4;
- /* color: #3e3e8c; */
- text-decoration: none;
-}
-a:hover {
- /* color: blue; */
- text-decoration: underline
-}
-
-.wall-item-name-link {
-/* float: left;*/
-}
-
-.wall-item-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-
-.left {
- float: left;
-}
-.right {
- float: right;
-}
-.hidden {
- display: none;
-}
-.clear {
- clear: both;
-}
-.fakelink {
- color: #3465A4;
- /* color: #3e3e8c; */
- text-decoration: none;
- cursor: pointer;
-}
-.fakelink:hover {
- /* color: blue; */
- /*color: #005c94; */
- text-decoration: underline;
-}
-code {
- font-family: Courier, monospace;
- white-space: pre;
- display: block;
- overflow: auto;
- border: 1px solid #444;
- background: #EEE;
- color: #444;
- padding: 10px;
- margin-top: 20px;
-}
-#panel {
- position: absolute;
- width: 12em;
- background: #ffffff;
- color: #2d2d2d;
- margin: 0px;
- padding: 1em;
- list-style: none;
- border: 3px solid #364e59;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-/* tool */
-.tool {
- height: auto;
- overflow: auto;
- padding: 3px;
-}
-#saved-search-ul .tool:hover,
-#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
-}
-.tool .label {
- float: left;
-}
-.tool .action {
- float: right;
-}
-.tool a {
- color: ##3F8FBA;
-}
-.tool a:hover {
- text-decoration: none;
-}
-/* popup notifications */
-div.jGrowl div.notice {
- background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-div.jGrowl div.info {
- background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
- color: #ffffff;
- padding-left: 58px;
-}
-/* header */
-header {
- position: fixed;
- left: 0%;
- right: 80%;
- top: 0px;
- margin: 0px;
- padding: 0px;
- width: 22%;
- height: 32px;
- background: #000;
- z-index: 100;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-}
-header #site-location {
- display: none;
-}
-header #banner {
- overflow: hidden;
- text-align: left;
- width: 82%%;
- margin-left: 25%;
-}
-header #banner a,
-header #banner a:active,
-header #banner a:visited,
-header #banner a:link,
-header #banner a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
- vertical-align: middle;
- font-weight: bolder;
- margin-left: 3px;
-}
-header #banner #logo-img {
- height: 25px;
- margin-top: 3px;
-}
-header #banner #logo-text {
- font-size: 20px;
- position: absolute;
- top: 10%;
-}
-/* nav */
-nav {
- width: 80%;
- height: 32px;
- position: fixed;
- left: 22%;
- top: 0px;
- padding: 0px;
- background: #000;
- color: #ffffff;
- z-index: 99;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-}
-nav a,
-nav a:active,
-nav a:visited,
-nav a:link,
-nav a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
-}
-nav #banner {
- overflow: hidden;
- /*text-align: center;*/
- width: 100%;
-}
-nav #banner a,
-nav #banner a:active,
-nav #banner a:visited,
-nav #banner a:link,
-nav #banner a:hover {
- color: #ffffff;
- text-decoration: none;
- outline: none;
- vertical-align: bottom;
-}
-nav #banner #logo-img {
- height: 22px;
- margin-top: 5px;
-}
-nav #banner #logo-text {
- font-size: 22px;
-}
-nav #navbar{
- }
-nav ul {
- margin: 0px;
- padding: 0px 20px;
-}
-nav ul li {
- list-style: none;
- margin: 0px;
- /* padding: 1px 1px 3px 1px; */
- float: left;
-}
-nav ul li .menu-popup {
- left: 0px;
- right: auto;
-}
-
-nav #logo-img {
- height: 25px;
- margin-top: 4px;
- margin-left: 30px;
-}
-
-nav #logo-text {
- font-size: 22px;
- margin-top: 3px;
- margin-right: 15px;
-}
-nav .nav-menu-search {
- position: relative;
-
- margin: 4px 17px;
- margin-right: 0px;
- height: 17px;
- width: 180px;
-
-}
-
-nav #search-box #search-text {
- background-image: url('icons/lupe.png');
- background-repeat:no-repeat;
- padding-left:20px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
- }
-
-
-nav .nav-menu-icon {
- position: relative;
- height: 22px;
- padding: 5px;
- margin: 0px 7px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-nav .nav-menu-icon.selected {
- background-color: #fff;
-}
-nav .nav-menu-icon img {
- width: 22px;
- height: 22px;
-}
-nav .nav-menu-icon .nav-notify {
- top: 3px;
-}
-nav .nav-menu {
- position: relative;
- height: 16px;
- padding: 5px;
- margin: 3px 15px 0px;
- font-size: 13px;
- /*border-bottom: 3px solid #364A84;*/
-}
-nav .nav-menu.selected {
- /*border-bottom: 3px solid #9eabb0;*/
-}
-nav .nav-notify {
- display: none;
- position: absolute;
- background-color: #ff0000;
- /* background-color: #19aeff; */
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- font-size: 10px;
- font-weight: 900;
- padding: 1px 4px;
- top: 0px;
- right: -6px;
- min-width: 10px;
- text-align: center;
-}
-nav .nav-notify.show {
- display: block;
-}
-nav #nav-help-link,
-nav #nav-search-link,
-nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-site-linkmenu,
-nav #nav-home-link,
-nav #nav-user-linkmenu
-{
- float: right;
-}
-nav #nav-user-linkmenu{
- margin-right: 0px;
- }
-nav #nav-home-link, #nav-directory-link, #nav-apps-link{
- margin-left: 0px;
- margin-right: 0px;
- font-weight: bold;
- margin: 3px 5px;
- }
-nav #nav-directory-link{
- margin-right: 0px;
- }
-nav #nav-home-link{
- margin-left: 0px;
- }
-nav #nav-help-link .menu-popup,
-nav #nav-search-link .menu-popup,
-nav #nav-directory-link .menu-popup,
-nav #nav-apps-link .menu-popup,
-nav #nav-site-linkmenu .menu-popup {
- right: 0px;
- left: auto;
-}
-
-nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
- background-image: url("../../../view/theme/diabook/icons/messages2.png");
- }
-
-/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
- background-image: url("../../../view/theme/diabook/icons/notify2.png");
- }
-
-nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
- background-image: url("../../../view/theme/diabook/icons/contacts2.png");
- }
-
-nav #nav-apps-link.selected {
- background-color: #364e59;
-}
-
-#nav-notifications-mark-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-#nav-notifications-see-all {
- /* padding: 1px 1px 2px 26px; */
- /* border-bottom: 1px solid #364E59; */
- /* margin: 0px 0px 2px 0px;
- padding: 5px 10px; */
-}
-
-.notify-seen {
- background: none repeat scroll 0 0 #DDDDDD;
- }
-
-ul.menu-popup {
- position: absolute;
- display: none;
- width: 11em;
- background: #ffffff;
- color: #2d2d2d;
- margin: 0px;
- padding: 0px;
- list-style: none;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
- display: block;
- color: #2d2d2d;
- padding: 5px 10px;
- text-decoration: none;
-}
-ul.menu-popup a:hover {
- background-color: #fff797; /*bdcdd4;*/
- color: #000;
-}
-ul.menu-popup .menu-sep {
- border-top: 1px solid #9eabb0;
-}
-ul.menu-popup li {
- float: none;
- overflow: auto;
- height: auto;
- display: block;
-}
-ul.menu-popup li img {
- float: left;
- width: 16px;
- height: 16px;
- padding-right: 5px;
-}
-ul.menu-popup .empty {
- padding: 5px;
- text-align: center;
- color: #9eabb0;
-}
-/* autocomplete popup */
-.acpopup {
- max-height: 150px;
- background-color: #ffffff;
- color: #2d2d2d;
- border: 1px solid #MenuBorder;
- overflow: auto;
- z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-.acpopupitem {
- color: #2d2d2d;
- padding: 4px;
- clear: left;
-}
-.acpopupitem img {
- float: left;
- margin-right: 4px;
-}
-.acpopupitem.selected {
- background-color: #bdcdd4;
-}
-#nav-notifications-menu {
- width: 400px;
- max-height: 550px;
- overflow: auto;
-}
-/* #nav-notifications-menu a {
- display: inline;
- padding: 5px 0px;
- margin: 0px 0px 2px 0px;
-}
-#nav-notifications-menu li:hover {
- background-color: #bdcdd4;
-}*/
-
-#nav-notifications-menu img {
- float: left;
- margin-right: 5px;
-}
-#nav-notifications-menu .contactname {
- font-weight: bold;
-}
-#nav-notifications-menu .notif-when {
- font-size: 10px;
- color: #9eabb0;
- display: block;
-}
-
-.notif-image {
- width: 32px;
- height: 32px;
- padding: 7px 7px 0px 0px;
-}
-
-/*profile_side*/
-#profile_side {
- margin-bottom: 30px;
-}
-#ps-usericon{
- height: 25px
- }
-#ps-username{
- font-size: 1.17em;
- font-weight: bold;
- vertical-align: top;
- position: absolute;
- padding-top: 4px;
- padding-left: 5px;
- color: #2D2D2D;
- word-wrap: break-word;
- width: 130px;
- }
-#ps-username:hover{
- text-decoration: none;
- }
-.menu-profile-side{
- list-style: none;
- padding-left: 0px;
- min-height: 0px;
- }
-.menu-profile-list{
- height: auto;
- overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
- }
-.menu-profile-list:hover{
- background: #EEE;
- }
-.menu-profile-list-item{
- padding-left: 5px;
- }
-.menu-profile-list-item:hover{
- text-decoration: none;
- }
-/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
- background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
- }
-.menu-profile-list.photos{
- background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
- background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
- background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
- background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
- background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
- }
-
-/* aside */
-aside {
- display: table-cell;
- vertical-align: top;
- width: 200px;
- padding: 0px 10px 0px 10px;
- border-right: 1px solid #D2D2D2;
- float: left;
- /* background: #F1F1F1; */
-}
-
-aside .vcard {
- display: none;
-}
-aside .vcard .title {
- margin-bottom: 5px;
-}
-aside .vcard dl {
- height: auto;
- overflow: auto;
-}
-aside .vcard dt {
- float: left;
- margin-left: 0px;
- /*width: 35%;*/
- text-align: right;
- color: #999999;
-}
-aside .vcard dd {
- float: left;
- margin-left: 5px;
- /*width: 60%;*/
-}
-aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
-}
-aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
- list-style: none;
-}
-aside #dfrn-request-link {
- display: block;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
- color: #ffffff;
- background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
- font-weight: bold;
- text-transform: uppercase;
- padding: 4px 2px 2px 35px;
-}
-aside #dfrn-request-link:hover {
- text-decoration: none;
- background-color: #36c;
- /* background-color: #19aeff; */
-}
-aside #profiles-menu {
- width: 20em;
-}
-aside #search-text {
- width: 150px;
- border-top-left-radius: 15px;
-border-top-right-radius: 15px;
-border-bottom-right-radius: 15px;
-border-bottom-left-radius: 15px;
-}
-aside #side-follow-url {
- width: 150px;
- }
-aside #side-peoplefind-url {
- width: 150px;
- }
-#contact-block {
- display: none;
-}
-#contact-block .contact-block-h4 {
- float: left;
- margin: 5px 0px;
-}
-#contact-block .allcontact-link {
- float: right;
- margin: 5px 0px;
-}
-#contact-block .contact-block-content {
- clear: both;
- overflow: auto;
- height: auto;
-}
-#contact-block .contact-block-link {
- float: left;
- margin: 0px 2px 2px 0px;
-}
-#contact-block .contact-block-link img {
- widht: 48px;
- height: 48px;
-}
-#lost-password-link {
- float: left;
- margin-right: 20px;
- }
-/* widget */
-.widget {
- margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-/* font-size: 12px; */
-}
-.widget h3 {
- padding: 0px;
- margin: 2px;
-}
-.widget .action {
- opacity: 0.1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget input.action {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget:hover .title .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget .tool:hover .action.ticked {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.widget ul {
- padding: 0px;
-}
-.widget ul li {
- padding-left: 16px;
- min-height: 16px;
- list-style: none;
-}
-.widget .tool.selected {
- background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
-}
-/* widget: search */
-span.sbox_l {
- background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-left: 10px;
- margin-top: 5px;
-
-}
-
-span.sbox_r {
- background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
- float: left;
- width: 19px; height: 19px;
- margin-top: 5px;
-}
-
-span.sbox input {
- background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
- float: left;
- margin-top: 5px;
- border: 0;
- height: 13px; width: 100px;
- padding: 3px;
- font: 11px/13px arial;
- color: #000;
-}
-#add-search-popup {
- width: 200px;
- top: 18px;
-}
-/* section */
-section {
- display: table-cell;
- vertical-align: top;
- width: 650px;
- padding: 0px 0px 0px 20px;
-}
-
-body .pageheader{
- text-align: center;
- font-size: 20px;
- max-width: 575px;
- margin-bottom: 20px;
- margin-top: 0px;
- max-width: 575px;
- }
-
-#id_username {
- width: 173px;
- }
-#id_password {
- width: 173px;
- }
-#id_openid_url {
- width: 173px;
- }
-#contact-edit-end {
- }
-.pager {
- padding: 10px;
- text-align: center;
- font-size: 1.0em;
- clear: both;
- display: block;
-}
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
-
- background-position: 0 -20px;
- background-repeat: repeat-x;
- height: 27px;
- padding: 0;
- }
-.rs_tab.button {
- /*background: none repeat scroll 0 0 #F8F8F8;*/
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- font-weight: bolder;
- padding: 3px;
- color: #333333;
- text-decoration: none;
- }
-
-#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
- margin-bottom: 10px;
- }
-
-right_aside {
- display: table-cell;
- vertical-align: top;
- width: 170px;
-
- /*border-left: 1px solid #D2D2D2;*/
-
- /* background: #F1F1F1; */
-}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
-margin-top:30px;}
-right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
-right_aside .directory-photo { margin: 0px; }
-right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
-right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto; width: 100%; }
-right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
-right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
-#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
-#page-sidebar-right_aside ul {margin-top: 0px;}
-#page-sidebar-right_aside .label {max-width: 128px;}
-right_aside .icon {width: 10px; height: 10px;}
-.close_box {
- background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 0.1;
- }
-.close_box:hover {
- background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
- float: right;
- cursor: pointer;
- opacity: 1;
--webkit-transition: all 0.2s ease-in-out;
--moz-transition: all 0.2s ease-in-out;
--o-transition: all 0.2s ease-in-out;
--ms-transition: all 0.2s ease-in-out;
-transition: all 0.2s ease-in-out;
- }
-/* wall item */
-.tread-wrapper {
- border-bottom: 1px solid #D2D2D2;
- position: relative;
- padding: 5px;
- margin-bottom: 0px;
- width: 575px;
-}
-.wall-item-decor {
- position: absolute;
- left: 790px;
- top: -10px;
- width: 16px;
-}
-
-.wall-item-container {
- display: table;
- width: 580px;
-}
-
-
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
- display: table-row;
-}
-
-.wall-item-bottom {
- font-size: 13px;
-}
-.wall-item-container .wall-item-bottom {
-/* opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container:hover .wall-item-bottom {
-/* opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; */
-}
-.wall-item-container .wall-item-info {
- display: table-cell;
- vertical-align: top;
- text-align: left;
- width: 80px;
-}
-.wall-item-container .wall-item-location {
- padding-right: 40px;
- display: table-cell;
-}
-.wall-item-container .wall-item-ago {
- word-wrap: break-word;
- width: 50px;
- margin-left: 10px;
- color: #999;
-}
-.wall-item-location {
-
- clear: both;
- overflow: hidden;
-
- margin-bottom: 5px;
-}
-
-.wall-item-container .wall-item-content {
- font-size: 12.5px;
- max-width: 420px;
- word-wrap: break-word;
- line-height: 1.2;
-}
-
-.wall-item-container .wall-item-content img {
- max-width: 400px;
-}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
- display: table-cell;
- vertical-align: middle;
-}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
- opacity: 0.5;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
- opacity: 1;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
-}
-.wall-item-container .wall-item-name {
- font-weight: bold;
-}
-.wall-item-container .wall-item-actions-author {
- width: 100%;
- margin-bottom: 0.3em;
-}
-.wall-item-container .wall-item-actions-social {
- float: left;
- margin-bottom: 1px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-social a {
- margin-right: 1em;
-}
-.wall-item-actions-social a {
- float: left;
-}
-.wall-item-container .wall-item-actions-tools {
- float: right;
- width: 80px;
- display: table-cell;
-}
-.wall-item-container .wall-item-actions-tools a {
- float: right;
-}
-.wall-item-container .wall-item-actions-tools input {
- float: right;
-}
-.wall-item-container.comment {
- margin-top: 5px;
- margin-bottom: 5px;
- margin-left: 80px;
- width: 500px;
- border-bottom: 1px solid hsl(198, 21%, 79%);
-}
-.wall-item-container.comment .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.wall-item-container.comment {
- top: 15px !important;
- left: 15px !important;
-}
-.wall-item-container.comment .wall-item-links {
- padding-left: 12px;
-}
-.wall-item-comment-wrapper {
- margin: 1px 5px 1px 80px;
-}
-.wall-item-comment-wrapper .comment-edit-photo {
- display: none;
-}
-.wall-item-comment-wrapper textarea {
- height: 2.0em;
- width: 100%;
- font-size: 10px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- font-size: 14px;
-}
-.wall-item-comment-wrapper .comment-edit-text-full {
- font-size: 14px;
- height: 4em;
- color: #2d2d2d;
- border: 1px solid #2d2d2d;
-}
-.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
- margin-top: 10px;
-}
-.comment-edit-preview .contact-photo {
- width: 32px;
- height: 32px;
- margin-left: 16px;
- /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
-}
-.comment-edit-preview {
- top: 15px !important;
- left: 15px !important;
-}
-.comment-edit-preview .wall-item-links {
- padding-left: 12px;
-}
-.comment-edit-preview .wall-item-container {
- width: 700px;
-}
-.comment-edit-preview .tread-wrapper {
- width: 700px;
- padding: 0;
- margin: 10px 0;
-}
-
-.shiny {
- /* border-right: 10px solid #fce94f; */
- border-right: 1px solid #A7C7F7;
- padding-right: 12px;
-}
-
-#jot-preview-content{
- margin-top: 30px;}
-
-#jot-preview-content .tread-wrapper {
- background-color: #fff797;
-}
-
-.wall-item-tags {
- padding-top: 1px;
- padding-bottom: 2px;
-}
-.tag {
- /*background: url("../../../images/tag_b.png") repeat-x center left;*/
- color: #3465A4;
- padding-left: 3px;
- font-size: 12px;
-}
-.tag a {
- padding-right: 5px;
- /*background: url("../../../images/tag.png") no-repeat center right;*/
- color: #3465A4;
-}
-.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
- background: #FFFFFF;
- border: 2px solid #364e59;
- height: 25px;
- width: 25px;
- overflow: hidden;
- padding: 1px;
- position: absolute !important;
- top: 40px;
- left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-}
-.wwto .contact-photo {
- width: auto;
- height: 25px;
-}
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
- width: 80px;
-}
-
-.contact-photo-wrapper.wwto {
- width: 25px;
-}
-
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper {
- left: 0px;
- top: 63px;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-name {
- /* text-align: center; */
- /*font-weight: bold;*/
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-/* editor */
-.jothidden {
- display: none;
-}
-#jot {
- width: 585px;
- margin: 0px 2em 20px 0px;
-}
-#profile-jot-form #profile-jot-text {
- height: 2.0em;
- width: 99%;
- font-size: 15px;
- color: #999999;
- border: 1px solid #DDD;
- padding: 0.3em;
- margin-bottom: 10px;
-}
-#jot #jot-tools {
- margin: 0px;
- padding: 0px;
- height: 40px;
- overflow: none;
- width: 583px;
- background-color: #fff;
- border-bottom: 2px solid #9eabb0;
-}
-
-#jot #jot-tools li {
- list-style: none;
- float: left;
- width: 80px;
- height: 40px;
- border-bottom: 2px solid #9eabb0;
-}
-#jot #jot-tools li a {
- display: block;
- color: #cccccc;
- width: 100%;
- height: 40px;
- text-align: center;
- line-height: 40px;
- overflow: hidden;
-}
-#jot #jot-tools li:hover {
- background-color: #364e59;
- border-bottom: 2px solid #bdcdd4;
-}
-#jot #jot-tools li.perms {
- float: right;
- width: 40px;
-}
-#jot #jot-tools li.perms a.unlock {
- width: 30px;
- border-left: 10px solid #cccccc;
- background-color: #cccccc;
- background-position: left center;
-}
-#jot #jot-tools li.perms a.lock {
- width: 30px;
- border-left: 10px solid #666666;
- background-color: #666666;
-}
-#jot #jot-tools li.submit {
- float: right;
- background-color: #cccccc;
- border-bottom: 2px solid #cccccc;
- border-right: 1px solid #666666;
- border-left: 1px solid #666666;
-}
-#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
- background-color: #cccccc;
- color: #666666;
- width: 80px;
- height: 40px;
- line-height: 40px;
-}
-#jot #jot-tools li.submit input:hover {
- background-color: #bdcdd4;
- color: #666666;
-}
-#jot #jot-tools li.loading {
- float: right;
- background-color: #ffffff;
- width: 20px;
- vertical-align: center;
- text-align: center;
- border-top: 2px solid #9eabb0;
- height: 38px;
-}
-#jot #jot-tools li.loading img {
- margin-top: 10px;
-}
-#profile-jot-form #jot-title {
-
- border-radius: 5px 5px 5px 5px;
- font-weight: bold;
- height: 20px;
- margin: 0 0 5px;
- width: 60%;
- border: 1px solid #ffffff;
-}
-#profile-jot-form #jot-title:-webkit-input-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #jot-title:-moz-placeholder {
- font-weight: normal;
-}
-#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
- width: 585px;
- height: 100px;
- }
-#jot #jot-title:hover {
- border: 1px solid #999999;
-}
-#jot #jot-title:focus {
- border: 1px solid #999999;
-}
-#jot #character-counter {
- width: 80px;
- float: right;
- text-align: right;
- height: 20px;
- line-height: 20px;
- padding-right: 20px;
-}
-#jot-perms-icon,
-#profile-location,
-#profile-nolocation,
-#profile-youtube,
-#profile-video,
-#profile-audio,
-#profile-link,
-#profile-title,
-#wall-image-upload,
-#wall-file-upload,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
- cursor: pointer;
- margin-top: 2px;
-}
-#profile-jot-wrapper{
- margin: 0 2em 20px 0;
- width: 585px;
- }
-
-#profile-jot-submit-wrapper {
- margin-bottom: 50px;
- width: 585px;
-}
-
-#profile-jot-submit {
- float: right;
- margin-top: 2px;
- font-size: 14px;
-}
-#profile-upload-wrapper {
- float: left;
- margin-top: 2px;
- margin-left: 10px;
-
-}
-#profile-attach-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-rotator {
- float: left;
- margin-left: 30px;
- margin-top: 2px;
-}
-#profile-link-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-youtube-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-video-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-audio-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-location-wrapper {
- float: left;
- margin-left: 15px;
- margin-top: 2px;
-}
-#profile-jot-perms {
- float: left;
- margin-left: 45px;
- margin-top: 2px;
-}
-#jot-preview-link {
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- font-size: 9px;
- font-weight: bolder;
- cursor: pointer;
-}
-#profile-jot-perms{
- float: right;
- margin-left: 10px;
- margin-top: 2px;
- }
-/** buttons **/
-.button.creation1 {
- background-color: #fff;
- border: 1px solid #777777;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- cursor: pointer;
- font-weight: bolder;
-}
-.button.creation2 {
- background-color: #33ACFF;
- background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 0 1px 1px #CFCFCF;
- margin-left: 5px;
- cursor: pointer;
- font-weight: bolder;
-}
-/*input[type="submit"] {
- border: 0px;
- background-color: @ButtonBackgroundColor;
- color: @ButtonColor;
- padding: 0px 10px;
- .rounded(5px);
- height: 18px;
-}*/
-/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
- display: block!important;
-}
-#acl-wrapper {
- width: 690px;
- float: left;
-}
-#acl-search {
- float: right;
- background: #ffffff url("../../../images/search_18.png") no-repeat right center;
- padding-right: 20px;
-}
-#acl-showall {
- float: left;
- display: block;
- width: auto;
- height: 18px;
- background-color: #cccccc;
- background-image: url("../../../images/show_all_off.png");
- background-position: 7px 7px;
- background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
- color: #999999;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- border-radius: 5px 5px 5px 5px;
-}
-#acl-showall.selected {
- color: #000000;
- background-color: #ff9900;
- background-image: url("../../../images/show_all_on.png");
-}
-#acl-list {
- height: 210px;
- border: 1px solid #cccccc;
- clear: both;
- margin-top: 30px;
- overflow: auto;
-}
-.acl-list-item {
- display: block;
- width: 150px;
- height: 30px;
- border: 1px solid #cccccc;
- margin: 5px;
- float: left;
-}
-.acl-list-item img {
- width: 22px;
- height: 22px;
- float: left;
- margin: 4px;
-}
-.acl-list-item p {
- height: 12px;
- font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
- overflow: hidden;
-}
-.acl-list-item a {
- font-size: 8px;
- display: block;
- width: 40px;
- height: 10px;
- float: left;
- color: #999999;
- background-color: #cccccc;
- background-position: 3px 3px;
- background-repeat: no-repeat;
- margin-right: 5px;
- -webkit-border-radius: 2px ;
- -moz-border-radius: 2px;
- border-radius: 2px;
- padding-left: 15px;
-}
-#acl-wrapper a:hover {
- text-decoration: none;
- color: #000000;
-}
-.acl-button-show {
- background-image: url("../../../images/show_off.png");
-}
-.acl-button-hide {
- background-image: url("../../../images/hide_off.png");
-}
-.acl-button-show.selected {
- color: #000000;
- background-color: #9ade00;
- background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
- color: #000000;
- background-color: #ff4141;
- background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow {
- border-color: #9ade00;
-}
-.acl-list-item.grouphide {
- border-color: #ff4141;
-}
-/** /acl **/
-/** tab buttons **/
-ul.rs_tabs {
- list-style-type: none;
-
- font-size: 11px;
-}
-ul.rs_tabs li {
- float: left;
- margin-bottom: 30px;
- clear: both;
-}
-ul.rs_tabs li .active {
- background-color: #333;
- border: 1px solid #777777;
- color: white;
- border-radius: 3px 3px 3px 3px;
- box-shadow: 2px 2px 2px #CFCFCF;
- font-size: 13px;
-}
-/**
- * Form fields
- */
-.field {
- margin-bottom: 10px;
- padding-bottom: 10px;
- overflow: auto;
- width: 100%;
-}
-.field label {
- float: left;
- width: 200px;
-}
-.field input, .field textarea {
- width: 400px;
-}
-.field textarea {
- height: 100px;
-}
-.field .field_help {
- display: block;
- margin-left: 200px;
- color: #666666;
-}
-.field .onoff {
- float: left;
- width: 80px;
-}
-.field .onoff a {
- display: block;
- border: 1px solid #666666;
- background-image: url("../../../images/onoff.jpg");
- background-repeat: no-repeat;
- padding: 4px 2px 2px 2px;
- height: 16px;
- text-decoration: none;
-}
-.field .onoff .off {
- border-color: #666666;
- padding-left: 40px;
- background-position: left center;
- background-color: #cccccc;
- color: #666666;
- text-align: right;
-}
-.field .onoff .on {
- border-color: #204A87;
- padding-right: 40px;
- background-position: right center;
- background-color: #D7E3F1;
- color: #204A87;
- text-align: left;
-}
-.field .hidden {
- display: none!important;
-}
-.field.radio .field_help {
- margin-left: 0px;
-}
-#directory-search-form{
- margin-bottom: 50px;
- }
-#profile-edit-links-end {
- clear: both;
- margin-bottom: 15px;
-}
-
-#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
-
-#profile-edit-links li {
- float: left;
- list-style: none;
- margin-left: 10px;
-}
-
-.profile-edit-side-div {
- display: none;
-}
-
-#register-form label,
-#profile-edit-form label {
- width: 300px; float: left;
-}
-
-.required {
- display: inline;
- color: #B20202;
-}
-
-/* oauth */
-.oauthapp {
- height: auto;
- overflow: auto;
- border-bottom: 2px solid #cccccc;
- padding-bottom: 1em;
- margin-bottom: 1em;
-}
-.oauthapp img {
- float: left;
- width: 48px;
- height: 48px;
- margin: 10px;
-}
-.oauthapp img.noicon {
- background-image: url("../../../images/icons/48/plugin.png");
- background-position: center center;
- background-repeat: no-repeat;
-}
-.oauthapp a {
- float: left;
-}
-/* contacts */
-.contact-entry-wrapper {
- width: 120px;
- height: 120px;
- float: left;
-}
-/* photo */
-.lframe {
- float: left;
-}
-/* profile match wrapper */
-.profile-match-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 20px;
-}
-.profile-match-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.profile-match-wrapper {
- left: 0px;
- top: 63px;
-}
-
-.contact-photo-menu-button {
- position: relative;
- background-image: url("../../../images/icons/16/menu.png");
- background-position: top left;
- background-repeat: no-repeat;
- margin: 0px 0px -16px 0px;
- padding: 0px;
- width: 16px;
- height: 16px;
- top: -20px; left:0px;
- overflow: hidden;
- text-indent: 40px;
- display: none;
-
-}
-.contact-photo-menu {
- width: 11em;
- border: 3px solid #364e59;
- color: #2d2d2d;
- background: #FFFFFF;
-/* position: absolute;*/
- position: relative;
- left: 0px; top: 0px;
- display: none;
- z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a {
- display: block;
- padding: 5px 10px;
- color: #2d2d2d;
- text-decoration: none;
-}
-.contact-photo-menu li a:hover {
- background-color: #bdcdd4;
-}
-
-/* page footer */
-footer {
- height: 100px;
- display: table-row;
-}
-
-blockquote {
- border-left: 1px solid #D2D2D2;
- padding-left: 9px;
- margin: 0 0 0 .8ex;
-}
-.aprofile dt{
-box-shadow: 1px 1px 5px 0;
- color: #666666;
- margin: 15px 0 5px;
- padding-left: 5px;
- }
-/* ================== */
-/* = Contacts Block = */
-/* ================== */
-
-.contact-block-img {
- width: 48px;
- height: 48px;
- padding-right: 3px;
-}
-.contact-block-div {
- float: left;
-}
-
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
-
-#group-edit-wrapper {
- margin-bottom: 10px;
-}
-
-#group-members-end {
- clear: both;
-}
-#group-edit-desc {
- margin-top: 15px;
-}
-
-/*
-#group-separator,
-#prof-separator { display: none;}
-*/
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
- margin-bottom: 10px;
- margin-top: 20px;
-}
-
-#prvmail-submit {
- float: right;
- margin-top: 10px;
-}
-#prvmail-subject
-{
-background: none repeat scroll 0 0 #FFFFFF;
-border: 1px solid #CCCCCC;
-border-radius: 5px 5px 5px 5px;
-font-weight: bold;
-height: 20px;
-margin: 0 0 5px;
-vertical-align: middle;
-}
-#prvmail-form{
- width: 597px;
- }
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
- float: left;
- margin-top: 10px;
- margin-right: 10px;
- width: 24px;
-}
-
-#prvmail-end {
- clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
- float: left;
-}
-.mail-list-detail {
- margin-left: 20px;
-}
-
-.mail-list-subject {
- font-size: 1.1em;
- margin-top: 10px;
-}
-a.mail-list-link {
- display: block;
- font-size: 1.3em;
- padding: 4px 0;
-}
-
-/*
-*a.mail-list-link:hover {
-* background-color: #15607B;
-* color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
- clear: both;
-}
-
-.mail-list-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-
-.mail-list-delete-icon {
- border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
- float: left;
-}
-.mail-conv-detail {
- margin-left: 20px;
- width: 500px;
-}
-
-.mail-conv-subject {
- font-size: 1.4em;
- margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-break {
- clear: both;
-}
-
-.mail-conv-delete-icon {
- border: none;
-}
-
-/* ========== */
-/* = Events = */
-/* ========== */
-.eventcal {
- float: left;
- font-size: 20px;
-}
-
-.vevent {
- border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
- margin-left: 10px;
- margin-right: 10px;
-}
-.vevent .event-start {
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#new-event-link {
- margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
-}
-
-.event-description:before {
- content: url('../../../images/calendar.png');
- margin-right: 15px;
-}
-
-.event-start, .event-end {
- margin-left: 10px;
- width: 330px;
- clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
- float: right;
-}
-
-.event-list-date {
- margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
- float: left;
- margin-left: 32px;
- margin-right: 32px;
- margin-top: 64px;
-}
-.event-calendar-end {
- clear: both;
-}
-
-
-.calendar {
- font-family: Courier, monospace;
-}
-.today {
- font-weight: bold;
- color: #FF0000;
-}
-
-.settings-block {
- border: 1px solid #AAA;
- margin: 10px;
- padding: 10px;
-}
-
-.app-title {
- margin: 10px;
-}
-
-#identity-manage-desc {
- margin-top:15px;
- margin-bottom: 15px;
-}
-
-#identity-manage-choose {
- margin-bottom: 15px;
-}
-
-#identity-submit {
- margin-top: 20px;
-}
-
-#photo-prev-link, #photo-next-link {
- padding: 10px;
- float: left;
-}
-.lightbox{
- float: left;
- }
-
-#photo-photo {
- float: left;
-}
-#photo-like-div .wall-item-like-buttons {
- float: left;
- margin-right: 5px;
- margin-top: 30px;
- }
-.comment-edit-text-empty {
- margin: 10px 0 0;
- width: 85%;
-}
-.comment-edit-photo {
- margin: 10px 0 0;
-}
-.wall-item-like-buttons .icon.like {
-float: left;
-}
-
-#photo-photo-end {
- clear: both;
-}
-
-.tabs .comment-wwedit-wrapper {
- display: block;
- margin-top: 30px;
- margin-left: 50px;
- }
-
-.profile-match-photo {
- float: left;
- text-align: center;
- width: 120px;
-}
-
-.profile-match-name {
- float: left;
- text-align: center;
- width: 120px;
- overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
- clear: both;
-}
-
-.profile-match-connect {
- text-align: center;
- font-weight: bold;
-}
-
-.profile-match-wrapper {
- float: left;
- padding: 10px;
- width: 120px;
- height: 120px;
- scroll: auto;
-}
-#profile-match-wrapper-end {
- clear: both;
-}
-
-/* ============= */
-/* = Directory = */
-/* ============= */
-/* contacts menu */
-.contact-photo-wrapper {
- position: relative;
-}
-.contact-photo {
- width: 48px;
- height: 48px;
- overflow: hidden;
- display: block;
-}
-.contact-photo img {
- width: 48px;
- height: 48px;
-}
-.contact-photo-menu-button {
- display: none;
- /* position: absolute; */
- /* position: absolute; */
- left: -2px;
- top: -20px;
-}
-.contact-wrapper {
- float: left;
- width: 90px;
- height: 90px;
- margin-bottom: 15px;
-}
-.contact-wrapper .contact-photo {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo img {
- width: 80px;
- height: 80px;
-}
-.contact-wrapper .contact-photo-menu-button {
- left: 0px;
- top: 63px;
-}
-.directory-item {
- float: left;
- width: 200px;
- height: 200px;
-}
-.directory-item .contact-photo {
- width: 175px;
- height: 175px;
-}
-.directory-item .contact-photo img {
- width: 175px;
- height: 175px;
-}
-.contact-name {
- text-align: left;
- font-weight: bold;
- font-size: 12px;
-}
-.contact-details {
- color: #999999;
-}
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
- margin-left: 30px;
- padding-left: 0px;
- }
-#side-bar-photos-albums{
- margin-top: 15px;
- }
-.photo-top-photo, .photo-album-photo {
- -webkit-border-radius: 5px 5px 0 0;
- -moz-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
-}
-.photo-album-image-wrapper, .photo-top-image-wrapper {
- float: left;
- -moz-box-shadow: 0 0 5px #888;
- -webkit-box-shadow: 0 0 5px #888;
- box-shadow: 0 0 5px #888;
- background-color: #000;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- padding-bottom: 20px;
- position: relative;
- margin: 0 10px 10px 0;
- width: 200px; height: 140px;
- overflow: hidden;
-}
-/*
-.photo-top-album-name {
- position: absolute;
- bottom: 0;
- padding: 0 5px;
-}*/
-/*.photo-top-image-wrapper {
- position: relative;
- float: left;
- margin-top: 15px;
- margin-right: 15px;
- width: 200px; height: 200px;
-
-}*/
-.photo-top-album-name {
- width: 100%;
- position: absolute;
- bottom: 0px;
- padding-left: 3px;
- background-color: #EEE;
-}
-.photo-top-album-link{
- color: #3465A4;
- }
-#photo-top-end {
- clear: both;
-}
-
-#photo-top-links {
- margin-bottom: 30px;
- margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
- float: left;
- width: 175px;
-} \ No newline at end of file
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 7105ad0e3..8a1a185a1 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -529,8 +529,9 @@ code {
}
#saved-search-ul .tool:hover,
#nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
- background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+ background: #E7F2F7;
}
.tool .label {
float: left;
@@ -1023,43 +1024,56 @@ ul.menu-popup .empty {
.menu-profile-list{
height: auto;
overflow: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 16px;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
- background: #EEE;
+ background: #E7F2F7;
}
.menu-profile-list-item{
padding-left: 5px;
+ vertical-align: middle;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
- background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
- }
-.menu-profile-list.photos{
- background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
- }
-.menu-profile-list.events{
- background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
- }
-.menu-profile-list.notes{
- background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
- }
-.menu-profile-list.foren{
- background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
- }
-.menu-profile-list.com_side{
- background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.home{
+ background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;
}
-.menu-profile-list.pscontacts{
+.menu-profile-icon.photos{
+ background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.events{
+ background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.notes{
+ background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.foren{
+ background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.com_side{
+ background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+ float: left;
+ height: 22px;
+ width: 22px;}
+.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
- }
+ float: left;
+ height: 22px;
+ width: 22px;}
/* aside */
aside {
@@ -1287,6 +1301,7 @@ body .pageheader{
padding: 3px;
color: #333333;
}
+
#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
margin-bottom: 10px;
@@ -2072,6 +2087,41 @@ ul.tabs li .active {
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
}
+//settings tabs
+ul.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+}
+ul.rs_tabs li {
+ float: left;
+ margin-bottom: 30px;
+ clear: both;
+}
+ul.rs_tabs li .selected {
+ background-color: #333;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 2px 2px 2px #CFCFCF;
+ font-size: 13px;
+}
+.rs_tabs {
+ list-style-type: none;
+ font-size: 11px;
+ background-position: 0 -20px;
+ background-repeat: repeat-x;
+ height: 27px;
+ padding: 0;
+ }
+.rs_tab.button {
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ font-weight: bolder;
+ padding: 3px;
+ color: #333333;
+ text-decoration: none;
+ }
/**
* Form fields
*/
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 4acb058e5..612650e90 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.016)
+ * Version: (Version: 1.017)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.016)";
+$diabook_version = "Diabook (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -24,7 +24,7 @@ $cssFile = null;
function diabook_community_info(){
$a = get_app();
- //right_aside at networkpages
+
// last 12 users
$aside['$lastusers_title'] = t('Last users');
@@ -288,58 +288,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
-
-
-//tabs at aside on settings page
-if ($a->argv[0] === "settings"){
-
- $tabs = array(
- array(
- 'label' => t('Account settings'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'sel' => (($a->argc == 1)?'active':''),
- ),
- array(
- 'label' => t('Display settings'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
- ),
- array(
- 'label' => t('Edit/Manage Profiles'),
- 'url' => $a->get_baseurl(true).'/profiles',
- ),
- array(
- 'label' => t('Connector settings'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
- ),
- array(
- 'label' => t('Plugin settings'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
- ),
- array(
- 'label' => t('Connections'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'sel' => ''
- )
- );
- $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
- $a->page['aside'] = replace_macros($tabtpl, array(
- '$tabs' => $tabs,
- ));
-
-
- // CUSTOM CSS
- $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
-
-}
-
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 1f776eed7..68d7e230f 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -1945,8 +1945,8 @@ div[id$="wrapper"] br {
margin: 0 0 -18px;
position: absolute;
text-decoration: none;
- top: 18px;
- right: 226px;
+ top: 113px;
+ right: 250px;
}
#profile-edit-links ul {
margin: 20px 0;
@@ -2611,7 +2611,7 @@ div[id$="wrapper"] br {
.icon.drop,
.icon.drophide, .icon.delete {
float: left;
- /*margin: 5px;*/
+ margin: 0 2px;
}
.icon.s22.delete {
display: block;
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 70d722e81..66d19e091 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1946,8 +1946,8 @@ div[id$="wrapper"] br {
margin: 0 0 -18px;
position: absolute;
text-decoration: none;
- top: 18px;
- right: 226px;
+ top: 113px;
+ right: 250px;
}
#profile-edit-links ul {
margin: 20px 0;
@@ -2612,7 +2612,7 @@ div[id$="wrapper"] br {
.icon.drop,
.icon.drophide, .icon.delete {
float: left;
- /*margin: 5px;*/
+ margin: 0 2px;
}
.icon.s22.delete {
display: block;
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1d951aba8..16c786d20 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -48,6 +48,9 @@
.icon.s10.unlock {
background-image: url("../../../images/icons/10/unlock.png");
}
+.icon.s10.plugin {
+ background-image: url("../../../images/icons/10/plugin.png");
+}
.icon.s10.type-unkn {
background-image: url("../../../images/icons/10/zip.png");
}
@@ -100,6 +103,9 @@
.icon.s16.unlock {
background-image: url("../../../images/icons/16/unlock.png");
}
+.icon.s16.plugin {
+ background-image: url("../../../images/icons/16/plugin.png");
+}
.icon.s16.type-unkn {
background-image: url("../../../images/icons/16/zip.png");
}
@@ -152,6 +158,9 @@
.icon.s22.unlock {
background-image: url("../../../images/icons/22/unlock.png");
}
+.icon.s22.plugin {
+ background-image: url("../../../images/icons/22/plugin.png");
+}
.icon.s22.type-unkn {
background-image: url("../../../images/icons/22/zip.png");
}
@@ -204,6 +213,9 @@
.icon.s48.unlock {
background-image: url("../../../images/icons/48/unlock.png");
}
+.icon.s48.plugin {
+ background-image: url("../../../images/icons/48/plugin.png");
+}
.icon.s48.type-unkn {
background-image: url("../../../images/icons/48/zip.png");
}
@@ -501,6 +513,17 @@ ul.menu-popup .empty {
text-align: center;
color: #9eabb0;
}
+ul.menu-popup .toolbar {
+ background-color: #9eabb0;
+ height: auto;
+ overflow: auto;
+}
+ul.menu-popup .toolbar a {
+ float: right;
+}
+ul.menu-popup .toolbar a:hover {
+ background-color: #ffffff;
+}
/* autocomplete popup */
.acpopup {
max-height: 150px;
diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/generic_links_widget.tpl
new file mode 100644
index 000000000..29580bbc7
--- /dev/null
+++ b/view/theme/quattro/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+ {{if $title}}<h3>$title</h3>{{endif}}
+ {{if $desc}}<div class="desc">$desc</div>{{endif}}
+
+ <ul>
+ {{ for $items as $item }}
+ <li class="tool {{ if $item.selected }}selected{{ endif }}"><a href="$item.url" class="link">$item.label</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index e7cc549d0..df43aa152 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -48,6 +48,9 @@
.icon.s10.unlock {
background-image: url("../../../images/icons/10/unlock.png");
}
+.icon.s10.plugin {
+ background-image: url("../../../images/icons/10/plugin.png");
+}
.icon.s10.type-unkn {
background-image: url("../../../images/icons/10/zip.png");
}
@@ -100,6 +103,9 @@
.icon.s16.unlock {
background-image: url("../../../images/icons/16/unlock.png");
}
+.icon.s16.plugin {
+ background-image: url("../../../images/icons/16/plugin.png");
+}
.icon.s16.type-unkn {
background-image: url("../../../images/icons/16/zip.png");
}
@@ -152,6 +158,9 @@
.icon.s22.unlock {
background-image: url("../../../images/icons/22/unlock.png");
}
+.icon.s22.plugin {
+ background-image: url("../../../images/icons/22/plugin.png");
+}
.icon.s22.type-unkn {
background-image: url("../../../images/icons/22/zip.png");
}
@@ -204,6 +213,9 @@
.icon.s48.unlock {
background-image: url("../../../images/icons/48/unlock.png");
}
+.icon.s48.plugin {
+ background-image: url("../../../images/icons/48/plugin.png");
+}
.icon.s48.type-unkn {
background-image: url("../../../images/icons/48/zip.png");
}
@@ -501,6 +513,17 @@ ul.menu-popup .empty {
text-align: center;
color: #9eabb0;
}
+ul.menu-popup .toolbar {
+ background-color: #9eabb0;
+ height: auto;
+ overflow: auto;
+}
+ul.menu-popup .toolbar a {
+ float: right;
+}
+ul.menu-popup .toolbar a:hover {
+ background-color: #ffffff;
+}
/* autocomplete popup */
.acpopup {
max-height: 150px;
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index e314fba1f..3688ae021 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -13,6 +13,7 @@
&.link { background-image: url("../../../images/icons/@{size}/link.png"); }
&.lock { background-image: url("../../../images/icons/@{size}/lock.png"); }
&.unlock { background-image: url("../../../images/icons/@{size}/unlock.png"); }
+ &.plugin { background-image: url("../../../images/icons/@{size}/plugin.png"); }
&.type-unkn { background-image: url("../../../images/icons/@{size}/zip.png"); }
&.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); }
&.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); }
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
index 8c872864c..26f04f134 100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
@@ -43,8 +43,7 @@
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span>
<ul id="nav-notifications-menu" class="menu-popup">
- <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
- <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+ <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
<li class="empty">$emptynotifications</li>
</ul>
</li>
@@ -92,40 +91,3 @@
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c6352cfe9..0660a3ad7 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -227,6 +227,12 @@ ul.menu-popup {
text-align: center;
color: @MenuEmpty;
}
+ .toolbar {
+ background-color: @MenuEmpty;
+ height: auto; overflow: auto;
+ a { float: right; }
+ a:hover { background-color: @MenuBg; }
+ }
}
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 889ec1530..b6104a170 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -1,5 +1,9 @@
<?php
- $color = get_pconfig(local_user(), "quattro","color");
+ $color = false;
+ if (local_user()) {
+ $color = get_pconfig(local_user(), "quattro","color");
+ $quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+ }
if ($color===false) $color="dark";
@@ -7,3 +11,13 @@
echo file_get_contents("$THEMEPATH/$color/style.css");
}
+
+ if($quattro_align=="center"){
+ echo "
+ html { width: 100%; margin:0px; padding:0px; }
+ body {
+ margin: 50px auto;
+ width: 900px;
+ }
+ ";
+ }
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
deleted file mode 100644
index be47a401c..000000000
--- a/view/theme/quattro/theme.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-
-
-
-$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
-
-if(local_user() && $quattro_align=="center"){
-
- $a->page['htmlhead'].="
- <style>
- html { width: 100%; margin:0px; padding:0px; }
- body {
- margin: 50px auto;
- width: 900px;
- }
- </style>
- ";
-
-}