clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master:
This commit is contained in:
Simon L'nu 2012-04-22 22:22:52 -04:00
parent 75c228fa13 2170df897b
commit 29d7f260d7
67 changed files with 230 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
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.1319' );
define ( 'FRIENDICA_VERSION', '2.3.1320' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );

11
include/api.php
View File

@ -567,8 +567,17 @@
$_REQUEST['profile_uid'] = local_user();
if(requestdata('parent'))
$_REQUEST['type'] = 'net-comment';
else
else {
$_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) {
// upload the image if we have one
$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
require_once('mod/wall_upload.php');
$media = wall_upload_post($a);
if(strlen($media)>0)
$_REQUEST['body'] .= "\n\n".$media;
}
}
// set this so that the item_post() function is quiet and doesn't redirect or emit json

2
include/diaspora.php
View File

@ -1172,7 +1172,7 @@ function diaspora_comment($importer,$xml,$msg) {
proc_run('php','include/notifier.php','comment',$message_id);
}
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
dbesc($parent_item['uri']),
intval($importer['uid'])
);

2
include/items.php
View File

@ -2479,7 +2479,7 @@ function local_delivery($importer,$data) {
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
dbesc($parent_uri),
intval($importer['importer_uid'])
);

2
mod/ping.php
View File

@ -134,6 +134,8 @@ function ping_init(&$a) {
function xmlize($href, $name, $url, $photo, $date, $seen, $message){
$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
call_hooks('ping_xmlize', $data);
$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
return sprintf ( $notsxml,
xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)

4
mod/settings.php
View File

@ -696,8 +696,8 @@ function settings_content(&$a) {
$allowed_themes_raw = explode(',',$allowed_themes_str);
$allowed_themes = array();
if(count($allowed_themes_raw))
foreach($allowed_themes_raw as $x)
if(strlen(trim($x)))
foreach($allowed_themes_raw as $x)
if(strlen(trim($x)) && is_dir("view/theme/$x"))
$allowed_themes[] = trim($x);

36
mod/wall_upload.php
View File

@ -5,19 +5,26 @@ require_once('Photo.php');
function wall_upload_post(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
if(! x($_FILES,'media')) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
}
else {
$user_info = api_get_user($a);
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($user_info['screen_name'])
);
}
}
else
return;
$can_post = false;
$visitor = 0;
@ -47,12 +54,19 @@ function wall_upload_post(&$a) {
killme();
}
if(! x($_FILES,'userfile'))
if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
killme();
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
if(x($_FILES,'userfile')) {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
}
elseif(x($_FILES,'media')) {
$src = $_FILES['media']['tmp_name'];
$filename = basename($_FILES['media']['name']);
$filesize = intval($_FILES['media']['size']);
}
$maximagesize = get_config('system','maximagesize');

197
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 2.3.1319\n"
"Project-Id-Version: 2.3.1320\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-21 10:00-0700\n"
"POT-Creation-Date: 2012-04-22 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"
@ -158,8 +158,6 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90
#: ../../view/theme/diabook-red/config.php:76
#: ../../view/theme/diabook-blue/config.php:76
#: ../../view/theme/diabook/diabook-green/config.php:76
#: ../../view/theme/diabook/diabook-red/config.php:76
#: ../../view/theme/diabook/diabook-blue/config.php:76
@ -167,9 +165,7 @@ msgstr ""
#: ../../view/theme/diabook/diabook-aerith/config.php:76
#: ../../view/theme/diabook/diabook-pink/config.php:76
#: ../../view/theme/diabook/config.php:91
#: ../../view/theme/quattro/config.php:52
#: ../../view/theme/diabook-aerith/config.php:76
#: ../../include/conversation.php:555
#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555
msgid "Submit"
msgstr ""
@ -227,17 +223,15 @@ msgstr ""
msgid "link to source"
msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:231
#: ../../view/theme/diabook-blue/theme.php:231
#: ../../mod/events.php:296
#: ../../view/theme/diabook/diabook-green/theme.php:233
#: ../../view/theme/diabook/diabook-red/theme.php:231
#: ../../view/theme/diabook/diabook-blue/theme.php:231
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook/diabook-dark/theme.php:233
#: ../../view/theme/diabook/diabook-aerith/theme.php:233
#: ../../view/theme/diabook/diabook-pink/theme.php:233
#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
#: ../../boot.php:1471
#: ../../include/nav.php:52 ../../boot.php:1471
msgid "Events"
msgstr ""
@ -369,8 +363,6 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook-red/theme.php:115
#: ../../view/theme/diabook-blue/theme.php:115
#: ../../view/theme/diabook/diabook-green/theme.php:116
#: ../../view/theme/diabook/diabook-red/theme.php:115
#: ../../view/theme/diabook/diabook-blue/theme.php:115
@ -378,7 +370,6 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:116
#: ../../view/theme/diabook/diabook-aerith/theme.php:116
#: ../../view/theme/diabook/diabook-pink/theme.php:116
#: ../../view/theme/diabook-aerith/theme.php:116
msgid "Contact Photos"
msgstr ""
@ -401,8 +392,6 @@ msgstr ""
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook-red/theme.php:116
#: ../../view/theme/diabook-blue/theme.php:116
#: ../../view/theme/diabook/diabook-green/theme.php:117
#: ../../view/theme/diabook/diabook-red/theme.php:116
#: ../../view/theme/diabook/diabook-blue/theme.php:116
@ -410,7 +399,6 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:117
#: ../../view/theme/diabook/diabook-aerith/theme.php:117
#: ../../view/theme/diabook/diabook-pink/theme.php:117
#: ../../view/theme/diabook-aerith/theme.php:117
msgid "Profile Photos"
msgstr ""
@ -432,8 +420,6 @@ msgstr ""
#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook-red/theme.php:87
#: ../../view/theme/diabook-blue/theme.php:87
#: ../../view/theme/diabook/diabook-green/theme.php:88
#: ../../view/theme/diabook/diabook-red/theme.php:87
#: ../../view/theme/diabook/diabook-blue/theme.php:87
@ -441,9 +427,8 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:88
#: ../../view/theme/diabook/diabook-aerith/theme.php:88
#: ../../view/theme/diabook/diabook-pink/theme.php:88
#: ../../view/theme/diabook-aerith/theme.php:88 ../../include/text.php:1304
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
#: ../../include/text.php:1304 ../../include/diaspora.php:1654
#: ../../include/conversation.php:53 ../../include/conversation.php:126
msgid "photo"
msgstr ""
@ -616,16 +601,15 @@ msgstr ""
msgid "Not available."
msgstr ""
#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:233
#: ../../view/theme/diabook-blue/theme.php:233
#: ../../mod/community.php:30
#: ../../view/theme/diabook/diabook-green/theme.php:235
#: ../../view/theme/diabook/diabook-red/theme.php:233
#: ../../view/theme/diabook/diabook-blue/theme.php:233
#: ../../view/theme/diabook/theme.php:253
#: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook/diabook-dark/theme.php:235
#: ../../view/theme/diabook/diabook-aerith/theme.php:235
#: ../../view/theme/diabook/diabook-pink/theme.php:235
#: ../../view/theme/diabook-aerith/theme.php:235 ../../include/nav.php:101
#: ../../include/nav.php:101
msgid "Community"
msgstr ""
@ -1266,17 +1250,15 @@ msgstr ""
msgid "Personal"
msgstr ""
#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:227
#: ../../view/theme/diabook-blue/theme.php:227
#: ../../mod/notifications.php:90
#: ../../view/theme/diabook/diabook-green/theme.php:229
#: ../../view/theme/diabook/diabook-red/theme.php:227
#: ../../view/theme/diabook/diabook-blue/theme.php:227
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook/theme.php:246
#: ../../view/theme/diabook/diabook-dark/theme.php:229
#: ../../view/theme/diabook/diabook-aerith/theme.php:229
#: ../../view/theme/diabook/diabook-pink/theme.php:229
#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:77
#: ../../include/nav.php:115
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr ""
@ -1652,16 +1634,15 @@ msgstr ""
msgid "Edit contact"
msgstr ""
#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:229
#: ../../view/theme/diabook-blue/theme.php:229
#: ../../mod/contacts.php:529
#: ../../view/theme/diabook/diabook-green/theme.php:231
#: ../../view/theme/diabook/diabook-red/theme.php:229
#: ../../view/theme/diabook/diabook-blue/theme.php:229
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook/diabook-dark/theme.php:231
#: ../../view/theme/diabook/diabook-aerith/theme.php:231
#: ../../view/theme/diabook/diabook-pink/theme.php:231
#: ../../view/theme/diabook-aerith/theme.php:231 ../../include/nav.php:139
#: ../../include/nav.php:139
msgid "Contacts"
msgstr ""
@ -2571,16 +2552,14 @@ msgstr ""
msgid "Profile Visibility Editor"
msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:228
#: ../../view/theme/diabook-blue/theme.php:228
#: ../../mod/profperm.php:103
#: ../../view/theme/diabook/diabook-green/theme.php:230
#: ../../view/theme/diabook/diabook-red/theme.php:228
#: ../../view/theme/diabook/diabook-blue/theme.php:228
#: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook/diabook-dark/theme.php:230
#: ../../view/theme/diabook/diabook-aerith/theme.php:230
#: ../../view/theme/diabook/diabook-pink/theme.php:230
#: ../../view/theme/diabook-aerith/theme.php:230
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1458
msgid "Profile"
@ -2766,10 +2745,6 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1655
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook-red/theme.php:82
#: ../../view/theme/diabook-red/theme.php:91
#: ../../view/theme/diabook-blue/theme.php:82
#: ../../view/theme/diabook-blue/theme.php:91
#: ../../view/theme/diabook/diabook-green/theme.php:83
#: ../../view/theme/diabook/diabook-green/theme.php:92
#: ../../view/theme/diabook/diabook-red/theme.php:82
@ -2784,8 +2759,6 @@ msgstr ""
#: ../../view/theme/diabook/diabook-aerith/theme.php:92
#: ../../view/theme/diabook/diabook-pink/theme.php:83
#: ../../view/theme/diabook/diabook-pink/theme.php:92
#: ../../view/theme/diabook-aerith/theme.php:83
#: ../../view/theme/diabook-aerith/theme.php:92
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130
@ -2794,8 +2767,6 @@ msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook-red/theme.php:96
#: ../../view/theme/diabook-blue/theme.php:96
#: ../../view/theme/diabook/diabook-green/theme.php:97
#: ../../view/theme/diabook/diabook-red/theme.php:96
#: ../../view/theme/diabook/diabook-blue/theme.php:96
@ -2803,7 +2774,6 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:97
#: ../../view/theme/diabook/diabook-aerith/theme.php:97
#: ../../view/theme/diabook/diabook-pink/theme.php:97
#: ../../view/theme/diabook-aerith/theme.php:97
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
@ -2824,17 +2794,15 @@ msgstr ""
msgid "Access denied."
msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook-red/theme.php:230
#: ../../view/theme/diabook-blue/theme.php:230
#: ../../mod/fbrowser.php:23
#: ../../view/theme/diabook/diabook-green/theme.php:232
#: ../../view/theme/diabook/diabook-red/theme.php:230
#: ../../view/theme/diabook/diabook-blue/theme.php:230
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook/diabook-dark/theme.php:232
#: ../../view/theme/diabook/diabook-aerith/theme.php:232
#: ../../view/theme/diabook/diabook-pink/theme.php:232
#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
#: ../../boot.php:1463
#: ../../include/nav.php:51 ../../boot.php:1463
msgid "Photos"
msgstr ""
@ -3986,16 +3954,14 @@ msgstr ""
msgid "No entries."
msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:143
#: ../../view/theme/diabook-blue/theme.php:143
#: ../../mod/suggest.php:38
#: ../../view/theme/diabook/diabook-green/theme.php:145
#: ../../view/theme/diabook/diabook-red/theme.php:143
#: ../../view/theme/diabook/diabook-blue/theme.php:143
#: ../../view/theme/diabook/theme.php:159
#: ../../view/theme/diabook/theme.php:158
#: ../../view/theme/diabook/diabook-dark/theme.php:145
#: ../../view/theme/diabook/diabook-aerith/theme.php:145
#: ../../view/theme/diabook/diabook-pink/theme.php:145
#: ../../view/theme/diabook-aerith/theme.php:145
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr ""
@ -4010,16 +3976,14 @@ msgstr ""
msgid "Ignore/Hide"
msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:141
#: ../../view/theme/diabook-blue/theme.php:141
#: ../../mod/directory.php:47
#: ../../view/theme/diabook/diabook-green/theme.php:143
#: ../../view/theme/diabook/diabook-red/theme.php:141
#: ../../view/theme/diabook/diabook-blue/theme.php:141
#: ../../view/theme/diabook/theme.php:157
#: ../../view/theme/diabook/theme.php:156
#: ../../view/theme/diabook/diabook-dark/theme.php:143
#: ../../view/theme/diabook/diabook-aerith/theme.php:143
#: ../../view/theme/diabook/diabook-pink/theme.php:143
#: ../../view/theme/diabook-aerith/theme.php:143
msgid "Global Directory"
msgstr ""
@ -4551,8 +4515,6 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook-red/theme.php:79
#: ../../view/theme/diabook-blue/theme.php:79
#: ../../view/theme/diabook/diabook-green/theme.php:80
#: ../../view/theme/diabook/diabook-red/theme.php:79
#: ../../view/theme/diabook/diabook-blue/theme.php:79
@ -4560,8 +4522,8 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:80
#: ../../view/theme/diabook/diabook-aerith/theme.php:80
#: ../../view/theme/diabook/diabook-pink/theme.php:80
#: ../../view/theme/diabook-aerith/theme.php:80 ../../include/text.php:1302
#: ../../include/conversation.php:45 ../../include/conversation.php:118
#: ../../include/text.php:1302 ../../include/conversation.php:45
#: ../../include/conversation.php:118
msgid "event"
msgstr ""
@ -5458,8 +5420,6 @@ msgstr ""
msgid "Post to Posterous by default"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:28
#: ../../view/theme/diabook-blue/theme.php:28
#: ../../view/theme/diabook/diabook-green/theme.php:29
#: ../../view/theme/diabook/diabook-red/theme.php:28
#: ../../view/theme/diabook/diabook-blue/theme.php:28
@ -5467,12 +5427,9 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:29
#: ../../view/theme/diabook/diabook-aerith/theme.php:29
#: ../../view/theme/diabook/diabook-pink/theme.php:29
#: ../../view/theme/diabook-aerith/theme.php:29
msgid "Last users"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:57
#: ../../view/theme/diabook-blue/theme.php:57
#: ../../view/theme/diabook/diabook-green/theme.php:58
#: ../../view/theme/diabook/diabook-red/theme.php:57
#: ../../view/theme/diabook/diabook-blue/theme.php:57
@ -5480,12 +5437,9 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:58
#: ../../view/theme/diabook/diabook-aerith/theme.php:58
#: ../../view/theme/diabook/diabook-pink/theme.php:58
#: ../../view/theme/diabook-aerith/theme.php:58
msgid "Last likes"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:102
#: ../../view/theme/diabook-blue/theme.php:102
#: ../../view/theme/diabook/diabook-green/theme.php:103
#: ../../view/theme/diabook/diabook-red/theme.php:102
#: ../../view/theme/diabook/diabook-blue/theme.php:102
@ -5493,207 +5447,164 @@ msgstr ""
#: ../../view/theme/diabook/diabook-dark/theme.php:103
#: ../../view/theme/diabook/diabook-aerith/theme.php:103
#: ../../view/theme/diabook/diabook-pink/theme.php:103
#: ../../view/theme/diabook-aerith/theme.php:103
msgid "Last photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:139
#: ../../view/theme/diabook-blue/theme.php:139
#: ../../view/theme/diabook/diabook-green/theme.php:141
#: ../../view/theme/diabook/diabook-red/theme.php:139
#: ../../view/theme/diabook/diabook-blue/theme.php:139
#: ../../view/theme/diabook/theme.php:155
#: ../../view/theme/diabook/theme.php:154
#: ../../view/theme/diabook/diabook-dark/theme.php:141
#: ../../view/theme/diabook/diabook-aerith/theme.php:141
#: ../../view/theme/diabook/diabook-pink/theme.php:141
#: ../../view/theme/diabook-aerith/theme.php:141
msgid "Find Friends"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:140
#: ../../view/theme/diabook-blue/theme.php:140
#: ../../view/theme/diabook/diabook-green/theme.php:142
#: ../../view/theme/diabook/diabook-red/theme.php:140
#: ../../view/theme/diabook/diabook-blue/theme.php:140
#: ../../view/theme/diabook/theme.php:156
#: ../../view/theme/diabook/theme.php:155
#: ../../view/theme/diabook/diabook-dark/theme.php:142
#: ../../view/theme/diabook/diabook-aerith/theme.php:142
#: ../../view/theme/diabook/diabook-pink/theme.php:142
#: ../../view/theme/diabook-aerith/theme.php:142
msgid "Local Directory"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:142
#: ../../view/theme/diabook-blue/theme.php:142
#: ../../view/theme/diabook/diabook-green/theme.php:144
#: ../../view/theme/diabook/diabook-red/theme.php:142
#: ../../view/theme/diabook/diabook-blue/theme.php:142
#: ../../view/theme/diabook/theme.php:158
#: ../../view/theme/diabook/theme.php:157
#: ../../view/theme/diabook/diabook-dark/theme.php:144
#: ../../view/theme/diabook/diabook-aerith/theme.php:144
#: ../../view/theme/diabook/diabook-pink/theme.php:144
#: ../../view/theme/diabook-aerith/theme.php:144
#: ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:144
#: ../../view/theme/diabook-blue/theme.php:144
#: ../../view/theme/diabook/diabook-green/theme.php:146
#: ../../view/theme/diabook/diabook-red/theme.php:144
#: ../../view/theme/diabook/diabook-blue/theme.php:144
#: ../../view/theme/diabook/theme.php:160
#: ../../view/theme/diabook/theme.php:159
#: ../../view/theme/diabook/diabook-dark/theme.php:146
#: ../../view/theme/diabook/diabook-aerith/theme.php:146
#: ../../view/theme/diabook/diabook-pink/theme.php:146
#: ../../view/theme/diabook-aerith/theme.php:146
#: ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:159
#: ../../view/theme/diabook-red/theme.php:234
#: ../../view/theme/diabook-blue/theme.php:159
#: ../../view/theme/diabook-blue/theme.php:234
#: ../../view/theme/diabook/diabook-green/theme.php:161
#: ../../view/theme/diabook/diabook-green/theme.php:236
#: ../../view/theme/diabook/diabook-red/theme.php:159
#: ../../view/theme/diabook/diabook-red/theme.php:234
#: ../../view/theme/diabook/diabook-blue/theme.php:159
#: ../../view/theme/diabook/diabook-blue/theme.php:234
#: ../../view/theme/diabook/theme.php:176
#: ../../view/theme/diabook/theme.php:254
#: ../../view/theme/diabook/theme.php:175
#: ../../view/theme/diabook/theme.php:253
#: ../../view/theme/diabook/diabook-dark/theme.php:161
#: ../../view/theme/diabook/diabook-dark/theme.php:236
#: ../../view/theme/diabook/diabook-aerith/theme.php:161
#: ../../view/theme/diabook/diabook-aerith/theme.php:236
#: ../../view/theme/diabook/diabook-pink/theme.php:161
#: ../../view/theme/diabook/diabook-pink/theme.php:236
#: ../../view/theme/diabook-aerith/theme.php:161
#: ../../view/theme/diabook-aerith/theme.php:236
msgid "Community Pages"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:192
#: ../../view/theme/diabook-blue/theme.php:192
#: ../../view/theme/diabook/diabook-green/theme.php:194
#: ../../view/theme/diabook/diabook-red/theme.php:192
#: ../../view/theme/diabook/diabook-blue/theme.php:192
#: ../../view/theme/diabook/theme.php:209
#: ../../view/theme/diabook/theme.php:208
#: ../../view/theme/diabook/diabook-dark/theme.php:194
#: ../../view/theme/diabook/diabook-aerith/theme.php:194
#: ../../view/theme/diabook/diabook-pink/theme.php:194
#: ../../view/theme/diabook-aerith/theme.php:194
msgid "Help or @NewHere ?"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:198
#: ../../view/theme/diabook-blue/theme.php:198
#: ../../view/theme/diabook/diabook-green/theme.php:200
#: ../../view/theme/diabook/diabook-red/theme.php:198
#: ../../view/theme/diabook/diabook-blue/theme.php:198
#: ../../view/theme/diabook/theme.php:215
#: ../../view/theme/diabook/theme.php:214
#: ../../view/theme/diabook/diabook-dark/theme.php:200
#: ../../view/theme/diabook/diabook-aerith/theme.php:200
#: ../../view/theme/diabook/diabook-pink/theme.php:200
#: ../../view/theme/diabook-aerith/theme.php:200
msgid "Connect Services"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:227
#: ../../view/theme/diabook-blue/theme.php:227
#: ../../view/theme/diabook/diabook-green/theme.php:229
#: ../../view/theme/diabook/diabook-red/theme.php:227
#: ../../view/theme/diabook/diabook-blue/theme.php:227
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook/theme.php:246
#: ../../view/theme/diabook/diabook-dark/theme.php:229
#: ../../view/theme/diabook/diabook-aerith/theme.php:229
#: ../../view/theme/diabook/diabook-pink/theme.php:229
#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:49
#: ../../include/nav.php:115
#: ../../include/nav.php:49 ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:228
#: ../../view/theme/diabook-blue/theme.php:228
#: ../../view/theme/diabook/diabook-green/theme.php:230
#: ../../view/theme/diabook/diabook-red/theme.php:228
#: ../../view/theme/diabook/diabook-blue/theme.php:228
#: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook/diabook-dark/theme.php:230
#: ../../view/theme/diabook/diabook-aerith/theme.php:230
#: ../../view/theme/diabook/diabook-pink/theme.php:230
#: ../../view/theme/diabook-aerith/theme.php:230 ../../include/nav.php:50
#: ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:229
#: ../../view/theme/diabook-blue/theme.php:229
#: ../../view/theme/diabook/diabook-green/theme.php:231
#: ../../view/theme/diabook/diabook-red/theme.php:229
#: ../../view/theme/diabook/diabook-blue/theme.php:229
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook/diabook-dark/theme.php:231
#: ../../view/theme/diabook/diabook-aerith/theme.php:231
#: ../../view/theme/diabook/diabook-pink/theme.php:231
#: ../../view/theme/diabook-aerith/theme.php:231
msgid "Your contacts"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:230
#: ../../view/theme/diabook-blue/theme.php:230
#: ../../view/theme/diabook/diabook-green/theme.php:232
#: ../../view/theme/diabook/diabook-red/theme.php:230
#: ../../view/theme/diabook/diabook-blue/theme.php:230
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook/diabook-dark/theme.php:232
#: ../../view/theme/diabook/diabook-aerith/theme.php:232
#: ../../view/theme/diabook/diabook-pink/theme.php:232
#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
#: ../../include/nav.php:51
msgid "Your photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:231
#: ../../view/theme/diabook-blue/theme.php:231
#: ../../view/theme/diabook/diabook-green/theme.php:233
#: ../../view/theme/diabook/diabook-red/theme.php:231
#: ../../view/theme/diabook/diabook-blue/theme.php:231
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook/diabook-dark/theme.php:233
#: ../../view/theme/diabook/diabook-aerith/theme.php:233
#: ../../view/theme/diabook/diabook-pink/theme.php:233
#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
#: ../../include/nav.php:52
msgid "Your events"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:232
#: ../../view/theme/diabook-blue/theme.php:232
#: ../../view/theme/diabook/diabook-green/theme.php:234
#: ../../view/theme/diabook/diabook-red/theme.php:232
#: ../../view/theme/diabook/diabook-blue/theme.php:232
#: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook/diabook-dark/theme.php:234
#: ../../view/theme/diabook/diabook-aerith/theme.php:234
#: ../../view/theme/diabook/diabook-pink/theme.php:234
#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
#: ../../include/nav.php:53
msgid "Personal notes"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:232
#: ../../view/theme/diabook-blue/theme.php:232
#: ../../view/theme/diabook/diabook-green/theme.php:234
#: ../../view/theme/diabook/diabook-red/theme.php:232
#: ../../view/theme/diabook/diabook-blue/theme.php:232
#: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook/diabook-dark/theme.php:234
#: ../../view/theme/diabook/diabook-aerith/theme.php:234
#: ../../view/theme/diabook/diabook-pink/theme.php:234
#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
#: ../../include/nav.php:53
msgid "Your personal photos"
msgstr ""
#: ../../view/theme/diabook-red/config.php:78
#: ../../view/theme/diabook-blue/config.php:78
#: ../../view/theme/diabook/diabook-green/config.php:78
#: ../../view/theme/diabook/diabook-red/config.php:78
#: ../../view/theme/diabook/diabook-blue/config.php:78
@ -5702,12 +5613,9 @@ msgstr ""
#: ../../view/theme/diabook/diabook-pink/config.php:78
#: ../../view/theme/diabook/config.php:93
#: ../../view/theme/quattro/config.php:54
#: ../../view/theme/diabook-aerith/config.php:78
msgid "Theme settings"
msgstr ""
#: ../../view/theme/diabook-red/config.php:79
#: ../../view/theme/diabook-blue/config.php:79
#: ../../view/theme/diabook/diabook-green/config.php:79
#: ../../view/theme/diabook/diabook-red/config.php:79
#: ../../view/theme/diabook/diabook-blue/config.php:79
@ -5715,12 +5623,9 @@ msgstr ""
#: ../../view/theme/diabook/diabook-aerith/config.php:79
#: ../../view/theme/diabook/diabook-pink/config.php:79
#: ../../view/theme/diabook/config.php:94
#: ../../view/theme/diabook-aerith/config.php:79
msgid "Set font-size for posts and comments"
msgstr ""
#: ../../view/theme/diabook-red/config.php:80
#: ../../view/theme/diabook-blue/config.php:80
#: ../../view/theme/diabook/diabook-green/config.php:80
#: ../../view/theme/diabook/diabook-red/config.php:80
#: ../../view/theme/diabook/diabook-blue/config.php:80
@ -5728,12 +5633,9 @@ msgstr ""
#: ../../view/theme/diabook/diabook-aerith/config.php:80
#: ../../view/theme/diabook/diabook-pink/config.php:80
#: ../../view/theme/diabook/config.php:95
#: ../../view/theme/diabook-aerith/config.php:80
msgid "Set line-height for posts and comments"
msgstr ""
#: ../../view/theme/diabook-red/config.php:81
#: ../../view/theme/diabook-blue/config.php:81
#: ../../view/theme/diabook/diabook-green/config.php:81
#: ../../view/theme/diabook/diabook-red/config.php:81
#: ../../view/theme/diabook/diabook-blue/config.php:81
@ -5741,7 +5643,6 @@ msgstr ""
#: ../../view/theme/diabook/diabook-aerith/config.php:81
#: ../../view/theme/diabook/diabook-pink/config.php:81
#: ../../view/theme/diabook/config.php:96
#: ../../view/theme/diabook-aerith/config.php:81
msgid "Set resolution for middle column"
msgstr ""

3
view/theme/diabook/admin_users.tpl
View File

@ -14,8 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>

6
view/theme/diabook/diabook-aerith/admin_users.tpl
View File

@ -14,7 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
@ -72,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

2
view/theme/diabook/diabook-aerith/nav.tpl
View File

@ -138,7 +138,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/diabook-aerith/style-network-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1395,7 +1395,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-aerith/style-network.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1388,7 +1388,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-aerith/style-profile-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1370,7 +1370,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-aerith/style-profile.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1362,7 +1362,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-aerith/style-wide.css
View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1624,7 +1624,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-aerith/style.css
View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1616,7 +1616,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

6
view/theme/diabook/diabook-blue/admin_users.tpl
View File

@ -14,7 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
@ -72,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

2
view/theme/diabook/diabook-blue/nav.tpl
View File

@ -138,7 +138,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/diabook-blue/style-network-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1357,7 +1357,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-blue/style-network.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-blue/style-profile-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-blue/style-profile.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-blue/style-wide.css
View File

@ -149,7 +149,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1581,7 +1581,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-blue/style.css
View File

@ -149,7 +149,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1574,7 +1574,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

6
view/theme/diabook/diabook-dark/admin_users.tpl
View File

@ -14,7 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
@ -72,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

2
view/theme/diabook/diabook-dark/nav.tpl
View File

@ -138,7 +138,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/diabook-dark/style-network-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-dark/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-dark/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1372,7 +1372,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-dark/style-network.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-dark/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-dark/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1351,7 +1351,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-dark/style-profile-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-dark/style-profile.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-dark/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-dark/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-dark/style-wide.css
View File

@ -149,7 +149,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1581,7 +1581,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-dark/style.css
View File

@ -149,7 +149,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-dark/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-dark/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1574,7 +1574,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

6
view/theme/diabook/diabook-green/admin_users.tpl
View File

@ -14,7 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
@ -72,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

2
view/theme/diabook/diabook-green/nav.tpl
View File

@ -138,7 +138,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/diabook-green/style-network-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-green/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-green/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1371,7 +1371,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-green/style-network.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-green/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-green/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1365,7 +1365,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-green/style-profile-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-green/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-green/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1346,7 +1346,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-green/style-profile.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-green/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-green/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1338,7 +1338,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-green/style-wide.css
View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1601,7 +1601,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-green/style.css
View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1600,7 +1600,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

6
view/theme/diabook/diabook-pink/admin_users.tpl
View File

@ -14,7 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
@ -72,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

2
view/theme/diabook/diabook-pink/nav.tpl
View File

@ -138,7 +138,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/diabook-pink/style-network-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-pink/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-pink/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1371,7 +1371,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-pink/style-network.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-pink/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-pink/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1365,7 +1365,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-pink/style-profile-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-pink/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-pink/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1346,7 +1346,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-pink/style-profile.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-pink/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-pink/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1338,7 +1338,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-pink/style-wide.css
View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1601,7 +1601,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-pink/style.css
View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1600,7 +1600,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

6
view/theme/diabook/diabook-red/admin_users.tpl
View File

@ -14,7 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
@ -72,8 +72,8 @@
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}

2
view/theme/diabook/diabook-red/nav.tpl
View File

@ -138,7 +138,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

4
view/theme/diabook/diabook-red/style-network-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-red/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-red/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1391,7 +1391,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-red/style-network.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-red/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-red/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1384,7 +1384,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-red/style-profile-wide.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-red/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-red/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-red/style-profile.css
View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-red/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-red/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1342,7 +1342,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-red/style-wide.css
View File

@ -149,7 +149,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1609,7 +1609,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/diabook-red/style.css
View File

@ -149,7 +149,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1602,7 +1602,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

4
view/theme/diabook/footer.tpl Normal file
View File

@ -0,0 +1,4 @@
<div style="display: table-cell"></div>
<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
</div>

2
view/theme/diabook/nav.tpl
View File

@ -136,7 +136,7 @@
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:$('html, body').animate({scrollTop:0}, 'slow'); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>

2
view/theme/diabook/oembed_video.tpl
View File

@ -1,4 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

8
view/theme/diabook/style-network-wide.css
View File

@ -122,7 +122,7 @@
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;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {
@ -1480,14 +1480,14 @@ transition: all 0.2s ease-in-out;
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #3465A4;
color: #999;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #3465A4;
color: #999;
}
.wwto {
position: absolute !important;

8
view/theme/diabook/style-network.css
View File

@ -122,7 +122,7 @@
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;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1326,7 +1326,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {
@ -1471,14 +1471,14 @@ transition: all 0.2s ease-in-out;
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #3465A4;
color: #999;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #3465A4;
color: #999;
}
.wwto {
position: absolute !important;

8
view/theme/diabook/style-profile-wide.css
View File

@ -121,7 +121,7 @@
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;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1309,7 +1309,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {
@ -1455,14 +1455,14 @@ transition: all 0.2s ease-in-out;
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #3465A4;
color: #999;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #3465A4;
color: #999;
}
.wwto {
position: absolute !important;

8
view/theme/diabook/style-profile.css
View File

@ -121,7 +121,7 @@
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;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1302,7 +1302,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {
@ -1447,14 +1447,14 @@ transition: all 0.2s ease-in-out;
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #3465A4;
color: #999;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #3465A4;
color: #999;
}
.wwto {
position: absolute !important;

8
view/theme/diabook/style-wide.css
View File

@ -150,7 +150,7 @@
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;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1457,7 +1457,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-photo-container .wall-item-content {
@ -1690,14 +1690,14 @@ body .pageheader{
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #3465A4;
color: #999;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #3465A4;
color: #999;
}
.wwto {
position: absolute !important;

8
view/theme/diabook/style.css
View File

@ -150,7 +150,7 @@
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;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1457,7 +1457,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-photo-container .wall-item-content {
@ -1688,14 +1688,14 @@ body .pageheader{
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #3465A4;
color: #999;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #3465A4;
color: #999;
}
.wwto {
position: absolute !important;

16
view/theme/diabook/theme.php
View File

@ -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.021)
* Version: (Version: 1.022)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.021)";
$diabook_version = "Diabook (Version: 1.022)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -291,7 +291,9 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//footer
$tpl = get_markup_template('footer.tpl');
$a->page['footer'] .= replace_macros($tpl, array());
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
@ -355,12 +357,18 @@ $(document).ready(function() {
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
$("a[href=#top]").click(function() {
$("html, body").animate({scrollTop:0}, "slow");
return false;
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");