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

* remotes/upstream/master:
  display settings hooks
  re-opened bug #363
  this is better
  include contact_widgets for categories_widget when doing updates
  remove loozah themes which fell too far behind to recover
  smal fix
  german translation for right_aside
  make right_aside translatable and provide german translation... and some css-fixes
  suppress duplicates in search
  make contact ssl_policy change a function since it is used in a few places
  more ssl policy fixes and prevent delivery to soapbox when using  local delivery
  don't change ssl settings on local photos for remote contact

* master:
This commit is contained in:
Simon L'nu 2012-04-04 02:14:26 -04:00
commit 2871e28df7
72 changed files with 404 additions and 3950 deletions

View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1300' );
define ( 'FRIENDICA_VERSION', '2.3.1301' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );

View File

@ -321,6 +321,14 @@ function delivery_run($argv, $argc){
$x[0]['writable'] = 1;
}
$ssl_policy = get_config('system','ssl_policy');
fix_contact_ssl_policy($x[0],$ssl_policy);
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);

View File

@ -824,3 +824,48 @@ function scale_external_images($s,$include_link = true) {
}
return $s;
}
function fix_contact_ssl_policy(&$contact,$new_policy) {
$ssl_changed = false;
if((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'],'https:')) {
$ssl_changed = true;
$contact['url'] = str_replace('https:','http:',$contact['url']);
$contact['request'] = str_replace('https:','http:',$contact['request']);
$contact['notify'] = str_replace('https:','http:',$contact['notify']);
$contact['poll'] = str_replace('https:','http:',$contact['poll']);
$contact['confirm'] = str_replace('https:','http:',$contact['confirm']);
$contact['poco'] = str_replace('https:','http:',$contact['poco']);
}
if((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'],'http:')) {
$ssl_changed = true;
$contact['url'] = str_replace('http:','https:',$contact['url']);
$contact['request'] = str_replace('http:','https:',$contact['request']);
$contact['notify'] = str_replace('http:','https:',$contact['notify']);
$contact['poll'] = str_replace('http:','https:',$contact['poll']);
$contact['confirm'] = str_replace('http:','https:',$contact['confirm']);
$contact['poco'] = str_replace('http:','https:',$contact['poco']);
}
if($ssl_changed) {
q("update contact set
url = '%s',
request = '%s',
notify = '%s',
poll = '%s',
confirm = '%s',
poco = '%s'
where id = %d limit 1",
dbesc($contact['url']),
dbesc($contact['request']),
dbesc($contact['notify']),
dbesc($contact['poll']),
dbesc($contact['confirm']),
dbesc($contact['poco']),
intval($contact['id'])
);
}
}

View File

@ -537,6 +537,17 @@ function notifier_run($argv, $argc){
$x[0]['writable'] = 1;
}
// if contact's ssl policy changed, which we just determined
// is on our own server, update our contact links
$ssl_policy = get_config('system','ssl_policy');
fix_contact_ssl_policy($x[0],$ssl_policy);
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);

View File

@ -222,6 +222,11 @@ function admin_page_site_post(&$a){
`poco` = replace(`poco` , 'http:' , 'https:')
where `self` = 1"
);
q("update `profile` set
`photo` = replace(`photo` , 'http:' , 'https:'),
`thumb` = replace(`thumb` , 'http:' , 'https:')
where 1 "
);
}
elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
q("update `contact` set
@ -236,6 +241,11 @@ function admin_page_site_post(&$a){
`poco` = replace(`poco` , 'https:' , 'http:')
where `self` = 1"
);
q("update `profile` set
`photo` = replace(`photo` , 'https:' , 'http:'),
`thumb` = replace(`thumb` , 'https:' , 'http:')
where 1 "
);
}
}
set_config('system','ssl_policy',$ssl_policy);

View File

@ -99,65 +99,10 @@ function dfrn_notify_post(&$a) {
$importer['forum'] = $page;
}
// if contact's ssl policy changed, update our links
$ssl_changed = false;
if($ssl_policy == 'self' && strstr($importer['url'],'https:')) {
$ssl_changed = true;
$importer['url'] = str_replace('https:','http:',$importer['url']);
$importer['nurl'] = normalise_link($importer['url']);
$importer['photo'] = str_replace('https:','http:',$importer['photo']);
$importer['thumb'] = str_replace('https:','http:',$importer['thumb']);
$importer['micro'] = str_replace('https:','http:',$importer['micro']);
$importer['request'] = str_replace('https:','http:',$importer['request']);
$importer['notify'] = str_replace('https:','http:',$importer['notify']);
$importer['poll'] = str_replace('https:','http:',$importer['poll']);
$importer['confirm'] = str_replace('https:','http:',$importer['confirm']);
$importer['poco'] = str_replace('https:','http:',$importer['poco']);
}
if($ssl_policy == 'full' && strstr($importer['url'],'http:')) {
$ssl_changed = true;
$importer['url'] = str_replace('http:','https:',$importer['url']);
$importer['nurl'] = normalise_link($importer['url']);
$importer['photo'] = str_replace('http:','https:',$importer['photo']);
$importer['thumb'] = str_replace('http:','https:',$importer['thumb']);
$importer['micro'] = str_replace('http:','https:',$importer['micro']);
$importer['request'] = str_replace('http:','https:',$importer['request']);
$importer['notify'] = str_replace('http:','https:',$importer['notify']);
$importer['poll'] = str_replace('http:','https:',$importer['poll']);
$importer['confirm'] = str_replace('http:','https:',$importer['confirm']);
$importer['poco'] = str_replace('http:','https:',$importer['poco']);
}
if($ssl_changed) {
q("update contact set
url = '%s',
nurl = '%s',
photo = '%s',
thumb = '%s',
micro = '%s',
request = '%s',
notify = '%s',
poll = '%s',
confirm = '%s',
poco = '%s'
where id = %d limit 1",
dbesc($importer['url']),
dbesc($importer['nurl']),
dbesc($importer['photo']),
dbesc($importer['thumb']),
dbesc($importer['micro']),
dbesc($importer['request']),
dbesc($importer['notify']),
dbesc($importer['poll']),
dbesc($importer['confirm']),
dbesc($importer['poco']),
intval($importer['id'])
);
}
fix_contact_ssl_policy($importer,$ssl_policy);
logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
logger('dfrn_notify: data: ' . $data, LOGGER_DATA);

View File

@ -124,9 +124,9 @@ function profile_content(&$a, $update = 0) {
return;
}
$a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
if(! $update) {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
@ -148,6 +148,7 @@ function profile_content(&$a, $update = 0) {
$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
if(can_write_wall($a,$a->profile['profile_uid'])) {

View File

@ -97,27 +97,26 @@ function search_content(&$a) {
// OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall.
$r = q("SELECT COUNT(*) AS `total`
$r = q("SELECT distinct(`item`.`uri`) as `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )",
AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) group by `item`.`uri` ",
intval(local_user()),
dbesc(preg_quote($search)),
dbesc('\\]' . preg_quote($search) . '\\[')
);
if(count($r))
$a->set_pager_total($r[0]['total']);
if(! $r[0]['total']) {
$a->set_pager_total(count($r));
if(! count($r)) {
info( t('No results.') . EOL);
return $o;
}
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@ -129,6 +128,7 @@ function search_content(&$a) {
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
group by `item`.`uri`
ORDER BY `received` DESC LIMIT %d , %d ",
intval(local_user()),
dbesc(preg_quote($search)),

View File

@ -229,7 +229,7 @@ function settings_post(&$a) {
if ($theme == $a->user['theme']){
// call theme_post only if theme has not benn changed
// call theme_post only if theme has not been changed
if( ($themeconfigfile = get_theme_config_file($theme)) != null){
require_once($themeconfigfile);
theme_post($a);
@ -242,6 +242,7 @@ function settings_post(&$a) {
intval(local_user())
);
call_hooks('display_settings_post', $_POST);
goaway($a->get_baseurl(true) . '/settings/display' );
return; // NOTREACHED
}
@ -679,6 +680,8 @@ function settings_content(&$a) {
'$settings_connectors' => $settings_connectors
));
call_hooks('display_settings', $o);
return $o;
}

View File

@ -26,6 +26,7 @@ $a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
$a->strings["Submit"] = "Senden";
$a->strings["Help:"] = "Hilfe:";
$a->strings["Help"] = "Hilfe";
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NeuHier";
$a->strings["Not Found"] = "Nicht gefunden";
$a->strings["Page not found."] = "Seite nicht gefunden.";
$a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d";
@ -125,6 +126,9 @@ $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/A
$a->strings["Item not found"] = "Beitrag nicht gefunden";
$a->strings["Edit post"] = "Beitrag bearbeiten";
$a->strings["Post to Email"] = "An E-Mail senden";
$a->strings["PostIt to Friendica"] = "Teile mit Friendica";
$a->strings["Post to Friendica"] = "Teile mit Friendica";
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her, indem du diesen Link zu deinen Lesezeichen hinzufügst.";
$a->strings["Edit"] = "Bearbeiten";
$a->strings["Upload photo"] = "Foto hochladen";
$a->strings["Attach file"] = "Datei anhängen";
@ -244,6 +248,7 @@ $a->strings["Profile Match"] = "Profilübereinstimmungen";
$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
$a->strings["is interested in:"] = "ist interessiert an:";
$a->strings["Connect"] = "Verbinden";
$a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["No matches"] = "Keine Übereinstimmungen";
$a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
$a->strings["Visible to:"] = "Sichtbar für:";
@ -676,6 +681,7 @@ $a->strings["Force users to register with a space between firstname and lastname
$a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
$a->strings["Community Pages"] = "Foren";
$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt.";
@ -830,6 +836,7 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
$a->strings["Global Directory"] = "Weltweites Verzeichnis";
$a->strings["Local Directory"] = "Lokales Verzeichnis";
$a->strings["Normal site view"] = "Normale Seitenansicht";
$a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen";
$a->strings["Find on this site"] = "Auf diesem Server suchen";
@ -1164,6 +1171,7 @@ $a->strings["Dating"] = "Dating";
$a->strings["Unfaithful"] = "Untreu";
$a->strings["Sex Addict"] = "Sexbesessen";
$a->strings["Friends"] = "Freunde";
$a->strings["Find Friends"] = "Freunde finden";
$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
$a->strings["Casual"] = "Casual";
$a->strings["Engaged"] = "Verlobt";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

View File

@ -1,115 +0,0 @@
@import url('../loozah/style.css');
footer {
background: #CCC;
}
#banner {
color: #444444;
}
body {
background: #FFFFFF;
color: #000000;
}
.nav-selected {
background: #FFFFFF !important;
color: #888888 !important;
}
input:hover {
background-color: #CCCCCC;
color: #000000;
border: 1px solid #FFFFFF;
}
input, select {
background-color: #FFFFFF;
color: #000000;
}
.nav-link:hover, .nav-commlink:hover {
background: #DDDDDD;
color: #0000EE;
}
option {
background-color: #FFFFFF;
}
#page-footer {
border: none;
}
nav {
background: #F4F4F4;
}
body {
background: #FFFFFF;
color: #444444;
}
.nav-link {
color: #444444;
background: #EEE;
border: 2px solid #CCCCCC;
}
.nav-commlink {
color: #444444;
background: #EEE;
border: 2px solid #CCCCCC;
}
.tab {
color: #444444;
background: #EEE;
}
a, a:visited {
color: #8888FF;
text-decoration: none;
}
a:hover {
color: #0000FF;
text-decoration: underline;
}
.fakelink, .fakelink:visited {
color: #8888FF;
}
.fakelink:hover {
color: #0000FF;
}
.wall-item-content-wrapper {
border: 1px solid #CCC;
}
.wall-item-content-wrapper.comment {
background: #CCC;
}
.comment-edit-wrapper {
background: #CCC;
}
.comment-wwedit-wrapper {
background: #CCC;
}
#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
color: #8888FF;
}
#photos-upload-perms-menu:hover {
color: #0000FF;
}
#settings-default-perms-menu, #settings-default-perms-menu:visited {
color: #8888FF;
}
#settings-default-perms-menu:hover {
color: #0000FF;
}

View File

@ -1,4 +0,0 @@
<?php
$a->theme_info = array(
'extends' => 'loozah',
);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

View File

@ -1,67 +0,0 @@
@import url('../loozah/style.css');
nav {
background: #CCC;
}
footer {
background: #CCC;
}
#banner {
color: #FF0000;
}
body {
background: #000000;
color: #FF0000;
}
.nav-selected {
background: #000000 !important;
color: #888888 !important;
}
input:hover {
background-color: #800000;
}
input, select {
background-color: #000000;
color: #FF0000;
}
.nav-link:hover, .nav-commlink:hover, .tab:hover {
background: #DDDDDD;
color: #FF0000;
}
#logo-text a, #logo-text a:visited, #site-location {
color: #000000;
}
#page-footer {
border: none;
}
.nav-link {
color: #FF0000;
background: #444444;
}
.nav-commlink {
color: #FF0000;
background: #444444;
}
.tab {
color: #FF0000;
background: #444444;
}
a, a:visited, .fakelink, .fakelink:visited {
color: #888888;
text-decoration: none;
}
a:hover, .fakelink:hover {
color: #FF0000;
text-decoration: underline;
}

View File

@ -1,4 +0,0 @@
<?php
$a->theme_info = array(
'extends' => 'loozah',
);

View File

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

View File

@ -1260,7 +1260,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }

View File

@ -1255,7 +1255,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }

View File

@ -2042,6 +2042,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

View File

@ -3,7 +3,7 @@
/*
* 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.011)
* Version: (Version: 1.012)
* Author:
*/
@ -139,7 +139,8 @@ function diabook_aerith_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -189,9 +190,27 @@ function diabook_aerith_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;

View File

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

View File

@ -543,15 +543,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -630,7 +632,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1007,6 +1009,8 @@ aside #profiles-menu {
}
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;
@ -1219,7 +1223,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }
@ -1720,7 +1724,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1772,7 +1776,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1783,18 +1789,20 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
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;

View File

@ -544,15 +544,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -631,7 +633,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1006,6 +1008,8 @@ aside #profiles-menu {
}
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;
@ -1218,7 +1222,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }
@ -1721,7 +1725,7 @@ transition: all 0.2s ease-in-out;
float: left;
margin-top: 2px;
margin-left: 10px;
font-size: 14px;
}
#profile-attach-wrapper {
float: left;
@ -1767,7 +1771,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1778,18 +1784,20 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
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;

View File

@ -544,15 +544,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -631,7 +633,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1706,7 +1708,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1758,7 +1760,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1769,18 +1773,20 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
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;

View File

@ -541,15 +541,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* messages */
#message-new {
@ -708,7 +710,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1085,6 +1087,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
height: 17px;
padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@ -1725,7 +1729,7 @@ body .pageheader{
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1777,7 +1781,9 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1788,18 +1794,20 @@ body .pageheader{
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #1872A2;
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
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;
@ -1990,6 +1998,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

View File

@ -3,7 +3,7 @@
/*
* 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.011)
* Version: (Version: 1.012)
* Author:
*/
@ -139,7 +139,8 @@ function diabook_blue_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -189,9 +190,27 @@ function diabook_blue_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;

View File

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-red/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

View File

@ -1257,7 +1257,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }

View File

@ -1235,7 +1235,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }

View File

@ -579,6 +579,7 @@ header #banner #logo-text {
font-weight: bold;
padding: 1em 0px;
text-decoration: none;
background-color: red;
}
.mail-list-wrapper {
background-color: #f6f7f8;
@ -2027,6 +2028,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

View File

@ -3,7 +3,7 @@
/*
* 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.011)
* Version: (Version: 1.012)
* Author:
*/
@ -139,7 +139,8 @@ function diabook_red_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -189,9 +190,27 @@ function diabook_red_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;

View File

@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@ -16,8 +16,8 @@
<div id="close_services">
{{ if $lastusers_title }}
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
@ -32,9 +32,9 @@
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@ -44,8 +44,8 @@ $nv.search
<div id="close_postit">
{{ if $lastusers_title }}
<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

View File

@ -545,15 +545,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -632,7 +634,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1001,6 +1003,8 @@ aside #profiles-menu {
}
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;
@ -1201,7 +1205,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }
@ -1694,6 +1698,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
@ -1746,7 +1751,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1757,9 +1764,10 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1769,6 +1777,8 @@ transition: all 0.2s ease-in-out;
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px;
cursor: pointer;
font-weight: bolder;
}
/*input[type="submit"] {
background-color: #33ACFF;

View File

@ -543,15 +543,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -630,7 +632,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -995,6 +997,8 @@ aside #profiles-menu {
}
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;
@ -1195,7 +1199,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; 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; }
@ -1688,7 +1692,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1740,7 +1744,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1751,9 +1757,10 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1763,6 +1770,8 @@ transition: all 0.2s ease-in-out;
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;

View File

@ -543,15 +543,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* nav */
nav {
@ -630,7 +632,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1680,7 +1682,7 @@ transition: all 0.2s ease-in-out;
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1732,7 +1734,9 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1743,9 +1747,10 @@ transition: all 0.2s ease-in-out;
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1755,6 +1760,8 @@ transition: all 0.2s ease-in-out;
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;

View File

@ -542,15 +542,17 @@ header #banner a:hover {
text-decoration: none;
outline: none;
vertical-align: middle;
font-weight: bolder;
margin-left: 3px;
}
header #banner #logo-img {
height: 25px;
margin-top: 5px;
margin-top: 3px;
}
header #banner #logo-text {
font-size: 22px;
font-size: 20px;
position: absolute;
top: 15%;
top: 10%;
}
/* messages */
#message-new {
@ -709,7 +711,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
margin: 3px 17px;
margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@ -1076,7 +1078,13 @@ aside #profiles-menu {
width: 20em;
}
aside #search-text {
width: 173px;
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: 173px;
@ -1699,7 +1707,7 @@ body .pageheader{
#profile-jot-submit {
float: right;
margin-top: 2px;
font-size: 14px;
}
#profile-upload-wrapper {
float: left;
@ -1751,7 +1759,9 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
font-size: 10px;
font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
#profile-jot-perms{
float: right;
@ -1762,9 +1772,10 @@ body .pageheader{
.button.creation1 {
background-color: #fff;
border: 1px solid #777777;
background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
border-radius: 3px 3px 3px 3px;
box-shadow: 0 1px 1px #CFCFCF;
cursor: pointer;
font-weight: bolder;
}
.button.creation2 {
background-color: #33ACFF;
@ -1774,6 +1785,8 @@ body .pageheader{
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;
@ -1964,6 +1977,14 @@ ul.tabs li .active {
.field.radio .field_help {
margin-left: 0px;
}
.suggest-select {
width: 500px;
height: 350px;
}
.message-to-select {
width: 400px;
height: 150px;
}
#directory-search-form{
margin-bottom: 50px;
}

View File

@ -3,7 +3,7 @@
/*
* 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.011)
* Version: (Version: 1.012)
* Author:
*/
@ -143,7 +143,8 @@ function diabook_community_info(){
//right_aside FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@ -194,8 +195,27 @@ function diabook_community_info(){
$aside['$page'] = $page;
}
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
@ -331,6 +351,12 @@ $a->page['htmlhead'] .= '
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
$(document).ready(function (){
$("iframe").each(function(){
var url = $(this).attr("src");
$(this).attr("src",url+"?wmode=transparent"); });
});
</script>';

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

View File

@ -1,121 +0,0 @@
@import url('../loozah/style.css');
footer {
background: #CCC;
}
#banner {
color: #444444;
}
#logo-text a, #logo-text a:visited, #site-location {
color: #000000;
}
body {
background: #FFFFFF;
color: #000000;
}
.nav-selected {
background: #FFFFFF !important;
color: #888888 !important;
}
input:hover {
background-color: #FFEEBB;
color: #000000;
border: 1px solid #000000;
}
input, select {
background-color: #FFEEBB;
color: #000000;
}
.nav-link:hover, .nav-commlink:hover {
background: #FFDDAA;
color: #0000EE;
}
option {
background-color: #FFEEBB;
}
#page-footer {
border: none;
}
nav {
background: #FFEEBB;
}
body {
background: #FFDDAA;
color: #444444;
}
.nav-link {
color: #444444;
background: #FFCC55;
}
.nav-commlink {
color: #444444;
background: #FFCC55;
}
.nav-selected {
background: #FFDDAA !important;
}
.tab {
color: #444444;
background: #FFCC55;
}
a, a:visited {
color: #8888FF;
text-decoration: none;
}
a:hover {
color: #0000FF;
text-decoration: underline;
}
.fakelink, .fakelink:visited {
color: #8888FF;
}
.fakelink:hover {
color: #0000FF;
}
.wall-item-content-wrapper.comment {
background: #FFCC55;
}
.comment-edit-wrapper {
background: #FFCC55;
}
.comment-wwedit-wrapper {
background: #FFCC55;
}
#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
color: #8888FF;
}
#photos-upload-perms-menu:hover {
color: #0000FF;
}
#settings-default-perms-menu, #settings-default-perms-menu:visited {
color: #8888FF;
}
#settings-default-perms-menu:hover {
color: #0000FF;
}

View File

@ -1,4 +0,0 @@
<?php
$a->theme_info = array(
'extends' => 'loozah',
);

View File

@ -1,32 +0,0 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
<input type="hidden" name="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" />
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</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>
{{ if $qcomment }}
{{ for $qcomment as $qc }}
<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
&nbsp;
{{ endfor }}
{{ endif }}
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
</div>
<div class="comment-edit-end"></div>
</form>
</div>

View File

@ -1,25 +0,0 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
<div class="contact-entry-photo-wrapper" >
<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
{{ if $contact.photo_menu }}
<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
<div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
<ul>
$contact.photo_menu
</ul>
</div>
{{ endif }}
</div>
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
<div class="contact-entry-end" ></div>
</div>

View File

@ -1,13 +0,0 @@
{{ for $threads as $thread }}
<div id="tread-wrapper-$thread.id" class="tread-wrapper">
$thread.html
</div>
{{ endfor }}
{{ if $dropping }}
<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
<div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
<div id="item-delete-selected-desc" >$dropping</div>
</div>
<div id="item-delete-selected-end"></div>
{{ endif }}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 699 B

View File

@ -1,28 +0,0 @@
<div class="widget" id="group-sidebar">
<h3>$title</h3>
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
{{ for $groups as $group }}
<li class="sidebar-group-li">
{{ if $group.cid }}
<input type="checkbox"
class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
{{ if $group.ismember }}checked="checked"{{ endif }}
/>
{{ endif }}
{{ if $group.edit }}
<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
{{ endif }}
<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
</li>
{{ endfor }}
</ul>
</div>
<div id="sidebar-new-group">
<a href="group/new">$createtext</a>
</div>
</div>

View File

@ -1,84 +0,0 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div>
<div id="profile-jot-banner-end"></div>
<form id="profile-jot-form" action="$action" method="post" >
<input type="hidden" name="type" value="$ptyp" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="title" id="jot-title" value="" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id" value="$post_id" />
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
<div id="profile-upload-wrapper" style="display: $visitor;" >
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
</div>
<div id="profile-attach-wrapper" style="display: $visitor;" >
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
</div>
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
<div id="profile-video-wrapper" style="display: $visitor;" >
<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
</div>
<div id="profile-audio-wrapper" style="display: $visitor;" >
<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
</div>
<div id="profile-location-wrapper" style="display: $visitor;" >
<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
</div>
<div id="profile-nolocation-wrapper" style="display: none;" >
<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
</div>
<div id="profile-title-wrapper" style="display: $visitor;" >
<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
</div>
<div id="profile-jot-plugin-wrapper">
$jotplugins
</div>
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
</div>
<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
<div id="profile-jot-perms-end"></div>
<div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
<hr style="clear:both"/>
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets
</div>
</div>
</div>
<div id="profile-jot-end"></div>
</form>
</div>
{{ if $content }}<script>initEditor();</script>{{ endif }}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 B

View File

@ -1,51 +0,0 @@
<nav>
$langselector
<div id="site-location">$sitelocation</div>
{{ 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 }}
{{ if $nav.help }}<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>{{ endif }}
{{ 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.network }}
<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
<span id="net-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.home }}
<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.community }}
<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.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 }}
{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
</span>
<span id="nav-end"></span>
<span id="banner">$banner</span>
</nav>

View File

@ -1,10 +0,0 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 464 B

View File

@ -1,47 +0,0 @@
<div class="vcard">
<div class="fn label">$profile.name</div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
{{ if $location }}
<dl class="location"><dt class="location-label">$location</dt>
<dd class="adr">
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
<span class="city-state-zip">
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
<span class="region">$profile.region</span>
<span class="postal-code">$profile.postal-code</span>
</span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
</dd>
</dl>
{{ endif }}
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links">
<ul>
{{ if $connect }}
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
{{ endif }}
</ul>
</div>
</div>
$contact_block

View File

@ -1,14 +0,0 @@
<div class="widget" id="saved-search-list">
<h3 id="search">$title</h3>
$searchbox
<ul id="saved-search-ul">
{{ for $saved as $search }}
<li class="saved-search-li clear">
<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
</li>
{{ endfor }}
</ul>
<div class="clear"></div>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

View File

@ -1,52 +0,0 @@
<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
<ul>
$item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
<div class="wall-item-author">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-conv" id="wall-item-conv-$id" >
{{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>
</div>

File diff suppressed because it is too large Load Diff

View File

@ -1,71 +0,0 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
</a>
<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
<ul>
$item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
<div class="wall-item-author">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
{{ if $vote }}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
{{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
{{ if $edpost }}
<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
{{ endif }}
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
{{ endif }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-like" id="wall-item-like-$id">$like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
<div class="wall-item-comment-wrapper" >
$comment
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>
</div>

View File

@ -1,76 +0,0 @@
<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<div class="wall-item-info wallwall" id="wall-item-info-$id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
<ul>
$item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>
<div class="wall-item-author">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
{{ if $vote }}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
{{ endif }}
{{ if $plink }}
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
{{ if $edpost }}
<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
{{ endif }}
{{ if $star }}
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
{{ endif }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
<div class="wall-item-delete-end"></div>
</div>
</div>
<div class="wall-item-wrapper-end"></div>
<div class="wall-item-like" id="wall-item-like-$id">$like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
<div class="wall-item-comment-separator"></div>
<div class="wall-item-comment-wrapper" >
$comment
</div>
<div class="wall-item-outside-wrapper-end$indent" ></div>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

View File

@ -1,70 +0,0 @@
@import url('../loozah/style.css');
body {
background: #DDDDDD;
color: #444444;
}
.nav-link {
color: #444444;
background: #F4F4F4;
}
.nav-selected {
background: #DDDDDD !important;
}
.nav-commlink {
color: #444444;
background: #F4F4F4;
}
.tab {
color: #444444;
background: #F4F4F4;
}
a, a:visited {
color: #8888FF;
text-decoration: none;
}
a:hover {
color: #0000FF;
text-decoration: underline;
}
.fakelink, .fakelink:visited {
color: #8888FF;
}
.fakelink:hover {
color: #0000FF;
}
.wall-item-content-wrapper.comment {
background: #CCCCCC;
}
.comment-edit-wrapper {
background: #CCCCCC;
}
.comment-wwedit-wrapper {
background: #CCCCCC;
}
#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
color: #8888FF;
}
#photos-upload-perms-menu:hover {
color: #0000FF;
}
#settings-default-perms-menu, #settings-default-perms-menu:visited {
color: #8888FF;
}
#settings-default-perms-menu:hover {
color: #0000FF;
}

View File

@ -1,4 +0,0 @@
<?php
$a->theme_info = array(
'extends' => 'loozah',
);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

View File

@ -1,35 +0,0 @@
@import url('../loozah/style.css');
.error-message {
-moz-box-shadow: 5px 5px 5px #888888;
-webkit-box-shadow: 5px 5px 5px #888888;
box-shadow: 5px 5px 5px #888888;
-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
}
.nav-link {
-moz-box-shadow: 5px 5px 5px #888888;
-webkit-box-shadow: 5px 5px 5px #888888;
box-shadow: 5px 5px 5px #888888;
-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
}
.nav-commlink {
-moz-box-shadow: 5px 5px 5px #888888;
-webkit-box-shadow: 5px 5px 5px #888888;
box-shadow: 5px 5px 5px #888888;
-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
}
.tab {
-moz-box-shadow: 5px 5px 5px #888888;
-webkit-box-shadow: 5px 5px 5px #888888;
box-shadow: 5px 5px 5px #888888;
-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
}

View File

@ -1,4 +0,0 @@
<?php
$a->theme_info = array(
'extends' => 'loozah',
);