bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

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

Browse source 
* remotes/upstream/master:
  well that was a silly mistake...
  setting wasn't being applied
  rev update
  diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
  diabook: theme-settings: users can set font-size and line-height for posts and comments
  diabook-themes: small fixes
  quattro: language icon in navbar
  move html out of lang_selector() and new template lang_selector.tpl
  display settings: show theme screenshot on page load
  quattro: add admin theme settigs. darker items background with a bottom border.
  admin: change global theme settings
  quattro: work on     "like" activitiy items less visible     fixes to widths     popup notification out of navbar     category input in jot
  validate_url allow naked subdomain if is "localhost"

* master:
This commit is contained in:
Simon L'nu 2012-04-13 19:26:18 -04:00
commit a3d95f79f2
74 changed files with 2084 additions and 837 deletions
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'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1310' ); define ( 'FRIENDICA_VERSION', '2.3.1311' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 ); define ( 'DB_UPDATE_VERSION', 1138 );

5
include/network.php
View file

@ -587,8 +587,9 @@ function fetch_xrd_links($url) {
if(! function_exists('validate_url')) { if(! function_exists('validate_url')) {
function validate_url(&$url) { function validate_url(&$url) {
// no naked subdomains
if(strpos($url,'.') === false) // no naked subdomains (allow localhost for tests)
if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
return false; return false;
if(substr($url,0,4) != 'http') if(substr($url,0,4) != 'http')
$url = 'http://' . $url; $url = 'http://' . $url;

23
include/text.php
View file

@ -1068,10 +1068,12 @@ function unamp($s) {
if(! function_exists('lang_selector')) { if(! function_exists('lang_selector')) {
function lang_selector() { function lang_selector() {
global $lang; global $lang;
$o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
$o .= '<div id="language-selector" style="display: none;" >';
$o .= '<form action="#" method="post" ><select name="system_language" onchange="this.form.submit();" >';
$langs = glob('view/*/strings.php'); $langs = glob('view/*/strings.php');
$lang_options = array();
$selected = "";
if(is_array($langs) && count($langs)) { if(is_array($langs) && count($langs)) {
$langs[] = ''; $langs[] = '';
if(! in_array('view/en/strings.php',$langs)) if(! in_array('view/en/strings.php',$langs))
@ -1079,17 +1081,22 @@ function lang_selector() {
asort($langs); asort($langs);
foreach($langs as $l) { foreach($langs as $l) {
if($l == '') { if($l == '') {
$default_selected = ((! x($_SESSION,'language')) ? ' selected="selected" ' : ''); $lang_options[""] = t('default');
$o .= '<option value="" ' . $default_selected . '>' . t('default') . '</option>';
continue; continue;
} }
$ll = substr($l,5); $ll = substr($l,5);
$ll = substr($ll,0,strrpos($ll,'/')); $ll = substr($ll,0,strrpos($ll,'/'));
$selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : ''); $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected);
$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>'; $lang_options[$ll]=$ll;
} }
} }
$o .= '</select></form></div>';
$tpl = get_markup_template("lang_selector.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Select an alternate language'),
'$langs' => array($lang_options, $selected),
));
return $o; return $o;
}} }}

40
mod/admin.php
View file

@ -40,6 +40,20 @@ function admin_post(&$a){
goaway($a->get_baseurl(true) . '/admin/plugins/' . $a->argv[2] ); goaway($a->get_baseurl(true) . '/admin/plugins/' . $a->argv[2] );
return; // NOTREACHED return; // NOTREACHED
break; break;
case 'themes':
$theme = $a->argv[2];
if (is_file("view/theme/$theme/config.php")){
require_once("view/theme/$theme/config.php");
if (function_exists("theme_admin_post")){
theme_admin_post($a);
}
}
info(t('Theme settings updated.'));
if(is_ajax()) return;
goaway($a->get_baseurl(true) . '/admin/themes/' . $theme );
return;
break;
case 'logs': case 'logs':
admin_page_logs_post($a); admin_page_logs_post($a);
break; break;
@ -129,7 +143,13 @@ function admin_content(&$a) {
} else { } else {
$o = admin_page_summary($a); $o = admin_page_summary($a);
} }
if(is_ajax()) {
echo $o;
killme();
} else {
return $o; return $o;
}
} }
@ -362,7 +382,7 @@ function admin_page_site(&$a) {
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""),
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
'$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
@ -768,14 +788,22 @@ function admin_page_themes(&$a){
} }
$readme=Null; $readme=Null;
if (is_file("view/$theme/README.md")){ if (is_file("view/theme/$theme/README.md")){
$readme = file_get_contents("view/$theme/README.md"); $readme = file_get_contents("view/theme/$theme/README.md");
$readme = Markdown($readme); $readme = Markdown($readme);
} else if (is_file("view/$theme/README")){ } else if (is_file("view/theme/$theme/README")){
$readme = "<pre>". file_get_contents("view/$theme/README") ."</pre>"; $readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
} }
$admin_form=""; $admin_form="";
if (is_file("view/theme/$theme/config.php")){
require_once("view/theme/$theme/config.php");
if(function_exists("theme_admin")){
$admin_form = theme_admin($a);
}
}
$screenshot = array( get_theme_screenshot($theme), t('Screenshot')); $screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
if(! stristr($screenshot[0],$theme)) if(! stristr($screenshot[0],$theme))
@ -805,7 +833,7 @@ function admin_page_themes(&$a){
/** /**
* List plugins * List themes
*/ */
$xthemes = array(); $xthemes = array();

4
mod/notifications.php
View file

@ -151,7 +151,7 @@ function notifications_content(&$a) {
'$fullname' => $rr['fname'], '$fullname' => $rr['fname'],
'$url' => zrl($rr['furl']), '$url' => zrl($rr['furl']),
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => t('Approve'), '$approve' => t('Approve'),
@ -198,7 +198,7 @@ function notifications_content(&$a) {
'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
'$fullname' => $rr['name'], '$fullname' => $rr['name'],
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
'$activity' => array('activity', t('Post a new friend activity'), get_config('system','post_newfriend'), t('if applicable')), '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
'$url' => zrl($rr['url']), '$url' => zrl($rr['url']),
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => t('Approve'), '$approve' => t('Approve'),

1102
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1310\n" "Project-Id-Version: 2.3.1311\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-12 10:00-0700\n" "POT-Creation-Date: 2012-04-13 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -39,8 +39,8 @@ msgstr ""
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
#: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/editpost.php:10 ../../mod/install.php:171
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
#: ../../mod/settings.php:99 ../../mod/settings.php:510 #: ../../mod/settings.php:99 ../../mod/settings.php:514
#: ../../mod/settings.php:515 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@ -50,12 +50,13 @@ msgstr ""
#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
#: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38
#: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/message.php:90 ../../mod/allfriends.php:9
#: ../../mod/wall_upload.php:46 ../../mod/follow.php:8 ../../mod/common.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
#: ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
#: ../../mod/profiles.php:233 ../../mod/delegate.php:6 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:461 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../include/items.php:3132 ../../index.php:305 #: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132
#: ../../index.php:305
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -84,8 +85,8 @@ msgstr ""
msgid "Return to contact editor" msgid "Return to contact editor"
msgstr "" msgstr ""
#: ../../mod/crepair.php:148 ../../mod/settings.php:530 #: ../../mod/crepair.php:148 ../../mod/settings.php:534
#: ../../mod/settings.php:556 ../../mod/admin.php:524 ../../mod/admin.php:533 #: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553
msgid "Name" msgid "Name"
msgstr "" msgstr ""
@ -127,14 +128,14 @@ msgstr ""
#: ../../mod/photos.php:1274 ../../mod/photos.php:1305 #: ../../mod/photos.php:1274 ../../mod/photos.php:1305
#: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/install.php:251 ../../mod/install.php:289
#: ../../mod/localtime.php:45 ../../mod/contacts.php:325 #: ../../mod/localtime.php:45 ../../mod/contacts.php:325
#: ../../mod/settings.php:528 ../../mod/settings.php:674 #: ../../mod/settings.php:532 ../../mod/settings.php:678
#: ../../mod/settings.php:735 ../../mod/settings.php:919 #: ../../mod/settings.php:739 ../../mod/settings.php:930
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:354 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374
#: ../../mod/admin.php:521 ../../mod/admin.php:650 ../../mod/admin.php:822 #: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850
#: ../../mod/admin.php:902 ../../mod/profiles.php:402 ../../mod/invite.php:119 #: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119
#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76 #: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/planets/planets.php:180 #: ../../addon/planets/planets.php:158
#: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/uhremotestorage/uhremotestorage.php:89
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
@ -154,8 +155,9 @@ msgstr ""
#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:90 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 #: ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -213,11 +215,11 @@ msgstr ""
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:244 #: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52 #: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
#: ../../boot.php:1469 #: ../../boot.php:1470
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -267,7 +269,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37 #: ../../mod/events.php:395 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1081 #: ../../include/bb2diaspora.php:260 ../../boot.php:1082
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -276,8 +278,8 @@ msgid "Share this event"
msgstr "" msgstr ""
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:529 #: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
#: ../../mod/settings.php:555 ../../addon/js_upload/js_upload.php:45 #: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
@ -321,24 +323,24 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
#: ../../mod/settings.php:835 ../../mod/settings.php:841 #: ../../mod/settings.php:844 ../../mod/settings.php:850
#: ../../mod/settings.php:849 ../../mod/settings.php:853 #: ../../mod/settings.php:858 ../../mod/settings.php:862
#: ../../mod/settings.php:858 ../../mod/settings.php:864 #: ../../mod/settings.php:867 ../../mod/settings.php:873
#: ../../mod/settings.php:870 ../../mod/settings.php:876 #: ../../mod/settings.php:879 ../../mod/settings.php:885
#: ../../mod/settings.php:910 ../../mod/settings.php:911 #: ../../mod/settings.php:921 ../../mod/settings.php:922
#: ../../mod/settings.php:912 ../../mod/settings.php:913 #: ../../mod/settings.php:923 ../../mod/settings.php:924
#: ../../mod/register.php:532 ../../mod/profiles.php:379 #: ../../mod/register.php:532 ../../mod/profiles.php:475
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
#: ../../mod/settings.php:835 ../../mod/settings.php:841 #: ../../mod/settings.php:844 ../../mod/settings.php:850
#: ../../mod/settings.php:849 ../../mod/settings.php:853 #: ../../mod/settings.php:858 ../../mod/settings.php:862
#: ../../mod/settings.php:858 ../../mod/settings.php:864 #: ../../mod/settings.php:867 ../../mod/settings.php:873
#: ../../mod/settings.php:870 ../../mod/settings.php:876 #: ../../mod/settings.php:879 ../../mod/settings.php:885
#: ../../mod/settings.php:910 ../../mod/settings.php:911 #: ../../mod/settings.php:921 ../../mod/settings.php:922
#: ../../mod/settings.php:912 ../../mod/settings.php:913 #: ../../mod/settings.php:923 ../../mod/settings.php:924
#: ../../mod/register.php:533 ../../mod/profiles.php:380 #: ../../mod/register.php:533 ../../mod/profiles.php:476
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -349,10 +351,10 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 #: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook-red/theme.php:114 #: ../../view/theme/diabook-red/theme.php:113
#: ../../view/theme/diabook-blue/theme.php:114 #: ../../view/theme/diabook-blue/theme.php:113
#: ../../view/theme/diabook/theme.php:117 #: ../../view/theme/diabook/theme.php:117
#: ../../view/theme/diabook-aerith/theme.php:115 #: ../../view/theme/diabook-aerith/theme.php:114
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -375,10 +377,10 @@ msgstr ""
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111 #: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook-red/theme.php:115 #: ../../view/theme/diabook-red/theme.php:114
#: ../../view/theme/diabook-blue/theme.php:115 #: ../../view/theme/diabook-blue/theme.php:114
#: ../../view/theme/diabook/theme.php:118 #: ../../view/theme/diabook/theme.php:118
#: ../../view/theme/diabook-aerith/theme.php:116 #: ../../view/theme/diabook-aerith/theme.php:115
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -400,10 +402,10 @@ msgstr ""
#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook-red/theme.php:86 #: ../../view/theme/diabook-red/theme.php:85
#: ../../view/theme/diabook-blue/theme.php:86 #: ../../view/theme/diabook-blue/theme.php:85
#: ../../view/theme/diabook/theme.php:89 #: ../../view/theme/diabook/theme.php:89
#: ../../view/theme/diabook-aerith/theme.php:87 ../../include/text.php:1297 #: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
msgid "photo" msgid "photo"
@ -551,7 +553,7 @@ msgstr ""
#: ../../mod/photos.php:1233 ../../mod/photos.php:1273 #: ../../mod/photos.php:1233 ../../mod/photos.php:1273
#: ../../mod/photos.php:1304 ../../include/conversation.php:554 #: ../../mod/photos.php:1304 ../../include/conversation.php:554
#: ../../boot.php:494 #: ../../boot.php:495
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -560,8 +562,8 @@ msgstr ""
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1332 ../../mod/settings.php:591 #: ../../mod/photos.php:1332 ../../mod/settings.php:595
#: ../../mod/settings.php:672 ../../mod/group.php:168 ../../mod/admin.php:528 #: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548
#: ../../include/conversation.php:318 ../../include/conversation.php:576 #: ../../include/conversation.php:318 ../../include/conversation.php:576
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -578,10 +580,10 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:246 #: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
#: ../../view/theme/diabook-blue/theme.php:246 #: ../../view/theme/diabook-blue/theme.php:245
#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook/theme.php:253
#: ../../view/theme/diabook-aerith/theme.php:247 ../../include/nav.php:101 #: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "" msgstr ""
@ -633,7 +635,7 @@ msgstr ""
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
#: ../../mod/editpost.php:95 ../../mod/settings.php:590 #: ../../mod/editpost.php:95 ../../mod/settings.php:594
#: ../../include/conversation.php:563 #: ../../include/conversation.php:563
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
@ -863,7 +865,7 @@ msgstr ""
msgid "StatusNet/Federated Social Web" msgid "StatusNet/Federated Social Web"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:625 #: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
#: ../../include/contact_selectors.php:80 #: ../../include/contact_selectors.php:80
msgid "Diaspora" msgid "Diaspora"
msgstr "" msgstr ""
@ -1174,7 +1176,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1025 #: ../../include/contact_widgets.php:9 ../../boot.php:1026
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1222,10 +1224,10 @@ msgstr ""
msgid "Personal" msgid "Personal"
msgstr "" msgstr ""
#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:240 #: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239
#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:239
#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:77 #: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77
#: ../../include/nav.php:115 #: ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -1274,7 +1276,7 @@ msgid "if applicable"
msgstr "" msgstr ""
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
#: ../../mod/admin.php:526 #: ../../mod/admin.php:546
msgid "Approve" msgid "Approve"
msgstr "" msgstr ""
@ -1471,12 +1473,12 @@ msgid "View all contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:303 ../../mod/contacts.php:350 #: ../../mod/contacts.php:303 ../../mod/contacts.php:350
#: ../../mod/admin.php:530 #: ../../mod/admin.php:550
msgid "Unblock" msgid "Unblock"
msgstr "" msgstr ""
#: ../../mod/contacts.php:303 ../../mod/contacts.php:350 #: ../../mod/contacts.php:303 ../../mod/contacts.php:350
#: ../../mod/admin.php:529 #: ../../mod/admin.php:549
msgid "Block" msgid "Block"
msgstr "" msgstr ""
@ -1512,7 +1514,7 @@ msgid "Edit contact notes"
msgstr "" msgstr ""
#: ../../mod/contacts.php:334 ../../mod/contacts.php:507 #: ../../mod/contacts.php:334 ../../mod/contacts.php:507
#: ../../mod/viewcontacts.php:62 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
#, php-format #, php-format
msgid "Visit %s's profile [%s]" msgid "Visit %s's profile [%s]"
msgstr "" msgstr ""
@ -1545,7 +1547,7 @@ msgstr ""
msgid "Update public posts" msgid "Update public posts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:347 ../../mod/admin.php:951 #: ../../mod/contacts.php:347 ../../mod/admin.php:979
msgid "Update now" msgid "Update now"
msgstr "" msgstr ""
@ -1598,14 +1600,14 @@ msgstr ""
msgid "you are a fan of" msgid "you are a fan of"
msgstr "" msgstr ""
#: ../../mod/contacts.php:508 #: ../../mod/contacts.php:508 ../../mod/nogroup.php:41
msgid "Edit contact" msgid "Edit contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:242 #: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:241
#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:139 #: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1650,7 +1652,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:808 #: ../../mod/lostpass.php:83 ../../boot.php:809
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -1694,31 +1696,19 @@ msgstr ""
msgid "Reset" msgid "Reset"
msgstr "" msgstr ""
#: ../../mod/settings.php:49 ../../view/theme/diabook-red/theme.php:288 #: ../../mod/settings.php:49 ../../include/nav.php:137
#: ../../view/theme/diabook-blue/theme.php:287
#: ../../view/theme/diabook/theme.php:298
#: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137
msgid "Account settings" msgid "Account settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:54 ../../view/theme/diabook-red/theme.php:293 #: ../../mod/settings.php:54
#: ../../view/theme/diabook-blue/theme.php:292
#: ../../view/theme/diabook/theme.php:303
#: ../../view/theme/diabook-aerith/theme.php:293
msgid "Display settings" msgid "Display settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:60 ../../view/theme/diabook-red/theme.php:302 #: ../../mod/settings.php:60
#: ../../view/theme/diabook-blue/theme.php:301
#: ../../view/theme/diabook/theme.php:312
#: ../../view/theme/diabook-aerith/theme.php:302
msgid "Connector settings" msgid "Connector settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:65 ../../view/theme/diabook-red/theme.php:307 #: ../../mod/settings.php:65
#: ../../view/theme/diabook-blue/theme.php:306
#: ../../view/theme/diabook/theme.php:317
#: ../../view/theme/diabook-aerith/theme.php:307
msgid "Plugin settings" msgid "Plugin settings"
msgstr "" msgstr ""
@ -1726,14 +1716,11 @@ msgstr ""
msgid "Connected apps" msgid "Connected apps"
msgstr "" msgstr ""
#: ../../mod/settings.php:75 ../../view/theme/diabook-red/theme.php:317 #: ../../mod/settings.php:75
#: ../../view/theme/diabook-blue/theme.php:316
#: ../../view/theme/diabook/theme.php:327
#: ../../view/theme/diabook-aerith/theme.php:317
msgid "Export personal data" msgid "Export personal data"
msgstr "" msgstr ""
#: ../../mod/settings.php:83 ../../mod/admin.php:611 ../../mod/admin.php:789 #: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
#: ../../include/nav.php:137 #: ../../include/nav.php:137
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -1742,8 +1729,8 @@ msgstr ""
msgid "Missing some important data!" msgid "Missing some important data!"
msgstr "" msgstr ""
#: ../../mod/settings.php:129 ../../mod/settings.php:554 #: ../../mod/settings.php:129 ../../mod/settings.php:558
#: ../../mod/admin.php:75 #: ../../mod/admin.php:89
msgid "Update" msgid "Update"
msgstr "" msgstr ""
@ -1771,416 +1758,428 @@ msgstr ""
msgid "Password update failed. Please try again." msgid "Password update failed. Please try again."
msgstr "" msgstr ""
#: ../../mod/settings.php:377 #: ../../mod/settings.php:379
msgid " Please use a shorter name." msgid " Please use a shorter name."
msgstr "" msgstr ""
#: ../../mod/settings.php:379 #: ../../mod/settings.php:381
msgid " Name too short." msgid " Name too short."
msgstr "" msgstr ""
#: ../../mod/settings.php:385 #: ../../mod/settings.php:387
msgid " Not valid email." msgid " Not valid email."
msgstr "" msgstr ""
#: ../../mod/settings.php:387 #: ../../mod/settings.php:389
msgid " Cannot change to that email." msgid " Cannot change to that email."
msgstr "" msgstr ""
#: ../../mod/settings.php:457 ../../addon/facebook/facebook.php:450 #: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
#: ../../addon/impressum/impressum.php:75 #: ../../addon/impressum/impressum.php:75
#: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
msgid "Settings updated." msgid "Settings updated."
msgstr "" msgstr ""
#: ../../mod/settings.php:527 ../../mod/settings.php:553 #: ../../mod/settings.php:531 ../../mod/settings.php:557
#: ../../mod/settings.php:589 #: ../../mod/settings.php:593
msgid "Add application" msgid "Add application"
msgstr "" msgstr ""
#: ../../mod/settings.php:531 ../../mod/settings.php:557 #: ../../mod/settings.php:535 ../../mod/settings.php:561
#: ../../addon/statusnet/statusnet.php:547 #: ../../addon/statusnet/statusnet.php:547
msgid "Consumer Key" msgid "Consumer Key"
msgstr "" msgstr ""
#: ../../mod/settings.php:532 ../../mod/settings.php:558 #: ../../mod/settings.php:536 ../../mod/settings.php:562
#: ../../addon/statusnet/statusnet.php:546 #: ../../addon/statusnet/statusnet.php:546
msgid "Consumer Secret" msgid "Consumer Secret"
msgstr "" msgstr ""
#: ../../mod/settings.php:533 ../../mod/settings.php:559 #: ../../mod/settings.php:537 ../../mod/settings.php:563
msgid "Redirect" msgid "Redirect"
msgstr "" msgstr ""
#: ../../mod/settings.php:534 ../../mod/settings.php:560 #: ../../mod/settings.php:538 ../../mod/settings.php:564
msgid "Icon url" msgid "Icon url"
msgstr "" msgstr ""
#: ../../mod/settings.php:545 #: ../../mod/settings.php:549
msgid "You can't edit this application." msgid "You can't edit this application."
msgstr "" msgstr ""
#: ../../mod/settings.php:588 #: ../../mod/settings.php:592
msgid "Connected Apps" msgid "Connected Apps"
msgstr "" msgstr ""
#: ../../mod/settings.php:592 #: ../../mod/settings.php:596
msgid "Client key starts with" msgid "Client key starts with"
msgstr "" msgstr ""
#: ../../mod/settings.php:593 #: ../../mod/settings.php:597
msgid "No name" msgid "No name"
msgstr "" msgstr ""
#: ../../mod/settings.php:594 #: ../../mod/settings.php:598
msgid "Remove authorization" msgid "Remove authorization"
msgstr "" msgstr ""
#: ../../mod/settings.php:605 #: ../../mod/settings.php:609
msgid "No Plugin settings configured" msgid "No Plugin settings configured"
msgstr "" msgstr ""
#: ../../mod/settings.php:613 ../../addon/widgets/widgets.php:123 #: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123
msgid "Plugin Settings" msgid "Plugin Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:625 ../../mod/settings.php:626 #: ../../mod/settings.php:629 ../../mod/settings.php:630
#, php-format #, php-format
msgid "Built-in support for %s connectivity is %s" msgid "Built-in support for %s connectivity is %s"
msgstr "" msgstr ""
#: ../../mod/settings.php:625 ../../mod/settings.php:626 #: ../../mod/settings.php:629 ../../mod/settings.php:630
msgid "enabled" msgid "enabled"
msgstr "" msgstr ""
#: ../../mod/settings.php:625 ../../mod/settings.php:626 #: ../../mod/settings.php:629 ../../mod/settings.php:630
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""
#: ../../mod/settings.php:626 #: ../../mod/settings.php:630
msgid "StatusNet" msgid "StatusNet"
msgstr "" msgstr ""
#: ../../mod/settings.php:656 #: ../../mod/settings.php:660
msgid "Connector Settings" msgid "Connector Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:661 #: ../../mod/settings.php:665
msgid "Email/Mailbox Setup" msgid "Email/Mailbox Setup"
msgstr "" msgstr ""
#: ../../mod/settings.php:662 #: ../../mod/settings.php:666
msgid "" msgid ""
"If you wish to communicate with email contacts using this service " "If you wish to communicate with email contacts using this service "
"(optional), please specify how to connect to your mailbox." "(optional), please specify how to connect to your mailbox."
msgstr "" msgstr ""
#: ../../mod/settings.php:663 #: ../../mod/settings.php:667
msgid "Last successful email check:" msgid "Last successful email check:"
msgstr "" msgstr ""
#: ../../mod/settings.php:664 #: ../../mod/settings.php:668
msgid "Email access is disabled on this site." msgid "Email access is disabled on this site."
msgstr "" msgstr ""
#: ../../mod/settings.php:665 #: ../../mod/settings.php:669
msgid "IMAP server name:" msgid "IMAP server name:"
msgstr "" msgstr ""
#: ../../mod/settings.php:666 #: ../../mod/settings.php:670
msgid "IMAP port:" msgid "IMAP port:"
msgstr "" msgstr ""
#: ../../mod/settings.php:667 #: ../../mod/settings.php:671
msgid "Security:" msgid "Security:"
msgstr "" msgstr ""
#: ../../mod/settings.php:667 ../../mod/settings.php:672 #: ../../mod/settings.php:671 ../../mod/settings.php:676
msgid "None" msgid "None"
msgstr "" msgstr ""
#: ../../mod/settings.php:668 #: ../../mod/settings.php:672
msgid "Email login name:" msgid "Email login name:"
msgstr "" msgstr ""
#: ../../mod/settings.php:669 #: ../../mod/settings.php:673
msgid "Email password:" msgid "Email password:"
msgstr "" msgstr ""
#: ../../mod/settings.php:670 #: ../../mod/settings.php:674
msgid "Reply-to address:" msgid "Reply-to address:"
msgstr "" msgstr ""
#: ../../mod/settings.php:671 #: ../../mod/settings.php:675
msgid "Send public posts to all email contacts:" msgid "Send public posts to all email contacts:"
msgstr "" msgstr ""
#: ../../mod/settings.php:672 #: ../../mod/settings.php:676
msgid "Action after import:" msgid "Action after import:"
msgstr "" msgstr ""
#: ../../mod/settings.php:672 #: ../../mod/settings.php:676
msgid "Mark as seen" msgid "Mark as seen"
msgstr "" msgstr ""
#: ../../mod/settings.php:672 #: ../../mod/settings.php:676
msgid "Move to folder" msgid "Move to folder"
msgstr "" msgstr ""
#: ../../mod/settings.php:673 #: ../../mod/settings.php:677
msgid "Move to folder:" msgid "Move to folder:"
msgstr "" msgstr ""
#: ../../mod/settings.php:733 #: ../../mod/settings.php:737
msgid "Display Settings" msgid "Display Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:739 #: ../../mod/settings.php:743
msgid "Display Theme:" msgid "Display Theme:"
msgstr "" msgstr ""
#: ../../mod/settings.php:740 #: ../../mod/settings.php:744
msgid "Update browser every xx seconds" msgid "Update browser every xx seconds"
msgstr "" msgstr ""
#: ../../mod/settings.php:740 #: ../../mod/settings.php:744
msgid "Minimum of 10 seconds, no maximum" msgid "Minimum of 10 seconds, no maximum"
msgstr "" msgstr ""
#: ../../mod/settings.php:741 #: ../../mod/settings.php:745
msgid "Number of items to display on the network page:" msgid "Number of items to display on the network page:"
msgstr "" msgstr ""
#: ../../mod/settings.php:741 #: ../../mod/settings.php:745
msgid "Maximum of 100 items" msgid "Maximum of 100 items"
msgstr "" msgstr ""
#: ../../mod/settings.php:742 #: ../../mod/settings.php:746
msgid "Don't show emoticons" msgid "Don't show emoticons"
msgstr "" msgstr ""
#: ../../mod/settings.php:802 ../../mod/admin.php:142 ../../mod/admin.php:502 #: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522
msgid "Normal Account" msgid "Normal Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:803 #: ../../mod/settings.php:812
msgid "This account is a normal personal profile" msgid "This account is a normal personal profile"
msgstr "" msgstr ""
#: ../../mod/settings.php:806 ../../mod/admin.php:143 ../../mod/admin.php:503 #: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523
msgid "Soapbox Account" msgid "Soapbox Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:807 #: ../../mod/settings.php:816
msgid "Automatically approve all connection/friend requests as read-only fans" msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr "" msgstr ""
#: ../../mod/settings.php:810 ../../mod/admin.php:144 ../../mod/admin.php:504 #: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524
msgid "Community/Celebrity Account" msgid "Community/Celebrity Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:811 #: ../../mod/settings.php:820
msgid "Automatically approve all connection/friend requests as read-write fans" msgid "Automatically approve all connection/friend requests as read-write fans"
msgstr "" msgstr ""
#: ../../mod/settings.php:814 ../../mod/admin.php:145 ../../mod/admin.php:505 #: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525
msgid "Automatic Friend Account" msgid "Automatic Friend Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:815 #: ../../mod/settings.php:824
msgid "Automatically approve all connection/friend requests as friends" msgid "Automatically approve all connection/friend requests as friends"
msgstr "" msgstr ""
#: ../../mod/settings.php:825 #: ../../mod/settings.php:834
msgid "OpenID:" msgid "OpenID:"
msgstr "" msgstr ""
#: ../../mod/settings.php:825 #: ../../mod/settings.php:834
msgid "(Optional) Allow this OpenID to login to this account." msgid "(Optional) Allow this OpenID to login to this account."
msgstr "" msgstr ""
#: ../../mod/settings.php:835 #: ../../mod/settings.php:844
msgid "Publish your default profile in your local site directory?" msgid "Publish your default profile in your local site directory?"
msgstr "" msgstr ""
#: ../../mod/settings.php:841 #: ../../mod/settings.php:850
msgid "Publish your default profile in the global social directory?" msgid "Publish your default profile in the global social directory?"
msgstr "" msgstr ""
#: ../../mod/settings.php:849 #: ../../mod/settings.php:858
msgid "Hide your contact/friend list from viewers of your default profile?" msgid "Hide your contact/friend list from viewers of your default profile?"
msgstr "" msgstr ""
#: ../../mod/settings.php:853 #: ../../mod/settings.php:862
msgid "Hide your profile details from unknown viewers?" msgid "Hide your profile details from unknown viewers?"
msgstr "" msgstr ""
#: ../../mod/settings.php:858 #: ../../mod/settings.php:867
msgid "Allow friends to post to your profile page?" msgid "Allow friends to post to your profile page?"
msgstr "" msgstr ""
#: ../../mod/settings.php:864 #: ../../mod/settings.php:873
msgid "Allow friends to tag your posts?" msgid "Allow friends to tag your posts?"
msgstr "" msgstr ""
#: ../../mod/settings.php:870 #: ../../mod/settings.php:879
msgid "Allow us to suggest you as a potential friend to new members?" msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "" msgstr ""
#: ../../mod/settings.php:876 #: ../../mod/settings.php:885
msgid "Permit unknown people to send you private mail?" msgid "Permit unknown people to send you private mail?"
msgstr "" msgstr ""
#: ../../mod/settings.php:885 #: ../../mod/settings.php:896
msgid "Profile is <strong>not published</strong>." msgid "Profile is <strong>not published</strong>."
msgstr "" msgstr ""
#: ../../mod/settings.php:891 ../../mod/profile_photo.php:211 #: ../../mod/settings.php:902 ../../mod/profile_photo.php:211
msgid "or" msgid "or"
msgstr "" msgstr ""
#: ../../mod/settings.php:896 #: ../../mod/settings.php:907
msgid "Your Identity Address is" msgid "Your Identity Address is"
msgstr "" msgstr ""
#: ../../mod/settings.php:907 #: ../../mod/settings.php:918
msgid "Automatically expire posts after this many days:" msgid "Automatically expire posts after this many days:"
msgstr "" msgstr ""
#: ../../mod/settings.php:907 #: ../../mod/settings.php:918
msgid "If empty, posts will not expire. Expired posts will be deleted" msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr "" msgstr ""
#: ../../mod/settings.php:908 #: ../../mod/settings.php:919
msgid "Advanced expiration settings" msgid "Advanced expiration settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:909 #: ../../mod/settings.php:920
msgid "Advanced Expiration" msgid "Advanced Expiration"
msgstr "" msgstr ""
#: ../../mod/settings.php:910 #: ../../mod/settings.php:921
msgid "Expire posts:" msgid "Expire posts:"
msgstr "" msgstr ""
#: ../../mod/settings.php:911 #: ../../mod/settings.php:922
msgid "Expire personal notes:" msgid "Expire personal notes:"
msgstr "" msgstr ""
#: ../../mod/settings.php:912 #: ../../mod/settings.php:923
msgid "Expire starred posts:" msgid "Expire starred posts:"
msgstr "" msgstr ""
#: ../../mod/settings.php:913 #: ../../mod/settings.php:924
msgid "Expire photos:" msgid "Expire photos:"
msgstr "" msgstr ""
#: ../../mod/settings.php:917 #: ../../mod/settings.php:928
msgid "Account Settings" msgid "Account Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:926 #: ../../mod/settings.php:937
msgid "Password Settings" msgid "Password Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:927 #: ../../mod/settings.php:938
msgid "New Password:" msgid "New Password:"
msgstr "" msgstr ""
#: ../../mod/settings.php:928 #: ../../mod/settings.php:939
msgid "Confirm:" msgid "Confirm:"
msgstr "" msgstr ""
#: ../../mod/settings.php:928 #: ../../mod/settings.php:939
msgid "Leave password fields blank unless changing" msgid "Leave password fields blank unless changing"
msgstr "" msgstr ""
#: ../../mod/settings.php:932 #: ../../mod/settings.php:943
msgid "Basic Settings" msgid "Basic Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:933 ../../include/profile_advanced.php:15 #: ../../mod/settings.php:944 ../../include/profile_advanced.php:15
msgid "Full Name:" msgid "Full Name:"
msgstr "" msgstr ""
#: ../../mod/settings.php:934 #: ../../mod/settings.php:945
msgid "Email Address:" msgid "Email Address:"
msgstr "" msgstr ""
#: ../../mod/settings.php:935 #: ../../mod/settings.php:946
msgid "Your Timezone:" msgid "Your Timezone:"
msgstr "" msgstr ""
#: ../../mod/settings.php:936 #: ../../mod/settings.php:947
msgid "Default Post Location:" msgid "Default Post Location:"
msgstr "" msgstr ""
#: ../../mod/settings.php:937 #: ../../mod/settings.php:948
msgid "Use Browser Location:" msgid "Use Browser Location:"
msgstr "" msgstr ""
#: ../../mod/settings.php:940 #: ../../mod/settings.php:951
msgid "Security and Privacy Settings" msgid "Security and Privacy Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:942 #: ../../mod/settings.php:953
msgid "Maximum Friend Requests/Day:" msgid "Maximum Friend Requests/Day:"
msgstr "" msgstr ""
#: ../../mod/settings.php:942 ../../mod/settings.php:957 #: ../../mod/settings.php:953 ../../mod/settings.php:968
msgid "(to prevent spam abuse)" msgid "(to prevent spam abuse)"
msgstr "" msgstr ""
#: ../../mod/settings.php:943 #: ../../mod/settings.php:954
msgid "Default Post Permissions" msgid "Default Post Permissions"
msgstr "" msgstr ""
#: ../../mod/settings.php:944 #: ../../mod/settings.php:955
msgid "(click to open/close)" msgid "(click to open/close)"
msgstr "" msgstr ""
#: ../../mod/settings.php:957 #: ../../mod/settings.php:968
msgid "Maximum private messages per day from unknown people:" msgid "Maximum private messages per day from unknown people:"
msgstr "" msgstr ""
#: ../../mod/settings.php:960 #: ../../mod/settings.php:971
msgid "Notification Settings" msgid "Notification Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:961 #: ../../mod/settings.php:972
msgid "By default post a status message when:"
msgstr ""
#: ../../mod/settings.php:973
msgid "accepting a friend request"
msgstr ""
#: ../../mod/settings.php:974
msgid "making an <em>interesting</em> profile change"
msgstr ""
#: ../../mod/settings.php:975
msgid "Send a notification email when:" msgid "Send a notification email when:"
msgstr "" msgstr ""
#: ../../mod/settings.php:962 #: ../../mod/settings.php:976
msgid "You receive an introduction" msgid "You receive an introduction"
msgstr "" msgstr ""
#: ../../mod/settings.php:963 #: ../../mod/settings.php:977
msgid "Your introductions are confirmed" msgid "Your introductions are confirmed"
msgstr "" msgstr ""
#: ../../mod/settings.php:964 #: ../../mod/settings.php:978
msgid "Someone writes on your profile wall" msgid "Someone writes on your profile wall"
msgstr "" msgstr ""
#: ../../mod/settings.php:965 #: ../../mod/settings.php:979
msgid "Someone writes a followup comment" msgid "Someone writes a followup comment"
msgstr "" msgstr ""
#: ../../mod/settings.php:966 #: ../../mod/settings.php:980
msgid "You receive a private message" msgid "You receive a private message"
msgstr "" msgstr ""
#: ../../mod/settings.php:967 #: ../../mod/settings.php:981
msgid "You receive a friend suggestion" msgid "You receive a friend suggestion"
msgstr "" msgstr ""
#: ../../mod/settings.php:968 #: ../../mod/settings.php:982
msgid "You are tagged in a post" msgid "You are tagged in a post"
msgstr "" msgstr ""
#: ../../mod/settings.php:971 #: ../../mod/settings.php:985
msgid "Advanced Page Settings" msgid "Advanced Page Settings"
msgstr "" msgstr ""
@ -2210,7 +2209,7 @@ msgstr ""
msgid "Saved Searches" msgid "Saved Searches"
msgstr "" msgstr ""
#: ../../mod/network.php:92 ../../include/group.php:216 #: ../../mod/network.php:92 ../../include/group.php:217
msgid "add" msgid "add"
msgstr "" msgstr ""
@ -2270,7 +2269,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1474 #: ../../mod/notes.php:44 ../../boot.php:1475
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2517,12 +2516,12 @@ msgstr ""
msgid "Profile Visibility Editor" msgid "Profile Visibility Editor"
msgstr "" msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:241 #: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240
#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:240
#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook-aerith/theme.php:242 #: ../../view/theme/diabook-aerith/theme.php:241
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
#: ../../include/nav.php:50 ../../boot.php:1456 #: ../../include/nav.php:50 ../../boot.php:1457
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2671,7 +2670,7 @@ msgstr ""
msgid "Your invitation ID: " msgid "Your invitation ID: "
msgstr "" msgstr ""
#: ../../mod/register.php:553 ../../mod/admin.php:355 #: ../../mod/register.php:553 ../../mod/admin.php:375
msgid "Registration" msgid "Registration"
msgstr "" msgstr ""
@ -2694,7 +2693,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:774 #: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2706,13 +2705,13 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1549 #: ../../addon/facebook/facebook.php:1549
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook-red/theme.php:81 #: ../../view/theme/diabook-red/theme.php:80
#: ../../view/theme/diabook-red/theme.php:90 #: ../../view/theme/diabook-red/theme.php:89
#: ../../view/theme/diabook-blue/theme.php:81 #: ../../view/theme/diabook-blue/theme.php:80
#: ../../view/theme/diabook-blue/theme.php:90 #: ../../view/theme/diabook-blue/theme.php:89
#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook-aerith/theme.php:82 #: ../../view/theme/diabook-aerith/theme.php:81
#: ../../view/theme/diabook-aerith/theme.php:91 #: ../../view/theme/diabook-aerith/theme.php:90
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130 #: ../../include/conversation.php:130
@ -2721,10 +2720,10 @@ msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
#: ../../addon/communityhome/communityhome.php:172 #: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook-red/theme.php:95 #: ../../view/theme/diabook-red/theme.php:94
#: ../../view/theme/diabook-blue/theme.php:95 #: ../../view/theme/diabook-blue/theme.php:94
#: ../../view/theme/diabook/theme.php:98 #: ../../view/theme/diabook/theme.php:98
#: ../../view/theme/diabook-aerith/theme.php:96 #: ../../view/theme/diabook-aerith/theme.php:95
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -2735,8 +2734,8 @@ msgstr ""
msgid "%1$s doesn't like %2$s's %3$s" msgid "%1$s doesn't like %2$s's %3$s"
msgstr "" msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
#: ../../mod/admin.php:562 ../../mod/admin.php:741 ../../mod/display.php:37 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3044 #: ../../mod/display.php:142 ../../include/items.php:3044
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -2954,479 +2953,485 @@ msgstr ""
msgid "No friends to display." msgid "No friends to display."
msgstr "" msgstr ""
#: ../../mod/admin.php:71 ../../mod/admin.php:353 #: ../../mod/admin.php:51
msgid "Theme settings updated."
msgstr ""
#: ../../mod/admin.php:85 ../../mod/admin.php:373
msgid "Site" msgid "Site"
msgstr "" msgstr ""
#: ../../mod/admin.php:72 ../../mod/admin.php:520 ../../mod/admin.php:532 #: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: ../../mod/admin.php:73 ../../mod/admin.php:609 ../../mod/admin.php:649 #: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669
msgid "Plugins" msgid "Plugins"
msgstr "" msgstr ""
#: ../../mod/admin.php:74 ../../mod/admin.php:787 ../../mod/admin.php:821 #: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849
msgid "Themes" msgid "Themes"
msgstr "" msgstr ""
#: ../../mod/admin.php:89 ../../mod/admin.php:901 #: ../../mod/admin.php:103 ../../mod/admin.php:929
msgid "Logs" msgid "Logs"
msgstr "" msgstr ""
#: ../../mod/admin.php:94 #: ../../mod/admin.php:108
msgid "User registrations waiting for confirmation" msgid "User registrations waiting for confirmation"
msgstr "" msgstr ""
#: ../../mod/admin.php:157 ../../mod/admin.php:352 ../../mod/admin.php:519 #: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539
#: ../../mod/admin.php:608 ../../mod/admin.php:648 ../../mod/admin.php:786 #: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814
#: ../../mod/admin.php:820 ../../mod/admin.php:900 #: ../../mod/admin.php:848 ../../mod/admin.php:928
msgid "Administration" msgid "Administration"
msgstr "" msgstr ""
#: ../../mod/admin.php:158 #: ../../mod/admin.php:178
msgid "Summary" msgid "Summary"
msgstr "" msgstr ""
#: ../../mod/admin.php:159 #: ../../mod/admin.php:179
msgid "Registered users" msgid "Registered users"
msgstr "" msgstr ""
#: ../../mod/admin.php:161 #: ../../mod/admin.php:181
msgid "Pending registrations" msgid "Pending registrations"
msgstr "" msgstr ""
#: ../../mod/admin.php:162 #: ../../mod/admin.php:182
msgid "Version" msgid "Version"
msgstr "" msgstr ""
#: ../../mod/admin.php:164 #: ../../mod/admin.php:184
msgid "Active plugins" msgid "Active plugins"
msgstr "" msgstr ""
#: ../../mod/admin.php:295 #: ../../mod/admin.php:315
msgid "Site settings updated." msgid "Site settings updated."
msgstr "" msgstr ""
#: ../../mod/admin.php:339 #: ../../mod/admin.php:359
msgid "Closed" msgid "Closed"
msgstr "" msgstr ""
#: ../../mod/admin.php:340 #: ../../mod/admin.php:360
msgid "Requires approval" msgid "Requires approval"
msgstr "" msgstr ""
#: ../../mod/admin.php:341 #: ../../mod/admin.php:361
msgid "Open" msgid "Open"
msgstr "" msgstr ""
#: ../../mod/admin.php:345 #: ../../mod/admin.php:365
msgid "No SSL policy, links will track page SSL state" msgid "No SSL policy, links will track page SSL state"
msgstr "" msgstr ""
#: ../../mod/admin.php:346 #: ../../mod/admin.php:366
msgid "Force all links to use SSL" msgid "Force all links to use SSL"
msgstr "" msgstr ""
#: ../../mod/admin.php:347 #: ../../mod/admin.php:367
msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr "" msgstr ""
#: ../../mod/admin.php:356 #: ../../mod/admin.php:376
msgid "File upload" msgid "File upload"
msgstr "" msgstr ""
#: ../../mod/admin.php:357 #: ../../mod/admin.php:377
msgid "Policies" msgid "Policies"
msgstr "" msgstr ""
#: ../../mod/admin.php:358 #: ../../mod/admin.php:378
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
#: ../../mod/admin.php:362 ../../addon/statusnet/statusnet.php:544 #: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544
msgid "Site name" msgid "Site name"
msgstr "" msgstr ""
#: ../../mod/admin.php:363 #: ../../mod/admin.php:383
msgid "Banner/Logo" msgid "Banner/Logo"
msgstr "" msgstr ""
#: ../../mod/admin.php:364 #: ../../mod/admin.php:384
msgid "System language" msgid "System language"
msgstr "" msgstr ""
#: ../../mod/admin.php:365 #: ../../mod/admin.php:385
msgid "System theme" msgid "System theme"
msgstr "" msgstr ""
#: ../../mod/admin.php:365 #: ../../mod/admin.php:385
msgid "Default system theme - may be over-ridden by user profiles" msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "" msgstr ""
#: ../../mod/admin.php:366 #: ../../mod/admin.php:386
msgid "SSL link policy" msgid "SSL link policy"
msgstr "" msgstr ""
#: ../../mod/admin.php:366 #: ../../mod/admin.php:386
msgid "Determines whether generated links should be forced to use SSL" msgid "Determines whether generated links should be forced to use SSL"
msgstr "" msgstr ""
#: ../../mod/admin.php:367 #: ../../mod/admin.php:387
msgid "Maximum image size" msgid "Maximum image size"
msgstr "" msgstr ""
#: ../../mod/admin.php:367 #: ../../mod/admin.php:387
msgid "" msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no " "Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits." "limits."
msgstr "" msgstr ""
#: ../../mod/admin.php:369 #: ../../mod/admin.php:389
msgid "Register policy" msgid "Register policy"
msgstr "" msgstr ""
#: ../../mod/admin.php:370 #: ../../mod/admin.php:390
msgid "Register text" msgid "Register text"
msgstr "" msgstr ""
#: ../../mod/admin.php:370 #: ../../mod/admin.php:390
msgid "Will be displayed prominently on the registration page." msgid "Will be displayed prominently on the registration page."
msgstr "" msgstr ""
#: ../../mod/admin.php:371 #: ../../mod/admin.php:391
msgid "Accounts abandoned after x days" msgid "Accounts abandoned after x days"
msgstr "" msgstr ""
#: ../../mod/admin.php:371 #: ../../mod/admin.php:391
msgid "" msgid ""
"Will not waste system resources polling external sites for abandonded " "Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit." "accounts. Enter 0 for no time limit."
msgstr "" msgstr ""
#: ../../mod/admin.php:372 #: ../../mod/admin.php:392
msgid "Allowed friend domains" msgid "Allowed friend domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:372 #: ../../mod/admin.php:392
msgid "" msgid ""
"Comma separated list of domains which are allowed to establish friendships " "Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains" "with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:373 #: ../../mod/admin.php:393
msgid "Allowed email domains" msgid "Allowed email domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:373 #: ../../mod/admin.php:393
msgid "" msgid ""
"Comma separated list of domains which are allowed in email addresses for " "Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any " "registrations to this site. Wildcards are accepted. Empty to allow any "
"domains" "domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:374 #: ../../mod/admin.php:394
msgid "Block public" msgid "Block public"
msgstr "" msgstr ""
#: ../../mod/admin.php:374 #: ../../mod/admin.php:394
msgid "" msgid ""
"Check to block public access to all otherwise public personal pages on this " "Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in." "site unless you are currently logged in."
msgstr "" msgstr ""
#: ../../mod/admin.php:375 #: ../../mod/admin.php:395
msgid "Force publish" msgid "Force publish"
msgstr "" msgstr ""
#: ../../mod/admin.php:375 #: ../../mod/admin.php:395
msgid "" msgid ""
"Check to force all profiles on this site to be listed in the site directory." "Check to force all profiles on this site to be listed in the site directory."
msgstr "" msgstr ""
#: ../../mod/admin.php:376 #: ../../mod/admin.php:396
msgid "Global directory update URL" msgid "Global directory update URL"
msgstr "" msgstr ""
#: ../../mod/admin.php:376 #: ../../mod/admin.php:396
msgid "" msgid ""
"URL to update the global directory. If this is not set, the global directory " "URL to update the global directory. If this is not set, the global directory "
"is completely unavailable to the application." "is completely unavailable to the application."
msgstr "" msgstr ""
#: ../../mod/admin.php:378 #: ../../mod/admin.php:398
msgid "Block multiple registrations" msgid "Block multiple registrations"
msgstr "" msgstr ""
#: ../../mod/admin.php:378 #: ../../mod/admin.php:398
msgid "Disallow users to register additional accounts for use as pages." msgid "Disallow users to register additional accounts for use as pages."
msgstr "" msgstr ""
#: ../../mod/admin.php:379 #: ../../mod/admin.php:399
msgid "OpenID support" msgid "OpenID support"
msgstr "" msgstr ""
#: ../../mod/admin.php:379 #: ../../mod/admin.php:399
msgid "OpenID support for registration and logins." msgid "OpenID support for registration and logins."
msgstr "" msgstr ""
#: ../../mod/admin.php:380 #: ../../mod/admin.php:400
msgid "Fullname check" msgid "Fullname check"
msgstr "" msgstr ""
#: ../../mod/admin.php:380 #: ../../mod/admin.php:400
msgid "" msgid ""
"Force users to register with a space between firstname and lastname in Full " "Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure" "name, as an antispam measure"
msgstr "" msgstr ""
#: ../../mod/admin.php:381 #: ../../mod/admin.php:401
msgid "UTF-8 Regular expressions" msgid "UTF-8 Regular expressions"
msgstr "" msgstr ""
#: ../../mod/admin.php:381 #: ../../mod/admin.php:401
msgid "Use PHP UTF8 regular expressions" msgid "Use PHP UTF8 regular expressions"
msgstr "" msgstr ""
#: ../../mod/admin.php:382 #: ../../mod/admin.php:402
msgid "Show Community Page" msgid "Show Community Page"
msgstr "" msgstr ""
#: ../../mod/admin.php:382 #: ../../mod/admin.php:402
msgid "" msgid ""
"Display a Community page showing all recent public postings on this site." "Display a Community page showing all recent public postings on this site."
msgstr "" msgstr ""
#: ../../mod/admin.php:383 #: ../../mod/admin.php:403
msgid "Enable OStatus support" msgid "Enable OStatus support"
msgstr "" msgstr ""
#: ../../mod/admin.php:383 #: ../../mod/admin.php:403
msgid "" msgid ""
"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be " "communications in OStatus are public, so privacy warnings will be "
"occasionally displayed." "occasionally displayed."
msgstr "" msgstr ""
#: ../../mod/admin.php:384 #: ../../mod/admin.php:404
msgid "Enable Diaspora support" msgid "Enable Diaspora support"
msgstr "" msgstr ""
#: ../../mod/admin.php:384 #: ../../mod/admin.php:404
msgid "Provide built-in Diaspora network compatibility." msgid "Provide built-in Diaspora network compatibility."
msgstr "" msgstr ""
#: ../../mod/admin.php:385 #: ../../mod/admin.php:405
msgid "Only allow Friendica contacts" msgid "Only allow Friendica contacts"
msgstr "" msgstr ""
#: ../../mod/admin.php:385 #: ../../mod/admin.php:405
msgid "" msgid ""
"All contacts must use Friendica protocols. All other built-in communication " "All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled." "protocols disabled."
msgstr "" msgstr ""
#: ../../mod/admin.php:386 #: ../../mod/admin.php:406
msgid "Verify SSL" msgid "Verify SSL"
msgstr "" msgstr ""
#: ../../mod/admin.php:386 #: ../../mod/admin.php:406
msgid "" msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you " "If you wish, you can turn on strict certificate checking. This will mean you "
"cannot connect (at all) to self-signed SSL sites." "cannot connect (at all) to self-signed SSL sites."
msgstr "" msgstr ""
#: ../../mod/admin.php:387 #: ../../mod/admin.php:407
msgid "Proxy user" msgid "Proxy user"
msgstr "" msgstr ""
#: ../../mod/admin.php:388 #: ../../mod/admin.php:408
msgid "Proxy URL" msgid "Proxy URL"
msgstr "" msgstr ""
#: ../../mod/admin.php:389 #: ../../mod/admin.php:409
msgid "Network timeout" msgid "Network timeout"
msgstr "" msgstr ""
#: ../../mod/admin.php:389 #: ../../mod/admin.php:409
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "" msgstr ""
#: ../../mod/admin.php:410 #: ../../mod/admin.php:430
#, php-format #, php-format
msgid "%s user blocked/unblocked" msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked" msgid_plural "%s users blocked/unblocked"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/admin.php:417 #: ../../mod/admin.php:437
#, php-format #, php-format
msgid "%s user deleted" msgid "%s user deleted"
msgid_plural "%s users deleted" msgid_plural "%s users deleted"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/admin.php:451 #: ../../mod/admin.php:471
#, php-format #, php-format
msgid "User '%s' deleted" msgid "User '%s' deleted"
msgstr "" msgstr ""
#: ../../mod/admin.php:458 #: ../../mod/admin.php:478
#, php-format #, php-format
msgid "User '%s' unblocked" msgid "User '%s' unblocked"
msgstr "" msgstr ""
#: ../../mod/admin.php:458 #: ../../mod/admin.php:478
#, php-format #, php-format
msgid "User '%s' blocked" msgid "User '%s' blocked"
msgstr "" msgstr ""
#: ../../mod/admin.php:522 #: ../../mod/admin.php:542
msgid "select all" msgid "select all"
msgstr "" msgstr ""
#: ../../mod/admin.php:523 #: ../../mod/admin.php:543
msgid "User registrations waiting for confirm" msgid "User registrations waiting for confirm"
msgstr "" msgstr ""
#: ../../mod/admin.php:524 #: ../../mod/admin.php:544
msgid "Request date" msgid "Request date"
msgstr "" msgstr ""
#: ../../mod/admin.php:524 ../../mod/admin.php:533 #: ../../mod/admin.php:544 ../../mod/admin.php:553
#: ../../include/contact_selectors.php:79 #: ../../include/contact_selectors.php:79
msgid "Email" msgid "Email"
msgstr "" msgstr ""
#: ../../mod/admin.php:525 #: ../../mod/admin.php:545
msgid "No registrations." msgid "No registrations."
msgstr "" msgstr ""
#: ../../mod/admin.php:527 #: ../../mod/admin.php:547
msgid "Deny" msgid "Deny"
msgstr "" msgstr ""
#: ../../mod/admin.php:533 #: ../../mod/admin.php:553
msgid "Register date" msgid "Register date"
msgstr "" msgstr ""
#: ../../mod/admin.php:533 #: ../../mod/admin.php:553
msgid "Last login" msgid "Last login"
msgstr "" msgstr ""
#: ../../mod/admin.php:533 #: ../../mod/admin.php:553
msgid "Last item" msgid "Last item"
msgstr "" msgstr ""
#: ../../mod/admin.php:533 #: ../../mod/admin.php:553
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: ../../mod/admin.php:535 #: ../../mod/admin.php:555
msgid "" msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on " "Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?" "this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "" msgstr ""
#: ../../mod/admin.php:536 #: ../../mod/admin.php:556
msgid "" msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this " "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?" "site will be permanently deleted!\\n\\nAre you sure?"
msgstr "" msgstr ""
#: ../../mod/admin.php:572 #: ../../mod/admin.php:592
#, php-format #, php-format
msgid "Plugin %s disabled." msgid "Plugin %s disabled."
msgstr "" msgstr ""
#: ../../mod/admin.php:576 #: ../../mod/admin.php:596
#, php-format #, php-format
msgid "Plugin %s enabled." msgid "Plugin %s enabled."
msgstr "" msgstr ""
#: ../../mod/admin.php:586 ../../mod/admin.php:765 #: ../../mod/admin.php:606 ../../mod/admin.php:785
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
#: ../../mod/admin.php:588 ../../mod/admin.php:767 #: ../../mod/admin.php:608 ../../mod/admin.php:787
msgid "Enable" msgid "Enable"
msgstr "" msgstr ""
#: ../../mod/admin.php:610 ../../mod/admin.php:788 #: ../../mod/admin.php:630 ../../mod/admin.php:816
msgid "Toggle" msgid "Toggle"
msgstr "" msgstr ""
#: ../../mod/admin.php:618 ../../mod/admin.php:798 #: ../../mod/admin.php:638 ../../mod/admin.php:826
msgid "Author: " msgid "Author: "
msgstr "" msgstr ""
#: ../../mod/admin.php:619 ../../mod/admin.php:799 #: ../../mod/admin.php:639 ../../mod/admin.php:827
msgid "Maintainer: " msgid "Maintainer: "
msgstr "" msgstr ""
#: ../../mod/admin.php:730 #: ../../mod/admin.php:750
msgid "No themes found." msgid "No themes found."
msgstr "" msgstr ""
#: ../../mod/admin.php:780 #: ../../mod/admin.php:808
msgid "Screenshot" msgid "Screenshot"
msgstr "" msgstr ""
#: ../../mod/admin.php:826 #: ../../mod/admin.php:854
msgid "[Experimental]" msgid "[Experimental]"
msgstr "" msgstr ""
#: ../../mod/admin.php:827 #: ../../mod/admin.php:855
msgid "[Unsupported]" msgid "[Unsupported]"
msgstr "" msgstr ""
#: ../../mod/admin.php:850 #: ../../mod/admin.php:878
msgid "Log settings updated." msgid "Log settings updated."
msgstr "" msgstr ""
#: ../../mod/admin.php:903 #: ../../mod/admin.php:931
msgid "Clear" msgid "Clear"
msgstr "" msgstr ""
#: ../../mod/admin.php:909 #: ../../mod/admin.php:937
msgid "Debugging" msgid "Debugging"
msgstr "" msgstr ""
#: ../../mod/admin.php:910 #: ../../mod/admin.php:938
msgid "Log file" msgid "Log file"
msgstr "" msgstr ""
#: ../../mod/admin.php:910 #: ../../mod/admin.php:938
msgid "" msgid ""
"Must be writable by web server. Relative to your Friendica top-level " "Must be writable by web server. Relative to your Friendica top-level "
"directory." "directory."
msgstr "" msgstr ""
#: ../../mod/admin.php:911 #: ../../mod/admin.php:939
msgid "Log level" msgid "Log level"
msgstr "" msgstr ""
#: ../../mod/admin.php:952 #: ../../mod/admin.php:980
msgid "Close" msgid "Close"
msgstr "" msgstr ""
#: ../../mod/admin.php:958 #: ../../mod/admin.php:986
msgid "FTP Host" msgid "FTP Host"
msgstr "" msgstr ""
#: ../../mod/admin.php:959 #: ../../mod/admin.php:987
msgid "FTP Path" msgid "FTP Path"
msgstr "" msgstr ""
#: ../../mod/admin.php:960 #: ../../mod/admin.php:988
msgid "FTP User" msgid "FTP User"
msgstr "" msgstr ""
#: ../../mod/admin.php:961 #: ../../mod/admin.php:989
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:20 ../../boot.php:938 #: ../../mod/profile.php:20 ../../boot.php:939
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -3483,6 +3488,10 @@ msgstr ""
msgid "{0} mentioned you in a post" msgid "{0} mentioned you in a post"
msgstr "" msgstr ""
#: ../../mod/nogroup.php:58
msgid "Contacts who are not members of a group"
msgstr ""
#: ../../mod/openid.php:24 #: ../../mod/openid.php:24
msgid "OpenID protocol error. No ID returned." msgid "OpenID protocol error. No ID returned."
msgstr "" msgstr ""
@ -3566,8 +3575,8 @@ msgstr ""
msgid "Search This Site" msgid "Search This Site"
msgstr "" msgstr ""
#: ../../mod/profiles.php:21 ../../mod/profiles.php:243 #: ../../mod/profiles.php:21 ../../mod/profiles.php:339
#: ../../mod/profiles.php:357 ../../mod/dfrn_confirm.php:62 #: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62
msgid "Profile not found." msgid "Profile not found."
msgstr "" msgstr ""
@ -3575,213 +3584,259 @@ msgstr ""
msgid "Profile Name is required." msgid "Profile Name is required."
msgstr "" msgstr ""
#: ../../mod/profiles.php:202 #: ../../mod/profiles.php:143
msgid "Marital Status"
msgstr ""
#: ../../mod/profiles.php:144
msgid "Romantic Partner"
msgstr ""
#: ../../mod/profiles.php:145
msgid "Work/Employment"
msgstr ""
#: ../../mod/profiles.php:146
msgid "Religion"
msgstr ""
#: ../../mod/profiles.php:147
msgid "Political Views"
msgstr ""
#: ../../mod/profiles.php:148
msgid "Gender"
msgstr ""
#: ../../mod/profiles.php:149
msgid "Sexual Preference"
msgstr ""
#: ../../mod/profiles.php:150
msgid "Homepage"
msgstr ""
#: ../../mod/profiles.php:151
msgid "Interests"
msgstr ""
#: ../../mod/profiles.php:154
msgid "Location"
msgstr ""
#: ../../mod/profiles.php:225
msgid "Profile updated." msgid "Profile updated."
msgstr "" msgstr ""
#: ../../mod/profiles.php:262 #: ../../mod/profiles.php:300
msgid "public profile"
msgstr ""
#: ../../mod/profiles.php:302
#, php-format
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
#: ../../mod/profiles.php:358
msgid "Profile deleted." msgid "Profile deleted."
msgstr "" msgstr ""
#: ../../mod/profiles.php:280 ../../mod/profiles.php:314 #: ../../mod/profiles.php:376 ../../mod/profiles.php:410
msgid "Profile-" msgid "Profile-"
msgstr "" msgstr ""
#: ../../mod/profiles.php:299 ../../mod/profiles.php:341 #: ../../mod/profiles.php:395 ../../mod/profiles.php:437
msgid "New profile created." msgid "New profile created."
msgstr "" msgstr ""
#: ../../mod/profiles.php:320 #: ../../mod/profiles.php:416
msgid "Profile unavailable to clone." msgid "Profile unavailable to clone."
msgstr "" msgstr ""
#: ../../mod/profiles.php:378 #: ../../mod/profiles.php:474
msgid "Hide your contact/friend list from viewers of this profile?" msgid "Hide your contact/friend list from viewers of this profile?"
msgstr "" msgstr ""
#: ../../mod/profiles.php:401 #: ../../mod/profiles.php:497
msgid "Edit Profile Details" msgid "Edit Profile Details"
msgstr "" msgstr ""
#: ../../mod/profiles.php:403 #: ../../mod/profiles.php:499
msgid "View this profile" msgid "View this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:404 #: ../../mod/profiles.php:500
msgid "Create a new profile using these settings" msgid "Create a new profile using these settings"
msgstr "" msgstr ""
#: ../../mod/profiles.php:405 #: ../../mod/profiles.php:501
msgid "Clone this profile" msgid "Clone this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:406 #: ../../mod/profiles.php:502
msgid "Delete this profile" msgid "Delete this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:407 #: ../../mod/profiles.php:503
msgid "Profile Name:" msgid "Profile Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:408 #: ../../mod/profiles.php:504
msgid "Your Full Name:" msgid "Your Full Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:409 #: ../../mod/profiles.php:505
msgid "Title/Description:" msgid "Title/Description:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:410 #: ../../mod/profiles.php:506
msgid "Your Gender:" msgid "Your Gender:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:411 #: ../../mod/profiles.php:507
#, php-format #, php-format
msgid "Birthday (%s):" msgid "Birthday (%s):"
msgstr "" msgstr ""
#: ../../mod/profiles.php:412 #: ../../mod/profiles.php:508
msgid "Street Address:" msgid "Street Address:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:413 #: ../../mod/profiles.php:509
msgid "Locality/City:" msgid "Locality/City:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:414 #: ../../mod/profiles.php:510
msgid "Postal/Zip Code:" msgid "Postal/Zip Code:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:415 #: ../../mod/profiles.php:511
msgid "Country:" msgid "Country:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:416 #: ../../mod/profiles.php:512
msgid "Region/State:" msgid "Region/State:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:417 #: ../../mod/profiles.php:513
msgid "<span class=\"heart\">&hearts;</span> Marital Status:" msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:418 #: ../../mod/profiles.php:514
msgid "Who: (if applicable)" msgid "Who: (if applicable)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:419 #: ../../mod/profiles.php:515
msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "" msgstr ""
#: ../../mod/profiles.php:420 ../../include/profile_advanced.php:43 #: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43
msgid "Sexual Preference:" msgid "Sexual Preference:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:421 #: ../../mod/profiles.php:517
msgid "Homepage URL:" msgid "Homepage URL:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:422 ../../include/profile_advanced.php:49 #: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49
msgid "Political Views:" msgid "Political Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:423 #: ../../mod/profiles.php:519
msgid "Religious Views:" msgid "Religious Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:424 #: ../../mod/profiles.php:520
msgid "Public Keywords:" msgid "Public Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:425 #: ../../mod/profiles.php:521
msgid "Private Keywords:" msgid "Private Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:426 #: ../../mod/profiles.php:522
msgid "Example: fishing photography software" msgid "Example: fishing photography software"
msgstr "" msgstr ""
#: ../../mod/profiles.php:427 #: ../../mod/profiles.php:523
msgid "(Used for suggesting potential friends, can be seen by others)" msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:428 #: ../../mod/profiles.php:524
msgid "(Used for searching profiles, never shown to others)" msgid "(Used for searching profiles, never shown to others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:429 #: ../../mod/profiles.php:525
msgid "Tell us about yourself..." msgid "Tell us about yourself..."
msgstr "" msgstr ""
#: ../../mod/profiles.php:430 #: ../../mod/profiles.php:526
msgid "Hobbies/Interests" msgid "Hobbies/Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:431 #: ../../mod/profiles.php:527
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" msgstr ""
#: ../../mod/profiles.php:432 #: ../../mod/profiles.php:528
msgid "Musical interests" msgid "Musical interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:433 #: ../../mod/profiles.php:529
msgid "Books, literature" msgid "Books, literature"
msgstr "" msgstr ""
#: ../../mod/profiles.php:434 #: ../../mod/profiles.php:530
msgid "Television" msgid "Television"
msgstr "" msgstr ""
#: ../../mod/profiles.php:435 #: ../../mod/profiles.php:531
msgid "Film/dance/culture/entertainment" msgid "Film/dance/culture/entertainment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:436 #: ../../mod/profiles.php:532
msgid "Love/romance" msgid "Love/romance"
msgstr "" msgstr ""
#: ../../mod/profiles.php:437 #: ../../mod/profiles.php:533
msgid "Work/employment" msgid "Work/employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:438 #: ../../mod/profiles.php:534
msgid "School/education" msgid "School/education"
msgstr "" msgstr ""
#: ../../mod/profiles.php:443 #: ../../mod/profiles.php:539
msgid "" msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet." "be visible to anybody using the internet."
msgstr "" msgstr ""
#: ../../mod/profiles.php:453 ../../mod/directory.php:111 #: ../../mod/profiles.php:549 ../../mod/directory.php:111
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: ../../mod/profiles.php:488 ../../view/theme/diabook-red/theme.php:298 #: ../../mod/profiles.php:584
#: ../../view/theme/diabook-blue/theme.php:297
#: ../../view/theme/diabook/theme.php:308
#: ../../view/theme/diabook-aerith/theme.php:298
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:489 ../../boot.php:1047 #: ../../mod/profiles.php:585 ../../boot.php:1048
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:490 ../../boot.php:1048 #: ../../mod/profiles.php:586 ../../boot.php:1049
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:501 ../../boot.php:1058 #: ../../mod/profiles.php:597 ../../boot.php:1059
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:503 ../../boot.php:1061 #: ../../mod/profiles.php:599 ../../boot.php:1062
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:504 ../../boot.php:1062 #: ../../mod/profiles.php:600 ../../boot.php:1063
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -3833,10 +3888,10 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:150 #: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149
#: ../../view/theme/diabook-blue/theme.php:150 #: ../../view/theme/diabook-blue/theme.php:149
#: ../../view/theme/diabook/theme.php:153 #: ../../view/theme/diabook/theme.php:153
#: ../../view/theme/diabook-aerith/theme.php:151 #: ../../view/theme/diabook-aerith/theme.php:150
#: ../../include/contact_widgets.php:34 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
@ -3851,10 +3906,10 @@ msgstr ""
msgid "Ignore/Hide" msgid "Ignore/Hide"
msgstr "" msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:148 #: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
#: ../../view/theme/diabook-blue/theme.php:148 #: ../../view/theme/diabook-blue/theme.php:147
#: ../../view/theme/diabook/theme.php:151 #: ../../view/theme/diabook/theme.php:151
#: ../../view/theme/diabook-aerith/theme.php:149 #: ../../view/theme/diabook-aerith/theme.php:148
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
@ -4346,11 +4401,11 @@ msgstr ""
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
#: ../../addon/planets/planets.php:172 #: ../../addon/planets/planets.php:150
msgid "Planets Settings" msgid "Planets Settings"
msgstr "" msgstr ""
#: ../../addon/planets/planets.php:174 #: ../../addon/planets/planets.php:152
msgid "Enable Planets Plugin" msgid "Enable Planets Plugin"
msgstr "" msgstr ""
@ -4358,7 +4413,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:795 #: ../../include/nav.php:64 ../../boot.php:796
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -4386,10 +4441,10 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook-red/theme.php:78 #: ../../view/theme/diabook-red/theme.php:77
#: ../../view/theme/diabook-blue/theme.php:78 #: ../../view/theme/diabook-blue/theme.php:77
#: ../../view/theme/diabook/theme.php:81 #: ../../view/theme/diabook/theme.php:81
#: ../../view/theme/diabook-aerith/theme.php:79 ../../include/text.php:1295 #: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302
#: ../../include/conversation.php:45 ../../include/conversation.php:118 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -5080,7 +5135,7 @@ msgid "Show More Settings saved."
msgstr "" msgstr ""
#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
#: ../../boot.php:495 #: ../../boot.php:496
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -5190,11 +5245,27 @@ msgstr ""
msgid "Consumer secret" msgid "Consumer secret"
msgstr "" msgstr ""
#: ../../addon/irc/irc.php:25 #: ../../addon/irc/irc.php:44
msgid "IRC Chatroom" msgid "IRC Settings"
msgstr "" msgstr ""
#: ../../addon/irc/irc.php:46 #: ../../addon/irc/irc.php:46
msgid "Channel(s) to auto connect (comma separated)"
msgstr ""
#: ../../addon/irc/irc.php:51
msgid "Popular Channels (comma separated)"
msgstr ""
#: ../../addon/irc/irc.php:69
msgid "IRC settings saved."
msgstr ""
#: ../../addon/irc/irc.php:74
msgid "IRC Chatroom"
msgstr ""
#: ../../addon/irc/irc.php:96
msgid "Popular Channels" msgid "Popular Channels"
msgstr "" msgstr ""
@ -5250,189 +5321,182 @@ msgstr ""
msgid "Post to Posterous by default" msgid "Post to Posterous by default"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:27 #: ../../view/theme/diabook-red/theme.php:26
#: ../../view/theme/diabook-blue/theme.php:27 #: ../../view/theme/diabook-blue/theme.php:26
#: ../../view/theme/diabook/theme.php:30 #: ../../view/theme/diabook/theme.php:30
#: ../../view/theme/diabook-aerith/theme.php:28 #: ../../view/theme/diabook-aerith/theme.php:27
msgid "Last users" msgid "Last users"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:56 #: ../../view/theme/diabook-red/theme.php:55
#: ../../view/theme/diabook-blue/theme.php:56 #: ../../view/theme/diabook-blue/theme.php:55
#: ../../view/theme/diabook/theme.php:59 #: ../../view/theme/diabook/theme.php:59
#: ../../view/theme/diabook-aerith/theme.php:57 #: ../../view/theme/diabook-aerith/theme.php:56
msgid "Last likes" msgid "Last likes"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:101 #: ../../view/theme/diabook-red/theme.php:100
#: ../../view/theme/diabook-blue/theme.php:101 #: ../../view/theme/diabook-blue/theme.php:100
#: ../../view/theme/diabook/theme.php:104 #: ../../view/theme/diabook/theme.php:104
#: ../../view/theme/diabook-aerith/theme.php:102 #: ../../view/theme/diabook-aerith/theme.php:101
msgid "Last photos" msgid "Last photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:145
#: ../../view/theme/diabook-blue/theme.php:145
#: ../../view/theme/diabook/theme.php:149
#: ../../view/theme/diabook-aerith/theme.php:146
msgid "Find Friends"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:146 #: ../../view/theme/diabook-red/theme.php:146
#: ../../view/theme/diabook-blue/theme.php:146 #: ../../view/theme/diabook-blue/theme.php:146
#: ../../view/theme/diabook/theme.php:149
#: ../../view/theme/diabook-aerith/theme.php:147
msgid "Find Friends"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:147
#: ../../view/theme/diabook-blue/theme.php:147
#: ../../view/theme/diabook/theme.php:150 #: ../../view/theme/diabook/theme.php:150
#: ../../view/theme/diabook-aerith/theme.php:148 #: ../../view/theme/diabook-aerith/theme.php:147
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:149 #: ../../view/theme/diabook-red/theme.php:148
#: ../../view/theme/diabook-blue/theme.php:149 #: ../../view/theme/diabook-blue/theme.php:148
#: ../../view/theme/diabook/theme.php:152 #: ../../view/theme/diabook/theme.php:152
#: ../../view/theme/diabook-aerith/theme.php:150 #: ../../view/theme/diabook-aerith/theme.php:149
#: ../../include/contact_widgets.php:35 #: ../../include/contact_widgets.php:35
msgid "Similar Interests" msgid "Similar Interests"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:151 #: ../../view/theme/diabook-red/theme.php:150
#: ../../view/theme/diabook-blue/theme.php:151 #: ../../view/theme/diabook-blue/theme.php:150
#: ../../view/theme/diabook/theme.php:154 #: ../../view/theme/diabook/theme.php:154
#: ../../view/theme/diabook-aerith/theme.php:152 #: ../../view/theme/diabook-aerith/theme.php:151
#: ../../include/contact_widgets.php:37 #: ../../include/contact_widgets.php:37
msgid "Invite Friends" msgid "Invite Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:166 #: ../../view/theme/diabook-red/theme.php:165
#: ../../view/theme/diabook-red/theme.php:247 #: ../../view/theme/diabook-red/theme.php:246
#: ../../view/theme/diabook-blue/theme.php:166 #: ../../view/theme/diabook-blue/theme.php:165
#: ../../view/theme/diabook-blue/theme.php:247 #: ../../view/theme/diabook-blue/theme.php:246
#: ../../view/theme/diabook/theme.php:170 #: ../../view/theme/diabook/theme.php:170
#: ../../view/theme/diabook/theme.php:254 #: ../../view/theme/diabook/theme.php:254
#: ../../view/theme/diabook-aerith/theme.php:167 #: ../../view/theme/diabook-aerith/theme.php:166
#: ../../view/theme/diabook-aerith/theme.php:248 #: ../../view/theme/diabook-aerith/theme.php:247
msgid "Community Pages" msgid "Community Pages"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:199 #: ../../view/theme/diabook-red/theme.php:198
#: ../../view/theme/diabook-blue/theme.php:199 #: ../../view/theme/diabook-blue/theme.php:198
#: ../../view/theme/diabook/theme.php:203 #: ../../view/theme/diabook/theme.php:203
#: ../../view/theme/diabook-aerith/theme.php:200 #: ../../view/theme/diabook-aerith/theme.php:199
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:205 #: ../../view/theme/diabook-red/theme.php:204
#: ../../view/theme/diabook-blue/theme.php:205 #: ../../view/theme/diabook-blue/theme.php:204
#: ../../view/theme/diabook/theme.php:209 #: ../../view/theme/diabook/theme.php:209
#: ../../view/theme/diabook-aerith/theme.php:206 #: ../../view/theme/diabook-aerith/theme.php:205
msgid "Connect Services" msgid "Connect Services"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:211 #: ../../view/theme/diabook-red/theme.php:210
#: ../../view/theme/diabook-blue/theme.php:211 #: ../../view/theme/diabook-blue/theme.php:210
#: ../../view/theme/diabook/theme.php:215 #: ../../view/theme/diabook/theme.php:215
#: ../../view/theme/diabook-aerith/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:211
msgid "PostIt to Friendica" msgid "PostIt to Friendica"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:211 #: ../../view/theme/diabook-red/theme.php:210
#: ../../view/theme/diabook-blue/theme.php:211 #: ../../view/theme/diabook-blue/theme.php:210
#: ../../view/theme/diabook/theme.php:215 #: ../../view/theme/diabook/theme.php:215
#: ../../view/theme/diabook-aerith/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:211
msgid "Post to Friendica" msgid "Post to Friendica"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:212 #: ../../view/theme/diabook-red/theme.php:211
#: ../../view/theme/diabook-blue/theme.php:212 #: ../../view/theme/diabook-blue/theme.php:211
#: ../../view/theme/diabook/theme.php:216 #: ../../view/theme/diabook/theme.php:216
#: ../../view/theme/diabook-aerith/theme.php:213 #: ../../view/theme/diabook-aerith/theme.php:212
msgid " from anywhere by bookmarking this Link." msgid " from anywhere by bookmarking this Link."
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:240 #: ../../view/theme/diabook-red/theme.php:239
#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:239
#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:49 #: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
#: ../../include/nav.php:115 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:240
#: ../../view/theme/diabook-blue/theme.php:240
#: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-red/theme.php:241
#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:241
#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:50 #: ../../view/theme/diabook-aerith/theme.php:242
msgid "Your profile page" msgid "Your contacts"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:243
msgid "Your contacts"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51 #: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
#: ../../boot.php:1461 #: ../../boot.php:1462
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:243 #: ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51 #: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
msgid "Your photos" msgid "Your events"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:244 #: ../../view/theme/diabook-red/theme.php:244
#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52
msgid "Your events"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:245
#: ../../view/theme/diabook-blue/theme.php:245
#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
msgid "Personal notes" msgid "Personal notes"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:245 #: ../../view/theme/diabook-red/theme.php:244
#: ../../view/theme/diabook-blue/theme.php:245 #: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
msgid "Your personal photos" msgid "Your personal photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:312 #: ../../view/theme/quattro/config.php:54
#: ../../view/theme/diabook-blue/theme.php:311
#: ../../view/theme/diabook/theme.php:322
#: ../../view/theme/diabook-aerith/theme.php:312
msgid "Connections"
msgstr ""
#: ../../view/theme/quattro/config.php:23
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
#: ../../view/theme/quattro/config.php:24 #: ../../view/theme/quattro/config.php:55
msgid "Alignment" msgid "Alignment"
msgstr "" msgstr ""
#: ../../view/theme/quattro/config.php:24 #: ../../view/theme/quattro/config.php:55
msgid "Left" msgid "Left"
msgstr "" msgstr ""
#: ../../view/theme/quattro/config.php:24 #: ../../view/theme/quattro/config.php:55
msgid "Center" msgid "Center"
msgstr "" msgstr ""
#: ../../view/theme/quattro/config.php:25 #: ../../view/theme/quattro/config.php:56
msgid "Color scheme" msgid "Color scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1083 #: ../../include/profile_advanced.php:17 ../../boot.php:1084
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5453,11 +5517,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1086 #: ../../include/profile_advanced.php:37 ../../boot.php:1087
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1088 #: ../../include/profile_advanced.php:45 ../../boot.php:1089
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -5941,27 +6005,27 @@ msgstr ""
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1071 #: ../../include/text.php:1084
msgid "Select an alternate language"
msgstr ""
#: ../../include/text.php:1083
msgid "default" msgid "default"
msgstr "" msgstr ""
#: ../../include/text.php:1299 #: ../../include/text.php:1096
msgid "Select an alternate language"
msgstr ""
#: ../../include/text.php:1306
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: ../../include/text.php:1301 #: ../../include/text.php:1308
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: ../../include/text.php:1302 #: ../../include/text.php:1309
msgid "post" msgid "post"
msgstr "" msgstr ""
#: ../../include/text.php:1457 #: ../../include/text.php:1464
msgid "Item filed" msgid "Item filed"
msgstr "" msgstr ""
@ -5978,7 +6042,7 @@ msgstr ""
msgid "[Relayed] Comment authored by %s from network %s" msgid "[Relayed] Comment authored by %s from network %s"
msgstr "" msgstr ""
#: ../../include/network.php:822 #: ../../include/network.php:823
msgid "view full size" msgid "view full size"
msgstr "" msgstr ""
@ -6017,7 +6081,11 @@ msgstr ""
msgid "Create a new group" msgid "Create a new group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:794 #: ../../include/group.php:215
msgid "Contacts not in any group"
msgstr ""
#: ../../include/nav.php:46 ../../boot.php:795
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -6025,7 +6093,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1451 #: ../../include/nav.php:49 ../../boot.php:1452
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6105,11 +6173,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1041 #: ../../include/nav.php:138 ../../boot.php:1042
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1041 #: ../../include/nav.php:138 ../../boot.php:1042
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -6747,70 +6815,70 @@ msgstr ""
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
#: ../../boot.php:493 #: ../../boot.php:494
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:496 #: ../../boot.php:497
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:773 #: ../../boot.php:774
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:797 #: ../../boot.php:798
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:798 #: ../../boot.php:799
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:801 #: ../../boot.php:802
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:807 #: ../../boot.php:808
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:973 #: ../../boot.php:974
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1033 #: ../../boot.php:1034
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1149 ../../boot.php:1221 #: ../../boot.php:1150 ../../boot.php:1222
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1150 ../../boot.php:1222 #: ../../boot.php:1151 ../../boot.php:1223
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1175 #: ../../boot.php:1176
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1176 #: ../../boot.php:1177
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1199 ../../boot.php:1264 #: ../../boot.php:1200 ../../boot.php:1265
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1245 #: ../../boot.php:1246
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1246 #: ../../boot.php:1247
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1258 #: ../../boot.php:1259
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""

2
view/admin_plugins_details.tpl
View file

@ -17,7 +17,7 @@
</p> </p>
{{ if $screenshot }} {{ if $screenshot }}
<a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a> <a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a>
{{ endif }} {{ endif }}
{{ if $admin_form }} {{ if $admin_form }}

36
view/admin_site.tpl
View file

@ -1,3 +1,39 @@
<script>
$(function(){
$("#cnftheme").fancybox({
width: 800,
autoDimensions: false,
onStart: function(){
var theme = $("#id_theme :selected").val();
$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
},
onComplete: function(){
$("div#fancybox-content form").submit(function(e){
var url = $(this).attr('action');
// can't get .serialize() to work...
var data={};
$(this).find("input").each(function(){
data[$(this).attr('name')] = $(this).val();
});
$(this).find("select").each(function(){
data[$(this).attr('name')] = $(this).children(":selected").val();
});
console.log(":)", url, data);
$.post(url, data, function(data) {
if(timer) clearTimeout(timer);
NavUpdate();
$.fancybox.close();
})
return false;
});
}
});
});
</script>
<div id='adminpage'> <div id='adminpage'>
<h1>$title - $page</h1> <h1>$title - $page</h1>

2
view/field_checkbox.tpl
View file

@ -1,6 +1,6 @@
<div class='field checkbox'> <div class='field checkbox'>
<label for='id_$field.0'>$field.1</label> <label for='id_$field.0'>$field.1</label>
<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="true"{{ endif }}> <input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}>
<span class='field_help'>$field.3</span> <span class='field_help'>$field.3</span>
</div> </div>

2
view/field_themeselect.tpl
View file

@ -1,4 +1,4 @@
<script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script>
<div class='field select'> <div class='field select'>
<label for='id_$field.0'>$field.1</label> <label for='id_$field.0'>$field.1</label>
<select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" > <select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >

10
view/lang_selector.tpl Normal file
View file

@ -0,0 +1,10 @@
<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{ for $langs.0 as $v=>$l }}
<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
{{ endfor }}
</select>
</form>
</div>

14
view/theme/diabook-aerith/comment_item.tpl
View file

@ -12,13 +12,13 @@
</div> </div>
<div class="comment-edit-photo-end"></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> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a> <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a> <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>
{{ if $qcomment }} {{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option> <option value=""></option>

71
view/theme/diabook-aerith/config.php Normal file
View file

@ -0,0 +1,71 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['diabook-aerith-settings-submit'])){
set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
}
}
function theme_admin(&$a){
$font_size = get_config('diabook-aerith', 'font_size' );
$line_height = get_config('diabook-aerith', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_admin_post(&$a){
if (isset($_POST['diabook-aerith-settings-submit'])){
set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
}
}
function diabook_form(&$a, $font_size, $line_height){
$line_heights = array(
"1.4"=>"1.4",
"1.3"=>"1.3",
"1.2"=>"1.2",
"1.1"=>"1.1",
);
$font_sizes = array(
'14'=>'14',
'13.5'=>'13.5',
'13'=>'13',
'12.5'=>'12.5',
'12'=>'12',
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
));
return $o;
}

16
view/theme/diabook-aerith/group_side.tpl
View file

@ -1,18 +1,18 @@
<div id="group-sidebar" class="widget"> <div id="profile_side" >
<div class="title tool"> <div class="">
<h3 class="label">$title</h3> <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
</div> </div>
<div id="sidebar-group-list"> <div id="sidebar-group-list">
<ul> <ul class="menu-profile-side">
{{ for $groups as $group }} {{ for $groups as $group }}
<li class="tool {{ if $group.selected }}selected{{ endif }}"> <li class="menu-profile-list">
<a href="$group.href" class="label"> <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a href="$group.href" class="menu-profile-list-item">
$group.text $group.text
</a> </a>
{{ if $group.edit }} {{ if $group.edit }}
<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
{{ endif }} {{ endif }}
{{ if $group.cid }} {{ if $group.cid }}
<input type="checkbox" <input type="checkbox"

BIN
view/theme/diabook-aerith/icons/selected.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 293 B

Before After
Before After

BIN
view/theme/diabook-aerith/icons/unselected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 225 B

2
view/theme/diabook-aerith/nets.tpl
View file

@ -3,7 +3,7 @@
<div id="nets-desc">$desc</div> <div id="nets-desc">$desc</div>
<ul class="nets-ul"> <ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }} {{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }} {{ endfor }}

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

@ -1380,10 +1380,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

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

@ -1358,10 +1358,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

52
view/theme/diabook-aerith/style.css
View file

@ -1230,6 +1230,50 @@ aside #likes a:hover{
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
.group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.group_unselected {
background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.icon.text_add {
background-image: url("../../../images/icons/16/add.png");
float: right;
opacity: 0.1;
margin-right: 14px;
}
.icon.text_add:hover {
background-image: url("../../../images/icons/16/add.png");
float: right;
cursor: pointer;
margin-right: 14px;
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.icon.text_edit {
background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1;
margin-top: 6px;
float: right;
height: 10px;
}
.icon.text_edit:hover {
background-image: url("../../../images/icons/10/edit.png");
opacity: 1;
margin-top: 6px;
float: right;
height: 10px;
}
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 2em;
@ -1410,10 +1454,10 @@ body .pageheader{
color: #999; color: #999;
} }
.wall-item-photo-container .wall-item-content { .wall-item-photo-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }
.wall-item-photo-container .wall-item-content img { .wall-item-photo-container .wall-item-content img {
@ -1555,10 +1599,10 @@ body .pageheader{
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

120
view/theme/diabook-aerith/style.php Normal file
View file

@ -0,0 +1,120 @@
<?php
$line_height=false;
$diabook_font_size=false;
$site_line_height = get_config("diabook-aerith","line_height");
$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
if (local_user()) {
$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
}
if ($line_height===false) $line_height=$site_line_height;
if ($line_height===false) $line_height="1.3";
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
if ($diabook_font_size===false) $diabook_font_size="13";
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
if($diabook_font_size == "14"){
echo "
.wall-item-container .wall-item-content {
font-size: 14px;
}
.wall-item-photo-container .wall-item-content {
font-size: 14px;
}
";
}
if($diabook_font_size == "13.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 13.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13.5px;
}
";
}
if($diabook_font_size == "13"){
echo "
.wall-item-container .wall-item-content {
font-size: 13px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13px;
}
";
}
if($diabook_font_size == "12.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 12.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12.5px;
}
";
}
if($diabook_font_size == "12"){
echo "
.wall-item-container .wall-item-content {
font-size: 12px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12px;
}
";
}
if($line_height == "1.4"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.4;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.4;
}
";
}
if($line_height == "1.3"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.3;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.3;
}
";
}
if($line_height == "1.2"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.2;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.2;
}
";
}
if($line_height == "1.1"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.1;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.1;
}
";
}

8
view/theme/diabook-aerith/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook-aerith * Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.017) * Version: (Version: 1.018)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-aerith (Version: 1.017)"; $diabook_version = "Diabook-aerith (Version: 1.018)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@ -462,10 +462,10 @@ function restore_boxes(){
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script type="text/javascript"> <script type="text/javascript">
function insertFormatting(BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == "Kommentar") { if(tmpStr == comment) {
tmpStr = ""; tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");

8
view/theme/diabook-aerith/theme_settings.tpl Normal file
View file

@ -0,0 +1,8 @@
{{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$line_height}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
</div>

14
view/theme/diabook-blue/comment_item.tpl
View file

@ -12,13 +12,13 @@
</div> </div>
<div class="comment-edit-photo-end"></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> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a> <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a> <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>
{{ if $qcomment }} {{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option> <option value=""></option>

71
view/theme/diabook-blue/config.php Normal file
View file

@ -0,0 +1,71 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$font_size = get_pconfig(local_user(), 'diabook-blue', 'font_size' );
$line_height = get_pconfig(local_user(), 'diabook-blue', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['diabook-blue-settings-submit'])){
set_pconfig(local_user(), 'diabook-blue', 'font_size', $_POST['diabook-blue_font_size']);
set_pconfig(local_user(), 'diabook-blue', 'line_height', $_POST['diabook-blue_line_height']);
}
}
function theme_admin(&$a){
$font_size = get_config('diabook-blue', 'font_size' );
$line_height = get_config('diabook-blue', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_admin_post(&$a){
if (isset($_POST['diabook-blue-settings-submit'])){
set_config('diabook-blue', 'font_size', $_POST['diabook-blue_font_size']);
set_config('diabook-blue', 'line_height', $_POST['diabook-blue_line_height']);
}
}
function diabook_form(&$a, $font_size, $line_height){
$line_heights = array(
"1.4"=>"1.4",
"1.3"=>"1.3",
"1.2"=>"1.2",
"1.1"=>"1.1",
);
$font_sizes = array(
'14'=>'14',
'13.5'=>'13.5',
'13'=>'13',
'12.5'=>'12.5',
'12'=>'12',
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
));
return $o;
}

16
view/theme/diabook-blue/group_side.tpl
View file

@ -1,18 +1,18 @@
<div id="group-sidebar" class="widget"> <div id="profile_side" >
<div class="title tool"> <div class="">
<h3 class="label">$title</h3> <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
</div> </div>
<div id="sidebar-group-list"> <div id="sidebar-group-list">
<ul> <ul class="menu-profile-side">
{{ for $groups as $group }} {{ for $groups as $group }}
<li class="tool {{ if $group.selected }}selected{{ endif }}"> <li class="menu-profile-list">
<a href="$group.href" class="label"> <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a href="$group.href" class="menu-profile-list-item">
$group.text $group.text
</a> </a>
{{ if $group.edit }} {{ if $group.edit }}
<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
{{ endif }} {{ endif }}
{{ if $group.cid }} {{ if $group.cid }}
<input type="checkbox" <input type="checkbox"

BIN
view/theme/diabook-blue/icons/selected.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 293 B

Before After
Before After

BIN
view/theme/diabook-blue/icons/unselected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 225 B

2
view/theme/diabook-blue/nets.tpl
View file

@ -3,7 +3,7 @@
<div id="nets-desc">$desc</div> <div id="nets-desc">$desc</div>
<ul class="nets-ul"> <ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }} {{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }} {{ endfor }}

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

@ -1342,10 +1342,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

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

@ -1325,10 +1325,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

52
view/theme/diabook-blue/style.css
View file

@ -1190,6 +1190,50 @@ aside #side-peoplefind-url {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
.group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.group_unselected {
background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.icon.text_add {
background-image: url("../../../images/icons/16/add.png");
float: right;
opacity: 0.1;
margin-right: 14px;
}
.icon.text_add:hover {
background-image: url("../../../images/icons/16/add.png");
float: right;
cursor: pointer;
margin-right: 14px;
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.icon.text_edit {
background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1;
margin-top: 6px;
float: right;
height: 10px;
}
.icon.text_edit:hover {
background-image: url("../../../images/icons/10/edit.png");
opacity: 1;
margin-top: 6px;
float: right;
height: 10px;
}
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 2em;
@ -1367,10 +1411,10 @@ body .pageheader{
color: #999; color: #999;
} }
.wall-item-photo-container .wall-item-content { .wall-item-photo-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }
.wall-item-photo-container .wall-item-content img { .wall-item-photo-container .wall-item-content img {
@ -1513,10 +1557,10 @@ body .pageheader{
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

120
view/theme/diabook-blue/style.php Normal file
View file

@ -0,0 +1,120 @@
<?php
$line_height=false;
$diabook_font_size=false;
$site_line_height = get_config("diabook-blue","line_height");
$site_diabook_font_size = get_config("diabook-blue", "font_size" );
if (local_user()) {
$line_height = get_pconfig(local_user(), "diabook-blue","line_height");
$diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size");
}
if ($line_height===false) $line_height=$site_line_height;
if ($line_height===false) $line_height="1.3";
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
if ($diabook_font_size===false) $diabook_font_size="13";
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
if($diabook_font_size == "14"){
echo "
.wall-item-container .wall-item-content {
font-size: 14px;
}
.wall-item-photo-container .wall-item-content {
font-size: 14px;
}
";
}
if($diabook_font_size == "13.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 13.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13.5px;
}
";
}
if($diabook_font_size == "13"){
echo "
.wall-item-container .wall-item-content {
font-size: 13px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13px;
}
";
}
if($diabook_font_size == "12.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 12.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12.5px;
}
";
}
if($diabook_font_size == "12"){
echo "
.wall-item-container .wall-item-content {
font-size: 12px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12px;
}
";
}
if($line_height == "1.4"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.4;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.4;
}
";
}
if($line_height == "1.3"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.3;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.3;
}
";
}
if($line_height == "1.2"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.2;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.2;
}
";
}
if($line_height == "1.1"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.1;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.1;
}
";
}

8
view/theme/diabook-blue/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook-blue * Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.017) * Version: (Version: 1.018)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-blue (Version: 1.017)"; $diabook_version = "Diabook-blue (Version: 1.018)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -462,10 +462,10 @@ function restore_boxes(){
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script type="text/javascript"> <script type="text/javascript">
function insertFormatting(BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == "Kommentar") { if(tmpStr == comment) {
tmpStr = ""; tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");

8
view/theme/diabook-blue/theme_settings.tpl Normal file
View file

@ -0,0 +1,8 @@
{{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$line_height}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" />
</div>

14
view/theme/diabook-red/comment_item.tpl
View file

@ -12,13 +12,13 @@
</div> </div>
<div class="comment-edit-photo-end"></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> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a> <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a> <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>
{{ if $qcomment }} {{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option> <option value=""></option>

71
view/theme/diabook-red/config.php Normal file
View file

@ -0,0 +1,71 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' );
$line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['diabook-blue-settings-submit'])){
set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']);
set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']);
}
}
function theme_admin(&$a){
$font_size = get_config('diabook-red', 'font_size' );
$line_height = get_config('diabook-red', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_admin_post(&$a){
if (isset($_POST['diabook-red-settings-submit'])){
set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']);
set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']);
}
}
function diabook_form(&$a, $font_size, $line_height){
$line_heights = array(
"1.4"=>"1.4",
"1.3"=>"1.3",
"1.2"=>"1.2",
"1.1"=>"1.1",
);
$font_sizes = array(
'14'=>'14',
'13.5'=>'13.5',
'13'=>'13',
'12.5'=>'12.5',
'12'=>'12',
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
));
return $o;
}

16
view/theme/diabook-red/group_side.tpl
View file

@ -1,18 +1,18 @@
<div id="group-sidebar" class="widget"> <div id="profile_side" >
<div class="title tool"> <div class="">
<h3 class="label">$title</h3> <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
</div> </div>
<div id="sidebar-group-list"> <div id="sidebar-group-list">
<ul> <ul class="menu-profile-side">
{{ for $groups as $group }} {{ for $groups as $group }}
<li class="tool {{ if $group.selected }}selected{{ endif }}"> <li class="menu-profile-list">
<a href="$group.href" class="label"> <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a href="$group.href" class="menu-profile-list-item">
$group.text $group.text
</a> </a>
{{ if $group.edit }} {{ if $group.edit }}
<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
{{ endif }} {{ endif }}
{{ if $group.cid }} {{ if $group.cid }}
<input type="checkbox" <input type="checkbox"

BIN
view/theme/diabook-red/icons/selected.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 293 B

Before After
Before After

BIN
view/theme/diabook-red/icons/unselected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 225 B

2
view/theme/diabook-red/nets.tpl
View file

@ -3,7 +3,7 @@
<div id="nets-desc">$desc</div> <div id="nets-desc">$desc</div>
<ul class="nets-ul"> <ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }} {{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }} {{ endfor }}

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

@ -1376,10 +1376,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

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

@ -1338,10 +1338,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

52
view/theme/diabook-red/style.css
View file

@ -1219,6 +1219,50 @@ aside #side-peoplefind-url {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
.group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.group_unselected {
background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.icon.text_add {
background-image: url("../../../images/icons/16/add.png");
float: right;
opacity: 0.1;
margin-right: 14px;
}
.icon.text_add:hover {
background-image: url("../../../images/icons/16/add.png");
float: right;
cursor: pointer;
margin-right: 14px;
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.icon.text_edit {
background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1;
margin-top: 6px;
float: right;
height: 10px;
}
.icon.text_edit:hover {
background-image: url("../../../images/icons/10/edit.png");
opacity: 1;
margin-top: 6px;
float: right;
height: 10px;
}
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 2em;
@ -1396,10 +1440,10 @@ body .pageheader{
color: #999; color: #999;
} }
.wall-item-photo-container .wall-item-content { .wall-item-photo-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }
.wall-item-photo-container .wall-item-content img { .wall-item-photo-container .wall-item-content img {
@ -1541,10 +1585,10 @@ body .pageheader{
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

120
view/theme/diabook-red/style.php Normal file
View file

@ -0,0 +1,120 @@
<?php
$line_height=false;
$diabook_font_size=false;
$site_line_height = get_config("diabook-red","line_height");
$site_diabook_font_size = get_config("diabook-red", "font_size" );
if (local_user()) {
$line_height = get_pconfig(local_user(), "diabook-red","line_height");
$diabook_font_size = get_pconfig(local_user(), "diabook-red", "font_size");
}
if ($line_height===false) $line_height=$site_line_height;
if ($line_height===false) $line_height="1.3";
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
if ($diabook_font_size===false) $diabook_font_size="13";
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
if($diabook_font_size == "14"){
echo "
.wall-item-container .wall-item-content {
font-size: 14px;
}
.wall-item-photo-container .wall-item-content {
font-size: 14px;
}
";
}
if($diabook_font_size == "13.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 13.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13.5px;
}
";
}
if($diabook_font_size == "13"){
echo "
.wall-item-container .wall-item-content {
font-size: 13px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13px;
}
";
}
if($diabook_font_size == "12.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 12.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12.5px;
}
";
}
if($diabook_font_size == "12"){
echo "
.wall-item-container .wall-item-content {
font-size: 12px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12px;
}
";
}
if($line_height == "1.4"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.4;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.4;
}
";
}
if($line_height == "1.3"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.3;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.3;
}
";
}
if($line_height == "1.2"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.2;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.2;
}
";
}
if($line_height == "1.1"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.1;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.1;
}
";
}

8
view/theme/diabook-red/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook-red * Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.017) * Version: (Version: 1.018)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-red (Version: 1.017)"; $diabook_version = "Diabook-red (Version: 1.018)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -461,10 +461,10 @@ function restore_boxes(){
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script type="text/javascript"> <script type="text/javascript">
function insertFormatting(BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == "Kommentar") { if(tmpStr == comment) {
tmpStr = ""; tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");

8
view/theme/diabook-red/theme_settings.tpl Normal file
View file

@ -0,0 +1,8 @@
{{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$line_height}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-red-settings-submit" />
</div>

14
view/theme/diabook/comment_item.tpl
View file

@ -12,13 +12,13 @@
</div> </div>
<div class="comment-edit-photo-end"></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> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a> <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a> <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a> <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>
{{ if $qcomment }} {{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option> <option value=""></option>

71
view/theme/diabook/config.php Normal file
View file

@ -0,0 +1,71 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$font_size = get_pconfig(local_user(), 'diabook', 'font_size' );
$line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['diabook-settings-submit'])){
set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']);
set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
}
}
function theme_admin(&$a){
$font_size = get_config('diabook', 'font_size' );
$line_height = get_config('diabook', 'line_height' );
return diabook_form($a,$font_size, $line_height);
}
function theme_admin_post(&$a){
if (isset($_POST['diabook-settings-submit'])){
set_config('diabook', 'font_size', $_POST['diabook_font_size']);
set_config('diabook', 'line_height', $_POST['diabook_line_height']);
}
}
function diabook_form(&$a, $font_size, $line_height){
$line_heights = array(
"1.4"=>"1.4",
"1.3"=>"1.3",
"1.2"=>"1.2",
"1.1"=>"1.1",
);
$font_sizes = array(
'14'=>'14',
'13.5'=>'13.5',
'13'=>'13',
'12.5'=>'12.5',
'12'=>'12',
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$font_size' => array('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
));
return $o;
}

16
view/theme/diabook/group_side.tpl
View file

@ -1,18 +1,18 @@
<div id="group-sidebar" class="widget"> <div id="profile_side" >
<div class="title tool"> <div class="">
<h3 class="label">$title</h3> <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
</div> </div>
<div id="sidebar-group-list"> <div id="sidebar-group-list">
<ul> <ul class="menu-profile-side">
{{ for $groups as $group }} {{ for $groups as $group }}
<li class="tool {{ if $group.selected }}selected{{ endif }}"> <li class="menu-profile-list">
<a href="$group.href" class="label"> <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a href="$group.href" class="menu-profile-list-item">
$group.text $group.text
</a> </a>
{{ if $group.edit }} {{ if $group.edit }}
<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
{{ endif }} {{ endif }}
{{ if $group.cid }} {{ if $group.cid }}
<input type="checkbox" <input type="checkbox"

BIN
view/theme/diabook/icons/selected.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 293 B

Before After
Before After

BIN
view/theme/diabook/icons/unselected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 225 B

2
view/theme/diabook/nets.tpl
View file

@ -3,7 +3,7 @@
<div id="nets-desc">$desc</div> <div id="nets-desc">$desc</div>
<ul class="nets-ul"> <ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }} {{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }} {{ endfor }}

4
view/theme/diabook/style-network.css
View file

@ -1318,10 +1318,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

4
view/theme/diabook/style-profile.css
View file

@ -1298,10 +1298,10 @@ transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 420px; max-width: 420px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }

51
view/theme/diabook/style.css
View file

@ -1241,8 +1241,49 @@ aside #side-peoplefind-url {
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.widget .tool.selected { .group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.group_unselected {
background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
float: left;
height: 22px;
width: 22px;
}
.icon.text_add {
background-image: url("../../../images/icons/16/add.png");
float: right;
opacity: 0.1;
margin-right: 14px;
}
.icon.text_add:hover {
background-image: url("../../../images/icons/16/add.png");
float: right;
cursor: pointer;
margin-right: 14px;
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.icon.text_edit {
background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1;
margin-top: 6px;
float: right;
height: 10px;
}
.icon.text_edit:hover {
background-image: url("../../../images/icons/10/edit.png");
opacity: 1;
margin-top: 6px;
float: right;
height: 10px;
} }
/* widget: search */ /* widget: search */
#add-search-popup { #add-search-popup {
@ -1394,17 +1435,17 @@ body .pageheader{
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }
.wall-item-photo-container .wall-item-content { .wall-item-photo-container .wall-item-content {
font-size: 12.5px;
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
margin-bottom: 14px; margin-bottom: 14px;
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {

120
view/theme/diabook/style.php Normal file
View file

@ -0,0 +1,120 @@
<?php
$line_height=false;
$diabook_font_size=false;
$site_line_height = get_config("diabook","line_height");
$site_diabook_font_size = get_config("diabook", "font_size" );
if (local_user()) {
$line_height = get_pconfig(local_user(), "diabook","line_height");
$diabook_font_size = get_pconfig(local_user(), "diabook", "font_size");
}
if ($line_height===false) $line_height=$site_line_height;
if ($line_height===false) $line_height="1.3";
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
if ($diabook_font_size===false) $diabook_font_size="13";
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
if($diabook_font_size == "14"){
echo "
.wall-item-container .wall-item-content {
font-size: 14px;
}
.wall-item-photo-container .wall-item-content {
font-size: 14px;
}
";
}
if($diabook_font_size == "13.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 13.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13.5px;
}
";
}
if($diabook_font_size == "13"){
echo "
.wall-item-container .wall-item-content {
font-size: 13px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13px;
}
";
}
if($diabook_font_size == "12.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 12.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12.5px;
}
";
}
if($diabook_font_size == "12"){
echo "
.wall-item-container .wall-item-content {
font-size: 12px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12px;
}
";
}
if($line_height == "1.4"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.4;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.4;
}
";
}
if($line_height == "1.3"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.3;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.3;
}
";
}
if($line_height == "1.2"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.2;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.2;
}
";
}
if($line_height == "1.1"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.1;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.1;
}
";
}

11
view/theme/diabook/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook * Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.017) * Version: (Version: 1.018)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.017)"; $diabook_version = "Diabook (Version: 1.018)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -469,13 +469,14 @@ function restore_boxes(){
} }
</script>';} </script>';}
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script type="text/javascript"> <script>
function insertFormatting(BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val(); var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == "Kommentar") { if(tmpStr == comment) {
tmpStr = ""; tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");

8
view/theme/diabook/theme_settings.tpl Normal file
View file

@ -0,0 +1,8 @@
{{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$line_height}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
</div>

2
view/theme/quattro/TODO Normal file
View file

@ -0,0 +1,2 @@
jot.tpl: <!-- TODO: waiting for a better placement
nav.tpl: <!-- TODO: better icons! -->

42
view/theme/quattro/config.php
View file

@ -11,6 +11,37 @@ function theme_content(&$a){
$align = get_pconfig(local_user(), 'quattro', 'align' ); $align = get_pconfig(local_user(), 'quattro', 'align' );
$color = get_pconfig(local_user(), 'quattro', 'color' ); $color = get_pconfig(local_user(), 'quattro', 'color' );
return quattro_form($a,$align, $color);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['quattro-settings-submit'])){
set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
}
}
function theme_admin(&$a){
$align = get_config('quattro', 'align' );
$color = get_config('quattro', 'color' );
return quattro_form($a,$align, $color);
}
function theme_admin_post(&$a){
if (isset($_POST['quattro-settings-submit'])){
set_config('quattro', 'align', $_POST['quattro_align']);
set_config('quattro', 'color', $_POST['quattro_color']);
}
}
function quattro_form(&$a, $align, $color){
$colors = array( $colors = array(
"dark"=>"Quattro", "dark"=>"Quattro",
"green"=>"Green" "green"=>"Green"
@ -26,14 +57,3 @@ function theme_content(&$a){
)); ));
return $o; return $o;
} }
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['quattro-settings-submit'])){
set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
}
}

5
view/theme/quattro/conversation.tpl
View file

@ -9,8 +9,11 @@
{{endif}} {{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ if $item.type == tag }}
{{ inc wall_item_tag.tpl }}{{ endinc }}
{{ else }}
{{ inc $item.template }}{{ endinc }} {{ inc $item.template }}{{ endinc }}
{{ endif }}
{{ endfor }} {{ endfor }}
</div> </div>

8
view/theme/quattro/dark/colors.less
View file

@ -38,7 +38,7 @@
@Link: @Blue3; @Link: @Blue3;
@LinkHover: @Blue3; @LinkHover: @Blue3;
@LinkVisited: @Blue3; @LinkVisited: @Blue3;
@LinkDimmed: @Blue2;
@ButtonColor: @Grey1; @ButtonColor: @Grey1;
@ButtonBackgroundColor: @Grey5; @ButtonBackgroundColor: @Grey5;
@ -73,9 +73,13 @@
@FieldHelpColor: @Grey3; @FieldHelpColor: @Grey3;
@ThreadBackgroundColor: #f6f7f8; @ThreadBackgroundColor: #eff0f1;
@ThreadBottomBorderColor: @Grey2;
@ShinyBorderColor: @Yellow1; @ShinyBorderColor: @Yellow1;
@ItemColor: @Grey5;
@ItemColorDimmed: @Grey3;
@CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyColor: @Grey3;
@CommentBoxEmptyBorderColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3;
@CommentBoxFullColor: @Grey5; @CommentBoxFullColor: @Grey5;

130
view/theme/quattro/dark/style.css
View file

@ -66,6 +66,9 @@
.icon.s10.type-text { .icon.s10.type-text {
background-image: url("../../../images/icons/10/text.png"); background-image: url("../../../images/icons/10/text.png");
} }
.icon.s10.language {
background-image: url("icons/language.png");
}
.icon.s10.text { .icon.s10.text {
padding: 2px 0px 0px 15px; padding: 2px 0px 0px 15px;
} }
@ -121,6 +124,9 @@
.icon.s16.type-text { .icon.s16.type-text {
background-image: url("../../../images/icons/16/text.png"); background-image: url("../../../images/icons/16/text.png");
} }
.icon.s16.language {
background-image: url("icons/language.png");
}
.icon.s16.text { .icon.s16.text {
padding: 4px 0px 0px 20px; padding: 4px 0px 0px 20px;
} }
@ -176,6 +182,9 @@
.icon.s22.type-text { .icon.s22.type-text {
background-image: url("../../../images/icons/22/text.png"); background-image: url("../../../images/icons/22/text.png");
} }
.icon.s22.language {
background-image: url("icons/language.png");
}
.icon.s22.text { .icon.s22.text {
padding: 10px 0px 0px 25px; padding: 10px 0px 0px 25px;
} }
@ -231,6 +240,9 @@
.icon.s48.type-text { .icon.s48.type-text {
background-image: url("../../../images/icons/48/text.png"); background-image: url("../../../images/icons/48/text.png");
} }
.icon.s48.language {
background-image: url("icons/language.png");
}
/* global */ /* global */
body { body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@ -314,6 +326,10 @@ code {
float: right; float: right;
} }
/* popup notifications */ /* popup notifications */
#jGrowl.top-right {
top: 30px;
right: 15px;
}
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -565,7 +581,7 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0; color: #9eabb0;
display: block; display: block;
} }
/* aside */ /* aside 230px*/
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
@ -772,20 +788,21 @@ aside #profiles-menu {
width: 200px; width: 200px;
top: 18px; top: 18px;
} }
/* section */ /* section 800px */
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 800px; width: 770px;
padding: 0px 20px 0px 10px; padding: 0px 20px 0px 10px;
} }
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
background-color: #f6f7f8; background-color: #eff0f1;
position: relative; position: relative;
padding: 10px; padding: 10px;
margin-bottom: 20px; margin-bottom: 20px;
width: 780px; width: 750px;
border-bottom: 1px solid #cccccc;
} }
.wall-item-decor { .wall-item-decor {
position: absolute; position: absolute;
@ -798,7 +815,7 @@ section {
} }
.wall-item-container { .wall-item-container {
display: table; display: table;
width: 780px; width: 750px;
} }
.wall-item-container .wall-item-item, .wall-item-container .wall-item-item,
.wall-item-container .wall-item-bottom { .wall-item-container .wall-item-bottom {
@ -890,26 +907,42 @@ section {
.wall-item-container .wall-item-actions-tools input { .wall-item-container .wall-item-actions-tools input {
float: right; float: right;
} }
.wall-item-container.comment { .wall-item-container.comment .contact-photo-wrapper {
/*margin-top: 50px;*/ margin-left: 16px;
} }
.wall-item-container.comment .contact-photo { .wall-item-container.comment .contact-photo {
width: 32px; width: 32px;
height: 32px; height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
} }
.wall-item-container.comment .contact-photo-menu-button { .wall-item-container.comment .contact-photo-menu-button {
top: 15px !important; top: 15px !important;
left: 15px !important; left: 0px !important;
} }
.wall-item-container.comment .wall-item-links { .wall-item-container.comment .wall-item-links {
padding-left: 12px; padding-left: 12px;
} }
/* 'tag' item type */
.wall-item-container.item-tag .wall-item-content {
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.wall-item-container.item-tag .contact-photo-wrapper {
margin-left: 32px;
}
.wall-item-container.item-tag .contact-photo {
width: 16px;
height: 16px;
}
.wall-item-container.item-tag .contact-photo-menu-button {
top: 15px !important;
left: 15px !important;
}
.wall-item-comment-wrapper { .wall-item-comment-wrapper {
margin: 30px 2em 2em 60px; margin: 1em 2em 1em 60px;
} }
.wall-item-comment-wrapper .comment-edit-photo { .wall-item-comment-wrapper .comment-edit-photo {
display: none; display: none;
@ -961,6 +994,9 @@ section {
#jot-preview-content .tread-wrapper { #jot-preview-content .tread-wrapper {
background-color: #fce94f; background-color: #fce94f;
} }
.hide-comments-outer {
margin-bottom: 0.8em;
}
.wall-item-tags { .wall-item-tags {
padding-top: 5px; padding-top: 5px;
} }
@ -1087,7 +1123,7 @@ section {
padding: 0px; padding: 0px;
height: 40px; height: 40px;
overflow: none; overflow: none;
width: 800px; width: 770px;
background-color: #0e232e; background-color: #0e232e;
border-bottom: 2px solid #9eabb0; border-bottom: 2px solid #9eabb0;
} }
@ -1162,7 +1198,7 @@ section {
border: 0px; border: 0px;
margin: 0px; margin: 0px;
height: 20px; height: 20px;
width: 700px; width: 500px;
font-weight: bold; font-weight: bold;
border: 1px solid #ffffff; border: 1px solid #ffffff;
} }
@ -1179,13 +1215,26 @@ section {
border: 1px solid #999999; border: 1px solid #999999;
} }
#jot #character-counter { #jot #character-counter {
width: 80px; width: 40px;
float: right; float: right;
text-align: right; text-align: right;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
padding-right: 20px; padding-right: 20px;
} }
#jot #jot-category {
border: 0px;
margin: 0px;
height: 20px;
width: 200px;
border: 1px solid #ffffff;
}
#jot #jot-category:hover {
border: 1px solid #999999;
}
#jot #jot-category:focus {
border: 1px solid #999999;
}
/** buttons **/ /** buttons **/
/*input[type="submit"] { /*input[type="submit"] {
border: 0px; border: 0px;
@ -1592,44 +1641,19 @@ ul.tabs li .active {
-ms-transition: all 0.2s ease-in-out; -ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
} }
/* mail view */ /* theme screenshot */
/* .screenshot,
.mail-conv-sender, #theme-preview {
.mail-conv-detail { position: absolute;
float: left; width: 202px;
left: 70%;
top: 50px;
} }
.mail-conv-detail { .screenshot img,
margin-left: 20px; #theme-preview img {
width: 500px; width: 200px;
height: 150px;
} }
.mail-conv-subject {
font-size: 1.4em;
margin: 10px 0;
}
.mail-conv-outside-wrapper-end {
clear: both;
}
.mail-conv-outside-wrapper {
margin-top: 30px;
}
.mail-conv-delete-wrapper {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-break {
clear: both;
}
.mail-conv-delete-icon {
border: none;
}
*/
/* page footer */ /* page footer */
footer { footer {
height: 100px; height: 100px;

3
view/theme/quattro/green/colors.less
View file

@ -74,7 +74,8 @@
@FieldHelpColor: @Grey3; @FieldHelpColor: @Grey3;
@ThreadBackgroundColor: #f6f7f8; @ThreadBackgroundColor: #eff0f1;
@ThreadBottomBorderColor: @Grey2;
@ShinyBorderColor: @Green4; @ShinyBorderColor: @Green4;
@CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyColor: @Grey3;

130
view/theme/quattro/green/style.css
View file

@ -66,6 +66,9 @@
.icon.s10.type-text { .icon.s10.type-text {
background-image: url("../../../images/icons/10/text.png"); background-image: url("../../../images/icons/10/text.png");
} }
.icon.s10.language {
background-image: url("icons/language.png");
}
.icon.s10.text { .icon.s10.text {
padding: 2px 0px 0px 15px; padding: 2px 0px 0px 15px;
} }
@ -121,6 +124,9 @@
.icon.s16.type-text { .icon.s16.type-text {
background-image: url("../../../images/icons/16/text.png"); background-image: url("../../../images/icons/16/text.png");
} }
.icon.s16.language {
background-image: url("icons/language.png");
}
.icon.s16.text { .icon.s16.text {
padding: 4px 0px 0px 20px; padding: 4px 0px 0px 20px;
} }
@ -176,6 +182,9 @@
.icon.s22.type-text { .icon.s22.type-text {
background-image: url("../../../images/icons/22/text.png"); background-image: url("../../../images/icons/22/text.png");
} }
.icon.s22.language {
background-image: url("icons/language.png");
}
.icon.s22.text { .icon.s22.text {
padding: 10px 0px 0px 25px; padding: 10px 0px 0px 25px;
} }
@ -231,6 +240,9 @@
.icon.s48.type-text { .icon.s48.type-text {
background-image: url("../../../images/icons/48/text.png"); background-image: url("../../../images/icons/48/text.png");
} }
.icon.s48.language {
background-image: url("icons/language.png");
}
/* global */ /* global */
body { body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@ -314,6 +326,10 @@ code {
float: right; float: right;
} }
/* popup notifications */ /* popup notifications */
#jGrowl.top-right {
top: 30px;
right: 15px;
}
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;
@ -565,7 +581,7 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0; color: #9eabb0;
display: block; display: block;
} }
/* aside */ /* aside 230px*/
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
@ -772,20 +788,21 @@ aside #profiles-menu {
width: 200px; width: 200px;
top: 18px; top: 18px;
} }
/* section */ /* section 800px */
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 800px; width: 770px;
padding: 0px 20px 0px 10px; padding: 0px 20px 0px 10px;
} }
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
background-color: #f6f7f8; background-color: #eff0f1;
position: relative; position: relative;
padding: 10px; padding: 10px;
margin-bottom: 20px; margin-bottom: 20px;
width: 780px; width: 750px;
border-bottom: 1px solid #cccccc;
} }
.wall-item-decor { .wall-item-decor {
position: absolute; position: absolute;
@ -798,7 +815,7 @@ section {
} }
.wall-item-container { .wall-item-container {
display: table; display: table;
width: 780px; width: 750px;
} }
.wall-item-container .wall-item-item, .wall-item-container .wall-item-item,
.wall-item-container .wall-item-bottom { .wall-item-container .wall-item-bottom {
@ -890,26 +907,42 @@ section {
.wall-item-container .wall-item-actions-tools input { .wall-item-container .wall-item-actions-tools input {
float: right; float: right;
} }
.wall-item-container.comment { .wall-item-container.comment .contact-photo-wrapper {
/*margin-top: 50px;*/ margin-left: 16px;
} }
.wall-item-container.comment .contact-photo { .wall-item-container.comment .contact-photo {
width: 32px; width: 32px;
height: 32px; height: 32px;
margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
} }
.wall-item-container.comment .contact-photo-menu-button { .wall-item-container.comment .contact-photo-menu-button {
top: 15px !important; top: 15px !important;
left: 15px !important; left: 0px !important;
} }
.wall-item-container.comment .wall-item-links { .wall-item-container.comment .wall-item-links {
padding-left: 12px; padding-left: 12px;
} }
/* 'tag' item type */
.wall-item-container.item-tag .wall-item-content {
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.wall-item-container.item-tag .contact-photo-wrapper {
margin-left: 32px;
}
.wall-item-container.item-tag .contact-photo {
width: 16px;
height: 16px;
}
.wall-item-container.item-tag .contact-photo-menu-button {
top: 15px !important;
left: 15px !important;
}
.wall-item-comment-wrapper { .wall-item-comment-wrapper {
margin: 30px 2em 2em 60px; margin: 1em 2em 1em 60px;
} }
.wall-item-comment-wrapper .comment-edit-photo { .wall-item-comment-wrapper .comment-edit-photo {
display: none; display: none;
@ -961,6 +994,9 @@ section {
#jot-preview-content .tread-wrapper { #jot-preview-content .tread-wrapper {
background-color: #ddffdd; background-color: #ddffdd;
} }
.hide-comments-outer {
margin-bottom: 0.8em;
}
.wall-item-tags { .wall-item-tags {
padding-top: 5px; padding-top: 5px;
} }
@ -1087,7 +1123,7 @@ section {
padding: 0px; padding: 0px;
height: 40px; height: 40px;
overflow: none; overflow: none;
width: 800px; width: 770px;
background-color: #009100; background-color: #009100;
border-bottom: 2px solid #9eabb0; border-bottom: 2px solid #9eabb0;
} }
@ -1162,7 +1198,7 @@ section {
border: 0px; border: 0px;
margin: 0px; margin: 0px;
height: 20px; height: 20px;
width: 700px; width: 500px;
font-weight: bold; font-weight: bold;
border: 1px solid #ffffff; border: 1px solid #ffffff;
} }
@ -1179,13 +1215,26 @@ section {
border: 1px solid #999999; border: 1px solid #999999;
} }
#jot #character-counter { #jot #character-counter {
width: 80px; width: 40px;
float: right; float: right;
text-align: right; text-align: right;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
padding-right: 20px; padding-right: 20px;
} }
#jot #jot-category {
border: 0px;
margin: 0px;
height: 20px;
width: 200px;
border: 1px solid #ffffff;
}
#jot #jot-category:hover {
border: 1px solid #999999;
}
#jot #jot-category:focus {
border: 1px solid #999999;
}
/** buttons **/ /** buttons **/
/*input[type="submit"] { /*input[type="submit"] {
border: 0px; border: 0px;
@ -1592,44 +1641,19 @@ ul.tabs li .active {
-ms-transition: all 0.2s ease-in-out; -ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
} }
/* mail view */ /* theme screenshot */
/* .screenshot,
.mail-conv-sender, #theme-preview {
.mail-conv-detail { position: absolute;
float: left; width: 202px;
left: 70%;
top: 50px;
} }
.mail-conv-detail { .screenshot img,
margin-left: 20px; #theme-preview img {
width: 500px; width: 200px;
height: 150px;
} }
.mail-conv-subject {
font-size: 1.4em;
margin: 10px 0;
}
.mail-conv-outside-wrapper-end {
clear: both;
}
.mail-conv-outside-wrapper {
margin-top: 30px;
}
.mail-conv-delete-wrapper {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-break {
clear: both;
}
.mail-conv-delete-icon {
border: none;
}
*/
/* page footer */ /* page footer */
footer { footer {
height: 100px; height: 100px;

3
view/theme/quattro/icons.less
View file

@ -20,6 +20,9 @@
&.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); } &.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); }
&.type-text { background-image: url("../../../images/icons/@{size}/text.png"); } &.type-text { background-image: url("../../../images/icons/@{size}/text.png"); }
&.language { background-image: url("icons/language.png"); }
} }

BIN
view/theme/quattro/icons/language.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 849 B

6
view/theme/quattro/jot.tpl
View file

@ -1,9 +1,11 @@
<form id="profile-jot-form" action="$action" method="post"> <form id="profile-jot-form" action="$action" method="post">
<div id="jot"> <div id="jot">
<div id="profile-jot-desc" class="jothidden">&nbsp;</div> <div id="profile-jot-desc" class="jothidden">&nbsp;</div>
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" /><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
<div id="character-counter" class="grey jothidden"></div> <div id="character-counter" class="grey jothidden"></div>
<input type="hidden" name="type" value="$ptyp" /> <input type="hidden" name="type" value="$ptyp" />
<input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
@ -20,8 +22,10 @@
<li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li> <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li> <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li> <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
<!-- TODO: waiting for a better placement
<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li> <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li> <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
-->
<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li> <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
$jotplugins $jotplugins

2
view/theme/quattro/nav.tpl
View file

@ -43,6 +43,7 @@
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
<span id="notify-update" class="nav-notify"></span> <span id="notify-update" class="nav-notify"></span>
<ul id="nav-notifications-menu" class="menu-popup"> <ul id="nav-notifications-menu" class="menu-popup">
<!-- TODO: better icons! -->
<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li> <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
<li class="empty">$emptynotifications</li> <li class="empty">$emptynotifications</li>
</ul> </ul>
@ -91,3 +92,4 @@
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>
<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>

104
view/theme/quattro/quattro.less
View file

@ -87,6 +87,10 @@ code {
/* popup notifications */ /* popup notifications */
#jGrowl.top-right {
top: 30px;
right: 15px;
}
div.jGrowl div.notice { div.jGrowl div.notice {
background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center; background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: @NoticeColor; color: @NoticeColor;
@ -270,7 +274,7 @@ ul.menu-popup {
/* aside */ /* aside 230px*/
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
@ -403,11 +407,11 @@ aside {
} }
/* section */ /* section 800px */
section { section {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 800px; width: 770px;
padding:0px 20px 0px 10px; padding:0px 20px 0px 10px;
} }
@ -417,14 +421,15 @@ section {
position: relative; position: relative;
padding: 10px; padding: 10px;
margin-bottom: 20px; margin-bottom: 20px;
width: 780px; width: 750px;
border-bottom: 1px solid @ThreadBottomBorderColor;
} }
.wall-item-decor { position: absolute; left: 97%; top: -10px; width: 16px;} .wall-item-decor { position: absolute; left: 97%; top: -10px; width: 16px;}
.unstarred { display: none; } .unstarred { display: none; }
.wall-item-container { .wall-item-container {
display: table; display: table;
width: 780px; width: 750px;
.wall-item-item, .wall-item-item,
.wall-item-bottom { display: table-row; } .wall-item-bottom { display: table-row; }
@ -478,19 +483,35 @@ section {
.wall-item-container.comment { .wall-item-container.comment {
/*margin-top: 50px;*/ .contact-photo-wrapper { margin-left: 16px; }
.contact-photo { width: 32px; height: 32px; margin-left: 16px; .contact-photo {
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ width: 32px; height: 32px;
}
.contact-photo-menu-button {
top: 15px !important;
left: 0px !important;
}
.wall-item-links { padding-left: 12px; }
}
/* 'tag' item type */
.wall-item-container.item-tag {
.wall-item-content {
.opaque(0.5);
}
.contact-photo-wrapper { margin-left: 32px; }
.contact-photo {
width: 16px; height: 16px;
} }
.contact-photo-menu-button { .contact-photo-menu-button {
top: 15px !important; top: 15px !important;
left: 15px !important; left: 15px !important;
} }
.wall-item-links { padding-left: 12px; }
} }
.wall-item-comment-wrapper { .wall-item-comment-wrapper {
margin: 30px 2em 2em 60px; margin: 1em 2em 1em 60px;
.comment-edit-photo { display: none; } .comment-edit-photo { display: none; }
textarea { textarea {
height: 1em; width: 100%; font-size: 10px; height: 1em; width: 100%; font-size: 10px;
@ -522,13 +543,12 @@ section {
.wall-item-container { width: 700px; } .wall-item-container { width: 700px; }
.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;} .tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
} }
.shiny { border-right:10px solid @ShinyBorderColor; } .shiny { border-right:10px solid @ShinyBorderColor; }
#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; } #jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
.hide-comments-outer {margin-bottom: 0.8em; }
.wall-item-tags { padding-top: 5px; } .wall-item-tags { padding-top: 5px; }
.tag { .tag {
@ -638,7 +658,7 @@ section {
#jot-tools { #jot-tools {
margin: 0px; padding: 0px; margin: 0px; padding: 0px;
height: 40px; overflow: none; height: 40px; overflow: none;
width: 800px; width: 770px;
background-color: @JotToolsBackgroundColor; background-color: @JotToolsBackgroundColor;
border-bottom: 2px solid @JotToolsBorderColor; border-bottom: 2px solid @JotToolsBorderColor;
li { li {
@ -710,7 +730,7 @@ section {
border: 0px; border: 0px;
margin: 0px; margin: 0px;
height: 20px; height: 20px;
width: 700px; width: 500px;
font-weight: bold; font-weight: bold;
border: 1px solid @BodyBackground; border: 1px solid @BodyBackground;
@ -727,7 +747,7 @@ section {
} }
#character-counter { #character-counter {
width: 80px; width: 40px;
float: right; float: right;
text-align: right; text-align: right;
height: 20px; height: 20px;
@ -735,6 +755,15 @@ section {
padding-right: 20px; padding-right: 20px;
} }
#jot-category {
border: 0px;
margin: 0px;
height: 20px;
width: 200px;
border: 1px solid @BodyBackground;
&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
}
} }
@ -1106,45 +1135,14 @@ ul.tabs {
} }
/* mail view */ /* theme screenshot */
/* .screenshot, #theme-preview {
.mail-conv-sender, position: absolute;
.mail-conv-detail { width:202px;
float: left; left: 70%;
top: 50px;
img { width: 200px; height: 150px; }
} }
.mail-conv-detail {
margin-left: 20px;
width: 500px;
}
.mail-conv-subject {
font-size: 1.4em;
margin: 10px 0;
}
.mail-conv-outside-wrapper-end {
clear: both;
}
.mail-conv-outside-wrapper {
margin-top: 30px;
}
.mail-conv-delete-wrapper {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-break {
clear: both;
}
.mail-conv-delete-icon {
border: none;
}
*/
/* page footer */ /* page footer */
footer { height: 100px; display: table-row; } footer { height: 100px; display: table-row; }

9
view/theme/quattro/style.php
View file

@ -1,11 +1,18 @@
<?php <?php
$color = false; $color=false;
$quattro_align=false;
$site_color = get_config("quattro","color");
$site_quattro_align = get_config("quattro", "align" );
if (local_user()) { if (local_user()) {
$color = get_pconfig(local_user(), "quattro","color"); $color = get_pconfig(local_user(), "quattro","color");
$quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); $quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
} }
if ($color===false) $color=$site_color;
if ($color===false) $color="dark"; if ($color===false) $color="dark";
if ($quattro_align===false) $quattro_align=$site_quattro_align;
if (file_exists("$THEMEPATH/$color/style.css")){ if (file_exists("$THEMEPATH/$color/style.css")){
echo file_get_contents("$THEMEPATH/$color/style.css"); echo file_get_contents("$THEMEPATH/$color/style.css");

12
view/theme/quattro/theme.php Normal file
View file

@ -0,0 +1,12 @@
<?php
/**
* Name: Quattro
* Version: 0.5
* Author: Fabio <http://kirgroup.com/profile/fabrixxm>
* Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
* Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias>
*/
$a->theme_info = array();

23
view/theme/quattro/wall_item_tag.tpl Normal file
View file

@ -0,0 +1,23 @@
<div class="wall-item-container item-tag $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
<div class="contact-photo-wrapper">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
</div>
<div class="wall-item-location">$item.location</div>
</div>
<div class="wall-item-content">
$item.body
</div>
</div>
</div>
<div class="wall-item-comment-wrapper" >
$item.comment
</div>