diff options
| author | zottel <github@zottel.net> | 2012-05-04 10:00:04 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-04 10:00:04 +0200 |
| commit | a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de (patch) | |
| tree | 8c931e7a9feb65af4505864e605dbccf544bfdec | |
| parent | 35771a778df18afb231969c242680a6353e5ef8e (diff) | |
| parent | 22c8fe46a554457b43b9721f1f46739511398060 (diff) | |
| download | volse-hubzilla-a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de.tar.gz volse-hubzilla-a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de.tar.bz2 volse-hubzilla-a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de.zip | |
Merge remote branch 'upstream/master'
37 files changed, 4343 insertions, 2709 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1330' ); +define ( 'FRIENDICA_VERSION', '2.3.1331' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index bf3a86958..4dab6a53e 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -143,7 +143,7 @@ function common_friends_visitor_widget($profile_uid) { $cid = $zcid = 0; if(can_write_wall($a,$profile_uid)) - $cid = local_user(); + $cid = remote_user(); else { if(get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", diff --git a/include/delivery.php b/include/delivery.php index 794b8f27a..28d81226a 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -51,6 +51,17 @@ function delivery_run($argv, $argc){ return; } + $maxsysload = intval(get_config('system','maxloadavg')); + if($maxsysload < 1) + $maxsysload = 50; + if(function_exists('sys_getloadavg')) { + $load = sys_getloadavg(); + if(intval($load[0]) > $maxsysload) { + logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.'); + return; + } + } + // It's ours to deliver. Remove it from the queue. q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1", diff --git a/include/network.php b/include/network.php index 4bec4a172..27a45ec40 100644 --- a/include/network.php +++ b/include/network.php @@ -583,7 +583,7 @@ function fetch_xrd_links($url) { // Take a URL from the wild, prepend http:// if necessary -// and check DNS to see if it's real +// and check DNS to see if it's real (or check if is a valid IP address) // return true if it's OK, false if something is wrong with it if(! function_exists('validate_url')) { @@ -596,7 +596,7 @@ function validate_url(&$url) { $url = 'http://' . $url; $h = @parse_url($url); - if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { + if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { return true; } return false; @@ -611,7 +611,7 @@ function validate_email($addr) { return false; $h = substr($addr,strpos($addr,'@') + 1); - if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) { + if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { return true; } return false; diff --git a/include/notifier.php b/include/notifier.php index 922e869f6..6ce281372 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -47,7 +47,7 @@ function notifier_run($argv, $argc){ $a->set_baseurl(get_config('system','url')); - logger('notifier: invoked: ' . print_r($argv,true)); + logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG); $cmd = $argv[1]; @@ -833,6 +833,8 @@ function notifier_run($argv, $argc){ } + logger('notifier: calling hooks', LOGGER_DEBUG); + if($normal_mode) call_hooks('notifier_normal',$target_item); diff --git a/include/poller.php b/include/poller.php index 0a0e66b86..f6553c846 100644 --- a/include/poller.php +++ b/include/poller.php @@ -30,6 +30,17 @@ function poller_run($argv, $argc){ load_config('config'); load_config('system'); + $maxsysload = intval(get_config('system','maxloadavg')); + if($maxsysload < 1) + $maxsysload = 50; + if(function_exists('sys_getloadavg')) { + $load = sys_getloadavg(); + if(intval($load[0]) > $maxsysload) { + logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.'); + return; + } + } + $lockpath = get_config('system','lockpath'); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'poller.lck'); @@ -39,6 +50,8 @@ function poller_run($argv, $argc){ } } + + $a->set_baseurl(get_config('system','url')); load_hooks(); diff --git a/include/socgraph.php b/include/socgraph.php index a67b3d9e3..b7c4ccc71 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -176,6 +176,7 @@ function count_common_friends($uid,$cid) { intval($cid) ); +// logger("count_common_friends: $uid $cid {$r[0]['total']}"); if(count($r)) return $r[0]['total']; return 0; diff --git a/mod/admin.php b/mod/admin.php index b07ef851a..cfe5a2dd2 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -243,6 +243,7 @@ function admin_page_site_post(&$a){ $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); + $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); @@ -290,6 +291,7 @@ function admin_page_site_post(&$a){ } set_config('system','ssl_policy',$ssl_policy); set_config('system','delivery_interval',$delivery_interval); + set_config('system','maxloadavg',$maxloadavg); set_config('config','sitename',$sitename); if ($banner==""){ // don't know why, but del_config doesn't work... @@ -434,7 +436,7 @@ function admin_page_site(&$a) { '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")), - + '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$form_security_token' => get_form_security_token("admin_site"), )); diff --git a/mod/profiles.php b/mod/profiles.php index 4de9057dc..c72a233c2 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -328,8 +328,8 @@ function profile_activity($changed, $value) { $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; if($t == 1 && strlen($value)) { - $message = sprintf( t('%1$s changed %2$s to "%3$s"'), $A, $changes, $value); - $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof); + $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); + $message .= "\n\n" . sprintf( t(" - Visit %1$s\'s %2$s"), $A, $prof); } else $message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); diff --git a/util/messages.po b/util/messages.po index 3314eb58d..2dcee8d11 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1330\n" +"Project-Id-Version: 2.3.1331\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-02 10:00-0700\n" +"POT-Creation-Date: 2012-05-03 17:20-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -35,7 +35,7 @@ msgid "Contact update failed." msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 -#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26 +#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 @@ -123,7 +123,7 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 +#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958 #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 @@ -203,78 +203,78 @@ msgstr "" msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/events.php:62 +#: ../../mod/events.php:65 msgid "Event description and start time are required." msgstr "" -#: ../../mod/events.php:230 +#: ../../mod/events.php:258 msgid "l, F j" msgstr "" -#: ../../mod/events.php:252 +#: ../../mod/events.php:280 msgid "Edit event" msgstr "" -#: ../../mod/events.php:272 ../../include/text.php:1053 +#: ../../mod/events.php:300 ../../include/text.php:1053 msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:274 +#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:69 #: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" -#: ../../mod/events.php:297 +#: ../../mod/events.php:325 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:298 +#: ../../mod/events.php:326 msgid "Previous" msgstr "" -#: ../../mod/events.php:299 ../../mod/install.php:210 +#: ../../mod/events.php:327 ../../mod/install.php:210 msgid "Next" msgstr "" -#: ../../mod/events.php:371 +#: ../../mod/events.php:399 msgid "hour:minute" msgstr "" -#: ../../mod/events.php:380 +#: ../../mod/events.php:408 msgid "Event details" msgstr "" -#: ../../mod/events.php:381 +#: ../../mod/events.php:409 #, php-format msgid "Format is %s %s. Starting date and Description are required." msgstr "" -#: ../../mod/events.php:383 +#: ../../mod/events.php:411 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:386 +#: ../../mod/events.php:414 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:388 +#: ../../mod/events.php:416 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:391 +#: ../../mod/events.php:419 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:393 +#: ../../mod/events.php:421 msgid "Description:" msgstr "" -#: ../../mod/events.php:395 ../../include/event.php:37 +#: ../../mod/events.php:423 ../../include/event.php:37 #: ../../include/bb2diaspora.php:260 ../../boot.php:1092 msgid "Location:" msgstr "" -#: ../../mod/events.php:397 +#: ../../mod/events.php:425 msgid "Share this event" msgstr "" @@ -352,7 +352,7 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:155 +#: ../../view/theme/diabook/theme.php:436 msgid "Contact Photos" msgstr "" @@ -375,7 +375,7 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:156 +#: ../../view/theme/diabook/theme.php:437 msgid "Profile Photos" msgstr "" @@ -397,7 +397,7 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:127 ../../include/text.php:1304 +#: ../../view/theme/diabook/theme.php:408 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -572,7 +572,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:276 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:71 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -1214,7 +1214,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:270 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:65 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1655,7 +1655,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:272 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:67 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -2600,7 +2600,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:271 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:66 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" @@ -2786,8 +2786,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:1542 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:122 -#: ../../view/theme/diabook/theme.php:131 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:403 +#: ../../view/theme/diabook/theme.php:412 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2795,7 +2795,7 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:136 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:417 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2816,7 +2816,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:273 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:68 #: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -2852,28 +2852,28 @@ msgstr "" msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:762 +#: ../../mod/item.php:781 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:787 +#: ../../mod/item.php:806 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:789 +#: ../../mod/item.php:808 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:790 +#: ../../mod/item.php:809 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:792 +#: ../../mod/item.php:811 #, php-format msgid "%s posted an update." msgstr "" @@ -3783,12 +3783,7 @@ msgstr "" #: ../../mod/profiles.php:331 #, php-format -msgid "%1$s changed %2$s to \"%3$s\"" -msgstr "" - -#: ../../mod/profiles.php:332 -#, php-format -msgid " - Visit %1$s's %2$s" +msgid "%1$s changed %2$s to “%3$s”" msgstr "" #: ../../mod/profiles.php:335 @@ -4047,7 +4042,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:183 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:464 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4062,7 +4057,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:181 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:462 msgid "Global Directory" msgstr "" @@ -4585,10 +4580,15 @@ msgstr "" msgid "%s - Click to open/close" msgstr "" -#: ../../addon/page/page.php:47 +#: ../../addon/page/page.php:48 msgid "Forums" msgstr "" +#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 +#: ../../include/conversation.php:466 ../../boot.php:507 +msgid "show more" +msgstr "" + #: ../../addon/planets/planets.php:150 msgid "Planets Settings" msgstr "" @@ -4629,7 +4629,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:119 ../../include/text.php:1302 +#: ../../view/theme/diabook/theme.php:400 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -4781,7 +4781,7 @@ msgid "Post to Drupal by default" msgstr "" #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 -#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173 +#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:177 msgid "Post from Friendica" msgstr "" @@ -5342,11 +5342,6 @@ msgstr "" msgid "Show More Settings saved." msgstr "" -#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:507 -msgid "show more" -msgstr "" - #: ../../addon/piwik/piwik.php:79 msgid "" "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> " @@ -5549,78 +5544,78 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:48 -msgid "Community Profiles" +#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:49 +#: ../../include/nav.php:115 +msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:68 -msgid "Last users" +#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:50 +msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:97 -msgid "Last likes" +#: ../../view/theme/diabook/theme.php:67 +msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:142 -msgid "Last photos" +#: ../../view/theme/diabook/theme.php:68 ../../include/nav.php:51 +msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:179 -msgid "Find Friends" +#: ../../view/theme/diabook/theme.php:69 ../../include/nav.php:52 +msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:180 -msgid "Local Directory" +#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53 +msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:182 ../../include/contact_widgets.php:35 -msgid "Similar Interests" +#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53 +msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:184 ../../include/contact_widgets.php:37 -msgid "Invite Friends" +#: ../../view/theme/diabook/theme.php:72 +#: ../../view/theme/diabook/theme.php:481 +msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:199 -#: ../../view/theme/diabook/theme.php:277 -msgid "Community Pages" +#: ../../view/theme/diabook/theme.php:328 +msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:232 -msgid "Help or @NewHere ?" +#: ../../view/theme/diabook/theme.php:349 +msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:238 -msgid "Connect Services" +#: ../../view/theme/diabook/theme.php:378 +msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:270 ../../include/nav.php:49 -#: ../../include/nav.php:115 -msgid "Your posts and conversations" +#: ../../view/theme/diabook/theme.php:423 +msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:271 ../../include/nav.php:50 -msgid "Your profile page" +#: ../../view/theme/diabook/theme.php:460 +msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:272 -msgid "Your contacts" +#: ../../view/theme/diabook/theme.php:461 +msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:273 ../../include/nav.php:51 -msgid "Your photos" +#: ../../view/theme/diabook/theme.php:463 ../../include/contact_widgets.php:35 +msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:274 ../../include/nav.php:52 -msgid "Your events" +#: ../../view/theme/diabook/theme.php:465 ../../include/contact_widgets.php:37 +msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 -msgid "Personal notes" +#: ../../view/theme/diabook/theme.php:515 +msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 -msgid "Your personal photos" +#: ../../view/theme/diabook/theme.php:522 +msgid "Connect Services" msgstr "" #: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74 diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 852a2c0bf..265f2724d 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -81,6 +81,7 @@ {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} <div class="submit"><input type="submit" name="page_site" value="$submit" /></div> diff --git a/view/de/messages.po b/view/de/messages.po index 4082c70c2..409a967bd 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-28 10:00-0700\n" -"PO-Revision-Date: 2012-04-30 06:31+0000\n" +"POT-Creation-Date: 2012-05-02 10:00-0700\n" +"PO-Revision-Date: 2012-05-04 05:22+0000\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -51,8 +51,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:104 ../../mod/settings.php:519 -#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:104 ../../mod/settings.php:521 +#: ../../mod/settings.php:526 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -64,11 +64,11 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 +#: ../../mod/profiles.php:7 ../../mod/profiles.php:365 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 -#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171 -#: ../../index.php:309 +#: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187 +#: ../../index.php:306 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -97,8 +97,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:539 -#: ../../mod/settings.php:565 ../../mod/admin.php:575 ../../mod/admin.php:584 +#: ../../mod/crepair.php:148 ../../mod/settings.php:541 +#: ../../mod/settings.php:567 ../../mod/admin.php:638 ../../mod/admin.php:647 msgid "Name" msgstr "Name" @@ -139,15 +139,15 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:318 -#: ../../mod/settings.php:537 ../../mod/settings.php:683 -#: ../../mod/settings.php:744 ../../mod/settings.php:935 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393 -#: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907 -#: ../../mod/admin.php:995 ../../mod/profiles.php:498 ../../mod/invite.php:119 -#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 -#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 -#: ../../addon/planets/planets.php:158 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 +#: ../../mod/settings.php:539 ../../mod/settings.php:685 +#: ../../mod/settings.php:746 ../../mod/settings.php:940 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 +#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 +#: ../../mod/admin.php:1057 ../../mod/profiles.php:534 +#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575 +#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 +#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 @@ -185,11 +185,11 @@ msgstr "Hilfe:" msgid "Help" msgstr "Hilfe" -#: ../../mod/help.php:38 ../../index.php:228 +#: ../../mod/help.php:38 ../../index.php:225 msgid "Not Found" msgstr "Nicht gefunden" -#: ../../mod/help.php:41 ../../index.php:231 +#: ../../mod/help.php:41 ../../index.php:228 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -231,8 +231,8 @@ msgstr "Veranstaltung bearbeiten" msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 -#: ../../include/nav.php:52 ../../boot.php:1481 +#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:274 +#: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "Veranstaltungen" @@ -282,7 +282,7 @@ msgid "Description:" msgstr "Beschreibung" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1083 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1092 msgid "Location:" msgstr "Ort:" @@ -291,8 +291,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:817 ../../mod/settings.php:538 -#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:540 +#: ../../mod/settings.php:566 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -335,36 +335,36 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:805 -#: ../../mod/settings.php:849 ../../mod/settings.php:855 -#: ../../mod/settings.php:863 ../../mod/settings.php:867 -#: ../../mod/settings.php:872 ../../mod/settings.php:878 -#: ../../mod/settings.php:884 ../../mod/settings.php:890 -#: ../../mod/settings.php:926 ../../mod/settings.php:927 -#: ../../mod/settings.php:928 ../../mod/settings.php:929 -#: ../../mod/register.php:532 ../../mod/profiles.php:475 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806 +#: ../../mod/settings.php:854 ../../mod/settings.php:860 +#: ../../mod/settings.php:868 ../../mod/settings.php:872 +#: ../../mod/settings.php:877 ../../mod/settings.php:883 +#: ../../mod/settings.php:889 ../../mod/settings.php:895 +#: ../../mod/settings.php:931 ../../mod/settings.php:932 +#: ../../mod/settings.php:933 ../../mod/settings.php:934 +#: ../../mod/register.php:532 ../../mod/profiles.php:511 msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:806 -#: ../../mod/settings.php:849 ../../mod/settings.php:855 -#: ../../mod/settings.php:863 ../../mod/settings.php:867 -#: ../../mod/settings.php:872 ../../mod/settings.php:878 -#: ../../mod/settings.php:884 ../../mod/settings.php:890 -#: ../../mod/settings.php:926 ../../mod/settings.php:927 -#: ../../mod/settings.php:928 ../../mod/settings.php:929 -#: ../../mod/register.php:533 ../../mod/profiles.php:476 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807 +#: ../../mod/settings.php:854 ../../mod/settings.php:860 +#: ../../mod/settings.php:868 ../../mod/settings.php:872 +#: ../../mod/settings.php:877 ../../mod/settings.php:883 +#: ../../mod/settings.php:889 ../../mod/settings.php:895 +#: ../../mod/settings.php:931 ../../mod/settings.php:932 +#: ../../mod/settings.php:933 ../../mod/settings.php:934 +#: ../../mod/register.php:533 ../../mod/profiles.php:512 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:43 +#: ../../mod/photos.php:43 ../../boot.php:1487 msgid "Photo Albums" msgstr "Fotoalben" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:135 +#: ../../view/theme/diabook/theme.php:155 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -387,7 +387,7 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:136 +#: ../../view/theme/diabook/theme.php:156 msgid "Profile Photos" msgstr "Profilbilder" @@ -409,7 +409,7 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:107 ../../include/text.php:1304 +#: ../../view/theme/diabook/theme.php:127 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -438,7 +438,7 @@ msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:732 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -558,7 +558,7 @@ msgstr "Das bist du" #: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1303 ../../include/conversation.php:554 -#: ../../boot.php:495 +#: ../../boot.php:506 msgid "Comment" msgstr "Kommentar" @@ -567,8 +567,8 @@ msgstr "Kommentar" msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1331 ../../mod/settings.php:600 -#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:579 +#: ../../mod/photos.php:1331 ../../mod/settings.php:602 +#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:642 #: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "Löschen" @@ -585,7 +585,7 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:257 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:276 #: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" @@ -594,35 +594,35 @@ msgstr "Gemeinschaft" msgid "No results." msgstr "Keine Ergebnisse." -#: ../../mod/friendica.php:47 +#: ../../mod/friendica.php:55 msgid "This is Friendica, version" msgstr "Dies ist Friendica, Version" -#: ../../mod/friendica.php:48 +#: ../../mod/friendica.php:56 msgid "running at web location" msgstr "die unter folgender Webadresse zu finden ist" -#: ../../mod/friendica.php:50 +#: ../../mod/friendica.php:58 msgid "" "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn " "more about the Friendica project." msgstr "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren." -#: ../../mod/friendica.php:52 +#: ../../mod/friendica.php:60 msgid "Bug reports and issues: please visit" msgstr "Probleme oder Fehler gefunden? Bitte besuche" -#: ../../mod/friendica.php:53 +#: ../../mod/friendica.php:61 msgid "" "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " "dot com" msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com" -#: ../../mod/friendica.php:58 +#: ../../mod/friendica.php:75 msgid "Installed plugins/addons/apps:" msgstr "Installierte Plugins/Erweiterungen/Apps" -#: ../../mod/friendica.php:71 +#: ../../mod/friendica.php:88 msgid "No installed plugins/addons/apps" msgstr "Keine Plugins/Erweiterungen/Apps installiert" @@ -638,7 +638,7 @@ msgstr "Beitrag bearbeiten" msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:95 ../../mod/settings.php:599 +#: ../../mod/editpost.php:95 ../../mod/settings.php:601 #: ../../include/conversation.php:571 msgid "Edit" msgstr "Bearbeiten" @@ -816,75 +816,75 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s." msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691 +#: ../../mod/dfrn_request.php:688 ../../include/items.php:2707 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:780 +#: ../../mod/dfrn_request.php:781 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:796 +#: ../../mod/dfrn_request.php:797 msgid "<strike>Connect as an email follower</strike> (Coming soon)" msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)" -#: ../../mod/dfrn_request.php:798 +#: ../../mod/dfrn_request.php:799 msgid "" "If you are not yet a member of the free social web, <a " "href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public" " Friendica site and join us today</a>." msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten." -#: ../../mod/dfrn_request.php:801 +#: ../../mod/dfrn_request.php:802 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:802 +#: ../../mod/dfrn_request.php:803 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:803 +#: ../../mod/dfrn_request.php:804 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:804 +#: ../../mod/dfrn_request.php:805 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:807 +#: ../../mod/dfrn_request.php:808 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:809 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:810 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:810 +#: ../../mod/dfrn_request.php:811 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:811 ../../mod/settings.php:634 +#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:636 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:812 +#: ../../mod/dfrn_request.php:813 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search" " bar." msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste." -#: ../../mod/dfrn_request.php:813 +#: ../../mod/dfrn_request.php:814 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:816 +#: ../../mod/dfrn_request.php:817 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -1180,7 +1180,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1027 +#: ../../include/contact_widgets.php:9 ../../boot.php:1036 msgid "Connect" msgstr "Verbinden" @@ -1211,8 +1211,8 @@ msgid "Discard" msgstr "Verwerfen" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:295 -#: ../../mod/contacts.php:344 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:296 +#: ../../mod/contacts.php:348 msgid "Ignore" msgstr "Ignorieren" @@ -1224,11 +1224,11 @@ msgstr "System" msgid "Network" msgstr "Netzwerk" -#: ../../mod/notifications.php:85 ../../mod/network.php:182 +#: ../../mod/notifications.php:85 ../../mod/network.php:184 msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:251 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:270 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" @@ -1264,7 +1264,7 @@ msgid "suggested by %s" msgstr "vorgeschlagen von %s" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" @@ -1277,7 +1277,7 @@ msgid "if applicable" msgstr "falls anwendbar" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:640 msgid "Approve" msgstr "Genehmigen" @@ -1477,168 +1477,212 @@ msgstr[1] "%d gemeinsame Kontakte" msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 -#: ../../mod/admin.php:581 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/admin.php:644 msgid "Unblock" msgstr "Entsperren" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 -#: ../../mod/admin.php:580 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/admin.php:643 msgid "Block" msgstr "Sperren" -#: ../../mod/contacts.php:295 ../../mod/contacts.php:344 +#: ../../mod/contacts.php:293 +msgid "Toggle Blocked status" +msgstr "Geblockt-Sttaus ein-/ausschalten" + +#: ../../mod/contacts.php:296 ../../mod/contacts.php:348 msgid "Unignore" msgstr "Ignorieren aufheben" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:299 +msgid "Toggle Ignored status" +msgstr "Ignoriert-Status ein-/ausschalten" + +#: ../../mod/contacts.php:303 msgid "Unarchive" msgstr "Unarchivieren" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:303 msgid "Archive" msgstr "Archivieren" #: ../../mod/contacts.php:306 +msgid "Toggle Archive status" +msgstr "Archiviert-Status ein-/ausschalten" + +#: ../../mod/contacts.php:309 msgid "Repair" msgstr "Reparieren" -#: ../../mod/contacts.php:316 +#: ../../mod/contacts.php:312 +msgid "Advanced Contact Settings" +msgstr "Fortgeschrittene Kontakteinstellungen" + +#: ../../mod/contacts.php:320 msgid "Contact Editor" msgstr "Kontakt Editor" -#: ../../mod/contacts.php:319 +#: ../../mod/contacts.php:323 msgid "Profile Visibility" msgstr "Profil Anzeige" -#: ../../mod/contacts.php:320 +#: ../../mod/contacts.php:324 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft." -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:325 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: ../../mod/contacts.php:322 +#: ../../mod/contacts.php:326 msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbiten" -#: ../../mod/contacts.php:327 ../../mod/contacts.php:511 +#: ../../mod/contacts.php:331 ../../mod/contacts.php:522 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:333 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: ../../mod/contacts.php:330 +#: ../../mod/contacts.php:334 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:335 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: ../../mod/contacts.php:333 +#: ../../mod/contacts.php:337 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:341 msgid "Last update:" msgstr "letzte Aktualisierung:" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:342 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:340 ../../mod/admin.php:1053 +#: ../../mod/contacts.php:344 ../../mod/admin.php:1115 msgid "Update now" msgstr "Jetzt aktualisieren" -#: ../../mod/contacts.php:347 +#: ../../mod/contacts.php:351 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: ../../mod/contacts.php:348 +#: ../../mod/contacts.php:352 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:353 msgid "Currently archived" msgstr "Momentan archiviert" -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein" -#: ../../mod/contacts.php:403 +#: ../../mod/contacts.php:407 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: ../../mod/contacts.php:408 ../../mod/group.php:191 +#: ../../mod/contacts.php:410 +msgid "Suggest potential friends" +msgstr "Freunde vorschlagen" + +#: ../../mod/contacts.php:413 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:413 +#: ../../mod/contacts.php:416 +msgid "Show all contacts" +msgstr "Alle Kontakte anzeigen" + +#: ../../mod/contacts.php:419 msgid "Unblocked" msgstr "Ungeblockt" -#: ../../mod/contacts.php:419 +#: ../../mod/contacts.php:422 +msgid "Only show unblocked contacts" +msgstr "Nur nicht-blockierte Kontakte anzeigen" + +#: ../../mod/contacts.php:426 msgid "Blocked" msgstr "Geblockt" -#: ../../mod/contacts.php:425 +#: ../../mod/contacts.php:429 +msgid "Only show blocked contacts" +msgstr "Nur blockierte Kontakte anzeigen" + +#: ../../mod/contacts.php:433 msgid "Ignored" msgstr "Ignoriert" -#: ../../mod/contacts.php:431 +#: ../../mod/contacts.php:436 +msgid "Only show ignored contacts" +msgstr "Nur ignorierte Kontakte anzeigen" + +#: ../../mod/contacts.php:440 msgid "Archived" msgstr "Archiviert" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:443 +msgid "Only show archived contacts" +msgstr "Nur archivierte Kontakte anzeigen" + +#: ../../mod/contacts.php:447 msgid "Hidden" msgstr "Verborgen" -#: ../../mod/contacts.php:487 +#: ../../mod/contacts.php:450 +msgid "Only show hidden contacts" +msgstr "Nur verborgene Kontakte anzeigen" + +#: ../../mod/contacts.php:498 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:491 +#: ../../mod/contacts.php:502 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:495 +#: ../../mod/contacts.php:506 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:512 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:533 ../../view/theme/diabook/theme.php:253 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:272 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:537 +#: ../../mod/contacts.php:548 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:538 ../../mod/directory.php:57 +#: ../../mod/contacts.php:549 ../../mod/directory.php:57 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:539 ../../mod/directory.php:59 +#: ../../mod/contacts.php:550 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Finde" @@ -1658,10 +1702,11 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:388 ../../mod/register.php:442 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 -#: ../../addon/facebook/facebook.php:650 -#: ../../addon/facebook/facebook.php:1139 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742 +#: ../../addon/facebook/facebook.php:658 +#: ../../addon/facebook/facebook.php:1148 +#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 +#: ../../boot.php:686 msgid "Administrator" msgstr "Administrator" @@ -1671,7 +1716,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:83 ../../boot.php:809 +#: ../../mod/lostpass.php:83 ../../boot.php:818 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -1743,7 +1788,7 @@ msgstr "Persönliche Daten exportieren" msgid "Remove account" msgstr "Account entfernen" -#: ../../mod/settings.php:88 ../../mod/admin.php:667 ../../mod/admin.php:872 +#: ../../mod/settings.php:88 ../../mod/admin.php:730 ../../mod/admin.php:935 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" @@ -1752,8 +1797,7 @@ msgstr "Einstellungen" msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:134 ../../mod/settings.php:563 -#: ../../mod/admin.php:97 +#: ../../mod/settings.php:134 ../../mod/settings.php:565 msgid "Update" msgstr "Aktualisierungen" @@ -1781,23 +1825,23 @@ msgstr "Passwort ändern." msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:384 +#: ../../mod/settings.php:385 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:386 +#: ../../mod/settings.php:387 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:392 +#: ../../mod/settings.php:393 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:394 +#: ../../mod/settings.php:395 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:469 +#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:470 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -1805,406 +1849,410 @@ msgstr "Ändern der E-Mail nicht möglich. " msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:536 ../../mod/settings.php:562 -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:538 ../../mod/settings.php:564 +#: ../../mod/settings.php:600 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:540 ../../mod/settings.php:566 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:541 ../../mod/settings.php:567 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:542 ../../mod/settings.php:568 +#: ../../mod/settings.php:544 ../../mod/settings.php:570 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:543 ../../mod/settings.php:569 +#: ../../mod/settings.php:545 ../../mod/settings.php:571 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:554 +#: ../../mod/settings.php:556 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:599 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:603 msgid "Client key starts with" msgstr "Anwender Schlüssel beginnt mit" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:604 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:605 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:614 +#: ../../mod/settings.php:616 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:624 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:634 ../../mod/settings.php:635 +#: ../../mod/settings.php:636 ../../mod/settings.php:637 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:634 ../../mod/settings.php:635 +#: ../../mod/settings.php:636 ../../mod/settings.php:637 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:634 ../../mod/settings.php:635 +#: ../../mod/settings.php:636 ../../mod/settings.php:637 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:635 +#: ../../mod/settings.php:637 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:667 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:672 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:673 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:674 msgid "Last successful email check:" msgstr "Letzter erfolgreicher Email Check" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:675 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:676 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:677 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:678 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:676 ../../mod/settings.php:681 +#: ../../mod/settings.php:678 ../../mod/settings.php:683 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:679 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:678 +#: ../../mod/settings.php:680 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:681 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:680 +#: ../../mod/settings.php:682 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:684 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:742 +#: ../../mod/settings.php:744 msgid "Display Settings" msgstr "Anzeige Einstellungen" -#: ../../mod/settings.php:748 +#: ../../mod/settings.php:750 msgid "Display Theme:" msgstr "Theme:" -#: ../../mod/settings.php:749 +#: ../../mod/settings.php:751 msgid "Update browser every xx seconds" msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:749 +#: ../../mod/settings.php:751 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimal 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:750 +#: ../../mod/settings.php:752 msgid "Number of items to display on the network page:" -msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: " +msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " -#: ../../mod/settings.php:750 +#: ../../mod/settings.php:752 msgid "Maximum of 100 items" msgstr "Maximal 100 Beiträge" -#: ../../mod/settings.php:751 +#: ../../mod/settings.php:753 msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:816 ../../mod/admin.php:173 ../../mod/admin.php:553 +#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:616 msgid "Normal Account" msgstr "Normaler Account" -#: ../../mod/settings.php:817 +#: ../../mod/settings.php:822 msgid "This account is a normal personal profile" msgstr "Dieser Account ist ein normales persönliches Profil" -#: ../../mod/settings.php:820 ../../mod/admin.php:174 ../../mod/admin.php:554 +#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:617 msgid "Soapbox Account" msgstr "Sandkasten-Account" -#: ../../mod/settings.php:821 +#: ../../mod/settings.php:826 msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert" +msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:824 ../../mod/admin.php:175 ../../mod/admin.php:555 +#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:618 msgid "Community/Celebrity Account" msgstr "Gemeinschafts/Promi-Account" -#: ../../mod/settings.php:825 +#: ../../mod/settings.php:830 msgid "" "Automatically approve all connection/friend requests as read-write fans" -msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" +msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:828 ../../mod/admin.php:176 ../../mod/admin.php:556 +#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:619 msgid "Automatic Friend Account" msgstr "Automatischer Freundesaccount" -#: ../../mod/settings.php:829 +#: ../../mod/settings.php:834 msgid "Automatically approve all connection/friend requests as friends" -msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert" +msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:844 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:844 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID." -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:854 msgid "Publish your default profile in your local site directory?" msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?" -#: ../../mod/settings.php:855 +#: ../../mod/settings.php:860 msgid "Publish your default profile in the global social directory?" msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?" -#: ../../mod/settings.php:863 +#: ../../mod/settings.php:868 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:867 +#: ../../mod/settings.php:872 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:872 +#: ../../mod/settings.php:877 msgid "Allow friends to post to your profile page?" msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?" -#: ../../mod/settings.php:878 +#: ../../mod/settings.php:883 msgid "Allow friends to tag your posts?" msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?" -#: ../../mod/settings.php:884 +#: ../../mod/settings.php:889 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:895 msgid "Permit unknown people to send you private mail?" msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?" -#: ../../mod/settings.php:901 +#: ../../mod/settings.php:906 msgid "Profile is <strong>not published</strong>." msgstr "Profil ist <strong>nicht veröffentlicht</strong>." -#: ../../mod/settings.php:907 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:912 ../../mod/profile_photo.php:211 msgid "or" msgstr "oder" -#: ../../mod/settings.php:912 +#: ../../mod/settings.php:917 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:924 +#: ../../mod/settings.php:929 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:925 +#: ../../mod/settings.php:930 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:926 +#: ../../mod/settings.php:931 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:932 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:933 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:934 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:938 msgid "Account Settings" msgstr "Account-Einstellungen" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:947 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:948 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:949 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:949 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:953 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:949 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:954 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:955 msgid "Email Address:" msgstr "Emailadresse:" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:956 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:957 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:958 msgid "Use Browser Location:" msgstr "Verwende den Standort des Browsers:" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:961 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:963 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:958 ../../mod/settings.php:973 +#: ../../mod/settings.php:963 ../../mod/settings.php:978 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:964 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:965 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:978 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:981 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:982 msgid "By default post a status message when:" msgstr "Standardmäßig eine Status-Nachricht posten wenn:" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:983 msgid "accepting a friend request" -msgstr "akzeptieren einer Freundschaftsanfrage" +msgstr "– du eine Kontaktanfrage akzeptierst" + +#: ../../mod/settings.php:984 +msgid "joining a forum/community" +msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:985 msgid "making an <em>interesting</em> profile change" -msgstr "<em>interessante</em> Änderungen am Profil gemacht werden" +msgstr "– du eine <em>interessante</em> Änderung an deinem Profil durchführst" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:986 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:987 msgid "You receive an introduction" -msgstr "- du eine Kontaktanfrage erhältst" +msgstr "– du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:988 msgid "Your introductions are confirmed" -msgstr "- eine deiner Kontaktanfragen akzeptiert wurde" +msgstr "– eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:989 msgid "Someone writes on your profile wall" -msgstr "- jemand etwas auf deine Pinnwand schreibt" +msgstr "– jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:990 msgid "Someone writes a followup comment" -msgstr "- jemand auch einen Kommentar verfasst" +msgstr "– jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:991 msgid "You receive a private message" -msgstr "- du eine private Nachricht erhältst" +msgstr "– du eine private Nachricht erhältst" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:992 msgid "You receive a friend suggestion" msgstr "- du eine Empfehlung erhältst" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:993 msgid "You are tagged in a post" msgstr "- du in einem Beitrag erwähnt wurdest" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:996 msgid "Advanced Page Settings" msgstr "Erweiterte Seiten-Einstellungen" @@ -2242,23 +2290,47 @@ msgstr "hinzufügen" msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../mod/network.php:176 +#: ../../mod/network.php:174 +msgid "Sort by Comment Date" +msgstr "Nach Kommentardatum sortieren" + +#: ../../mod/network.php:177 msgid "Posted Order" msgstr "Neueste Beiträge" +#: ../../mod/network.php:180 +msgid "Sort by Post Date" +msgstr "Nach Beitragsdatum sortieren" + #: ../../mod/network.php:187 +msgid "Posts that mention or involve you" +msgstr "Beiträge, in denen es um Dich geht" + +#: ../../mod/network.php:190 msgid "New" msgstr "Neue" -#: ../../mod/network.php:192 +#: ../../mod/network.php:193 +msgid "Activity Stream - by date" +msgstr "Aktivitäten-Stream - nach Datum" + +#: ../../mod/network.php:196 msgid "Starred" msgstr "Markierte" -#: ../../mod/network.php:197 +#: ../../mod/network.php:199 +msgid "Favourite Posts" +msgstr "Favorisierte Beiträge" + +#: ../../mod/network.php:202 msgid "Shared Links" msgstr "Geteilte Links" -#: ../../mod/network.php:274 +#: ../../mod/network.php:205 +msgid "Interesting Links" +msgstr "Interessante Links" + +#: ../../mod/network.php:281 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2266,40 +2338,40 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: ../../mod/network.php:277 +#: ../../mod/network.php:284 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:322 +#: ../../mod/network.php:329 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/network.php:333 +#: ../../mod/network.php:340 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/network.php:337 +#: ../../mod/network.php:344 msgid "Group: " msgstr "Gruppe: " -#: ../../mod/network.php:347 +#: ../../mod/network.php:354 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:349 +#: ../../mod/network.php:356 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: ../../mod/network.php:354 +#: ../../mod/network.php:361 msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1486 +#: ../../mod/notes.php:44 ../../boot.php:1499 msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:717 +#: ../../addon/facebook/facebook.php:726 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147 #: ../../include/text.php:652 msgid "Save" @@ -2503,7 +2575,7 @@ msgstr "Gruppe nicht gefunden." msgid "Group name changed." msgstr "Gruppenname geändert." -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -2543,9 +2615,9 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:271 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1468 +#: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" msgstr "Profil" @@ -2694,7 +2766,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:553 ../../mod/admin.php:394 +#: ../../mod/register.php:553 ../../mod/admin.php:401 msgid "Registration" msgstr "Registrierung" @@ -2717,7 +2789,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775 +#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:784 msgid "Register" msgstr "Registrieren" @@ -2726,19 +2798,19 @@ msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1533 +#: ../../addon/facebook/facebook.php:1542 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:102 -#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:122 +#: ../../view/theme/diabook/theme.php:131 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:136 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2749,9 +2821,9 @@ msgstr "%1$s mag %2$ss %3$s" msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149 -#: ../../mod/admin.php:616 ../../mod/admin.php:815 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3083 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 +#: ../../mod/admin.php:679 ../../mod/admin.php:878 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3099 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -2759,8 +2831,8 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 -#: ../../include/nav.php:51 ../../boot.php:1473 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:273 +#: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "Bilder" @@ -2982,492 +3054,545 @@ msgstr "Keine Freunde zum Anzeigen." msgid "Theme settings updated." msgstr "Themen Einstellungen aktualisiert." -#: ../../mod/admin.php:93 ../../mod/admin.php:392 +#: ../../mod/admin.php:96 ../../mod/admin.php:399 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:94 ../../mod/admin.php:571 ../../mod/admin.php:583 +#: ../../mod/admin.php:97 ../../mod/admin.php:634 ../../mod/admin.php:646 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:95 ../../mod/admin.php:665 ../../mod/admin.php:707 +#: ../../mod/admin.php:98 ../../mod/admin.php:728 ../../mod/admin.php:770 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:96 ../../mod/admin.php:870 ../../mod/admin.php:906 +#: ../../mod/admin.php:99 ../../mod/admin.php:933 ../../mod/admin.php:969 msgid "Themes" msgstr "Themen" -#: ../../mod/admin.php:111 ../../mod/admin.php:994 +#: ../../mod/admin.php:100 +msgid "DB updates" +msgstr "DB Updates" + +#: ../../mod/admin.php:101 +msgid "Software Update" +msgstr "Software Update" + +#: ../../mod/admin.php:115 ../../mod/admin.php:1056 msgid "Logs" msgstr "Protokolle" -#: ../../mod/admin.php:116 +#: ../../mod/admin.php:120 msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:188 ../../mod/admin.php:391 ../../mod/admin.php:570 -#: ../../mod/admin.php:664 ../../mod/admin.php:706 ../../mod/admin.php:869 -#: ../../mod/admin.php:905 ../../mod/admin.php:993 +#: ../../mod/admin.php:195 ../../mod/admin.php:398 ../../mod/admin.php:633 +#: ../../mod/admin.php:727 ../../mod/admin.php:769 ../../mod/admin.php:932 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 msgid "Administration" msgstr "Administration" -#: ../../mod/admin.php:189 +#: ../../mod/admin.php:196 msgid "Summary" msgstr "Zusammenfassung" -#: ../../mod/admin.php:190 +#: ../../mod/admin.php:197 msgid "Registered users" msgstr "Registrierte Nutzer" -#: ../../mod/admin.php:192 +#: ../../mod/admin.php:199 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: ../../mod/admin.php:193 +#: ../../mod/admin.php:200 msgid "Version" msgstr "Version" -#: ../../mod/admin.php:195 +#: ../../mod/admin.php:202 msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:337 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:385 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:386 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:380 +#: ../../mod/admin.php:387 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:391 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:392 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:393 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:402 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:403 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:404 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:401 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:408 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:409 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:410 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:411 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:411 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:412 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:412 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:413 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:413 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:415 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:416 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:416 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:417 msgid "Accounts abandoned after x days" msgstr "Accounts gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:417 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:418 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:418 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:419 msgid "Allowed email domains" msgstr "Erlaubte Domains für Emails" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:419 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:420 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:420 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist." -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:421 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:421 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen." -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:422 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:422 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar." -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:424 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:424 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:425 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:425 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:426 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:426 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden." -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:427 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:427 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:428 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:428 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server." -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:429 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:429 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:430 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:430 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:431 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:431 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert." -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:432 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:432 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:433 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:434 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:435 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:435 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)." -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:436 msgid "Delivery interval" msgstr "Zustellungsintervall" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:436 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:451 +msgid "Update has been marked successful" +msgstr "Update wurde als erfolgreich markiert" + +#: ../../mod/admin.php:461 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen." + +#: ../../mod/admin.php:464 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Update %s war erfolgreich." + +#: ../../mod/admin.php:468 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status." + +#: ../../mod/admin.php:471 +#, php-format +msgid "Update function %s could not be found." +msgstr "Updatefunktion %s konnte nicht gefunden werden." + +#: ../../mod/admin.php:486 +msgid "No failed updates." +msgstr "Keine fehlgeschlagenen Updates." + +#: ../../mod/admin.php:490 +msgid "Failed Updates" +msgstr "Fehlgeschlagene Updates" + +#: ../../mod/admin.php:491 +msgid "" +"This does not include updates prior to 1139, which did not return a status." +msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben." + +#: ../../mod/admin.php:492 +msgid "Mark success (if update was manually applied)" +msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" + +#: ../../mod/admin.php:493 +msgid "Attempt to execute this update step automatically" +msgstr "Versuchen, diesen Schritt automatisch auszuführen" + +#: ../../mod/admin.php:518 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Benutzer geblockt/freigegeben" msgstr[1] "%s Benutzer geblockt/freigegeben" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:525 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/admin.php:501 +#: ../../mod/admin.php:564 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:572 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:572 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:636 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:637 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:575 +#: ../../mod/admin.php:638 msgid "Request date" msgstr "Anfrage Datum" -#: ../../mod/admin.php:575 ../../mod/admin.php:584 +#: ../../mod/admin.php:638 ../../mod/admin.php:647 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Email" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:639 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:578 +#: ../../mod/admin.php:641 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:647 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:586 +#: ../../mod/admin.php:649 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:587 +#: ../../mod/admin.php:650 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:628 +#: ../../mod/admin.php:691 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:632 +#: ../../mod/admin.php:695 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:642 ../../mod/admin.php:840 +#: ../../mod/admin.php:705 ../../mod/admin.php:903 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:644 ../../mod/admin.php:842 +#: ../../mod/admin.php:707 ../../mod/admin.php:905 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:666 ../../mod/admin.php:871 +#: ../../mod/admin.php:729 ../../mod/admin.php:934 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:674 ../../mod/admin.php:881 +#: ../../mod/admin.php:737 ../../mod/admin.php:944 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:675 ../../mod/admin.php:882 +#: ../../mod/admin.php:738 ../../mod/admin.php:945 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:804 +#: ../../mod/admin.php:867 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:863 +#: ../../mod/admin.php:926 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:974 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:912 +#: ../../mod/admin.php:975 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:939 +#: ../../mod/admin.php:1002 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:996 +#: ../../mod/admin.php:1058 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1002 +#: ../../mod/admin.php:1064 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1003 +#: ../../mod/admin.php:1065 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1003 +#: ../../mod/admin.php:1065 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: ../../mod/admin.php:1004 +#: ../../mod/admin.php:1066 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1054 +#: ../../mod/admin.php:1116 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1122 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1061 +#: ../../mod/admin.php:1123 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1062 +#: ../../mod/admin.php:1124 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1063 +#: ../../mod/admin.php:1125 msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:940 +#: ../../mod/profile.php:21 ../../boot.php:949 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -3475,7 +3600,7 @@ msgstr "Das angefragte Profil ist nicht vorhanden." msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:147 +#: ../../mod/profile.php:151 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" @@ -3611,8 +3736,8 @@ msgstr "Keine Applikationen installiert." msgid "Search This Site" msgstr "Diese Seite durchsuchen" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:339 -#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:375 +#: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nicht gefunden." @@ -3620,259 +3745,273 @@ msgstr "Profil nicht gefunden." msgid "Profile Name is required." msgstr "Profilname ist erforderlich." -#: ../../mod/profiles.php:143 +#: ../../mod/profiles.php:145 msgid "Marital Status" msgstr "Familienstand" -#: ../../mod/profiles.php:144 +#: ../../mod/profiles.php:149 msgid "Romantic Partner" msgstr "Romanze" -#: ../../mod/profiles.php:145 +#: ../../mod/profiles.php:153 msgid "Work/Employment" msgstr "Arbeit / Beschäftigung" -#: ../../mod/profiles.php:146 +#: ../../mod/profiles.php:156 msgid "Religion" msgstr "Religion" -#: ../../mod/profiles.php:147 +#: ../../mod/profiles.php:160 msgid "Political Views" msgstr "Politische Ansichten" -#: ../../mod/profiles.php:148 +#: ../../mod/profiles.php:164 msgid "Gender" msgstr "Geschlecht" -#: ../../mod/profiles.php:149 +#: ../../mod/profiles.php:168 msgid "Sexual Preference" msgstr "Sexuelle Vorlieben" -#: ../../mod/profiles.php:150 +#: ../../mod/profiles.php:172 msgid "Homepage" msgstr "Webseite" -#: ../../mod/profiles.php:151 +#: ../../mod/profiles.php:176 msgid "Interests" msgstr "Interessen" -#: ../../mod/profiles.php:154 +#: ../../mod/profiles.php:181 msgid "Location" msgstr "Wohnort" -#: ../../mod/profiles.php:225 +#: ../../mod/profiles.php:253 msgid "Profile updated." msgstr "Profil aktualisiert." -#: ../../mod/profiles.php:300 +#: ../../mod/profiles.php:320 +msgid " and " +msgstr " und " + +#: ../../mod/profiles.php:328 msgid "public profile" msgstr "öffentliches Profil" -#: ../../mod/profiles.php:302 +#: ../../mod/profiles.php:331 +#, php-format +msgid "%1$s changed %2$s to \"%3$s\"" +msgstr "%1$s änderte %2$s zu \"%3$s\"" + +#: ../../mod/profiles.php:332 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " - %1$s's %2$s besuchen" + +#: ../../mod/profiles.php:335 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." -#: ../../mod/profiles.php:358 +#: ../../mod/profiles.php:394 msgid "Profile deleted." msgstr "Profil gelöscht." -#: ../../mod/profiles.php:376 ../../mod/profiles.php:410 +#: ../../mod/profiles.php:412 ../../mod/profiles.php:446 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:395 ../../mod/profiles.php:437 +#: ../../mod/profiles.php:431 ../../mod/profiles.php:473 msgid "New profile created." msgstr "Neues Profil angelegt." -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:452 msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:474 +#: ../../mod/profiles.php:510 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:497 +#: ../../mod/profiles.php:533 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:499 +#: ../../mod/profiles.php:535 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:500 +#: ../../mod/profiles.php:536 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:501 +#: ../../mod/profiles.php:537 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:502 +#: ../../mod/profiles.php:538 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:503 +#: ../../mod/profiles.php:539 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:504 +#: ../../mod/profiles.php:540 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:505 +#: ../../mod/profiles.php:541 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:506 +#: ../../mod/profiles.php:542 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:507 +#: ../../mod/profiles.php:543 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:508 +#: ../../mod/profiles.php:544 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:509 +#: ../../mod/profiles.php:545 msgid "Locality/City:" msgstr "Wohnort/Stadt:" -#: ../../mod/profiles.php:510 +#: ../../mod/profiles.php:546 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:511 +#: ../../mod/profiles.php:547 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:512 +#: ../../mod/profiles.php:548 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:513 +#: ../../mod/profiles.php:549 msgid "<span class=\"heart\">♥</span> Marital Status:" msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" -#: ../../mod/profiles.php:514 +#: ../../mod/profiles.php:550 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:515 +#: ../../mod/profiles.php:551 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:517 +#: ../../mod/profiles.php:553 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:519 +#: ../../mod/profiles.php:555 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:520 +#: ../../mod/profiles.php:556 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:521 +#: ../../mod/profiles.php:557 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:522 +#: ../../mod/profiles.php:558 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:523 +#: ../../mod/profiles.php:559 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" -#: ../../mod/profiles.php:524 +#: ../../mod/profiles.php:560 msgid "(Used for searching profiles, never shown to others)" msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" -#: ../../mod/profiles.php:525 +#: ../../mod/profiles.php:561 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:526 +#: ../../mod/profiles.php:562 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:527 +#: ../../mod/profiles.php:563 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:564 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:529 +#: ../../mod/profiles.php:565 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:566 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:567 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:532 +#: ../../mod/profiles.php:568 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:533 +#: ../../mod/profiles.php:569 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:570 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:539 +#: ../../mod/profiles.php:575 msgid "" "This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "be visible to anybody using the internet." msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." -#: ../../mod/profiles.php:549 ../../mod/directory.php:111 +#: ../../mod/profiles.php:585 ../../mod/directory.php:111 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:620 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:585 ../../boot.php:1049 +#: ../../mod/profiles.php:621 ../../boot.php:1058 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:586 ../../boot.php:1050 +#: ../../mod/profiles.php:622 ../../boot.php:1059 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:597 ../../boot.php:1060 +#: ../../mod/profiles.php:633 ../../boot.php:1069 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:599 ../../boot.php:1063 +#: ../../mod/profiles.php:635 ../../boot.php:1072 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:600 ../../boot.php:1064 +#: ../../mod/profiles.php:636 ../../boot.php:1073 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -3924,7 +4063,7 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:163 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:183 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -3939,7 +4078,7 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:161 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:181 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -3997,7 +4136,7 @@ msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten msgid "" "To accept this invitation, please visit and register at %s or any other " "public Friendica website." -msgstr "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website." +msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website." #: ../../mod/invite.php:103 #, php-format @@ -4078,118 +4217,123 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "%1$s ist nun mit %2$s befreundet" -#: ../../mod/dfrn_confirm.php:548 +#: ../../mod/dfrn_confirm.php:554 #, php-format msgid "No user record found for '%s' " msgstr "Für '%s' wurde kein Nutzer gefunden" -#: ../../mod/dfrn_confirm.php:558 +#: ../../mod/dfrn_confirm.php:564 msgid "Our site encryption key is apparently messed up." msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch." -#: ../../mod/dfrn_confirm.php:569 +#: ../../mod/dfrn_confirm.php:575 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." -#: ../../mod/dfrn_confirm.php:590 +#: ../../mod/dfrn_confirm.php:596 msgid "Contact record was not found for you on our site." msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." -#: ../../mod/dfrn_confirm.php:604 +#: ../../mod/dfrn_confirm.php:610 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." -#: ../../mod/dfrn_confirm.php:624 +#: ../../mod/dfrn_confirm.php:630 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." -#: ../../mod/dfrn_confirm.php:635 +#: ../../mod/dfrn_confirm.php:641 msgid "Unable to set your contact credentials on our system." msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." -#: ../../mod/dfrn_confirm.php:700 +#: ../../mod/dfrn_confirm.php:706 msgid "Unable to update your contact profile details on our system" msgstr "Die Updates für dein Profil konnten nicht gespeichert werden" -#: ../../mod/dfrn_confirm.php:730 +#: ../../mod/dfrn_confirm.php:740 #, php-format msgid "Connection accepted at %s" msgstr "Auf %s wurde die Verbindung akzeptiert" -#: ../../addon/facebook/facebook.php:490 +#: ../../mod/dfrn_confirm.php:789 +#, php-format +msgid "%1$s has joined %2$s" +msgstr "%1$s ist %2$s beigetreten" + +#: ../../addon/facebook/facebook.php:491 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:495 +#: ../../addon/facebook/facebook.php:496 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:515 +#: ../../addon/facebook/facebook.php:516 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:522 +#: ../../addon/facebook/facebook.php:523 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:528 +#: ../../addon/facebook/facebook.php:529 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für diesen Account installieren." -#: ../../addon/facebook/facebook.php:535 +#: ../../addon/facebook/facebook.php:536 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:540 +#: ../../addon/facebook/facebook.php:541 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:547 +#: ../../addon/facebook/facebook.php:548 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:551 +#: ../../addon/facebook/facebook.php:552 msgid "Link all your Facebook friends and conversations on this website" msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren" -#: ../../addon/facebook/facebook.php:553 +#: ../../addon/facebook/facebook.php:554 msgid "" "Facebook conversations consist of your <em>profile wall</em> and your friend" " <em>stream</em>." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>." -#: ../../addon/facebook/facebook.php:554 +#: ../../addon/facebook/facebook.php:555 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen." -#: ../../addon/facebook/facebook.php:555 +#: ../../addon/facebook/facebook.php:556 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:559 +#: ../../addon/facebook/facebook.php:560 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen" -#: ../../addon/facebook/facebook.php:564 +#: ../../addon/facebook/facebook.php:565 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:566 +#: ../../addon/facebook/facebook.php:567 msgid "" "If you choose to link conversations and leave both of these boxes unchecked," " your Facebook profile wall will be merged with your profile wall on this " @@ -4197,120 +4341,120 @@ msgid "" "who may see the conversations." msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:571 +#: ../../addon/facebook/facebook.php:572 msgid "Comma separated applications to ignore" msgstr "Komma separiert Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:648 +#: ../../addon/facebook/facebook.php:656 msgid "Problems with Facebook Real-Time Updates" msgstr "Probleme mit Facebook Echtzeit-Updates" -#: ../../addon/facebook/facebook.php:675 +#: ../../addon/facebook/facebook.php:684 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:676 +#: ../../addon/facebook/facebook.php:685 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:691 +#: ../../addon/facebook/facebook.php:700 msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:701 +#: ../../addon/facebook/facebook.php:710 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " "using this form.<br><br>" msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>" -#: ../../addon/facebook/facebook.php:706 +#: ../../addon/facebook/facebook.php:715 msgid "" "Error: the given API Key seems to be incorrect (the application access token" " could not be retrieved)." msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." -#: ../../addon/facebook/facebook.php:708 +#: ../../addon/facebook/facebook.php:717 msgid "The given API Key seems to work correctly." msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." -#: ../../addon/facebook/facebook.php:710 +#: ../../addon/facebook/facebook.php:719 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." -#: ../../addon/facebook/facebook.php:713 +#: ../../addon/facebook/facebook.php:722 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:714 +#: ../../addon/facebook/facebook.php:723 msgid "Application secret" msgstr "Anwendungs-Geheimnis" -#: ../../addon/facebook/facebook.php:715 +#: ../../addon/facebook/facebook.php:724 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "Abfrage-Intervall in Minuten (min %1$s Minuten)" -#: ../../addon/facebook/facebook.php:716 +#: ../../addon/facebook/facebook.php:725 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)" -#: ../../addon/facebook/facebook.php:720 +#: ../../addon/facebook/facebook.php:729 msgid "Real-Time Updates" msgstr "Echt-Zeit Aktualisierungen" -#: ../../addon/facebook/facebook.php:724 +#: ../../addon/facebook/facebook.php:733 msgid "Real-Time Updates are activated." msgstr "Echtzeit-Updates sind aktiviert." -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:734 msgid "Deactivate Real-Time Updates" msgstr "Echtzeit-Updates deaktivieren" -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:736 msgid "Real-Time Updates not activated." msgstr "Echtzeit-Updates nicht aktiviert." -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:736 msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:746 +#: ../../addon/facebook/facebook.php:755 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:770 +#: ../../addon/facebook/facebook.php:779 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:868 +#: ../../addon/facebook/facebook.php:877 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1088 +#: ../../addon/facebook/facebook.php:1097 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1121 +#: ../../addon/facebook/facebook.php:1130 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1161 +#: ../../addon/facebook/facebook.php:1170 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." -#: ../../addon/facebook/facebook.php:1162 +#: ../../addon/facebook/facebook.php:1171 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1163 +#: ../../addon/facebook/facebook.php:1172 #, php-format msgid "" "Hi %1$s,\n" @@ -4471,7 +4615,7 @@ msgstr "Aktiviere Planeten Plugin" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:796 +#: ../../include/nav.php:64 ../../boot.php:805 msgid "Login" msgstr "Anmeldung" @@ -4499,7 +4643,7 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:99 ../../include/text.php:1302 +#: ../../view/theme/diabook/theme.php:119 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -5075,7 +5219,7 @@ msgid "" "If enabled all your <strong>public</strong> postings can be posted to the " "associated StatusNet account. You can choose to do so by default (here) or " "for every posting separately in the posting options when writing the entry." -msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." +msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." #: ../../addon/statusnet/statusnet.php:336 msgid "" @@ -5209,7 +5353,7 @@ msgid "Show More Settings saved." msgstr "\"Mehr zeigen\" Einstellungen gesichert." #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:496 +#: ../../boot.php:507 msgid "show more" msgstr "mehr anzeigen" @@ -5289,7 +5433,7 @@ msgid "" "If enabled all your <strong>public</strong> postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for" " every posting separately in the posting options when writing the entry." -msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." +msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." #: ../../addon/twitter/twitter.php:192 msgid "" @@ -5416,72 +5560,76 @@ msgid "Color scheme" msgstr "Farbschema" #: ../../view/theme/diabook/theme.php:48 +msgid "Community Profiles" +msgstr "Community-Profile" + +#: ../../view/theme/diabook/theme.php:68 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook/theme.php:77 +#: ../../view/theme/diabook/theme.php:97 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook/theme.php:122 +#: ../../view/theme/diabook/theme.php:142 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook/theme.php:159 +#: ../../view/theme/diabook/theme.php:179 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook/theme.php:160 +#: ../../view/theme/diabook/theme.php:180 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook/theme.php:162 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:182 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook/theme.php:164 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:184 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook/theme.php:180 -#: ../../view/theme/diabook/theme.php:258 +#: ../../view/theme/diabook/theme.php:199 +#: ../../view/theme/diabook/theme.php:277 msgid "Community Pages" msgstr "Foren" -#: ../../view/theme/diabook/theme.php:213 +#: ../../view/theme/diabook/theme.php:232 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook/theme.php:219 +#: ../../view/theme/diabook/theme.php:238 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:270 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" -#: ../../view/theme/diabook/theme.php:252 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:271 ../../include/nav.php:50 msgid "Your profile page" msgstr "Deine Profilseite" -#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/theme.php:272 msgid "Your contacts" msgstr "Deine Kontakte" -#: ../../view/theme/diabook/theme.php:254 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:273 ../../include/nav.php:51 msgid "Your photos" msgstr "Deine Fotos" -#: ../../view/theme/diabook/theme.php:255 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:274 ../../include/nav.php:52 msgid "Your events" msgstr "Deine Ereignisse" -#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 msgid "Personal notes" msgstr "Persönliche Notizen" -#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Deine privaten Fotos" @@ -5513,7 +5661,7 @@ msgstr "Mitte" msgid "Set colour scheme" msgstr "Farbschema wählen" -#: ../../include/profile_advanced.php:17 ../../boot.php:1085 +#: ../../include/profile_advanced.php:17 ../../boot.php:1094 msgid "Gender:" msgstr "Geschlecht:" @@ -5534,11 +5682,11 @@ msgstr "Geburtstag:" msgid "Age:" msgstr "Alter:" -#: ../../include/profile_advanced.php:37 ../../boot.php:1088 +#: ../../include/profile_advanced.php:37 ../../boot.php:1097 msgid "Status:" msgstr "Status:" -#: ../../include/profile_advanced.php:45 ../../boot.php:1090 +#: ../../include/profile_advanced.php:45 ../../boot.php:1099 msgid "Homepage:" msgstr "Homepage:" @@ -5718,179 +5866,179 @@ msgstr "Andere" msgid "Undecided" msgstr "Unentschieden" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Males" msgstr "Männer" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Females" msgstr "Frauen" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Gay" msgstr "Schwul" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Lesbian" msgstr "Lesbisch" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "No Preference" msgstr "Keine Vorlieben" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Bisexual" msgstr "Bisexuell" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Autosexual" msgstr "Autosexual" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Abstinent" msgstr "Abstinent" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Virgin" msgstr "Jungfrauen" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Deviant" msgstr "Deviant" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Fetish" msgstr "Fetish" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Oodles" msgstr "Oodles" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Nonsexual" msgstr "Nonsexual" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Single" msgstr "Single" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Lonely" msgstr "Einsam" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Available" msgstr "Verfügbar" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unavailable" msgstr "Nicht verfügbar" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Has crush" msgstr "verknallt" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Infatuated" msgstr "verliebt" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Dating" msgstr "Dating" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unfaithful" msgstr "Untreu" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Sex Addict" msgstr "Sexbesessen" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Friends" msgstr "Freunde" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Friends/Benefits" msgstr "Freunde/Zuwendungen" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Casual" msgstr "Casual" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Engaged" msgstr "Verlobt" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Married" msgstr "Verheiratet" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Imaginarily married" msgstr "imaginär verheiratet" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Partners" msgstr "Partner" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Cohabiting" msgstr "zusammenlebend" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Common law" msgstr "wilde Ehe" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Happy" msgstr "Glücklich" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Not looking" msgstr "Nicht auf der Suche" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Swinger" msgstr "Swinger" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Betrayed" msgstr "Betrogen" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Separated" msgstr "Getrennt" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unstable" msgstr "Unstabil" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Divorced" msgstr "Geschieden" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Imaginarily divorced" msgstr "imaginär geschieden" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Widowed" msgstr "Verwitwet" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Uncertain" msgstr "Unsicher" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "It's complicated" msgstr "Ist kompliziert" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Don't care" msgstr "Ist mir nicht wichtig" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Ask me" msgstr "Frag mich" @@ -6122,7 +6270,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:795 +#: ../../include/nav.php:46 ../../boot.php:804 msgid "Logout" msgstr "Abmelden" @@ -6130,7 +6278,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1463 +#: ../../include/nav.php:49 ../../boot.php:1472 msgid "Status" msgstr "Status" @@ -6210,11 +6358,11 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:138 ../../boot.php:1043 +#: ../../include/nav.php:138 ../../boot.php:1052 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1043 +#: ../../include/nav.php:138 ../../boot.php:1052 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" @@ -6293,6 +6441,13 @@ msgstr "Alles" msgid "Categories" msgstr "Kategorien" +#: ../../include/contact_widgets.php:183 +#, php-format +msgid "%d friend in common" +msgid_plural "%d friends in common" +msgstr[0] "%d gemeinsamer Freund" +msgstr[1] "%d gemeinsame Freunde" + #: ../../include/auth.php:29 msgid "Logged out." msgstr "Abgemeldet." @@ -6540,7 +6695,7 @@ msgstr "%s markierte %s" #: ../../include/enotify.php:121 msgid "your post" -msgstr "Deinen Beitrag" +msgstr "deinen Beitrag" #: ../../include/enotify.php:130 msgid "[Friendica:Notify] Introduction received" @@ -6601,11 +6756,11 @@ msgstr "Foto:" msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." -#: ../../include/items.php:2698 +#: ../../include/items.php:2714 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:2698 +#: ../../include/items.php:2714 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " @@ -6636,33 +6791,33 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." -#: ../../include/Contact.php:96 +#: ../../include/Contact.php:111 msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:188 ../../include/conversation.php:817 +#: ../../include/Contact.php:203 ../../include/conversation.php:817 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:189 ../../include/conversation.php:818 +#: ../../include/Contact.php:204 ../../include/conversation.php:818 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:190 ../../include/conversation.php:819 +#: ../../include/Contact.php:205 ../../include/conversation.php:819 msgid "View Photos" msgstr "Bilder anschauen" -#: ../../include/Contact.php:191 ../../include/Contact.php:204 +#: ../../include/Contact.php:206 ../../include/Contact.php:219 #: ../../include/conversation.php:820 msgid "Network Posts" -msgstr "Netzwerk Beiträge" +msgstr "Netzwerk-Beiträge" -#: ../../include/Contact.php:192 ../../include/Contact.php:204 +#: ../../include/Contact.php:207 ../../include/Contact.php:219 #: ../../include/conversation.php:821 msgid "Edit Contact" msgstr "Kontakt bearbeiten" -#: ../../include/Contact.php:193 ../../include/Contact.php:204 +#: ../../include/Contact.php:208 ../../include/Contact.php:219 #: ../../include/conversation.php:822 msgid "Send PM" msgstr "Private Nachricht senden" @@ -6889,70 +7044,96 @@ msgstr "Ort löschen" msgid "permissions" msgstr "Zugriffsrechte" -#: ../../boot.php:494 +#: ../../boot.php:505 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:497 +#: ../../boot.php:508 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:774 +#: ../../boot.php:681 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." + +#: ../../boot.php:683 +#, php-format +msgid "Update Error at %s" +msgstr "Updatefehler bei %s" + +#: ../../boot.php:783 msgid "Create a New Account" msgstr "Neuen Account erstellen" -#: ../../boot.php:798 +#: ../../boot.php:807 msgid "Nickname or Email address: " msgstr "Spitzname oder Email-Adresse: " -#: ../../boot.php:799 +#: ../../boot.php:808 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:802 +#: ../../boot.php:811 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:808 +#: ../../boot.php:817 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:975 +#: ../../boot.php:984 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1035 +#: ../../boot.php:1044 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1151 ../../boot.php:1227 +#: ../../boot.php:1160 ../../boot.php:1236 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1152 ../../boot.php:1228 +#: ../../boot.php:1161 ../../boot.php:1237 msgid "F d" msgstr "d. F" -#: ../../boot.php:1197 ../../boot.php:1268 +#: ../../boot.php:1206 ../../boot.php:1277 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1209 +#: ../../boot.php:1218 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1210 +#: ../../boot.php:1219 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1261 +#: ../../boot.php:1270 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1279 +#: ../../boot.php:1288 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1280 +#: ../../boot.php:1289 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" + +#: ../../boot.php:1475 +msgid "Status Messages and Posts" +msgstr "Statusnachrichten und Beiträge" + +#: ../../boot.php:1481 +msgid "Profile Details" +msgstr "Profildetails" + +#: ../../boot.php:1496 +msgid "Events and Calendar" +msgstr "Ereignisse und Kalender" + +#: ../../boot.php:1502 +msgid "Only You Can See This" +msgstr "Nur Du Kannst Das Sehen" diff --git a/view/de/strings.php b/view/de/strings.php index f9d4fa668..f88c969d9 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -320,10 +320,14 @@ $a->strings["%d contact in common"] = array( $a->strings["View all contacts"] = "Alle Kontakte anzeigen"; $a->strings["Unblock"] = "Entsperren"; $a->strings["Block"] = "Sperren"; +$a->strings["Toggle Blocked status"] = "Geblockt-Sttaus ein-/ausschalten"; $a->strings["Unignore"] = "Ignorieren aufheben"; +$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; $a->strings["Unarchive"] = "Unarchivieren"; $a->strings["Archive"] = "Archivieren"; +$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; $a->strings["Repair"] = "Reparieren"; +$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; $a->strings["Contact Editor"] = "Kontakt Editor"; $a->strings["Profile Visibility"] = "Profil Anzeige"; $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."; @@ -343,12 +347,19 @@ $a->strings["Currently ignored"] = "Derzeit ignoriert"; $a->strings["Currently archived"] = "Momentan archiviert"; $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"; $a->strings["Suggestions"] = "Kontaktvorschläge"; +$a->strings["Suggest potential friends"] = "Freunde vorschlagen"; $a->strings["All Contacts"] = "Alle Kontakte"; +$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; $a->strings["Unblocked"] = "Ungeblockt"; +$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; $a->strings["Blocked"] = "Geblockt"; +$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; $a->strings["Ignored"] = "Ignoriert"; +$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; $a->strings["Archived"] = "Archiviert"; +$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; $a->strings["Hidden"] = "Verborgen"; +$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; $a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; $a->strings["is a fan of yours"] = "ist ein Fan von dir"; $a->strings["you are a fan of"] = "du bist Fan von"; @@ -430,17 +441,17 @@ $a->strings["Display Settings"] = "Anzeige Einstellungen"; $a->strings["Display Theme:"] = "Theme:"; $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; $a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum"; -$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: "; +$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "; $a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge"; $a->strings["Don't show emoticons"] = "Keine Smilies anzeigen"; $a->strings["Normal Account"] = "Normaler Account"; $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil"; $a->strings["Soapbox Account"] = "Sandkasten-Account"; -$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"; +$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"; $a->strings["Community/Celebrity Account"] = "Gemeinschafts/Promi-Account"; -$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"; +$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"; $a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount"; -$a->strings["Automatically approve all connection/friend requests as friends"] = "Freundschaftsanfragen werden automatisch als Freund akzeptiert"; +$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert"; $a->strings["OpenID:"] = "OpenID:"; $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."; $a->strings["Publish your default profile in your local site directory?"] = "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"; @@ -481,14 +492,15 @@ $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; $a->strings["By default post a status message when:"] = "Standardmäßig eine Status-Nachricht posten wenn:"; -$a->strings["accepting a friend request"] = "akzeptieren einer Freundschaftsanfrage"; -$a->strings["making an <em>interesting</em> profile change"] = "<em>interessante</em> Änderungen am Profil gemacht werden"; +$a->strings["accepting a friend request"] = "– du eine Kontaktanfrage akzeptierst"; +$a->strings["joining a forum/community"] = "– du einem Forum/einer Gemeinschaftsseite beitrittst"; +$a->strings["making an <em>interesting</em> profile change"] = "– du eine <em>interessante</em> Änderung an deinem Profil durchführst"; $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; -$a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst"; -$a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde"; -$a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine Pinnwand schreibt"; -$a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst"; -$a->strings["You receive a private message"] = "- du eine private Nachricht erhältst"; +$a->strings["You receive an introduction"] = "– du eine Kontaktanfrage erhältst"; +$a->strings["Your introductions are confirmed"] = "– eine deiner Kontaktanfragen akzeptiert wurde"; +$a->strings["Someone writes on your profile wall"] = "– jemand etwas auf deine Pinnwand schreibt"; +$a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst"; +$a->strings["You receive a private message"] = "– du eine private Nachricht erhältst"; $a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst"; $a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest"; $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen"; @@ -500,10 +512,16 @@ $a->strings["Remove term"] = "Begriff entfernen"; $a->strings["Saved Searches"] = "Gespeicherte Suchen"; $a->strings["add"] = "hinzufügen"; $a->strings["Commented Order"] = "Neueste Kommentare"; +$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren"; $a->strings["Posted Order"] = "Neueste Beiträge"; +$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; +$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; $a->strings["New"] = "Neue"; +$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; $a->strings["Starred"] = "Markierte"; +$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $a->strings["Shared Links"] = "Geteilte Links"; +$a->strings["Interesting Links"] = "Interessante Links"; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", @@ -665,6 +683,8 @@ $a->strings["Site"] = "Seite"; $a->strings["Users"] = "Nutzer"; $a->strings["Plugins"] = "Plugins"; $a->strings["Themes"] = "Themen"; +$a->strings["DB updates"] = "DB Updates"; +$a->strings["Software Update"] = "Software Update"; $a->strings["Logs"] = "Protokolle"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten"; $a->strings["Administration"] = "Administration"; @@ -731,6 +751,16 @@ $a->strings["Network timeout"] = "Netzwerk Wartezeit"; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."; $a->strings["Delivery interval"] = "Zustellungsintervall"; $a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."; +$a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; +$a->strings["Executing %s failed. Check system logs."] = "Ausführung von %s schlug fehl. Systemprotokolle prüfen."; +$a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich."; +$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s hat keinen Status zurückgegeben. Unbekannter Status."; +$a->strings["Update function %s could not be found."] = "Updatefunktion %s konnte nicht gefunden werden."; +$a->strings["No failed updates."] = "Keine fehlgeschlagenen Updates."; +$a->strings["Failed Updates"] = "Fehlgeschlagene Updates"; +$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."; +$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (falls das Update manuell installiert wurde)"; +$a->strings["Attempt to execute this update step automatically"] = "Versuchen, diesen Schritt automatisch auszuführen"; $a->strings["%s user blocked/unblocked"] = array( 0 => "%s Benutzer geblockt/freigegeben", 1 => "%s Benutzer geblockt/freigegeben", @@ -822,7 +852,10 @@ $a->strings["Homepage"] = "Webseite"; $a->strings["Interests"] = "Interessen"; $a->strings["Location"] = "Wohnort"; $a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings[" and "] = " und "; $a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to \"%3\$s\""] = "%1\$s änderte %2\$s zu \"%3\$s\""; +$a->strings[" - Visit %1\$s's %2\$s"] = " - %1\$s's %2\$s besuchen"; $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; $a->strings["Profile deleted."] = "Profil gelöscht."; $a->strings["Profile-"] = "Profil-"; @@ -902,7 +935,7 @@ $a->strings["%d message sent."] = array( ); $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen"; $a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."; -$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."; +$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."; $a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."; $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."; $a->strings["Send invitations"] = "Einladungen senden"; @@ -929,6 +962,7 @@ $a->strings["The ID provided by your system is a duplicate on our system. It sho $a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."; $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden"; $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert"; +$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; $a->strings["Facebook disabled"] = "Facebook deaktiviert"; $a->strings["Updating contacts"] = "Aktualisiere Kontakte"; $a->strings["Facebook API key is missing."] = "Facebook-API-Schlüssel nicht gefunden"; @@ -1146,7 +1180,7 @@ $a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen"; $a->strings["Current StatusNet API is"] = "Derzeitige StatusNet-API-URL lautet"; $a->strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen"; $a->strings["Currently connected to: "] = "Momentan verbunden mit: "; -$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; @@ -1193,7 +1227,7 @@ $a->strings["No consumer key pair for Twitter found. Please contact your site ad $a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."; $a->strings["Log in with Twitter"] = "bei Twitter anmelden"; $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; -$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; @@ -1223,6 +1257,7 @@ $a->strings["Theme settings"] = "Themen Einstellungen"; $a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"; $a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; $a->strings["Color scheme"] = "Farbschema"; +$a->strings["Community Profiles"] = "Community-Profile"; $a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Last likes"] = "Zuletzt gemocht"; $a->strings["Last photos"] = "Letzte Fotos"; @@ -1445,6 +1480,10 @@ $a->strings["All Networks"] = "Alle Netzwerke"; $a->strings["Saved Folders"] = "Gespeicherte Ordner"; $a->strings["Everything"] = "Alles"; $a->strings["Categories"] = "Kategorien"; +$a->strings["%d friend in common"] = array( + 0 => "%d gemeinsamer Freund", + 1 => "%d gemeinsame Freunde", +); $a->strings["Logged out."] = "Abgemeldet."; $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast."; $a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; @@ -1500,7 +1539,7 @@ $a->strings["tagged you"] = "erwähnte Dich"; $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag"; $a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt"; $a->strings["%s tagged %s"] = "%s markierte %s"; -$a->strings["your post"] = "Deinen Beitrag"; +$a->strings["your post"] = "deinen Beitrag"; $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"; $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten."; @@ -1526,7 +1565,7 @@ $a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Profile"] = "Profil anschauen"; $a->strings["View Photos"] = "Bilder anschauen"; -$a->strings["Network Posts"] = "Netzwerk Beiträge"; +$a->strings["Network Posts"] = "Netzwerk-Beiträge"; $a->strings["Edit Contact"] = "Kontakt bearbeiten"; $a->strings["Send PM"] = "Private Nachricht senden"; $a->strings["post/item"] = "Nachricht/Beitrag"; @@ -1586,6 +1625,8 @@ $a->strings["clear location"] = "Ort löschen"; $a->strings["permissions"] = "Zugriffsrechte"; $a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; $a->strings["show fewer"] = "weniger anzeigen"; +$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; +$a->strings["Update Error at %s"] = "Updatefehler bei %s"; $a->strings["Create a New Account"] = "Neuen Account erstellen"; $a->strings["Nickname or Email address: "] = "Spitzname oder Email-Adresse: "; $a->strings["Password: "] = "Passwort: "; @@ -1601,3 +1642,7 @@ $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; $a->strings["[No description]"] = "[keine Beschreibung]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; $a->strings["Events this week:"] = "Veranstaltungen diese Woche"; +$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; +$a->strings["Profile Details"] = "Profildetails"; +$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; +$a->strings["Only You Can See This"] = "Nur Du Kannst Das Sehen"; diff --git a/view/fr/cmnt_received_eml.tpl b/view/fr/cmnt_received_eml.tpl index ee98d98de..762a0c4cd 100644 --- a/view/fr/cmnt_received_eml.tpl +++ b/view/fr/cmnt_received_eml.tpl @@ -1,13 +1,13 @@ -Cher $username, +Cher(e) $username, - '$from' a commenté sur un élément ou une conversation que vous suivez. + « $from » a commenté un élément ou une conversation que vous suivez. ----- $body ----- -Connectez-vous à $siteurl si vous souhaitez voir la conversation complète: +Connectez-vous à $siteurl si vous souhaitez voir la conversation complète : $display diff --git a/view/fr/cmnt_received_html_body_eml.tpl b/view/fr/cmnt_received_html_body_eml.tpl index 1d904c53c..b56ef9e64 100644 --- a/view/fr/cmnt_received_html_body_eml.tpl +++ b/view/fr/cmnt_received_html_body_eml.tpl @@ -1,15 +1,15 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Message</title> + <title>Message de Friendica</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> </head> <body> <table style="border:1px solid #ccc"> <tbody> - <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr> + <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr> - <tr><td style="padding-top:22px;" colspan="2">$from a commenté sur un élément ou une conversation que vous suivez.</td></tr> + <tr><td style="padding-top:22px;" colspan="2">$from a commenté un élément ou une conversation que vous suivez.</td></tr> <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> diff --git a/view/fr/cmnt_received_text_body_eml.tpl b/view/fr/cmnt_received_text_body_eml.tpl index d46632138..876b53e12 100644 --- a/view/fr/cmnt_received_text_body_eml.tpl +++ b/view/fr/cmnt_received_text_body_eml.tpl @@ -1,12 +1,13 @@ -Cher $username, - '$from' a comment sur un lment ou une conversation que vous suivez. +Cher(e) $username, + + $from a comment un lment ou une conversation que vous suivez. ----- $body ----- -Connectez-vous $siteurl si vous souhaitez voir la conversation complte: +Connectez-vous $siteurl si vous souhaitez voir la conversation complte : $display diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl index c77a3e427..10d0b343b 100644 --- a/view/fr/follow_notify_eml.tpl +++ b/view/fr/follow_notify_eml.tpl @@ -1,9 +1,9 @@ -Chèr(e) $myname, +Cher(e) $myname, Une nouvelle personne - $requestor - vous suit désormais sur $sitename. -Vous pouvez visiter son profil sur $url. +Vous pouvez consulter son profil sur $url. Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl index 9b9c551fe..1f2553b5e 100644 --- a/view/fr/friend_complete_eml.tpl +++ b/view/fr/friend_complete_eml.tpl @@ -1,20 +1,20 @@ -Chèr(e) $username, +Cher(e) $username, - Grande nouvelle... '$fn' (de '$dfrn_url') à accepté votre -demande de connexion à '$sitename'. + Grande nouvelle… « $fn » (de « $dfrn_url ») a accepté votre +demande de connexion à « $sitename ». Vous êtes désormais dans une relation réciproque et pouvez échanger des photos, des humeurs et des messages sans restriction. -Merci de visiter votre page 'Contacts' sur $sitename pour toute +Merci de visiter votre page « Contacts » sur $sitename pour toute modification que vous souhaiteriez apporter à cette relation. $siteurl [Par exemple, vous pouvez créer un profil spécifique avec des informations cachées au grand public - et ainsi assigner des droits privilégiés à -'$fn']/ +« $fn »]/ Sincèremment, diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl index b8a7a3457..f698cfeb7 100644 --- a/view/fr/intro_complete_eml.tpl +++ b/view/fr/intro_complete_eml.tpl @@ -1,19 +1,19 @@ -Chèr(e) $username, +Cher(e) $username, - '$fn' du site '$dfrn_url' a accepté votre -demande de mise en relation sur '$sitename'. + « $fn » du site « $dfrn_url » a accepté votre +demande de mise en relation sur « $sitename ». - '$fn' a décidé de vous accepter comme "fan", ce qui restreint + « $fn » a décidé de vous accepter comme « fan », ce qui restreint certains de vos moyens de communication - tels que les messages privés et certaines interactions avec son profil. S'il s'agit de la page d'une célébrité et/ou communauté, ces réglages ont été définis automatiquement. - '$fn' pourra choisir d'étendre votre relation à quelque-chose de + « $fn » pourra choisir d'étendre votre relation à quelque chose de plus permissif dans l'avenir. - Vous allez commencer à recevoir les mises-à-jour publiques du -statut de '$fn', lesquelles apparaîtront sur votre page 'Réseau' sur + Vous allez commencer à recevoir les mises à jour publiques du +statut de « $fn », lesquelles apparaîtront sur votre page « Réseau » sur $siteurl diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl index 168e9a5e2..96c11d723 100644 --- a/view/fr/lostpass_eml.tpl +++ b/view/fr/lostpass_eml.tpl @@ -1,6 +1,7 @@ -Chèr(e) $username, - Nous avons récemment reçu, chez $sitename, un demande de remise +Cher(e) $username, + + Nous avons récemment reçu, chez $sitename, une demande de remise à zéro du mot de passe protégeant votre compte. Pour confirmer cette demande, merci de cliquer sur le lien de vérification suivant, ou de le coller dans la barre d'adresse de votre navigateur web. @@ -11,7 +12,7 @@ le lien en question, et d'ignorer/supprimer ce courriel. Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu nous assurer que vous êtes bien à l'origine de cette demande. -Merci de suivre le lien suivant pour confirmer votre identité: +Merci de suivre le lien suivant pour confirmer votre identité : $reset_link @@ -20,10 +21,10 @@ Vous recevrez en retour un message avec votre nouveau mot de passe. Vous pourrez ensuite changer ce mot de passe, après connexion, dans la page des réglages du compte. -Les informations du compte concerné sont: +Les informations du compte concerné sont : -Site: $siteurl -Pseudo/Courriel: $email +Site : $siteurl +Pseudo/Courriel : $email diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl index 55e8b8a73..9961a0c01 100644 --- a/view/fr/mail_received_html_body_eml.tpl +++ b/view/fr/mail_received_html_body_eml.tpl @@ -1,22 +1,22 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Message</title> + <title>Message de Friendica</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> </head> <body> <table style="border:1px solid #ccc"> <tbody> - <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr> + <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr> - <tr><td style="padding-top:22px;" colspan="2">$from t'a envoyŽ un message ˆ $siteName.</td></tr> + <tr><td style="padding-top:22px;" colspan="2">$from vous a envoyé un message à $siteName.</td></tr> <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> <td style="padding-top:22px;"><a href="$url">$from</a></td></tr> <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr> <tr><td style="padding-right:22px;">$htmlversion</td></tr> - <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp ˆ <a href="$siteurl">$siteurl</a> pour lire et rŽpondre ˆ vos messages privŽs.</td></tr> + <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Veuillez Ouvrir une session sur <a href="$siteurl">$siteurl</a> pour lire et répondre à vos messages privés.</td></tr> <tr><td></td><td>Merci,</td></tr> <tr><td></td><td>$siteName Administrateur</td></tr> </tbody> diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl index c877344e0..65d034c15 100644 --- a/view/fr/mail_received_text_body_eml.tpl +++ b/view/fr/mail_received_text_body_eml.tpl @@ -1,10 +1,10 @@ -$from t'a envoy un message $siteName. +$from vous a envoy un message $siteName. $title $textversion -Ouvrez une session svp $siteurl pour lire et rpondre vos messages privs. +Veuillez ouvrir une session sur $siteurl pour lire et rpondre vos messages privs. Merci, $siteName Administrateur diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl index c1881b13e..4ea8899fc 100644 --- a/view/fr/passchanged_eml.tpl +++ b/view/fr/passchanged_eml.tpl @@ -1,16 +1,17 @@ -Chèr(e) $username, - Votre mot de passe a été changé, comme demandé. Merci de conserver +Cher(e) $username, + + Votre mot de passe a été modifié comme demandé. Merci de conserver cette information pour un usage ultérieur (ou bien de changer votre mot de -passe immédiatement en quelque-chose dont vous vous souviendrez). +passe immédiatement en quelque chose dont vous vous souviendrez). -Vos informations de connexion sont désormais: +Vos informations de connexion sont désormais : -Site: $siteurl -Pseudo/Courriel: $email -Mot de passe: $new_password +Site : $siteurl +Pseudo/Courriel : $email +Mot de passe : $new_password -Vous pouvez changer ce mot de passe depuis la page des réglages de votre compte, +Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, après connexion Sincèrement votre, diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl index d61a5996d..5d9e737c3 100644 --- a/view/fr/register_open_eml.tpl +++ b/view/fr/register_open_eml.tpl @@ -1,13 +1,14 @@ -Chèr(e) $username, +Cher(e) $username, + Merci de votre inscription à $sitename. Votre compte a été créé. -Les informations de connexion sont comme suit: +Les informations de connexion sont les suivantes : -Site: $siteurl -Pseudo/Courriel: $email -Mot de passe: $password +Site : $siteurl +Pseudo/Courriel : $email +Mot de passe : $password -Vous pouvez changer de mot de passe dans la page des "Réglages" de votre compte, +Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte, après connexion. Merci de prendre quelques minutes pour découvrir les autres réglages disponibles diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl index 54362ce18..9cb31a6a8 100644 --- a/view/fr/register_verify_eml.tpl +++ b/view/fr/register_verify_eml.tpl @@ -3,21 +3,21 @@ Une nouvelle demande d'inscription a été reçue sur $sitename, et elle nécessite votre approbation. -Les informations de connexion sont comme suit: +Les informations de connexion sont les suivantes : -Nom complet: $username -Site: $siteurl -Pseudo/Courriel: $email +Nom complet : $username +Site : $siteurl +Pseudo/Courriel : $email -Pour approuver cette demande, merci de suivre le lien: +Pour approuver cette demande, merci de suivre le lien : $siteurl/regmod/allow/$hash Pour rejeter cette demande et supprimer le compte associé, -merci de suivre le lien: +merci de suivre le lien : $siteurl/regmod/deny/$hash diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl index afbb2ab7e..9234ceaaa 100644 --- a/view/fr/request_notify_eml.tpl +++ b/view/fr/request_notify_eml.tpl @@ -1,9 +1,9 @@ -Chèr(e) $myname, +Cher(e) $myname, Vous venez de recevoir une demande de mise en relation sur $sitename -venant de '$requestor'. +venant de « $requestor ». Vous pouvez visiter son profil sur $url. diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl index adfb91dd8..ad365a951 100644 --- a/view/fr/wall_received_eml.tpl +++ b/view/fr/wall_received_eml.tpl @@ -1,13 +1,13 @@ -Chèr(e) $username, +Cher(e) $username, - '$from' a posté quelque-chose sur le mur de votre profil. + « $from » a posté quelque chose sur le mur de votre profil. ----- $body ----- -Connectez-vous à $siteurl pour voir et/ou supprimer l'élément: +Connectez-vous à $siteurl pour voir et/ou supprimer l'élément : $display diff --git a/view/theme/dispy/dark/_base.less b/view/theme/dispy/dark/_base.less new file mode 100644 index 000000000..c26332bd2 --- /dev/null +++ b/view/theme/dispy/dark/_base.less @@ -0,0 +1,136 @@ +// _base.less +// +// the base file for dispy's dark "sub-theme". +// +// Notes: +// this is used to define mixins (think of them as functions) +// and variables. the mixins are the ".foo () {}" things, vars are +// like "@bar". +// +// (BTW, this will make it a LOT easier to maintain.) +// +// Dev. Note: the // style comments don't show up at all when +// you "compile" the css (with `lessc`), but css (/**/) comments +// do. i use them to our advantage :). + +//* backgrounds */ +@dk_bg_colour: #1d1f1d; +@bg_colour: #2e2f2e; +@bg_alt_colour: #2e302e; +@med_bg_colour: #4e4f4e; +@menu_bg_colour: #555753; + +//* font colour, aka color: */ +@lt_main_colour: #ffff99; +@main_colour: #eeeecc; +@main_alt_colour: #eeeeee; +// darken(@main_alt_colour, 13%) > #cdcdcd +// darken(@main_alt_colour, 60%) > #555555 +@disabled_colour: #ddddbb; +@shiny_colour: #2e3436; +@red_orange: #ff2000; +@orange: #f8911b; +@lt_orange: #fcaf3e; +@shadow_colour: #111111; +@friendica_blue: #3465a4; +@notice: #3320bc; +@info: #1353b1; +@alert: #ff0000; + +@lt_main_colour: lighten(@bg_colour, 10%); +@dk_main_colour: darken(@bg_colour, 10%); + +//* links */ +@link_colour: #88a9d2; +@dk_link_colour: darken(@link_colour, 10%); +@lt_link_colour: lighten(@link_colour, 10%); +//@hover_colour: #729fcf; +@hover_colour: @dk_link_colour; + +//* box shadows */ +@menu_shadow: 5px 0 10px 0 @shadow_colour; +@main_shadow: 3px 3px 3px 10px 0 @shadow_colour; + +// default here was @main_shadow +.box_shadow(@h: 5px, @v: 5px, @blur: 5px, @spread: 0px, @colour: @shadow_colour) { + -moz-box-shadow: @h @v @blur @spread @colour; + -o-box-shadow: @h @v @blur @spread @colour; + -webkit-box-shadow: @h @v @blur @spread @colour; + -ms-box-shadow: @h @v @blur @spread @colour; + box-shadow: @h @v @blur @spread @colour; +} +//* http://css-tricks.com/snippets/css/css-box-shadow/ +//* box-shadow: +//* 1. The horizontal offset of the shadow, positive means +//* the shadow will be on the right of the box, a negative +//* offset will put the shadow on the left of the box. +//* 2. The vertical offset of the shadow, a negative one +//* means the box-shadow will be above the box, a +//* positive one means the shadow will be below the box. +//* 3. The blur radius (optional), if set to 0 the shadow +//* will be sharp, the higher the number, the more blurred +//* it will be. +//* 4. The spread radius (optional), positive values increase +//* the size of the shadow, negative values decrease the size. +//* Default is 0 (the shadow is same size as blur). +//* 5. Colo[u]r +//*/ + +//* text-shadow */ +.text_shadow (@h: 1px, @v: 1px, @c: #111) { + -moz-text-shadow: @h @v @c; + -o-text-shadow: @h @v @c; + -webkit-text-shadow: @h @v @c; + -ms-text-shadow: @h @v @c; + text-shadow: @h @v @c; +} +//* transitions */ +.transition (@type: all, @dur: 0.5s, @effect: ease-in-out) { + -webkit-transition: @arguments; + -moz-transition: @arguments; + -o-transition: @arguments; + -ms-transition: @arguments; + transition: @arguments; +} + +//* borders */ +.borders (@size: 1px, @style: solid, @colour: @main_colour) { + border: @size @style @colour; +} + +//* rounded box corners */ +.rounded_corners (@r: 5px) { + -o-border-radius: @r; + -webkit-border-radius: @r; + -moz-border-radius: @r; + -ms-border-radius: @r; + border-radius: @r; +} + +//* pre wrap */ +.wrap () { + white-space: pre-wrap; + white-space: pre; + word-wrap: none; +} +//* font size sizing */ +.default_font () { + font-size: 16px; + line-height: 1.1em; + font-family: sans-serif; +} + +//* reset ul, ol */ +.list_reset () { + margin: 0px; + padding: 0px; + list-style: none; + list-style-position: inside; +} + +//* box size: width, height */ +.box (@w: 20px, @h: 20px) { + width: @w; + height: @h; +} + diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index de4f3a6dc..4a21a76fb 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -2,36 +2,39 @@ article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]),[hidden]{display:none;} html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#eec;background-color:#2e2f2e;} -button,input,select,textarea{font-family:sans-serif;color:#eec;background-color:#2e2f2e;} -select{border:1px #555 dotted;padding:3px;margin:3px;color:#eec;background:#2e2f2e;} -option{padding:3px;color:#eec;background:#2e2f2e;}option[selected="selected"]{color:#2e2f2e;background:#eec;} -ul,ol{padding:0;} +body{margin:0;padding:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#eeeecc;background-color:#2e2f2e;} +button,input,select,textarea{color:#eeeecc;background-color:#2e2f2e;} +select{border:1px #555 dotted;padding:1px;margin:3px;color:#eeeecc;background:#2e2f2e;} +option{padding:1px;color:#eeeecc;background:#2e2f2e;}option[selected="selected"]{color:#2e2f2e;background:#eeeecc;} +ul,ol{margin:0px;padding:0px;list-style:none;list-style-position:inside;} +tr:nth-child(even){background-color:#474947;} :focus{outline:0;} -[disabled="disabled"]{background:#4e4f4f;color:#ddb;} -ins{background-color:#2e302e;color:#ff9;text-decoration:none;} -mark{background-color:#2e302e;color:#ff9;font-style:italic;font-weight:bold;} +[disabled="disabled"]{background:#4e4f4e;color:#ddddbb;} +ins,mark{background-color:#2e302e;color:#474947;} +ins{text-decoration:none;} +mark{font-style:italic;font-weight:bold;} pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;} -pre,.wall-item-body code{white-space:pre;white-space:pre-wrap;word-wrap:break-word;} +pre,.wall-item-body code{white-space:pre-wrap;white-space:pre;word-wrap:none;} q{quotes:none;}q:before,q:after{content:"";content:none;} small{font-size:85%;} sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;} sub{bottom:-0.25em;} sup{top:-0.5em;} img{border:0 none;} -a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover img{text-decoration:none;} -blockquote{background:#444;color:#eec;text-indent:5px;padding:5px;border:1px #aaa solid;border-radius:5px;} -a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;} +a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;} +a:hover img{text-decoration:none;} +blockquote{background:#444;color:#eeeecc;text-indent:5px;padding:5px;border:1px #aaa solid;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .required{display:inline;color:#ff0;font-size:16px;font-weight:bold;margin:3px;} -.fakelink,.lockview{color:#729fcf;cursor:pointer;} -.fakelink:hover{color:#729fcf;} +.fakelink,.lockview{color:#88a9d2;cursor:pointer;} +.fakelink:hover{color:#638ec4;} .smalltext{font-size:0.7em;} -#panel{position:absolute;font-size:0.8em;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #fff;background-color:#2e302e;color:#eeeeec;padding:1em;} +#panel{position:absolute;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeeee;background-color:#2e302e;color:#eeeecc;padding:1em;} .pager{margin-top:60px;display:block;clear:both;text-align:center;}.pager span{padding:4px;margin:4px;} -.pager_current{background-color:#729fcf;color:#fff;} +.pager_current{background-color:#88a9d2;color:#eeeeee;} .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} +[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;padding:3px;margin:5px 0;font-weight:bold;} #asidemain .field{overflow:hidden;width:200px;} #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;} #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;} @@ -41,10 +44,10 @@ a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;} #asidemain #login_openid{position:relative !important;float:none !important;margin-left:0px !important;height:auto !important;width:200px !important;} #login_openid #id_openid_url{width:180px !important;overflow:hidden !important;} #login_openid label{width:180px !important;} -nav{height:60px;background-color:#1d1f1d;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;} +nav{height:60px;background-color:#1d1f1d;color:#eeeeee;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeee;border:0px;}nav a:hover{text-decoration:none;color:#eeeeee;border:0px;} nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;} -ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;box-shadow:5px 10px 10px 0 #111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#2e302e;background-color:#eeeeec;} -ul#user-menu-popup li a.nav-sep{border-top:1px solid #eeeeec;} +ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#eeeecc;background-color:#2e302e;} +ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;} nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;} #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;} #nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;} @@ -58,24 +61,24 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin #nav-notify-link:hover{background-position:-66px -110px;} #nav-network-link{background-position:0px -177px;}#nav-network-link:hover{background-position:-22px -177px;} #nav-search-link{background-position:0 -44px;}#nav-search-link:hover{background-position:-22px -44px;} -#profile-link,#profile-title,#wall-image-upload,#wall-file-upload,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#jot-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;} -div.jGrowl div.notice{background:#511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;color:#ffffff;padding-left:58px;} -div.jGrowl div.info{background:#364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;color:#ffffff;padding-left:58px;} +#jot-title,#profile-link,#profile-title,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload,#wall-file-upload,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;} +div.jGrowl div.notice{background:#3320bc url("../../../images/icons/48/notice.png") no-repeat 5px center;color:white;padding-left:58px;margin-top:50px;} +div.jGrowl div.info{background:#1353b1 url("../../../images/icons/48/info.png") no-repeat 5px center;color:white;padding-left:58px;margin-top:50px;} #nav-notifications-menu{margin:30px 0 0 -20px;width:275px;max-height:300px;overflow-y:auto;font-size:9pt;}#nav-notifications-menu .contactname{font-weight:bold;font-size:0.9em;} #nav-notifications-menu img{float:left;margin-right:5px;} #nav-notifications-menu .notif-when{font-size:0.8em;display:block;} -#nav-notifications-menu li{word-wrap:normal;border-bottom:1px solid #000;}#nav-notifications-menu li:hover{color:black;} +#nav-notifications-menu li{word-wrap:normal;border-bottom:1px solid black;}#nav-notifications-menu li:hover{color:black;} #nav-notifications-menu a:hover{color:black;text-decoration:underline;} -nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("../../../images/icons/22/notify_on.png");} +nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");} .show{display:block;} -#notifications{height:20px;width:170px;position:absolute;top:-19px;left:4px;} -#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;border-radius:5px;z-index:100;width:300px;height:60px;} +#notifications{width:170px;height:20px;position:absolute;top:-19px;left:4px;} +#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:300px;height:60px;} #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} -.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;} -#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;} +.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} +#search-text{border:1px solid #eeeecc;background:#2e2f2e;color:#eeeecc;font-size:8pt;margin:8px;width:10em;height:14px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} -#user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;} +#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;} #user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;} .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#222;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;} .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;} @@ -86,98 +89,96 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;width:11em;background:#ffffff;color:#2d2d2d;margin:0px;padding:0px;list-style:none;border:3px solid #364e59;z-index:100000;-webkit-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);-moz-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);}.menu-popup a{display:block;color:#2d2d2d;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#bdcdd4;} -.menu-popup .menu-sep{border-top:1px solid #9eabb0;} +.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #2e3436;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#b9c1c3;} +.menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} -.menu-popup .empty{padding:5px;text-align:center;color:#9eabb0;} +.menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;} .notif-item{font-size:small;}.notif-item a{vertical-align:middle;} .notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;} -.notify-seen{background:#ddd;} -#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;} -#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;} -#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #ccccce;} +.notify-seen{background:#bbbbbb;} +#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;} +#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;} +#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeecc;} #asidemain{float:left;font-size:smaller;margin:20px 0 20px 35px;width:25%;display:inline;} #asideright,#asideleft{display:none;} .vcard .fn{font-size:1.7em;font-weight:bold;border-bottom:1px solid #729fcf;padding-bottom:3px;} -.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;} +.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} -.aprofile dt{background:#eec;color:#2e2f2e;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;} +.aprofile dt{background:#eeeecc;color:#2e2f2e;font-weight:bold;-moz-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;-o-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;-webkit-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;-ms-box-shadow:1px 1px 5px 0 5px 5px 0px #111111;box-shadow:1px 1px 5px 0 5px 5px 0px #111111;margin:15px 0 5px;padding-left:5px;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} -#dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;} -#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;} -.ttright{margin:0px 0px 0px 0px;} +#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;} +#wallmessage-link{color:#eeeeee;display:block;font-size:1.2em;padding:0.2em 0.5em;} +.ttright{margin:0px;} .contact-block-div{width:50px;height:50px;float:left;} .contact-block-textdiv{width:150px;height:34px;float:left;} -#contact-block-end{clear:both;} -#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;height:35px;overflow:none;width:100%;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;} +#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;width:100%;height:35px;overflow:none;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;} #jot #jot-tools .perms{float:right;width:40px;} -#jot #jot-tools li.loading{float:right;background-color:#ffffff;width:20px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;height:38px;}#jot #jot-tools li.loading img{margin-top:10px;} -#jot #jot-title{border:1px solid #ccc;margin:0 0 5px;height:20px;width:90%;font-weight:bold;border-radius:5px;vertical-align:middle;} -#jot-category{margin:5px 0;border-radius:5px;border:1px #999 solid;color:#aaa;font-size:smaller;}#jot-category:focus{color:#eee;} -#jot #character-counter{width:6%;float:right;text-align:right;height:15px;line-height:20px;padding:2px 20px 5px 0;} -#profile-jot-text_parent{box-shadow:5px 0 10px 0 #111;} +#jot #jot-tools li.loading{float:right;background-color:white;width:20px;height:38px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;}#jot #jot-tools li.loading img{margin-top:10px;} +#jot #jot-title{border:1px solid #cdcdcd;margin:0 0 5px;width:90%;height:20px;font-weight:bold;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;vertical-align:middle;} +#jot-category{margin:5px 0;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #9a9a9a;color:#a9a9a9;font-size:smaller;}#jot-category:focus{color:#eeeeee;} +#jot #character-counter{width:6%;height:15px;float:right;text-align:right;line-height:20px;padding:2px 20px 5px 0;} +#profile-jot-text_parent{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;} #profile-jot-text_tbl{margin-bottom:10px;background:#777;} #profile-jot-text_ifr{width:99.900002% !important;} #profile-jot-text_toolbargroup,.mceCenter tr{background:#777;} -[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eec;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eec;} +[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;} .defaultSkin tr.mceFirst{background:#777;} -.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eec;} -.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eec;} +.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;} +.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;} #profile-attach-wrapper,#profile-audio-wrapper,#profile-link-wrapper,#profile-location-wrapper,#profile-nolocation-wrapper,#profile-title-wrapper,#profile-upload-wrapper,#profile-video-wrapper{float:left;margin:0 20px 0 0;} #profile-rotator-wrapper{float:right;} -#profile-jot-tools-end,#profile-jot-banner-end{clear:both;} #profile-jot-email-wrapper{margin:10px 10% 0;border:1px solid #555753;border-bottom:0;} -#profile-jot-email-label{background-color:#555753;color:#ccccce;padding:5px;} +#profile-jot-email-label{background-color:#555753;color:#eeeecc;padding:5px;} #profile-jot-email{width:90%;margin:5px;} #profile-jot-networks{margin:0 10%;border:1px solid #555753;border-top:0;border-bottom:0;padding:5px;} #profile-jot-net{margin:5px 0;} #jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;} .icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;} -#profile-jot-perms{float:right;background-color:#555753;height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;} +#profile-jot-perms{float:right;background-color:#555753;width:22px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;} #profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;} -#profile-jot-submit-wrapper{float:right;width:100%;list-style:none;margin:10px 0 0 0;padding:0;} -#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:2px outset #222420;margin:0;float:right;text-shadow:1px 1px #111;width:auto;}#profile-jot-submit:active{box-shadow:0 0 0 0;} -#jot-perms-icon{height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0;} -#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;display:block !important;} -#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{width:47%;float:left;} -#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;float:right;} -#acl-permit-text{background-color:#555753;color:#ccccce;padding:5px;float:left;} -#jot-public{background-color:#555753;color:#ff0000;padding:5px;float:left;} -#acl-deny-text{background-color:#555753;color:#ccccce;padding:5px;float:left;} -#acl-permit-text-end,#acl-deny-text-end{clear:both;} -#jot-title-desc{color:#ccc;} +#profile-jot-submit-wrapper{float:right;width:100%;margin:10px 0 0 0;padding:0;} +#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:2px outset #2e3436;margin:0;float:right;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;width:auto;}#profile-jot-submit:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} +#jot-perms-icon{width:20px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;} +#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555555;border-top:0;display:block !important;border:1px solid #555753 solid #eeeecc;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;} +#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper,#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;} +#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{float:left;} +#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{float:right;} +#acl-permit-text{background-color:#555555;color:#eeeecc;padding:5px;float:left;} +#jot-public{background-color:#555555;color:#ff0000;padding:5px;float:left;} +#acl-deny-text{background-color:#555555;color:#eeeecc;padding:5px;float:left;} +#jot-title-desc{color:#cdcdcd;} #profile-jot-desc{color:#ff2000;margin:5px 0;} #jot-title-wrapper{margin-bottom:5px;} #jot-title-display{font-weight:bold;} .jothidden{display:none;} -#jot-preview-content{background-color:#3e3f3e;color:#eec;border:1px #eec solid;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;border-radius:0px;} +#jot-preview-content{background-color:#2e302e;color:#eeeecc;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;} #sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;} .tabs{list-style:none;margin:10px 0;padding:0;}.tabs li{display:inline;font-size:smaller;font-weight:bold;} -.tab{border:1px solid #729fcf;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#88a9d2;color:#2e2f2e;} -.tab.active{background:#88a9d2;color:#2e2f2e;}.tab.active a{color:#2e2f2e;} +.tab{border:1px solid #88a9d2;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#88a9d2;color:#2e2f2e;} +.tab.active{background:#eeeecc;color:#2e2f2e;}.tab.active a{color:#2e2f2e;} .tab a{border:0;text-decoration:none;} -.wall-item-outside-wrapper{border:1px solid #aaa;border-radius:5px;box-shadow:5px 0 10px 0 #111;}.wall-item-outside-wrapper.comment{margin-top:5px;} +.wall-item-outside-wrapper{border:1px solid #aaaaaa;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-outside-wrapper-end{clear:both;} .wall-item-content-wrapper{position:relative;padding:10px;width:auto;} .wall-item-outside-wrapper .wall-item-comment-wrapper{} -.shiny{background:#2e3436;border-radius:5px;} -.wall-outside-wrapper .shiny{border-radius:5px;} +.shiny{background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} +.wall-outside-wrapper .shiny{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .heart{color:red;} .wall-item-content{overflow-x:auto;margin:0px 15px 0px 5px;} [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:15px 0 0 0;padding:0px;} .wall-item-photo-menu{display:none;} -.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;height:20px;width:90px;top:85px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} +.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} .wall-item-info{float:left;width:110px;} -.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{} -.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;} -.wall-item-subtools1{height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;width:30px;} +.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} +.wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;} .wall-item-subtools2{height:25px;list-style:none outside none;margin:-75px 0 0 5px;padding:0;width:25px;} .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1em;} .wall-item-body{margin:20px 20px 10px 0px;text-align:left;overflow-x:auto;} -.wall-item-lock-wrapper{float:right;height:22px;margin:0 -5px 0 0;width:22px;opacity:1;} +.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#878883;margin:5px 0 5px 120px;} .wall-item-author,.wall-item-actions-author{clear:left;font-size:0.8em;color:#878883;margin:20px 20px 0 110px;} .wall-item-ago{display:inline;padding-left:10px;} @@ -188,8 +189,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;width:30px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;} .wallwall .wall-item-photo-end{clear:both;} .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;} -.wall-item-photo-menu{min-width:92px;border:2px solid #FFFFFF;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-webkit-border-radius:0px 5px 5px 5px;-moz-border-radius:0px 5px 5px 5px;border-radius:0px 5px 5px 5px;}.wall-item-photo-menu ul{margin:0px;padding:0px;list-style:none;} -.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;} +.wall-item-photo-menu{min-width:92px;border:2px solid #ffffff;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;} #item-delete-selected{overflow:auto;width:100%;} #connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;} .ccollapse-wrapper{font-size:0.9em;margin-left:80px;} @@ -202,16 +202,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;} .comment-wwedit-wrapper{} .comment-edit-wrapper{border-top:1px #aaa solid;} -[class^="comment-edit-bb"]{list-style:none;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;} +[class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;} .comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;} .comment-edit-photo-link,.comment-edit-photo{margin-left:10px;} .my-comment-photo{width:40px;height:40px;padding:5px;} [class^="comment-edit-text"]{margin:5px 0 10px 20px;width:84.5%;} .comment-edit-text-empty{height:20px;border:2px #c8bebe solid;border-radius:5px;color:#c8bebe;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.comment-edit-text-empty:hover{color:#999999;} -.comment-edit-text-full{height:10em;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} +.comment-edit-text-full{height:10em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;} .comment-edit-submit-wrapper{width:90%;margin:5px 5px 10px 50px;text-align:right;} -.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:0;} -.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#2e2f2e;width:95%;} +.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;} +.wall-item-body code{background-color:#444;border-bottom:1px dashed #ccc;border-left-style:solid;border-left-width:10px;border-top:1px dashed #ccc;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;} div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} @@ -223,14 +223,13 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #advanced-profile-with{margin-left:200px;} .photos{height:auto;overflow:auto;} #photo-top-links{margin-bottom:30px;} -.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;background-color:#222;color:#2e2f2e;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;} +.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;background-color:#222;color:#2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;} #photo-photo{max-width:100%;}#photo-photo img{max-width:100%;} .photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;} -.photo-top-photo,.photo-album-photo{-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} -.photo-top-album-name{position:absolute;bottom:0;padding:0 5px;} -.caption{position:absolute;bottom:0;margin:0 5px;} +.photo-top-photo,.photo-album-photo{-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} +.photo-top-album-name,.caption{position:absolute;bottom:0;padding:0 5px;} #photo-photo{position:relative;float:left;} -#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-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;background-position:center center;background-repeat:no-repeat;} +#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background:#ffffff center center no-repeat;opacity:0;-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;} #photo-prev-link{background-image:url(dark/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;} #photo-next-link{background-image:url(dark/next.png);height:350px;right:45%;top:215px;width:50px;} #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;} @@ -239,7 +238,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #photo-next-link .icon{display:none;} #photo-prev-link .icon{display:none;} #photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;} -#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;} +#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeee;padding:1px;} #photos-upload-album-select,#photos-upload-newalbum{width:99%;} #photos-upload-perms-menu{text-align:right;} #photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;} @@ -251,7 +250,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #photo-edit-end{margin-bottom:35px;} #photo-caption{font-size:110%;font-weight:bold;margin-top:15px;margin-bottom:15px;} .prvmail-text{width:100%;} -#prvmail-subject{width:100%;color:#2e2f2e;background:#eec;} +#prvmail-subject{width:100%;color:#2e2f2e;background:#eeeecc;} #prvmail-submit-wrapper{margin-top:10px;} #prvmail-submit{float:right;margin-top:0;} #prvmail-submit-wrapper div{margin-right:5px;float:left;} @@ -263,7 +262,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .mail-list-sender-name,.mail-list-date{font-style:italic;} .mail-list-subject{font-size:1.2em;} .mail-list-delete-wrapper{float:right;} -.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eec dotted;} +.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eeeecc dotted;} .mail-conv-sender{float:left;margin:0px 5px 5px 0px;} .mail-conv-sender-photo{width:32px;height:32px;} .mail-conv-sender-name{float:left;} @@ -277,27 +276,27 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .contact-entry-photo{margin-left:20px;} .contact-entry-name{width:120px;font-weight:bold;} .contact-entry-photo{position:relative;} -.contact-entry-edit-links .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background-color:#fff;} -#contact-entry-url,[id^="contact-entry-url"]{font-size:smaller;} -#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;font-style:italic;} +.contact-entry-edit-links .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:#fff;} +#contact-entry-url,[id^="contact-entry-url"],#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;} +#contact-entry-network,[id^="contact-entry-network"]{font-style:italic;} #contact-edit-banner-name{font-size:1.5em;} #contact-edit-photo-wrapper{position:relative;float:left;padding:20px;} #contact-edit-direction-icon{position:absolute;top:60px;left:0;} #contact-edit-nav-wrapper{margin-left:0px;} -#contact-edit-links{margin-top:23px;}#contact-edit-links ul{list-style-type:none;} +#contact-edit-links{margin-top:23px;}#contact-edit-links ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;} #contact-drop-links{margin-left:5px;} -#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;} #contact-edit-poll-wrapper{margin-left:0px;} #contact-edit-last-update-text{margin-bottom:15px;} #contact-edit-last-updated{font-weight:bold;} #contact-edit-poll-text{display:inline;} #contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;} #contact-edit-end{clear:both;margin-bottom:65px;} -.contact-photo-menu-button{position:absolute;background-image:url("dark/photo-menu.jpg");background-position:top left;background-repeat:no-repeat;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;} -.contact-photo-menu{width:auto;border:2px solid #444;background:#2e2f2e;color:#eec;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu ul{margin:0px;padding:0px;list-style:none;} +.contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;} +.contact-photo-menu{width:auto;border:2px solid #444;background:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu ul{margin:0px;padding:0px;list-style:none;} .contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:#fff;background:#3465A4;text-decoration:none;} #id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;} -#settings-nickname-desc{background-color:#eec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding:5px;color:#111;} +#settings-nickname-desc{background-color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;color:#111;} #settings-default-perms{margin-bottom:20px;} #register-form div,#profile-edit-form div{clear:both;} .settings-block label{clear:left;} @@ -307,19 +306,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .profile-edit-side-div{display:none;} #profiles-menu-trigger{margin:0px 0px 0px 25px;} .profile-listing{float:left;margin:20px 20px 0px 0px;} -.icon-profile-edit{background:url("dark/icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;float:right;width:20px;height:20px;margin:0 0 -18px;position:absolute;text-decoration:none;top:113px;right:260px;} -#profile-edit-links ul{margin:20px 0;padding:0;list-style:none;} +.icon-profile-edit{background:url("dark/icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;width:20px;height:20px;margin:0 0 -18px;text-decoration:none;top:113px;right:260px;} +#profile-edit-links ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:20px 0;} .marital{margin-top:5px;} #register-sitename{display:inline;font-weight:bold;} -#advanced-expire-popup{background:#2e2f2e;color:#eec;} +#advanced-expire-popup{background:#2e2f2e;color:#eeeecc;} #id_ssl_policy{width:374px;} #theme-preview img{margin:10px 10px 10px 288px;} .group-delete-wrapper{margin:-31px 50px 0 0;float:right;} #group-edit-submit-wrapper{margin:0 0 10px 0;display:inline;} #group-edit-desc{margin:10px 0px;} -#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} -#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} -#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeec;background-color:#555753;margin:0;padding:5px;} +#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} +#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} +#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeee;background-color:#555753;margin:0;padding:5px;} #group-separator,#prof-separator{display:none;} #cropimage-wrapper{float:left;} #crop-image-form{clear:both;} @@ -349,7 +348,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .prevcal,.nextcal{float:left;margin-left:32px;margin-right:32px;margin-top:64px;} .event-calendar-end{clear:both;} .calendar{font-family:monospace;} -.today{font-weight:bold;color:#FF0000;} +.today{font-weight:bold;color:#F00;} #event-start-text,#event-finish-text{margin-top:10px;margin-bottom:5px;} #event-nofinish-checkbox,#event-nofinish-text,#event-adjust-checkbox,#event-adjust-text,#event-share-checkbox{float:left;} #event-datetime-break{margin-bottom:10px;} @@ -366,28 +365,28 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #item-delete-selected-end{clear:both;} #item-delete-selected-icon{float:left;margin-right:5px;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} -.fc-state-highlight{background:#eec;color:#2e2f2e;} +.fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#88a9d2;font-weight:bold;} -.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#2e2f2e;} +.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;font-weight:bold;} +.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#88a9d2;background:#2e2f2e;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} -#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list ul{list-style-type:none;list-style-position:inside;} -#sidebar-group-list li{margin-top:10px;} -#sidebar-group-list .icon{display:inline-block;height:12px;width:12px;} +#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} +#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} +.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#2e2f2e;background:#88a9d2;font-weight:bold;padding:3px;} #sidebar-new-group{margin:auto;display:inline-block;color:#efefef;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;} -.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;} +#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;} +.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;} .admin.linklist{border:0;padding:0;} -.admin.link{list-style-position:inside;} -#adminpage{color:#eec;background:#2e2f2e;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;} +.admin.link{margin:0px;padding:0px;list-style:none;list-style-position:inside;} +#adminpage{color:#eeeecc;background:#2e2f2e;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;} #adminpage dt{width:250px;float:left;font-weight:bold;} #adminpage dd{margin-left:250px;} #adminpage h3{border-bottom:1px solid #ccc;} @@ -398,27 +397,26 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #adminpage table{width:100%;border-bottom:1px solid #000;margin:5px 0;}#adminpage table th{text-align:left;} #adminpage td .icon{float:left;} #adminpage table#users img{width:16px;height:16px;} -#adminpage table tr:hover{color:#2e2f2e;background-color:#eec;} #adminpage .selectall{text-align:right;} -#adminpage #users a{color:#eec;text-decoration:underline;} -#users .name{color:#eec;} -.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eec;color:#111;} +#adminpage #users a{color:#eeeecc;text-decoration:underline;} +#users .name{color:#eeeecc;} +.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eeeecc;color:#111;} .field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #666;padding:3px 6px 4px 10px;height:16px;text-decoration:none;} -.field .onoff .on{background:url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;color:#111;text-align:left;} -.field .onoff .off{background:url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;color:#333;text-align:right;} +.field .onoff .on,.field .onoff .off{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');background-repeat:no-repeat;} +.field .onoff .on{background-position:42px 1px;background-color:#999;color:#111;text-align:left;} +.field .onoff .off{background-position:2px 1px;background-color:#ccc;color:#333;text-align:right;} .hidden{display:none !important;} .field textarea{width:80%;height:100px;} .field_help{display:block;margin-left:297px;color:#aaa;} .field.radio .field_help{margin-left:297px;} -label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eec;color:#111;} -input{width:250px;height:25px;border:1px #999 solid;}input[type="text"],input[type="password"],input[type="search"]{width:250px;height:25px;border:1px #999 solid;} -input[type="checkbox"],input[type="radio"]{border:1px #999 solid;margin:0 0 0 0;height:15px;width:15px;} -input[type="submit"],input[type="button"]{background-color:#eee;border:2px outset #aaa;border-radius:5px;box-shadow:1px 3px 4px 0 #111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;text-shadow:1px 1px #000;-webkit-border-radius:5px;-moz-border-radius:5px;} -input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;} +label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;} +input[type="submit"],input[type="button"]{background-color:#eee;border:2px outset #aaaaaa;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;} +input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} .popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#000;opacity:0.5;width:100%;height:100%;position:absolute;top:0px;left:0px;} .popup .panel{top:25%;left:25%;width:50%;height:50%;padding:1em;position:absolute;border:4px solid #000000;background-color:#FFFFFF;} #panel{z-index:100;} -.grey{color:grey;} +.grey,.gray{color:gray;} .orange{color:orange;} .red{color:red;} .popup .panel .panel_text{display:block;overflow:auto;height:80%;} @@ -428,9 +426,9 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;} .oauthapp{height:auto;overflow:auto;border-bottom:2px solid #cccccc;padding-bottom:1em;margin-bottom:1em;}.oauthapp img{float:left;width:48px;height:48px;margin:10px;}.oauthapp img.noicon{background-image:url("../../../images/icons/48/plugin.png");background-position:center center;background-repeat:no-repeat;} .oauthapp a{float:left;} .iconspacer{display:block;width:16px;height:16px;} -.icon{display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat;border:0;text-decoration:none;border-radius:5px;}.icon:hover{border:0;text-decoration:none;} +.icon{display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat;border:0;text-decoration:none;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.icon:hover{border:0;text-decoration:none;} .editicon{display:inline-block;width:21px;height:21px;background:url(dark/editicons.png) no-repeat;border:0;text-decoration:none;} -.shadow{box-shadow:2px 2px 5px 2px #111;}.shadow:active,.shadow:focus,.shadow:hover{box-shadow:0 0 0 0;} +.shadow{-moz-box-shadow:2px 2px 5px 2px #111111;-o-box-shadow:2px 2px 5px 2px #111111;-webkit-box-shadow:2px 2px 5px 2px #111111;-ms-box-shadow:2px 2px 5px 2px #111111;box-shadow:2px 2px 5px 2px #111111;}.shadow:active,.shadow:focus,.shadow:hover{box-shadow:0 0 0 0;} .editicon:hover{border:0;} .boldbb{background-position:0px 0px;}.boldbb:hover{background-position:-22px 0px;} .italicbb{background-position:0px -22px;}.italicbb:hover{background-position:-22px -22px;} @@ -483,7 +481,7 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;} .next{background-position:-110px -60px;} .icon.dim{opacity:0.3;} #pause{position:fixed;bottom:40px;right:30px;} -.border{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.border{border:1px solid #babdb6;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} .attachtype{display:block;width:20px;height:23px;background-image:url(../../../images/content-types.png);} .type-video{background-position:0px 0px;} .type-image{background-position:-20px 0;} @@ -492,25 +490,25 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} footer{display:block;clear:both;} -#profile-jot-text{height:20px;color:#eec;border:1px solid #eec;border-radius:5px;width:99.5%;} -#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eec;} +#profile-jot-text{height:20px;color:#eeeecc;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} +#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;} #acl-wrapper{width:660px;margin:0 auto;} #acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111;} -#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;} +#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;} #acl-list{height:210px;border:1px solid #ccc;clear:both;margin-top:30px;overflow:auto;} -.acl-list-item{border:1px solid #eec;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;} +.acl-list-item{border:1px solid #eeeecc;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;} .acl-list-item p{height:12px;font-size:10px;margin:0 0 22px;padding:2px 0 1px;} -.acl-list-item a{background:#eeeecc 3px 3px no-repeat;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#2e2f2e;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;} +.acl-list-item a{background:#eeeecc 3px 3px no-repeat;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#2e2f2e;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;} #acl-wrapper a:hover{text-decoration:none;color:#2e2f2e;border:0;} -.acl-button-show{background-image:url('../../../images/show_off.png');margin:0 auto;} -.acl-button-hide{background-image:url('../../../images/hide_off.png');margin:0 auto;} -.acl-button-show.selected{color:#2e2f2e;background-color:#9ade00;background-image:url(../../../images/show_on.png);} -.acl-button-hide.selected{color:#2e2f2e;background-color:#ff4141;background-image:url(../../../images/hide_on.png);} +.acl-button-show{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg==');margin:0 auto;} +.acl-button-hide{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII=');margin:0 auto;} +.acl-button-show.selected{background:#9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII=');color:#2e2f2e;} +.acl-button-hide.selected{background:#ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg==');color:#2e2f2e;} .acl-list-item.groupshow{border-color:#9ade00;} .acl-list-item.grouphide{border-color:#ff4141;} .acpopup{max-height:175px;max-width:42%;background-color:#555753;color:#fff;overflow:auto;z-index:100000;border:1px solid #cccccc;} .acpopupitem{background-color:#555753;padding:4px;clear:left;}.acpopupitem img{float:left;margin-right:4px;} -.acpopupitem.selected{color:#2e302e;background-color:#eeeeec;} +.acpopupitem.selected{color:#2e302e;background-color:#eeeeee;} .qcomment-wrapper{padding:0px;margin:5px 5px 5px 81%;} .qcomment{opacity:0.5;}.qcomment:hover{opacity:1.0;} #network-star-link{margin-top:10px;} @@ -519,4 +517,4 @@ footer{display:block;clear:both;} #sidebar-page-list ul{padding:0;margin:5px 0;} #sidebar-page-list li{list-style:none;} #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;} -@media handheld{body{font-size:15pt;}} +@media handheld{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:10px;}}@media only screen and (min-width:321px){body{font-size:10px;}}@media only screen and (max-width:320px){body{font-size:10px;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:16px;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:16px;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:16px;}}@media only screen and (min-width:1024px){body{font-size:16px;}}@media only screen and (min-width:1520px){body{font-size:18px;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:16px;}}.test{color:#88a9d2;background-color:#cdcdcd;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 41fd2c8aa..6d76044ba 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -12,684 +12,718 @@ /* from html5boilerplate */ /* these are to tell browsers they should be displayed a certain way */ -article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { - display: block; } - -audio, canvas, video, time { - display: inline-block; - *display: inline; - *zoom: 1; } - +@import "_base"; + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} +audio, +canvas, +video, +time { + display: inline-block; + *display: inline; + *zoom: 1; +} audio:not([controls]), [hidden] { - display: none; } - -/* - * Base - */ + display: none; +} /* * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units * 2. Force vertical scrollbar in non-IE - * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g + * 3. Prevent iOS text size adjust on device orientation change, + * without disabling user zoom: h5bp.com/g */ - html { - font-size: 100%; - overflow-y: scroll; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; } - + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} body { - margin: 0; - font-size: 16px; - line-height: 1.1em; - font-family: sans-serif; - color: #eec; - background-color: #2e2f2e; } - + margin: 0; + padding: 0; + .default_font; + color: @main_colour; + background-color: @bg_colour; +} button, input, select, textarea { - font-family: sans-serif; - color: #eec; - background-color: #2e2f2e; } - + color: @main_colour; + background-color: @bg_colour; +} select { - border: 1px #555 dotted; - padding: 3px; - margin: 3px; - color: #eec; - background: #2e2f2e; } - + border: 1px #555 dotted; + padding: 1px; + margin: 3px; + color: @main_colour; + background: @bg_colour; +} option { - padding: 3px; - color: #eec; - background: #2e2f2e; - &[selected="selected"] { - color: #2e2f2e; - background: #eec; } } - + padding: 1px; + color: @main_colour; + background: @bg_colour; + &[selected="selected"] { + color: @bg_colour; + background: @main_colour; + } +} ul, ol { - padding: 0; } - + .list_reset; +} +tr:nth-child(even) { + background-color: lighten(@bg_colour, 10%); +} /* remember to define focus styles! */ - :focus { - outline: 0; } - + outline: 0; +} [disabled="disabled"] { - background: #4e4f4f; - color: #ddb; } - + background: @med_bg_colour; + color: @disabled_colour; +} /* remember to highlight inserts somehow! */ - +ins, mark { + background-color: @bg_alt_colour; + color: @lt_main_colour; +} ins { - background-color: #2e302e; - color: #ff9; - text-decoration: none; } - + text-decoration: none; +} mark { - background-color: #2e302e; - color: #ff9; - font-style: italic; - font-weight: bold; } - + font-style: italic; + font-weight: bold; +} /* Redeclare monospace font family: h5bp.com/j */ - pre, code, kbd, samp, .wall-item-body code { - font-family: monospace, monospace; - _font-family: monospace; - font-size: 1em; } - + font-family: monospace, monospace; + _font-family: monospace; + font-size: 1em; +} /* Improve readability of pre-formatted text in all browsers */ - pre, .wall-item-body code { - white-space: pre; - white-space: pre-wrap; - word-wrap: break-word; } - + .wrap; +} q { - quotes: none; - &:before, &:after { - content: ""; - content: none; } } - + quotes: none; + &:before, &:after { + content: ""; + content: none; + } +} small { - font-size: 85%; } - + font-size: 85%; +} /* Position subscript and superscript content without affecting line-height: h5bp.com/k */ - sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; } - + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} sub { - bottom: -0.25em; } - + bottom: -0.25em; +} sup { - top: -0.5em; } - + top: -0.5em; +} img { - border: 0 none; } - + border: 0 none; +} a { - color: #88a9d2; - text-decoration: none; - margin-bottom: 1px; - &:hover img { - text-decoration: none; } } - + color: @link_colour; + text-decoration: none; + margin-bottom: 1px; + &:hover { + color: @hover_colour; + border-bottom: 1px dotted @hover_colour; + } + &:hover img { + text-decoration: none; + } +} blockquote { - background: #444; - color: #eec; - text-indent: 5px; - padding: 5px; - border: 1px #aaa solid; - border-radius: 5px; } - -a:hover { - color: #729fcf; - border-bottom: 1px dotted #729fcf; } - + background: #444; + color: @main_colour; + text-indent: 5px; + padding: 5px; + border: 1px #aaa solid; + .rounded_corners; +} .required { - display: inline; - color: #ff0; - font-size: 16px; - font-weight: bold; - margin: 3px; } - + display: inline; + color: #ff0; + font-size: 16px; + font-weight: bold; + margin: 3px; +} .fakelink, .lockview { - color: #729fcf; - cursor: pointer; } - + color: @link_colour; + cursor: pointer; +} .fakelink:hover { - color: #729fcf; } - + color: @hover_colour; +} .smalltext { - font-size: 0.7em; } - + font-size: 0.7em; +} #panel { - position: absolute; - font-size: 0.8em; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 1px solid #fff; - background-color: #2e302e; - color: #eeeeec; - padding: 1em; } - + position: absolute; + .rounded_corners; + .borders(1px, solid, @main_alt_colour); + background-color: @bg_alt_colour; + color: @main_colour; + padding: 1em; +} .pager { - margin-top: 60px; - display: block; - clear: both; - text-align: center; - span { - padding: 4px; - margin: 4px; } } - + margin-top: 60px; + display: block; + clear: both; + text-align: center; + span { + padding: 4px; + margin: 4px; + } +} .pager_current { - background-color: #729fcf; - color: #fff; } + background-color: @link_colour; + color: @main_alt_colour; +} + /** * global */ /* .tool .action */ - .action { - margin: 5px 0; } - + margin: 5px 0; +} .tool { - margin: 5px 0; - list-style: none; } - + margin: 5px 0; + list-style: none; +} #articlemain { - width: 100%; - height: 100%; - margin: 0 auto; } + .box(100%, 100%); + margin: 0 auto; +} +[class$="-desc"], [id$="-desc"] { + color: @bg_colour; + background: @main_colour; + .rounded_corners; + .box_shadow(3px, 3px, 5px); + padding: 3px; + margin: 5px 0; + font-weight: bold; +} + /** * login */ - #asidemain .field { - overflow: hidden; - width: 200px; } - + overflow: hidden; + width: 200px; +} #login-extra-links { - overflow: auto !important; - padding-top: 60px !important; - width: 100% !important; - a { - margin-right: 20px; } } - + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; + a { + margin-right: 20px; + } +} #login_standard { - display: block !important; - float: none !important; - height: 100% !important; - position: relative !important; - width: 100% !important; - .field label { - width: 200px !important; } - input { - margin: 0 0 8px !important; - width: 210px !important; - &[type="text"] { - margin: 0 0 8px !important; - width: 210px !important; } } } - + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; + .field label { + width: 200px !important; + } + input { + margin: 0 0 8px !important; + width: 210px !important; + &[type="text"] { + margin: 0 0 8px !important; + width: 210px !important; } + } +} #login-submit-wrapper { - margin: 0 !important; } - + margin: 0 !important; +} #login-submit-button { - margin-left: 0px !important; } - + margin-left: 0px !important; +} #asidemain #login_openid { - position: relative !important; - float: none !important; - margin-left: 0px !important; - height: auto !important; - width: 200px !important; } - + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; +} #login_openid { - #id_openid_url { - width: 180px !important; - overflow: hidden !important; } - label { - width: 180px !important; } } + #id_openid_url { + width: 180px !important; + overflow: hidden !important; } + label { + width: 180px !important; + } } + /** * nav */ - nav { - height: 60px; - background-color: #1d1f1d; - color: #eeeeec; - position: relative; - padding: 20px 20px 10px 95px; - a { - text-decoration: none; - color: #eeeeec; - border: 0px; - &:hover { - text-decoration: none; - color: #eeeeec; - border: 0px; } } - #banner { - display: block; - position: absolute; - left: 51px; - top: 25px; - #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; } } } - + height: 60px; + background-color: @dk_bg_colour; + color: @main_alt_colour; + position: relative; + padding: 20px 20px 10px 95px; + a { + text-decoration: none; + color: @main_alt_colour; + border: 0px; + &:hover { + text-decoration: none; + color: @main_alt_colour; + border: 0px; } } + #banner { + display: block; + position: absolute; + left: 51px; + top: 25px; + #logo-text a { + font-size: 40px; + font-weight: bold; + margin-left: 3px; } } +} ul#user-menu-popup { - display: none; - position: absolute; - background-color: #555753; - width: 100%; - padding: 10px 0px; - margin: 0px; - top: 20px; - left: 0; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - box-shadow: 5px 10px 10px 0 #111; - z-index: 10000; - li { - display: block; - a { - display: block; - padding: 5px; - &:hover { - color: #2e302e; - background-color: #eeeeec; } - &.nav-sep { - border-top: 1px solid #eeeeec; } } } } - + display: none; + position: absolute; + background-color: @menu_bg_colour; + width: 100%; + padding: 10px 0px; + margin: 0px; + top: 20px; + left: 0; + .rounded_corners(0 0 5px 5px); + .box_shadow(5px, 5px, 10px, 0px); + z-index: 10000; + li { + display: block; + a { + display: block; + padding: 5px; + &:hover { + color: @main_colour; + background-color: @bg_alt_colour; + } + &.nav-sep { + border-top: 1px solid @bg_alt_colour; } } } +} nav .nav-link { - display: inline-block; - width: 22px; - height: 22px; - overflow: hidden; - margin: 0px 5px 5px; - text-indent: 50px; - background: transparent url(dark/icons.png) 0 0 no-repeat; } - + display: inline-block; + .box(22px, 22px); + overflow: hidden; + margin: 0px 5px 5px; + text-indent: 50px; + background: transparent url(dark/icons.png) 0 0 no-repeat; +} #nav-apps-link { - background-position: 0 -66px; - &:hover { - background-position: -22px -66px; } } - + background-position: 0 -66px; + &:hover { + background-position: -22px -66px; } +} #nav-community-link, #nav-contacts-link { - background-position: 0 -22px; - &:hover { - background-position: -22px -22px; } } - + background-position: 0 -22px; + &:hover { + background-position: -22px -22px; } +} #nav-directory-link { - background-position: -44px -154px; - &:hover { - background-position: -66px -154px; } } - + background-position: -44px -154px; + &:hover { + background-position: -66px -154px; } +} #nav-help-link { - background-position: 0 -110px; - &:hover { - background-position: -22px -110px; } } - + background-position: 0 -110px; + &:hover { + background-position: -22px -110px; } +} #nav-home-link { - background-position: -44px -132px; - &:hover { - background-position: -66px -132px; } } - + background-position: -44px -132px; + &:hover { + background-position: -66px -132px; } +} #nav-intro-link { - background-position: 0px -190px; - &:hover { - background-position: -44px -190px; } } - + background-position: 0px -190px; + &:hover { + background-position: -44px -190px; } +} #nav-login-link, #nav-logout-link { - background-position: 0 -88px; - &:hover { - background-position: -22px -88px; } } - + background-position: 0 -88px; + &:hover { + background-position: -22px -88px; } +} #nav-messages-link { - background-position: -44px -88px; - &:hover { - background-position: -66px -88px; } } - + background-position: -44px -88px; + &:hover { + background-position: -66px -88px; } +} #nav-notify-link, #nav-notifications-linkmenu { - background-position: -44px -110px; } - + background-position: -44px -110px; +} #nav-notify-link:hover { - background-position: -66px -110px; } - + background-position: -66px -110px; +} #nav-network-link { - background-position: 0px -177px; - &:hover { - background-position: -22px -177px; } } - + background-position: 0px -177px; + &:hover { + background-position: -22px -177px; } +} #nav-search-link { - background-position: 0 -44px; - &:hover { - background-position: -22px -44px; } } - -#profile-link, #profile-title, #wall-image-upload, #wall-file-upload, #profile-attach-wrapper, #profile-audio, #profile-link, #profile-location, #profile-nolocation, #profile-title, #jot-title, #profile-upload-wrapper, #profile-video, #profile-jot-submit, #wall-image-upload-div, #wall-file-upload-div, .icon, .hover, .focus, .pointer { - cursor: pointer; } + background-position: 0 -44px; + &:hover { + background-position: -22px -44px; + } +} +#jot-title, +#profile-link, +#profile-title, +#profile-attach-wrapper, +#profile-audio, +#profile-link, +#profile-location, +#profile-nolocation, +#profile-title, +#profile-upload-wrapper, +#profile-video, +#profile-jot-submit, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.icon, +.hover, +.focus, +.pointer { + cursor: pointer; +} /* popup notifications */ div.jGrowl div { - &.notice { - background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; - color: #ffffff; - padding-left: 58px; } - &.info { - background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; - color: #ffffff; - padding-left: 58px; } } + &.notice { + background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: white; + padding-left: 58px; + margin-top: 50px; + } + &.info { + background: @info url("../../../images/icons/48/info.png") no-repeat 5px center; + color: white; + padding-left: 58px; + margin-top: 50px; + } +} #nav-notifications-menu { - margin: 30px 0 0 -20px; - width: 275px; - max-height: 300px; - overflow-y: auto; - font-size: 9pt; - .contactname { - font-weight: bold; - font-size: 0.9em; } - img { - float: left; - margin-right: 5px; } - .notif-when { - font-size: 0.8em; - display: block; } - li { - word-wrap: normal; - border-bottom: 1px solid #000; - &:hover { - color: black; } } - a:hover { - color: black; - text-decoration: underline; } } + margin: 30px 0 0 -20px; + width: 275px; + max-height: 300px; + overflow-y: auto; + font-size: 9pt; + .contactname { + font-weight: bold; + font-size: 0.9em; } + img { + float: left; + margin-right: 5px; } + .notif-when { + font-size: 0.8em; + display: block; } + li { + word-wrap: normal; + border-bottom: 1px solid black; + &:hover { + color: black; } + } + a:hover { + color: black; + text-decoration: underline; } +} nav #nav-notifications-linkmenu { - &.on .icon.s22.notify, &.selected .icon.s22.notify { - background-image: url("../../../images/icons/22/notify_on.png"); } } - + &.on .icon.s22.notify, + &.selected .icon.s22.notify { + // background-image: url("../../../images/icons/22/notify_on.png"); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg=="); + } +} .show { - display: block; } - + display: block; +} #notifications { - height: 20px; - width: 170px; - position: absolute; - top: -19px; - left: 4px; } - + .box(170px, 20px); + position: absolute; + top: -19px; + left: 4px; +} #nav-floater { - position: fixed; - top: 20px; - right: 1%; - padding: 5px; - background: #1d1f1d; - color: transparent; - border-radius: 5px; - z-index: 100; - width: 300px; - height: 60px; } + position: fixed; + top: 20px; + right: 1%; + padding: 5px; + background: @dk_bg_colour; + color: transparent; + .rounded_corners; + z-index: 100; + .box(300px, 60px); +} #nav-buttons { - clear: both; - list-style: none; - padding: 0px; - margin: 0px; - height: 25px; - > li { - padding: 0; - display: inline-block; - margin: 0px -4px 0px 0px; } } - + clear: both; + list-style: none; + padding: 0px; + margin: 0px; + height: 25px; + > li { + padding: 0; + display: inline-block; + margin: 0px -4px 0px 0px; + } +} .floaterflip { - display: block; - position: fixed; - z-index: 110; - top: 56px; - right: 19px; - width: 22px; - height: 22px; - overflow: hidden; - margin: 0px; - background: transparent url(dark/icons.png) -190px -60px no-repeat; } - + display: block; + position: fixed; + z-index: 110; + top: 56px; + right: 19px; + .box(22px, 22px); + overflow: hidden; + margin: 0px; + background: transparent url(dark/icons.png) -190px -60px no-repeat; +} .search-box { - display: inline-block; - margin: 5px; - position: fixed; - right: 0px; - bottom: 0px; - z-index: 100; - background: #1d1f1d; - border-radius: 5px; } - + display: inline-block; + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: @dk_bg_colour; + .rounded_corners; +} #search-text { - border: 1px #eec solid; - background: #2e2f2e; - color: #eec; - font-size: 8pt; - margin: 8px; - width: 10em; - height: 14px; } - + .borders; + background: @bg_colour; + color: @main_colour; + font-size: 8pt; + margin: 8px; + .box(10em, 14px); +} #scrollup { - position: fixed; - right: 5px; - bottom: 40px; - z-index: 100; - a:hover { - text-decoration: none; - border: 0; } } - + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; + a:hover { + text-decoration: none; + border: 0; + } +} #user-menu { - box-shadow: 5px 0 10px 0 #111; - display: block; - width: 75%; - margin: 3px 0 0 0; - position: relative; - background-color: #555753; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - background: #555753 url("dark/menu-user-pin.jpg") 98% center no-repeat; - clear: both; - top: 4px; - left: 10px; - padding: 2px; - > a { - vertical-align: top; } } - + .box_shadow(5px, 0, 10px, 0); + display: block; + width: 75%; + margin: 3px 0 0 0; + position: relative; + .rounded_corners; + background-color: @menu_bg_colour; + background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q=="); + background-position: 98% center; + background-repeat: no-repeat; + clear: both; + top: 4px; + left: 10px; + padding: 2px; + > a { + vertical-align: top; + } +} #user-menu-label { - font-size: 12px; - padding: 3px 20px 9px 5px; - height: 10px; } - + font-size: 12px; + padding: 3px 20px 9px 5px; + height: 10px; +} .nav-ajax-update, .nav-ajax-left { - width: 30px; - height: 19px; - background: transparent url(dark/notifications.png) 0 0 no-repeat; - color: #222; - font-weight: bold; - font-size: 0.8em; - padding-top: 0.2em; - text-align: center; - float: left; - margin: 0 -1px 0 3px; - display: block; - visibility: hidden; } - + .box(30px, 19px); + background: transparent url(dark/notifications.png) 0 0 no-repeat; + color: #222; + font-weight: bold; + font-size: 0.8em; + padding-top: 0.2em; + text-align: center; + float: left; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; +} .nav-ajax-update.show, .nav-ajax-left.show { - visibility: visible; } - + visibility: visible; +} #net-update { - background-position: 0px 0px; } - + background-position: 0px 0px; +} #mail-update { - background-position: -30px 0; } - + background-position: -30px 0; +} #notify-update { - background-position: -60px 0px; } - + background-position: -60px 0px; +} #home-update { - background-position: -90px 0px; } - + background-position: -90px 0px; +} #intro-update { - background-position: -120px 0px; } - + background-position: -120px 0px; +} #lang-select-icon { - cursor: pointer; - position: fixed; - left: 28px; - bottom: 6px; - z-index: 10; } - + cursor: pointer; + position: fixed; + left: 28px; + bottom: 6px; + z-index: 10; +} #language-selector { - position: fixed; - bottom: 2px; - left: 52px; - z-index: 10; } - + position: fixed; + bottom: 2px; + left: 52px; + z-index: 10; +} .menu-popup { - position: absolute; - display: none; - width: 11em; - background: #ffffff; - color: #2d2d2d; - margin: 0px; - padding: 0px; - list-style: none; - border: 3px solid #364e59; - z-index: 100000; - -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7); - -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7); - box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7); - a { - display: block; - color: #2d2d2d; - padding: 5px 10px; - text-decoration: none; - &:hover { - background-color: #bdcdd4; } } - .menu-sep { - border-top: 1px solid #9eabb0; } - li { - float: none; - overflow: auto; - height: auto; - display: block; - img { - float: left; - width: 16px; - height: 16px; - padding-right: 5px; } } - .empty { - padding: 5px; - text-align: center; - color: #9eabb0; } } - + position: absolute; + display: none; + width: 11em; + background: white; + color: @bg_colour; + margin: 0px; + padding: 0px; + .borders(3px, solid, @shiny_colour); + z-index: 100000; + .box_shadow; + a { + display: block; + color: @bg_colour; + padding: 5px 10px; + text-decoration: none; + &:hover { + background-color: lighten(@shiny_colour, 55%); + } + } + .menu-sep { + border-top: 1px solid @med_bg_colour; + } + li { + float: none; + overflow: auto; + height: auto; + display: block; + img { + float: left; + .box(16px, 16px); + padding-right: 5px; + } + } + .empty { + padding: 5px; + text-align: center; + color: lighten(@shiny_colour, 45%); + } +} .notif-item { - font-size: small; - a { - vertical-align: middle; } } - + font-size: small; + a { + vertical-align: middle; + } +} .notif-image { - width: 32px; - height: 32px; - padding: 7px 7px 0px 0px; } - + .box(32px, 32px); + padding: 7px 7px 0px 0px; +} .notify-seen { - background: #ddd; } + background: darken(@main_alt_colour, 20%); +} + /** * sysmsg */ - #sysmsg_info { - position: fixed; - bottom: 0; - -moz-box-shadow: 3px 3px 3px 10px 0 #000; - -webkit-box-shadow: 3px 3px 10px 0 #000; - box-shadow: 3px 3px 10px 0 #000; - padding: 10px; - background-color: #fcaf3e; - border: 2px solid #f8911b; - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; } - + position: fixed; + bottom: 0; + .box_shadow(@main_shadow); + padding: 10px; + background-color: @lt_orange; + .borders(2px, solid, @orange); + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; +} #sysmsg { - position: fixed; - bottom: 0; - -moz-box-shadow: 3px 3px 10px 0 #000; - -webkit-box-shadow: 3px 3px 10px 0 #000; - box-shadow: 3px 3px 10px 0 #000; - padding: 10px; - background-color: #fcaf3e; - border: 2px solid #f8911b; - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; } - + position: fixed; + bottom: 0; + .box_shadow(@main_shadow); + padding: 10px; + background-color: @lt_orange; + .borders(2px, solid, @orange); + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; +} #sysmsg_info br, #sysmsg br { - display: block; - margin: 2px 0px; - border-top: 1px solid #ccccce; } + display: block; + margin: 2px 0px; + border-top: 1px solid @main_colour; +} + /** * aside */ - #asidemain { - float: left; - font-size: smaller; - margin: 20px 0 20px 35px; - width: 25%; - display: inline; } + float: left; + font-size: smaller; + margin: 20px 0 20px 35px; + width: 25%; + display: inline; +} /* for now, disappear these */ - #asideright, #asideleft { - display: none; } - + display: none; +} .vcard { - .fn { - font-size: 1.7em; - font-weight: bold; - border-bottom: 1px solid #729fcf; - padding-bottom: 3px; } - #profile-photo-wrapper { - margin: 20px; - img { - box-shadow: 3px 3px 10px 0 #000; } } } - -/* http://css-tricks.com/snippets/css/css-box-shadow/ -* box-shadow: -* 1. The horizontal offset of the shadow, positive means -* the shadow will be on the right of the box, a negative -* offset will put the shadow on the left of the box. -* 2. The vertical offset of the shadow, a negative one -* means the box-shadow will be above the box, a -* positive one means the shadow will be below the box. -* 3. The blur radius (optional), if set to 0 the shadow -* will be sharp, the higher the number, the more blurred -* it will be. -* 4. The spread radius (optional), positive values increase -* the size of the shadow, negative values decrease the size. -* Default is 0 (the shadow is same size as blur). -* 5. Colo[u]r -*/ - + .fn { + font-size: 1.7em; + font-weight: bold; + border-bottom: 1px solid #729fcf; + padding-bottom: 3px; + } + #profile-photo-wrapper { + margin: 20px; + img { + .box_shadow(3px, 3px, 10px, 0); + } + } +} #asidemain { h4 { font-size: 1.2em; } @@ -703,701 +737,715 @@ nav #nav-notifications-linkmenu { .contact-block-div { float: left; margin: 0 5px 5px 0; - width: 50px; - height: 50px; + .box(50px, 50px); padding: 3px; - position: relative; - } - } - } + position: relative; } } } } .aprofile dt { - background: #eec; - color: #2e2f2e; - font-weight: bold; - box-shadow: 1px 1px 5px 0 #000; - margin: 15px 0 5px; - padding-left: 5px; } - + background: @main_colour; + color: @bg_colour; + font-weight: bold; + .box_shadow(1px 1px 5px 0); + margin: 15px 0 5px; + padding-left: 5px; +} #profile-extra-links ul { - margin-left: 0px; - padding-left: 0px; - list-style: none; } - + margin-left: 0px; + padding-left: 0px; + list-style: none; +} #dfrn-request-link { - background: #3465a4 url(dark/connect.png) no-repeat 95% center; - border-radius: 5px 5px 5px 5px; - color: #eec; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; } - + .rounded_corners; + color: @main_colour; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; + background-color: @friendica_blue; + // background-image: url(icons/connect.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); + background-repeat: no-repeat; + background-position: 95% center; +} #wallmessage-link { - /*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/ - /*border-radius: 5px 5px 5px 5px;*/ - color: #eee; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; } - + ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/ + ///*border-radius: 5px 5px 5px 5px;*/ + color: @main_alt_colour; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; +} .ttright { - margin: 0px 0px 0px 0px; } + margin: 0px; +} + /** * contacts block */ - .contact-block-div { - width: 50px; - height: 50px; - float: left; } - + .box(50px, 50px); + float: left; +} .contact-block-textdiv { - width: 150px; - height: 34px; - float: left; } + .box(150px, 34px); + float: left; +} -#contact-block-end { - clear: both; } /** * jot */ - #jot { - /*width: 785px;*/ - margin: 10px 0 20px 0px; - width: 100%; - #jot-tools { - margin: 0px; - padding: 0px; - height: 35px; - overflow: none; - width: 100%; - /*background-color: #0e232e;*/ - /*border-bottom: 2px solid #9eabb0;*/ - span { - float: left; - margin: 10px 20px 2px 0px; - a { - display: block; } } - .perms { - float: right; - width: 40px; } - li.loading { - float: right; - background-color: #ffffff; - width: 20px; - vertical-align: center; - text-align: center; - border-top: 2px solid #9eabb0; - height: 38px; - img { - margin-top: 10px; } } } - #jot-title { - border: 1px solid #ccc; - margin: 0 0 5px; - height: 20px; - width: 90%; - font-weight: bold; - border-radius: 5px; - vertical-align: middle; } } - + margin: 10px 0 20px 0px; + width: 100%; + #jot-tools { + margin: 0px; + padding: 0px; + .box(100%, 35px); + overflow: none; + span { + float: left; + margin: 10px 20px 2px 0px; + a { + display: block; + } + } + .perms { + float: right; + width: 40px; + } + li.loading { + float: right; + background-color: white; + .box(20px, 38px); + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + img { + margin-top: 10px; + } + } + } + #jot-title { + .borders(1px, solid, darken(@main_alt_colour, 13%)); + margin: 0 0 5px; + .box(90%, 20px); + font-weight: bold; + .rounded_corners; + vertical-align: middle; + } +} #jot-category { - margin: 5px 0; - border-radius: 5px; - border: 1px #999 solid; - color: #aaa; - font-size: smaller; - &:focus { - color: #eee; } } - + margin: 5px 0; + .rounded_corners; + .borders(1px, solid, darken(@main_alt_colour, 33%)); + color: darken(@main_alt_colour, 27%); + font-size: smaller; + &:focus { + color: @main_alt_colour; + } +} #jot #character-counter { - width: 6%; - float: right; - text-align: right; - height: 15px; - line-height: 20px; - padding: 2px 20px 5px 0; } - + .box(6%, 15px); + float: right; + text-align: right; + line-height: 20px; + padding: 2px 20px 5px 0; +} #profile-jot-text_parent { - box-shadow: 5px 0 10px 0 #111; } - + .box_shadow(5px, 0, 10px, 0, @shadow_colour); +} #profile-jot-text_tbl { - margin-bottom: 10px; - background: #777; } - + margin-bottom: 10px; + background: #777; +} #profile-jot-text_ifr { - width: 99.900002% !important; } - + width: 99.900002% !important; +} #profile-jot-text_toolbargroup, .mceCenter tr { - background: #777; } - + background: #777; +} [id$="jot-text_ifr"] { - width: 99.900002% !important; - color: #2e2f2e; - background: #eec; - .mceContentBody { - color: #2e2f2e; - background: #eec; } } - + width: 99.900002% !important; + color: @bg_colour; + background: @main_colour; + .mceContentBody { + color: @bg_colour; + background: @main_colour; + } +} .defaultSkin { - tr.mceFirst { - background: #777; } - td { - &.mceFirst, &.mceLast { - background-color: #eec; } } - span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon { - background-color: #eec; } } - -#profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, #profile-location-wrapper, #profile-nolocation-wrapper, #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper { - float: left; - margin: 0 20px 0 0; } - + tr.mceFirst { + background: #777; + } + td { + &.mceFirst, &.mceLast { + background-color: @main_colour; + } + } + span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon { + background-color: @main_colour; + } +} +#profile-attach-wrapper, +#profile-audio-wrapper, +#profile-link-wrapper, +#profile-location-wrapper, +#profile-nolocation-wrapper, +#profile-title-wrapper, +#profile-upload-wrapper, +#profile-video-wrapper { + float: left; + margin: 0 20px 0 0; +} #profile-rotator-wrapper { - float: right; } - -#profile-jot-tools-end, #profile-jot-banner-end { - clear: both; } - + float: right; +} #profile-jot-email-wrapper { - margin: 10px 10% 0; - border: 1px solid #555753; - border-bottom: 0; } - + margin: 10px 10% 0; + .borders(1px, solid, @menu_bg_colour); + border-bottom: 0; +} #profile-jot-email-label { - background-color: #555753; - color: #ccccce; - padding: 5px; } - + background-color: @menu_bg_colour; + color: @main_colour; + padding: 5px; +} #profile-jot-email { - width: 90%; - margin: 5px; } - + width: 90%; + margin: 5px; +} #profile-jot-networks { - margin: 0 10%; - border: 1px solid #555753; - border-top: 0; - border-bottom: 0; - padding: 5px; } - + margin: 0 10%; + border: 1px solid @menu_bg_colour; + border-top: 0; + border-bottom: 0; + padding: 5px; +} #profile-jot-net { - margin: 5px 0; } - + margin: 5px 0; +} #jot-preview-link { - margin: 0 0 0 10px; - border: 0; - text-decoration: none; - float: right; } - + margin: 0 0 0 10px; + border: 0; + text-decoration: none; + float: right; +} .icon-text-preview { - margin: 0 0 -18px 0; - display: block; - width: 20px; - height: 20px; - background: url(dark/icons.png) no-repeat -128px -40px; - border: 0; - text-decoration: none; - float: right; - cursor: pointer; } - + margin: 0 0 -18px 0; + display: block; + .box(20px, 20px); + background: url(dark/icons.png) no-repeat -128px -40px; + border: 0; + text-decoration: none; + float: right; + cursor: pointer; +} #profile-jot-perms { - float: right; - background-color: #555753; - height: 22px; - width: 20px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - overflow: hidden; - border: 0px; - margin: 0 10px 0 10px; } - + float: right; + background-color: @menu_bg_colour; + .box(22px, 22px); + .rounded_corners; + overflow: hidden; + border: 0px; + margin: 0 10px 0 10px; +} #profile-jot-plugin-wrapper { - width: 1px; - margin: 10px 0 0 0; - float: right; } - + width: 1px; + margin: 10px 0 0 0; + float: right; +} #profile-jot-submit-wrapper { - float: right; - width: 100%; - list-style: none; - margin: 10px 0 0 0; - padding: 0; } - + float: right; + width: 100%; + margin: 10px 0 0 0; + padding: 0; +} #profile-jot-submit { - height: auto; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 2px outset #222420; - margin: 0; - float: right; - text-shadow: 1px 1px #111; - width: auto; - &:active { - box-shadow: 0 0 0 0; } } - + height: auto; + background-color: @menu_bg_colour; + color: @main_alt_colour; + .rounded_corners; + .borders(2px, outset, @shiny_colour); + margin: 0; + float: right; + .text_shadow; + width: auto; + &:active { + .box_shadow(0, 0, 0, 0); + } +} #jot-perms-icon { - height: 22px; - width: 20px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - overflow: hidden; - border: 0; } - + .box(20px, 22px); + .rounded_corners; + overflow: hidden; +} #profile-jot-acl-wrapper { - margin: 0 10px; - border: 1px solid #555753; - border-top: 0; - display: block !important; } - -#group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper { - width: 47%; - float: left; } - -#contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper { - width: 47%; - float: right; } - + margin: 0 10px; + .borders(1px, solid, darken(@main_alt_colour, 60%)); + border-top: 0; + display: block !important; + .borders(1px solid @menu_bg_colour); + .box_shadow; +} +#group_allow_wrapper, +#group_deny_wrapper, +#acl-permit-outer-wrapper, +#contact_allow_wrapper, +#contact_deny_wrapper, +#acl-deny-outer-wrapper { + width: 47%; +} +#group_allow_wrapper, +#group_deny_wrapper, +#acl-permit-outer-wrapper { + float: left; +} +#contact_allow_wrapper, +#contact_deny_wrapper, +#acl-deny-outer-wrapper { + float: right; +} #acl-permit-text { - background-color: #555753; - color: #ccccce; - padding: 5px; - float: left; } - + background-color: darken(@main_alt_colour, 60%); + color: @main_colour; + padding: 5px; + float: left; +} #jot-public { - background-color: #555753; - color: #ff0000; - padding: 5px; - float: left; } - + background-color: darken(@main_alt_colour, 60%); + color: @alert; + padding: 5px; + float: left; +} #acl-deny-text { - background-color: #555753; - color: #ccccce; - padding: 5px; - float: left; } - -#acl-permit-text-end, #acl-deny-text-end { - clear: both; } - + background-color: darken(@main_alt_colour, 60%); + color: @main_colour; + padding: 5px; + float: left; +} #jot-title-desc { - color: #ccc; } - + color: darken(@main_alt_colour, 13%); +} #profile-jot-desc { - color: #ff2000; - margin: 5px 0; } - + color: @red_orange; + margin: 5px 0; +} #jot-title-wrapper { - margin-bottom: 5px; } - + margin-bottom: 5px; +} #jot-title-display { - font-weight: bold; } - + font-weight: bold; +} .jothidden { - display: none; } - + display: none; +} #jot-preview-content { - background-color: #3e3f3e; - color: #eec; - border: 1px #eec solid; - border-radius: 5px; - padding: 3px 3px 6px 10px; - .wall-item-outside-wrapper { - border: 0; - border-radius: 0px; } } + background-color: @bg_alt_colour; + color: @main_colour; + .borders(1px, solid, @main_colour); + .rounded_corners; + padding: 3px 3px 6px 10px; + .wall-item-outside-wrapper { + border: 0; + .rounded_corners(0px 0px 0px 0px); + } +} + /** * section */ - #sectionmain { - margin: 20px; - font-size: 0.8em; - min-width: 475px; - width: 67%; - float: left; - display: inline; } + margin: 20px; + font-size: 0.8em; + min-width: 475px; + width: 67%; + float: left; + display: inline; +} + /** * tabs */ - .tabs { - list-style: none; - margin: 10px 0; - padding: 0; - li { - display: inline; - font-size: smaller; - font-weight: bold; } } - + list-style: none; + margin: 10px 0; + padding: 0; + li { + display: inline; + font-size: smaller; + font-weight: bold; + } +} .tab { - border: 1px solid #729fcf; - padding: 4px; - &:hover, &.active:hover, &:active { - background: #88a9d2; - color: #2e2f2e; } - &.active { - background: #88a9d2; - color: #2e2f2e; - a { - color: #2e2f2e; } } - a { - border: 0; - text-decoration: none; } } + border: 1px solid @link_colour; + padding: 4px; + &:hover, &.active:hover, &:active { + background: @link_colour; + color: @bg_colour; + } + &.active { + background: @main_colour; + color: @bg_colour; + a { + color: @bg_colour; + } + } + a { + border: 0; + text-decoration: none; + } +} /** * items */ - .wall-item-outside-wrapper { - border: 1px solid #aaa; - border-radius: 5px; - box-shadow: 5px 0 10px 0 #111; - &.comment { - margin-top: 5px; } } - + .borders(1px, solid, #aaa); + .rounded_corners; + .box_shadow(5px, 0, 10px, 0); + &.comment { + margin-top: 5px; + } +} .wall-item-outside-wrapper-end { - clear: both; } - + clear: both; +} .wall-item-content-wrapper { - position: relative; - padding: 10px; - width: auto; } - + position: relative; + padding: 10px; + width: auto; +} .wall-item-outside-wrapper .wall-item-comment-wrapper { - /*margin-left: 90px;*/ } - + /*margin-left: 90px;*/ +} .shiny { - background: #2e3436; - border-radius: 5px; } - + background: @shiny_colour; + .rounded_corners; +} .wall-outside-wrapper .shiny { - border-radius: 5px; } - + .rounded_corners; +} .heart { - color: red; } - + color: red; +} .wall-item-content { - overflow-x: auto; - margin: 0px 15px 0px 5px; } - -/* removing it from here, vs. putting it in .wall-item-content -* might break things for people. we shall see ;) */ - + overflow-x: auto; + margin: 0px 15px 0px 5px; +} [id^="tread-wrapper"], [class^="tread-wrapper"] { - margin: 15px 0 0 0; - padding: 0px; - /*overflow-x: auto;*/ } - + margin: 15px 0 0 0; + padding: 0px; +} .wall-item-photo-menu { - display: none; } - + display: none; +} .wall-item-photo-menu-button { - display: none; - text-indent: -99999px; - background: #555753 url(dark/menu-user-pin.jpg) no-repeat 75px center; - position: absolute; - overflow: hidden; - height: 20px; - width: 90px; - top: 85px; - left: 0; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; } - + display: none; + text-indent: -99999px; + background: @menu_bg_colour url(dark/menu-user-pin.jpg) no-repeat 75px center; + position: absolute; + overflow: hidden; + .box(90px, 20px); + top: 85px; + left: 0; + .rounded_corners(0 0 5px 5px); +} .wall-item-info { - float: left; - width: 110px; } - + float: left; + width: 110px; +} .wall-item-photo-wrapper { - width: 80px; - height: 80px; - position: relative; - padding: 5px; - background-color: #555753; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; } - + .box(80px, 80px); + position: relative; + padding: 5px; + background-color: @menu_bg_colour; + .rounded_corners; +} [class^="wall-item-tools"] * { - /*margin: 0 0 5px 0;*/ - > * { - /*margin: 0 0 5px 0;*/ } } - + /*margin: 0 0 5px 0;*/ + > * { + /*margin: 0 0 5px 0;*/ + } +} .wall-item-tools { - float: right; - opacity: 0.4; - -webkit-transition: all 1s ease-in-out; - -moz-transition: all 1s ease-in-out; - -o-transition: all 1s ease-in-out; - -ms-transition: all 1s ease-in-out; - transition: all 1s ease-in-out; - &:hover { - opacity: 1; - -webkit-transition: all 1s ease-in-out; - -moz-transition: all 1s ease-in-out; - -o-transition: all 1s ease-in-out; - -ms-transition: all 1s ease-in-out; - transition: all 1s ease-in-out; } } - + float: right; + opacity: 0.4; + .transition; + &:hover { + opacity: 1; + .transition; + } +} .wall-item-subtools1 { - height: 30px; - list-style: none outside none; - margin: 20px 0 30px -20px; - padding: 0; - width: 30px; } - + .box(30px, 30px); + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; +} .wall-item-subtools2 { - height: 25px; - list-style: none outside none; - margin: -75px 0 0 5px; - padding: 0; - width: 25px; } - + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; +} .wall-item-title { - font-size: 1.2em; - font-weight: bold; - margin-bottom: 1em; } - + font-size: 1.2em; + font-weight: bold; + margin-bottom: 1em; +} .wall-item-body { - margin: 20px 20px 10px 0px; - text-align: left; - overflow-x: auto; } - + margin: 20px 20px 10px 0px; + text-align: left; + overflow-x: auto; +} .wall-item-lock-wrapper { - float: right; - height: 22px; - margin: 0 -5px 0 0; - width: 22px; - opacity: 1; } - -.wall-item-dislike, .wall-item-like { - clear: left; - font-size: 0.8em; - color: #878883; - margin: 5px 0 5px 120px; } - -.wall-item-author, .wall-item-actions-author { - clear: left; - font-size: 0.8em; - color: #878883; - margin: 20px 20px 0 110px; } - + float: right; + .box(22px, 22px); + margin: 0 -5px 0 0; + opacity: 1; +} +.wall-item-dislike, +.wall-item-like { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 5px 0 5px 120px; +} +.wall-item-author, +.wall-item-actions-author { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 20px 0 110px; +} .wall-item-ago { - display: inline; - padding-left: 10px; } - + display: inline; + padding-left: 10px; +} .wall-item-wrapper-end { - clear: both; } - + clear: both; +} .wall-item-location { - margin-top: 15px; - width: 100px; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; - .icon { - float: left; } - > a, .smalltext { - margin-left: 25px; - font-size: 0.7em; - display: block; } - > br { - display: none; } } - + margin-top: 15px; + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + .icon { + float: left; + } + > a, .smalltext { + margin-left: 25px; + font-size: 0.7em; + display: block; + } + > br { + display: none; + } +} .wallwall { - .wwto { - left: 5px; - margin: 0; - position: absolute; - top: 75px; - width: 30px; - z-index: 10001; - width: 30px; - height: 30px; - img { - width: 30px !important; - height: 30px !important; } } - .wall-item-photo-end { - clear: both; } } - + .wwto { + left: 5px; + margin: 0; + position: absolute; + top: 75px; + width: 30px; + z-index: 10001; + .box(30px, 30px); + img { + width: 30px !important; + height: 30px !important; + } + } + .wall-item-photo-end { + clear: both; + } +} .wall-item-arrowphoto-wrapper { - position: absolute; - left: 35px; - top: 80px; - z-index: 10002; } - + position: absolute; + left: 35px; + top: 80px; + z-index: 10002; +} .wall-item-photo-menu { - min-width: 92px; - border: 2px solid #FFFFFF; - border-top: 0px; - background: #555753; - position: absolute; - left: -2px; - top: 101px; - display: none; - z-index: 10003; - -webkit-border-radius: 0px 5px 5px 5px; - -moz-border-radius: 0px 5px 5px 5px; - border-radius: 0px 5px 5px 5px; - ul { - margin: 0px; - padding: 0px; - list-style: none; } - li a { - white-space: nowrap; - display: block; - padding: 5px 2px; - color: #eeeeec; - &:hover { - color: #555753; - background: #eeeeec; } } } - + min-width: 92px; + .borders(2px, solid, white); + border-top: 0px; + background: #555753; + position: absolute; + left: -2px; + top: 101px; + display: none; + z-index: 10003; + .rounded_corners; + li a { + white-space: nowrap; + display: block; + padding: 5px 2px; + color: @main_alt_colour; + &:hover { + color: #555753; + background: @main_alt_colour; + } + } +} #item-delete-selected { - overflow: auto; - width: 100%; } + overflow: auto; + width: 100%; +} +#connect-services-header, +#connect-services, +#extra-help-header, +#extra-help, +#postit-header, +#postit { + margin: 5px 0 0 0; +} -#connect-services-header, #connect-services, #extra-help-header, #extra-help, #postit-header, #postit { - margin: 5px 0 0 0; } /** * comment */ - .ccollapse-wrapper { - font-size: 0.9em; - margin-left: 80px; } - + font-size: 0.9em; + margin-left: 80px; +} .wall-item-outside-wrapper.comment { - margin-left: 80px; - .wall-item-photo { - width: 40px!important; - height: 40px!important; } - .wall-item-photo-wrapper { - width: 40px; - height: 40px; } - .wall-item-photo-menu-button { - width: 50px; - top: 45px; - background-position: 35px center; } - .wall-item-info { - width: 60px; } - .wall-item-body { - margin-left: 10px; } - .wall-item-author { - margin-left: 50px; } - .wall-item-photo-menu { - min-width: 50px; - top: 60px; } } - + margin-left: 80px; + .wall-item-photo { + width: 40px!important; + height: 40px!important; + } + .wall-item-photo-wrapper { + width: 40px; + height: 40px; + } + .wall-item-photo-menu-button { + width: 50px; + top: 45px; + background-position: 35px center; + } + .wall-item-info { + width: 60px; + } + .wall-item-body { + margin-left: 10px; + } + .wall-item-author { + margin-left: 50px; + } + .wall-item-photo-menu { + min-width: 50px; + top: 60px; + } +} .comment-wwedit-wrapper { - /*margin: 30px 0px 0px 80px;*/ } - + /*margin: 30px 0px 0px 80px;*/ +} .comment-edit-wrapper { - border-top: 1px #aaa solid; } - + border-top: 1px #aaa solid; +} [class^="comment-edit-bb"] { - list-style: none; - display: none; - margin: -40px 0 5px 60px; - width: 75%; - > li { - display: inline-block; - margin: 0 10px 0 0; - visibility: none; } } - -.comment-wwedit-wrapper img, .comment-edit-wrapper img { - width: 20px; - height: 20px; } - -.comment-edit-photo-link, .comment-edit-photo { - margin-left: 10px; } - + .list_reset; + display: none; + margin: -40px 0 5px 60px; + width: 75%; + > li { + display: inline-block; + margin: 0 10px 0 0; + visibility: none; + } +} +.comment-wwedit-wrapper img, +.comment-edit-wrapper img { + .box; +} +.comment-edit-photo-link, +.comment-edit-photo { + margin-left: 10px; +} .my-comment-photo { - width: 40px; - height: 40px; - padding: 5px; } + .box(40px, 40px); + padding: 5px; +} [class^="comment-edit-text"] { - margin: 5px 0 10px 20px; - width: 84.5%; } - + margin: 5px 0 10px 20px; + width: 84.5%; +} .comment-edit-text-empty { - height: 20px; - border: 2px #c8bebe solid; - border-radius: 5px; - color: #c8bebe; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; - &:hover { - color: #999999; } } - + height: 20px; + border: 2px #c8bebe solid; + border-radius: 5px; + color: #c8bebe; + .transition; + &:hover { + color: #999999; + } +} .comment-edit-text-full { - height: 10em; - border-radius: 5px; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; } - + height: 10em; + .rounded_corners; + .transition; +} .comment-edit-submit-wrapper { - width: 90%; - margin: 5px 5px 10px 50px; - text-align: right; } - + width: 90%; + margin: 5px 5px 10px 50px; + text-align: right; +} .comment-edit-submit { - height: 22px; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 0; } + height: 22px; + background-color: #555753; + color: @main_alt_colour; + .rounded_corners; + border: 0; +} + /** * item text style */ - .wall-item-body code { - display: block; - padding: 0 0 10px 5px; - border-color: #ccc; - border-style: solid; - border-width: 1px 1px 1px 10px; - background: #eee; - color: #2e2f2e; - width: 95%; } + background-color: #444; + border-bottom: 1px dashed #ccc; + border-left-style: solid; + border-left-width: 10px; + border-top: 1px dashed #ccc; + display: block; + overflow-x: auto; + padding: 5px 0 15px 10px; + width: 95%; + a { + color: @lt_link_colour; + } +} + /** * profile */ - div { - &[id$="text"] { - font-weight: bold; - border-bottom: 1px solid #ccc; } - &[id$="wrapper"] { - height: 100%; - margin-bottom: 1em; - br { - clear: left; } } } - + &[id$="text"] { + font-weight: bold; + border-bottom: 1px solid #ccc; + } + &[id$="wrapper"] { + height: 100%; + margin-bottom: 1em; + br { + clear: left; + } + } +} .profile-match-wrapper { float: left; margin: 0 5px 40px 0; - width: 120px; - height: 120px; + .box(120px, 120px); padding: 3px; position: relative; } @@ -1407,11 +1455,10 @@ div { .profile-match-photo { } - [id$="-end"], [class$="-end"] { - clear: both; - margin: 0 0 10px 0; } - + clear: both; + margin: 0 0 10px 0; +} .profile-match-end { margin: 0 0 5px 0; } @@ -1438,59 +1485,48 @@ div { margin-bottom: 30px; } .photo-album-image-wrapper, .photo-top-image-wrapper { - float: left; - -moz-box-shadow: 3px 3px 10px 0 #000; - -webkit-box-shadow: 3px 3px 10px 0 #000; - box-shadow: 3px 3px 10px 0 #000; - background-color: #222; - color: #2e2f2e; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - padding-bottom: 30px; - position: relative; - margin: 0 10px 10px 0; } + float: left; + .box_shadow; + background-color: #222; + color: @bg_colour; + .rounded_corners; + padding-bottom: 30px; + position: relative; + margin: 0 10px 10px 0; +} #photo-photo { - max-width: 100%; - img { - max-width: 100%; } } - -.photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover { - border-bottom: 0; } + max-width: 100%; + img { + max-width: 100%; } } + +.photo-top-image-wrapper a:hover, +#photo-photo a:hover, +.photo-album-image-wrapper a:hover { + border-bottom: 0; +} .photo-top-photo, .photo-album-photo { - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; } - -.photo-top-album-name { - position: absolute; - bottom: 0; - padding: 0 5px; } + .rounded_corners(5px 5px 0 0); +} -.caption { - position: absolute; - bottom: 0; - margin: 0 5px; } +.photo-top-album-name, .caption { + position: absolute; + bottom: 0; + padding: 0 5px; +} #photo-photo { - position: relative; - float: left; } + position: relative; + float: left; } #photo-prev-link, #photo-next-link { - position: absolute; - width: 30%; - height: 100%; - background-color: rgba(255, 255, 255, 0.5); - opacity: 0; - -webkit-transition: all .2s ease-in-out; - -moz-transition: all .2s ease-in-out; - -o-transition: all .2s ease-in-out; - -ms-transition: all .2s ease-in-out; - transition: all .2s ease-in-out; - background-position: center center; - background-repeat: no-repeat; } + position: absolute; + .box(30%, 100%); + background: white center center no-repeat; + opacity: 0; + .transition(all, 0.2s); +} #photo-prev-link { background-image: url(dark/prev.png); @@ -1517,55 +1553,60 @@ div { text-indent: -900000px; } #photo-prev-link:hover { - opacity: 1; - -webkit-transition: all .2s ease-in-out; - -moz-transition: all .2s ease-in-out; - -o-transition: all .2s ease-in-out; - -ms-transition: all .2s ease-in-out; - transition: all .2s ease-in-out; } + opacity: 1; + .transition(all, 0.2s); +} #photo-next-link { - &:hover { - opacity: 1; - -webkit-transition: all .2s ease-in-out; - -moz-transition: all .2s ease-in-out; - -o-transition: all .2s ease-in-out; - -ms-transition: all .2s ease-in-out; - transition: all .2s ease-in-out; } - .icon { - display: none; } } + &:hover { + opacity: 1; + .transition(all, 0.2s); + } + .icon { + display: none; + } +} #photo-prev-link .icon { display: none; } -#photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper { +#photos-upload-spacer, +#photos-upload-new-wrapper, +#photos-upload-exist-wrapper { margin-bottom: 1em; } -#photos-upload-existing-album-text, #photos-upload-newalbum-div { +#photos-upload-existing-album-text, +#photos-upload-newalbum-div { background-color: #555753; - color: #eeeeec; + color: @main_alt_colour; padding: 1px; } -#photos-upload-album-select, #photos-upload-newalbum { +#photos-upload-album-select, +#photos-upload-newalbum { width: 99%; } #photos-upload-perms-menu { text-align: right; } -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { +#photo-edit-caption, +#photo-edit-newtag, +#photo-edit-albumname { float: left; margin-bottom: 25px; } #photo-edit-link-wrap { margin-bottom: 15px; } -#photo-edit-caption, #photo-edit-newtag { +#photo-edit-caption, +#photo-edit-newtag { width: 100%; } #photo-like-div { margin-bottom: 25px; } -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end { +#photo-edit-caption-end, +#photo-edit-tags-end, +#photo-edit-albumname-end { clear: both; } #photo-edit-delete-button { @@ -1585,12 +1626,14 @@ div { */ .prvmail-text { - width: 100%; } + width: 100%; +} #prvmail-subject { - width: 100%; - color: #2e2f2e; - background: #eec; } + width: 100%; + color: @bg_colour; + background: @main_colour; +} #prvmail-submit-wrapper { margin-top: 10px; } @@ -1632,21 +1675,21 @@ div { .mail-list-outside-wrapper-end { clear: both; - border-bottom: 1px #eec dotted; } + border-bottom: 1px @main_colour dotted; } .mail-conv-sender { float: left; margin: 0px 5px 5px 0px; } .mail-conv-sender-photo { - width: 32px; - height: 32px; } + .box(32px, 32px) +} .mail-conv-sender-name { - float: left; } + float: left; } .mail-conv-date { - float: right; } + float: right; } .mail-conv-subject { clear: right; @@ -1664,48 +1707,51 @@ div { */ .view-contact-wrapper, .contact-entry-wrapper { - float: left; - margin: 0 5px 40px 0; - width: 120px; - height: 120px; - padding: 3px; - position: relative; } + float: left; + margin: 0 5px 40px 0; + .box(120px, 120px); + padding: 3px; + position: relative; } .contact-direction-wrapper { - position: absolute; - top: 20px; } + position: absolute; + top: 20px; } .contact-edit-links { - position: absolute; - top: 60px; } + position: absolute; + top: 60px; } .contact-entry-photo-wrapper {} .contact-entry-photo { - margin-left: 20px; } + margin-left: 20px; } .contact-entry-name { - width: 120px; - font-weight: bold; - /*overflow: hidden;*/ } + width: 120px; + font-weight: bold; + /*overflow: hidden;*/ +} .contact-entry-photo { position: relative; } .contact-entry-edit-links .icon { - border: 1px solid #babdb6; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #fff; } - -#contact-entry-url, [id^="contact-entry-url"] { - font-size: smaller; - /*overflow: scroll;*/ } - -#contact-entry-network, [id^="contact-entry-network"] { - font-size: smaller; - font-style: italic; } + border: 1px solid #babdb6; + .rounded_corners(3px); + background-color: #fff; +} + +#contact-entry-url, +[id^="contact-entry-url"], +#contact-entry-network, +[id^="contact-entry-network"] { + font-size: smaller; +} + +#contact-entry-network, +[id^="contact-entry-network"] { + font-style: italic; +} #contact-edit-banner-name { font-size: 1.5em; } @@ -1724,18 +1770,20 @@ div { margin-left: 0px; } #contact-edit-links { - margin-top: 23px; - ul { - list-style-type: none; } } + margin-top: 23px; + ul { + .list_reset; + } +} #contact-drop-links { - margin-left: 5px; } + margin-left: 5px; +} #contact-edit-nav-wrapper .icon { - border: 1px solid #babdb6; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; } + .borders(1px, solid, #babdb6); + .rounded_corners(3px); +} #contact-edit-poll-wrapper { margin-left: 0px; } @@ -1757,25 +1805,23 @@ div { margin-bottom: 65px; } .contact-photo-menu-button { - position: absolute; - background-image: url("dark/photo-menu.jpg"); - background-position: top left; - background-repeat: no-repeat; - margin: 0px; - padding: 0px; - width: 16px; - height: 16px; - top: 64px; - left: 0px; - overflow: hidden; - text-indent: 40px; - display: none; } + position: absolute; + background: url("dark/photo-menu.jpg") top left no-repeat transparent; + margin: 0px; + padding: 0px; + .box(16px, 16px); + top: 64px; + left: 0px; + overflow: hidden; + text-indent: 40px; + display: none; +} .contact-photo-menu { width: auto; border: 2px solid #444; - background: #2e2f2e; - color: #eec; + background: @bg_colour; + color: @main_colour; position: absolute; left: 0px; top: 90px; @@ -1805,12 +1851,11 @@ div { padding-left: 18px; } #settings-nickname-desc { - background-color: #eec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 5px; - color: #111; } + background-color: @main_colour; + .rounded_corners; + padding: 5px; + color: #111; +} #settings-default-perms { margin-bottom: 20px; } @@ -1861,84 +1906,82 @@ div { margin: 20px 20px 0px 0px; } .icon-profile-edit { - background: url("dark/icons.png") -150px 0px no-repeat; - border: 0; - cursor: pointer; - display: block; - float: right; - width: 20px; - height: 20px; - margin: 0 0 -18px; - position: absolute; - text-decoration: none; - top: 113px; - right: 260px; } - + background: url("dark/icons.png") -150px 0px no-repeat; + border: 0; + cursor: pointer; + display: block; + .box(20px, 20px); + margin: 0 0 -18px; + text-decoration: none; + top: 113px; + right: 260px; +} #profile-edit-links ul { - margin: 20px 0; - padding: 0; - list-style: none; } - + .list_reset; + margin: 20px 0; +} .marital { - margin-top: 5px; } - + margin-top: 5px; +} #register-sitename { - display: inline; - font-weight: bold; } - + display: inline; + font-weight: bold; +} #advanced-expire-popup { - background: #2e2f2e; - color: #eec; } - + background: @bg_colour; + color: @main_colour; +} #id_ssl_policy { - width: 374px; } - + width: 374px; +} #theme-preview img { - margin: 10px 10px 10px 288px; } + margin: 10px 10px 10px 288px; +} /** * contacts selector */ .group-delete-wrapper { - margin: -31px 50px 0 0; - float: right; } + margin: -31px 50px 0 0; + float: right; } /*.group-delete-icon { margin: 0 0 0 10px; }*/ #group-edit-submit-wrapper { - margin: 0 0 10px 0; - display: inline; } + margin: 0 0 10px 0; + display: inline; } #group-edit-desc { - margin: 10px 0px; } + margin: 10px 0px; } #group-members, #prof-members { - height: 200px; - overflow: auto; - border: 1px solid #555753; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; } + height: 200px; + overflow: auto; + .borders(1px, solid, #555753); + .rounded_corners(5px 5px 0 0); +} #group-all-contacts, #prof-all-contacts { - height: 200px; - overflow: auto; - border: 1px solid #555753; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; } + height: 200px; + overflow: auto; + .borders(1px, solid, #555753); + .rounded_corners(0 0 5px 5px); +} -#group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 { - color: #eeeeec; - background-color: #555753; - margin: 0; - padding: 5px; } +#group-members h3, +#group-all-contacts h3, +#prof-members h3, +#prof-all-contacts h3 { + color: @main_alt_colour; + background-color: #555753; + margin: 0; + padding: 5px; } #group-separator, #prof-separator { - display: none; } + display: none; } /** * profile @@ -2009,7 +2052,7 @@ div { font-size: 20px; } .event { - background: #2e2f2e; } + background: @bg_colour; } .vevent { border: 1px solid #ccc; @@ -2055,7 +2098,7 @@ div { .today { font-weight: bold; - color: #FF0000; } + color: #F00; } #event-start-text, #event-finish-text { margin-top: 10px; @@ -2125,8 +2168,8 @@ div { text-decoration: underline; } } .fc-state-highlight { - background: #eec; - color: #2e2f2e; } + background: @main_colour; + color: @bg_colour; } /** * directory @@ -2145,74 +2188,88 @@ div { */ #group-sidebar { - margin-bottom: 10px; } - -.group-selected, .nets-selected, .fileas-selected { - padding: 3px; - color: #2e2f2e; - background: #88a9d2; - font-weight: bold; } - -.group-selected:hover, .nets-selected:hover, .fileas-selected:hover { - color: #2e2f2e; } - + margin-bottom: 10px; +} +.group-selected, +.nets-selected, +.fileas-selected { + padding: 3px; + color: @bg_colour; + background: @main_colour; + font-weight: bold; +} +.group-selected:hover, +.nets-selected:hover, +.fileas-selected:hover { + color: @link_colour; + background: @bg_colour; +} .groupsideedit { - margin-right: 10px; } - + margin-right: 10px; +} #sidebar-group-ul { - padding-left: 0; } - + padding-left: 0; +} #sidebar-group-list { - margin: 0 0 5px 0; - ul { - list-style-type: none; - list-style-position: inside; } - li { - margin-top: 10px; } - .icon { - display: inline-block; - height: 12px; - width: 12px; } } - + margin: 0 0 5px 0; + li { + margin-top: 10px; + } + .icon { + display: inline-block; + .box(12px, 12px); + } +} +.sidebar-group-element { + padding: 3px; + &:hover { + color: @bg_colour; + background: @link_colour; + font-weight: bold; + padding: 3px; + } +} #sidebar-new-group { - margin: auto; - display: inline-block; - color: #efefef; - text-decoration: none; - text-align: center; } - + margin: auto; + display: inline-block; + color: #efefef; + text-decoration: none; + text-align: center; +} #peoplefind-sidebar form { - margin-bottom: 10px; } - + margin-bottom: 10px; +} #sidebar-new-group { - &:hover { - /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ - /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ - /*background-color: #b20202;*/ } - &:active { - position: relative; - top: 1px; } } - + &:hover { + /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ + /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ + /*background-color: #b20202;*/ } + &:active { + position: relative; + top: 1px; + } +} #side-peoplefind-url { - background-color: #2e2f2e; - color: #eec; - border: 1px #999 solid; - margin-right: 3px; - width: 75%; - &:hover, &:focus { - background-color: #efefef; - color: #222; - border: 1px 333 solid; } } - + background-color: @bg_colour; + color: @main_colour; + border: 1px #999 solid; + margin-right: 3px; + width: 75%; + &:hover, &:focus { + background-color: #efefef; + color: #222; + border: 1px 333 solid; + } +} .nets-ul { - list-style-type: none; - padding-left: 0px; - li { - margin: 10px 0 0; } } - + .list_reset; + li { + margin: 10px 0 0; + } +} .nets-link, .nets-all { - margin-left: 0px; } - + margin-left: 0px; +} #netsearch-box { margin: 20px 0px 30px; width: 135px; @@ -2221,125 +2278,147 @@ div { } } + /** * admin */ - #pending-update { - float: right; - color: #fff; - font-weight: bold; - background-color: #ff0000; - padding: 0 .3em; } - + float: right; + color: #fff; + font-weight: bold; + background-color: #ff0000; + padding: 0 .3em; +} .admin { - &.linklist { - border: 0; - padding: 0; } - &.link { - list-style-position: inside; } } - + &.linklist { + border: 0; + padding: 0; } + &.link { + .list_reset; + } +} #adminpage { - color: #eec; - background: #2e2f2e; - margin: 5px; - padding: 10px; - dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid #000; } - dt { - width: 250px; - float: left; - font-weight: bold; } - dd { - margin-left: 250px; } - h3 { - border-bottom: 1px solid #ccc; } - .submit { - clear: left; } - #pluginslist { - margin: 0; - padding: 0; } - .plugin { - list-style: none; - display: block; - border: 1px solid #888; - padding: 1em; - margin-bottom: 5px; - clear: left; } - .toggleplugin { - float: left; - margin-right: 1em; } - table { - width: 100%; - border-bottom: 1px solid #000; - margin: 5px 0; - th { - text-align: left; } } - td .icon { - float: left; } - table { - &#users img { - width: 16px; - height: 16px; } - tr:hover { - color: #2e2f2e; - background-color: #eec; } } - .selectall { - text-align: right; } - #users a { - color: #eec; - text-decoration: underline; } } + color: @main_colour; + background: @bg_colour; + margin: 5px; + padding: 10px; + dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid #000; + } + dt { + width: 250px; + float: left; + font-weight: bold; + } + dd { + margin-left: 250px; + } + h3 { + border-bottom: 1px solid #ccc; + } + .submit { + clear: left; + } + #pluginslist { + margin: 0; + padding: 0; + } + .plugin { + list-style: none; + display: block; + border: 1px solid #888; + padding: 1em; + margin-bottom: 5px; + clear: left; + } + .toggleplugin { + float: left; + margin-right: 1em; + } + table { + width: 100%; + border-bottom: 1px solid #000; + margin: 5px 0; + th { + text-align: left; + } + } + td .icon { + float: left; + } + table { + &#users img { + width: 16px; + height: 16px; + } + } + .selectall { + text-align: right; + } + #users a { + color: @main_colour; + text-decoration: underline; + } +} #users .name { - color: #eec; } + color: @main_colour; +} /** * form fields */ .field { - /*margin-bottom: 10px;*/ - /*padding-bottom: 10px;*/ - overflow: auto; - /* width: 100%;*/ - label { - width: 38%; - display: inline-block; - font-size: 1.077em; - margin: 0 10px 1em 0; - border: 1px #2e2f2e solid; - padding: 5px; - background: #eec; - color: #111; } } + overflow: auto; + label { + width: 38%; + display: inline-block; + font-size: 1.077em; + margin: 0 10px 1em 0; + border: 1px @bg_colour solid; + padding: 5px; + background: @main_colour; + color: #111; } } .field .onoff { - float: right; - margin: 0 330px 0 auto; - width: 80px; - a { - display: block; - border: 1px solid #666; - padding: 3px 6px 4px 10px; - height: 16px; - text-decoration: none; } - .on { - background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999999; - color: #111; - text-align: left; } - .off { - background: url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc; - color: #333; - text-align: right; } } + float: right; + margin: 0 330px 0 auto; + width: 80px; + a { + display: block; + border: 1px solid #666; + padding: 3px 6px 4px 10px; + height: 16px; + text-decoration: none; + } + .on, .off { + background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q=='); + background-repeat: no-repeat; + } + .on { + background-position: 42px 1px; + background-color: #999; + color: #111; + text-align: left; + } + .off { + background-position: 2px 1px; + background-color: #ccc; + color: #333; + text-align: right; + } +} .hidden { - display: none !important; } + display: none !important; } .field textarea { - width: 80%; - height: 100px; } + .box(80%, 100px); +} .field_help { display: block; @@ -2350,99 +2429,99 @@ div { margin-left: 297px; } label { - width: 38%; - display: inline-block; - font-size: 1.077em; - margin: 0 10px 1em 0; - border: 1px #2e2f2e solid; - padding: 5px; - background: #eec; - color: #111; } - + width: 38%; + display: inline-block; + font-size: 1.077em; + margin: 0 10px 1em 0; + .borders(1px, solid, @bg_colour); + padding: 5px; + background: @main_colour; + color: #111; + .box_shadow(3px, 3px, 5px); +} input { - width: 250px; - height: 25px; - border: 1px #999 solid; - &[type="text"], &[type="password"], &[type="search"] { - width: 250px; - height: 25px; - border: 1px #999 solid; } - &[type="checkbox"], &[type="radio"] { - border: 1px #999 solid; - margin: 0 0 0 0; - height: 15px; - width: 15px; } - &[type="submit"], &[type="button"] { - background-color: #eee; - border: 2px outset #aaa; - border-radius: 5px; - box-shadow: 1px 3px 4px 0 #111; - color: #2e302e; - cursor: pointer; - font-weight: bold; - width: auto; - text-shadow: 1px 1px #000; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; } - &[type="submit"]:active, &[type="button"]:active { - box-shadow: 0 0 0 0; } } + .box(250px, 25px); + .borders(1px, solid, #999); + &[type="checkbox"], + &[type="radio"] { + margin: 0; + .box(15px, 15px); + } + &[type="submit"], + &[type="button"] { + background-color: #eee; + .borders(2px, outset, #aaa); + .rounded_corners; + .box_shadow(1px, 3px, 4px, 0); + color: #2e302e; + cursor: pointer; + font-weight: bold; + width: auto; + .text_shadow; + } + &[type="submit"]:active, + &[type="button"]:active { + .box_shadow(0, 0, 0, 0); + } +} /* * update */ - .popup { - width: 100%; - height: 100%; - top: 0px; - left: 0px; - position: absolute; - display: none; - .background { - background-color: #000; - opacity: 0.5; - width: 100%; - height: 100%; - position: absolute; - top: 0px; - left: 0px; } - .panel { - top: 25%; - left: 25%; - width: 50%; - height: 50%; - padding: 1em; - position: absolute; - border: 4px solid #000000; - background-color: #FFFFFF; } } + .box(100%, 100%); + top: 0px; + left: 0px; + position: absolute; + display: none; + .background { + background-color: #000; + opacity: 0.5; + .box(100%, 100%); + position: absolute; + top: 0px; + left: 0px; } + .panel { + top: 25%; + left: 25%; + .box(50%, 50%); + padding: 1em; + position: absolute; + border: 4px solid #000000; + background-color: #FFFFFF; + } +} #panel { - z-index: 100; } + z-index: 100; } -.grey { - color: grey; } +.grey, .gray { + color: gray; } .orange { - color: orange; } + color: orange; } .red { - color: red; } + color: red; } .popup .panel { - .panel_text { - display: block; - overflow: auto; - height: 80%; } - .panel_in { - width: 100%; - height: 100%; - position: relative; } - .panel_actions { - width: 100%; - bottom: 4px; - left: 0px; - position: absolute; } } + .panel_text { + display: block; + overflow: auto; + height: 80%; + } + .panel_in { + .box(100%, 100%); + position: relative; + } + .panel_actions { + width: 100%; + bottom: 4px; + left: 0px; + position: absolute; + } +} .panel_text .progress { width: 50%; @@ -2484,21 +2563,20 @@ input { */ .iconspacer { - display: block; - width: 16px; - height: 16px; } + display: block; + .box(16px, 16px); +} .icon { - display: block; - width: 20px; - height: 20px; - background: url(dark/icons.png) no-repeat; - border: 0; - text-decoration: none; - border-radius: 5px; - &:hover { - border: 0; - text-decoration: none; } } + display: block; + .box; + background: url(dark/icons.png) no-repeat; + border: 0; + text-decoration: none; + .rounded_corners; + &:hover { + border: 0; + text-decoration: none; } } .editicon { display: inline-block; @@ -2509,273 +2587,272 @@ input { text-decoration: none; } .shadow { - box-shadow: 2px 2px 5px 2px #111; - &:active, &:focus, &:hover { - box-shadow: 0 0 0 0; } } - + .box_shadow(2px, 2px, 5px, 2px); + &:active, &:focus, &:hover { + box-shadow: 0 0 0 0; + } +} .editicon:hover { - border: 0; } + border: 0; } .boldbb { - background-position: 0px 0px; - &:hover { - background-position: -22px 0px; } } + background-position: 0px 0px; + &:hover { + background-position: -22px 0px; } } .italicbb { - background-position: 0px -22px; - &:hover { - background-position: -22px -22px; } } + background-position: 0px -22px; + &:hover { + background-position: -22px -22px; } } .underlinebb { - background-position: 0px -44px; - &:hover { - background-position: -22px -44px; } } + background-position: 0px -44px; + &:hover { + background-position: -22px -44px; } } .quotebb { - background-position: 0px -66px; - &:hover { - background-position: -22px -66px; } } + background-position: 0px -66px; + &:hover { + background-position: -22px -66px; } } .codebb { - background-position: 0px -88px; - &:hover { - background-position: -22px -88px; } } + background-position: 0px -88px; + &:hover { + background-position: -22px -88px; } } .imagebb { - background-position: -44px 0px; - &:hover { - background-position: -66px 0px; } } + background-position: -44px 0px; + &:hover { + background-position: -66px 0px; } } .urlbb { - background-position: -44px -22px; - &:hover { - background-position: -66px -22px; } } + background-position: -44px -22px; + &:hover { + background-position: -66px -22px; } } .videobb { - background-position: -44px -44px; - &:hover { - background-position: -66px -44px; } } + background-position: -44px -44px; + &:hover { + background-position: -66px -44px; } } .icon { - &.drop, &.drophide, &.delete { - float: left; - margin: 0 2px; } - &.s22 { - &.delete { - display: block; - background-position: -110px 0; } - &.text { - padding: 10px 0px 0px 25px; - width: 200px; } } - &.text { - text-indent: 0px; } - &.s16 { - min-width: 16px; - height: 16px; } } + &.drop, &.drophide, &.delete { + float: left; + margin: 0 2px; } + &.s22 { + &.delete { + display: block; + background-position: -110px 0; } + &.text { + padding: 10px 0px 0px 25px; + width: 200px; } } + &.text { + text-indent: 0px; } + &.s16 { + min-width: 16px; + height: 16px; } } .s16 .add { - background: url("../../../images/icons/16/add.png") no-repeat; } + background: url("../../../images/icons/16/add.png") no-repeat; +} .add { - margin: 0px 5px; } + margin: 0px 5px; } .article { - background-position: -50px 0; } + background-position: -50px 0; } .audio { - background-position: -70px 0; } + background-position: -70px 0; } .block { - background-position: -90px 0px; } + background-position: -90px 0px; } .drop, .delete { - background-position: -110px 0; } + background-position: -110px 0; } .drophide { - background-position: -130px 0; } + background-position: -130px 0; } .edit { - background-position: -150px 0; } + background-position: -150px 0; } .camera { - background-position: -170px 0; } + background-position: -170px 0; } .dislike { - background-position: -190px 0; } + background-position: -190px 0; } .file-as { - background-position: -230px -60px; } + background-position: -230px -60px; } .like { - background-position: -211px 0; } + background-position: -211px 0; } .link { - background-position: -230px 0; } + background-position: -230px 0; } .globe, .location { - background-position: -50px -20px; } + background-position: -50px -20px; } .noglobe, .nolocation { - background-position: -70px -20px; } + background-position: -70px -20px; } .no { - background-position: -90px -20px; } + background-position: -90px -20px; } .pause { - background-position: -110px -20px; } + background-position: -110px -20px; } .play { - background-position: -130px -20px; } + background-position: -130px -20px; } .pencil { - background-position: -151px -18px; } + background-position: -151px -18px; } .small-pencil { - background-position: -170px -20px; } + background-position: -170px -20px; } .recycle { - background-position: -190px -20px; } + background-position: -190px -20px; } .remote-link { - background-position: -210px -20px; } + background-position: -210px -20px; } .share { - background-position: -230px -20px; } + background-position: -230px -20px; } .tools { - background-position: -50px -40px; } + background-position: -50px -40px; } .lock { - background-position: -70px -40px; } + background-position: -70px -40px; } .unlock { - background-position: -88px -40px; } + background-position: -88px -40px; } .video { - background-position: -110px -40px; } + background-position: -110px -40px; } .attach { - background-position: -190px -40px; } + background-position: -190px -40px; } .language { - background-position: -210px -40px; } + background-position: -210px -40px; } .starred { - background-position: -130px -60px; } + background-position: -130px -60px; } .unstarred { - background-position: -150px -60px; } + background-position: -150px -60px; } .tagged { - background-position: -170px -60px; } + background-position: -170px -60px; } .on { - background-position: -50px -60px; } + background-position: -50px -60px; } .off { - background-position: -70px -60px; } + background-position: -70px -60px; } .prev { - background-position: -90px -60px; } + background-position: -90px -60px; } .next { - background-position: -110px -60px; } + background-position: -110px -60px; } .icon.dim { - opacity: 0.3; } + opacity: 0.3; } #pause { - position: fixed; - bottom: 40px; - right: 30px; } + position: fixed; + bottom: 40px; + right: 30px; } .border { - border: 1px solid #babdb6; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - &:hover { - border: 1px solid #babdb6; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; } } + .borders(1px, solid, #babdb6); + .rounded_corners; + &:hover { + .borders(1px, solid, #babdb6); + .rounded_corners; + } +} .attachtype { - display: block; - width: 20px; - height: 23px; - background-image: url(../../../images/content-types.png); } + display: block; + width: 20px; + height: 23px; + background-image: url(../../../images/content-types.png); } .type-video { - background-position: 0px 0px; } + background-position: 0px 0px; } .type-image { - background-position: -20px 0; } + background-position: -20px 0; } .type-audio { - background-position: -40px 0; } + background-position: -40px 0; } .type-text { - background-position: -60px 0px; } + background-position: -60px 0px; } .type-unkn { - background-position: -80px 0; } + background-position: -80px 0; } /** * footer */ .cc-license { - margin-top: 100px; - font-size: 0.7em; } + margin-top: 100px; + font-size: 0.7em; } footer { - display: block; - /*margin: 50px 20%;*/ - clear: both; } + display: block; + /*margin: 50px 20%;*/ + clear: both; } #profile-jot-text { - height: 20px; - color: #eec; - border: 1px solid #eec; - border-radius: 5px; - width: 99.5%; } + height: 20px; + color: @main_colour; + .borders; + .rounded_corners; + width: 99.5%; +} /** * acl */ #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { - display: block !important; - background: #2e2f2e; - color: #eec; } + display: block !important; + background: @bg_colour; + color: @main_colour; } #acl-wrapper { - width: 660px; - margin: 0 auto; } + width: 660px; + margin: 0 auto; } #acl-search { - float: right; - background: white url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; - margin: 6px; - color: #111; } + float: right; + background: white url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; + margin: 6px; + color: #111; } #acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat; - padding: 7px 10px 7px 30px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - color: #999; - margin: 5px 0; - &.selected { - color: #000; - background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } } + float: left; + display: block; + width: auto; + height: 18px; + background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat; + padding: 7px 10px 7px 30px; + .rounded_corners; + color: #999; + margin: 5px 0; + &.selected { + color: #000; + background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } } #acl-list { height: 210px; @@ -2788,95 +2865,97 @@ footer { }*/ .acl-list-item { - border: 1px solid #eec; - display: block; - float: left; - height: 110px; - margin: 3px 0 5px 5px; - width: 120px; - img { - width: 22px; - height: 22px; - float: left; - margin: 5px 5px 20px; } - p { - height: 12px; - font-size: 10px; - margin: 0 0 22px; - padding: 2px 0 1px; } - a { - background: #eeeecc 3px 3px no-repeat; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - clear: both; - font-size: 10px; - display: block; - width: 55px; - height: 20px; - color: #2e2f2e; - margin: 5px auto 0; - padding: 0 3px; - text-align: center; - vertical-align: middle; } } + .borders; + display: block; + float: left; + height: 110px; + margin: 3px 0 5px 5px; + width: 120px; + img { + .box(22px, 22px); + float: left; + margin: 5px 5px 20px; } + p { + height: 12px; + font-size: 10px; + margin: 0 0 22px; + padding: 2px 0 1px; } + a { + background: #eeeecc 3px 3px no-repeat; + .rounded_corners; + clear: both; + font-size: 10px; + display: block; + width: 55px; + height: 20px; + color: @bg_colour; + margin: 5px auto 0; + padding: 0 3px; + text-align: center; + vertical-align: middle; } } #acl-wrapper a:hover { - text-decoration: none; - color: #2e2f2e; - border: 0; } + text-decoration: none; + color: @bg_colour; + border: 0; } +//data URI: +// data:[<MIME-type>][;charset=<encoding>][;base64],<data> .acl-button-show { - background-image: url('../../../images/show_off.png'); - margin: 0 auto; } - + // background-image: url('../../../images/show_off.png'); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg=='); + margin: 0 auto; +} .acl-button-hide { - background-image: url('../../../images/hide_off.png'); - margin: 0 auto; } - + // background-image: url('../../../images/hide_off.png'); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII='); + margin: 0 auto; +} .acl-button-show.selected { - color: #2e2f2e; - background-color: #9ade00; - background-image: url(../../../images/show_on.png); } - + // background: #9ade00 url(../../../images/show_on.png); + background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII='); + color: @bg_colour; +} .acl-button-hide.selected { - color: #2e2f2e; - background-color: #ff4141; - background-image: url(../../../images/hide_on.png); } - + // background: #ff4141 url(../../../images/hide_on.png); + background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg=='); + color: @bg_colour; +} .acl-list-item { - &.groupshow { - border-color: #9ade00; } - &.grouphide { - border-color: #ff4141; } } + &.groupshow { + border-color: #9ade00; } + &.grouphide { + border-color: #ff4141; } } /** /acl **/ /* autocomplete popup */ - .acpopup { - max-height: 175px; - max-width: 42%; - background-color: #555753; - color: #fff; - overflow: auto; - z-index: 100000; - border: 1px solid #cccccc; } - + max-height: 175px; + max-width: 42%; + background-color: #555753; + color: #fff; + overflow: auto; + z-index: 100000; + border: 1px solid #cccccc; +} .acpopupitem { - background-color: #555753; - padding: 4px; - clear: left; - img { - float: left; - margin-right: 4px; } - &.selected { - color: #2e302e; - background-color: #eeeeec; } } - + background-color: #555753; + padding: 4px; + clear: left; + img { + float: left; + margin-right: 4px; + } + &.selected { + color: #2e302e; + background-color: @main_alt_colour; + } +} .qcomment-wrapper { - padding: 0px; - margin: 5px 5px 5px 81%; } - + padding: 0px; + margin: 5px 5px 5px 81%; +} .qcomment { opacity: 0.5; &:hover { @@ -2915,7 +2994,76 @@ footer { /* override the jappix css */ z-index: 999; } -/* media stuff */ +//* media stuff */ @media handheld { - body { - font-size: 15pt; } } + body { + font-size: 15pt; + } +} +//* Smartphones (portrait and landscape) ----------- */ +@media only screen and (min-device-width: 320px) + and (max-device-width: 480px) { + body { + font-size: 10px; + } +} +//* Smartphones (landscape) ----------- */ +@media only screen and (min-width: 321px) { + body { + font-size: 10px; + } +} +//* Smartphones (portrait) ----------- */ +@media only screen and (max-width: 320px) { + body { + font-size: 10px; + } +} +//* iPads (portrait and landscape) ----------- */ +@media only screen and (min-device-width: 768px) + and (max-device-width: 1024px) { + body { + font-size: 16px; + } +} +//* iPads (landscape) ----------- */ +@media only screen and (min-device-width: 768px) + and (max-device-width: 1024px) + and (orientation: landscape) { + body { + font-size: 16px; + } +} +//* iPads (portrait) ----------- */ +@media only screen and (min-device-width: 768px) + and (max-device-width: 1024px) + and (orientation: portrait) { + body { + font-size: 16px; + } +} +//* Desktops and laptops ----------- */ +//adjusted to 1024 from 1224. +//not everybody has a fucking big screen ffs +@media only screen and (min-width: 1024px) { + body { + font-size: 16px; + } +} +//* Large screens - */ +@media only screen and (min-width: 1520px) { + body { + font-size: 18px; + } +} +//* iPhone 4 ----------- */ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (min-device-pixel-ratio: 1.5) { + body { + font-size: 16px; + } +} +.test { + color: @link_colour; + background-color: darken(@main_alt_colour, 13%); +} diff --git a/view/theme/dispy/dark/connect.png b/view/theme/dispy/icons/connect.png Binary files differindex b76fc13dc..b76fc13dc 100644 --- a/view/theme/dispy/dark/connect.png +++ b/view/theme/dispy/icons/connect.png diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index 688ac1451..c6b339457 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -20,25 +20,25 @@ <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-upload-wrapper" style="display: $visitor;"> - <div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div> + <div id="wall-image-upload-div"><a class="icon camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div> </div> <div id="profile-attach-wrapper" style="display: $visitor;"> - <div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div> + <div id="wall-file-upload-div"><a class="icon attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div> </div> <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"> - <a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a> + <a class="icon link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a> </div> <div id="profile-video-wrapper" style="display: $visitor;"> - <a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a> + <a class="icon video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a> </div> <div id="profile-audio-wrapper" style="display: $visitor;"> - <a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a> + <a class="icon audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a> </div> <div id="profile-location-wrapper" style="display: $visitor;"> - <a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a> + <a class="icon globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a> </div> <div id="profile-nolocation-wrapper" style="display: none;"> - <a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a> + <a class="icon noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a> </div> <div id="profile-jot-plugin-wrapper"> diff --git a/view/theme/dispy/js/modernizr.custom.2.5.3.js b/view/theme/dispy/js/modernizr.custom.2.5.3.js new file mode 100644 index 000000000..2502348b1 --- /dev/null +++ b/view/theme/dispy/js/modernizr.custom.2.5.3.js @@ -0,0 +1,989 @@ +/* Modernizr 2.5.3 (Custom Build) | MIT & BSD
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;
+
+
+
+window.Modernizr = (function( window, document, undefined ) {
+
+ var version = '2.5.3',
+
+ Modernizr = {},
+
+
+ docElement = document.documentElement,
+
+ mod = 'modernizr',
+ modElem = document.createElement(mod),
+ mStyle = modElem.style,
+
+ inputElem = document.createElement('input') ,
+
+ smile = ':)',
+
+ toString = {}.toString,
+
+ prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),
+
+
+
+ omPrefixes = 'Webkit Moz O ms',
+
+ cssomPrefixes = omPrefixes.split(' '),
+
+ domPrefixes = omPrefixes.toLowerCase().split(' '),
+
+ ns = {'svg': 'http://www.w3.org/2000/svg'},
+
+ tests = {},
+ inputs = {},
+ attrs = {},
+
+ classes = [],
+
+ slice = classes.slice,
+
+ featureName,
+
+
+ injectElementWithStyles = function( rule, callback, nodes, testnames ) {
+
+ var style, ret, node,
+ div = document.createElement('div'),
+ body = document.body,
+ fakeBody = body ? body : document.createElement('body');
+
+ if ( parseInt(nodes, 10) ) {
+ while ( nodes-- ) {
+ node = document.createElement('div');
+ node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
+ div.appendChild(node);
+ }
+ }
+
+ style = ['­','<style>', rule, '</style>'].join('');
+ div.id = mod;
+ (body ? div : fakeBody).innerHTML += style;
+ fakeBody.appendChild(div);
+ if(!body){
+ fakeBody.style.background = "";
+ docElement.appendChild(fakeBody);
+ }
+
+ ret = callback(div, rule);
+ !body ? fakeBody.parentNode.removeChild(fakeBody) : div.parentNode.removeChild(div);
+
+ return !!ret;
+
+ },
+
+ testMediaQuery = function( mq ) {
+
+ var matchMedia = window.matchMedia || window.msMatchMedia;
+ if ( matchMedia ) {
+ return matchMedia(mq).matches;
+ }
+
+ var bool;
+
+ injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) {
+ bool = (window.getComputedStyle ?
+ getComputedStyle(node, null) :
+ node.currentStyle)['position'] == 'absolute';
+ });
+
+ return bool;
+
+ },
+
+
+ isEventSupported = (function() {
+
+ var TAGNAMES = {
+ 'select': 'input', 'change': 'input',
+ 'submit': 'form', 'reset': 'form',
+ 'error': 'img', 'load': 'img', 'abort': 'img'
+ };
+
+ function isEventSupported( eventName, element ) {
+
+ element = element || document.createElement(TAGNAMES[eventName] || 'div');
+ eventName = 'on' + eventName;
+
+ var isSupported = eventName in element;
+
+ if ( !isSupported ) {
+ if ( !element.setAttribute ) {
+ element = document.createElement('div');
+ }
+ if ( element.setAttribute && element.removeAttribute ) {
+ element.setAttribute(eventName, '');
+ isSupported = is(element[eventName], 'function');
+
+ if ( !is(element[eventName], 'undefined') ) {
+ element[eventName] = undefined;
+ }
+ element.removeAttribute(eventName);
+ }
+ }
+
+ element = null;
+ return isSupported;
+ }
+ return isEventSupported;
+ })(),
+
+
+ _hasOwnProperty = ({}).hasOwnProperty, hasOwnProperty;
+
+ if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
+ hasOwnProperty = function (object, property) {
+ return _hasOwnProperty.call(object, property);
+ };
+ }
+ else {
+ hasOwnProperty = function (object, property) {
+ return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
+ };
+ }
+
+
+ if (!Function.prototype.bind) {
+ Function.prototype.bind = function bind(that) {
+
+ var target = this;
+
+ if (typeof target != "function") {
+ throw new TypeError();
+ }
+
+ var args = slice.call(arguments, 1),
+ bound = function () {
+
+ if (this instanceof bound) {
+
+ var F = function(){};
+ F.prototype = target.prototype;
+ var self = new F;
+
+ var result = target.apply(
+ self,
+ args.concat(slice.call(arguments))
+ );
+ if (Object(result) === result) {
+ return result;
+ }
+ return self;
+
+ } else {
+
+ return target.apply(
+ that,
+ args.concat(slice.call(arguments))
+ );
+
+ }
+
+ };
+
+ return bound;
+ };
+ }
+
+ function setCss( str ) {
+ mStyle.cssText = str;
+ }
+
+ function setCssAll( str1, str2 ) {
+ return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
+ }
+
+ function is( obj, type ) {
+ return typeof obj === type;
+ }
+
+ function contains( str, substr ) {
+ return !!~('' + str).indexOf(substr);
+ }
+
+ function testProps( props, prefixed ) {
+ for ( var i in props ) {
+ if ( mStyle[ props[i] ] !== undefined ) {
+ return prefixed == 'pfx' ? props[i] : true;
+ }
+ }
+ return false;
+ }
+
+ function testDOMProps( props, obj, elem ) {
+ for ( var i in props ) {
+ var item = obj[props[i]];
+ if ( item !== undefined) {
+
+ if (elem === false) return props[i];
+
+ if (is(item, 'function')){
+ return item.bind(elem || obj);
+ }
+
+ return item;
+ }
+ }
+ return false;
+ }
+
+ function testPropsAll( prop, prefixed, elem ) {
+
+ var ucProp = prop.charAt(0).toUpperCase() + prop.substr(1),
+ props = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
+
+ if(is(prefixed, "string") || is(prefixed, "undefined")) {
+ return testProps(props, prefixed);
+
+ } else {
+ props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');
+ return testDOMProps(props, prefixed, elem);
+ }
+ }
+
+ var testBundle = (function( styles, tests ) {
+ var style = styles.join(''),
+ len = tests.length;
+
+ injectElementWithStyles(style, function( node, rule ) {
+ var style = document.styleSheets[document.styleSheets.length - 1],
+ cssText = style ? (style.cssRules && style.cssRules[0] ? style.cssRules[0].cssText : style.cssText || '') : '',
+ children = node.childNodes, hash = {};
+
+ while ( len-- ) {
+ hash[children[len].id] = children[len];
+ }
+
+ Modernizr['touch'] = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch || (hash['touch'] && hash['touch'].offsetTop) === 9;
+ Modernizr['csstransforms3d'] = (hash['csstransforms3d'] && hash['csstransforms3d'].offsetLeft) === 9 && hash['csstransforms3d'].offsetHeight === 3; Modernizr['generatedcontent'] = (hash['generatedcontent'] && hash['generatedcontent'].offsetHeight) >= 1; Modernizr['fontface'] = /src/i.test(cssText) &&
+ cssText.indexOf(rule.split(' ')[0]) === 0; }, len, tests);
+
+ })([
+ '@font-face {font-family:"font";src:url("https://")}' ,['@media (',prefixes.join('touch-enabled),('),mod,')',
+ '{#touch{top:9px;position:absolute}}'].join('') ,['@media (',prefixes.join('transform-3d),('),mod,')',
+ '{#csstransforms3d{left:9px;position:absolute;height:3px;}}'].join('')
+
+ ,['#generatedcontent:after{content:"',smile,'";visibility:hidden}'].join('')
+ ],
+ [
+ 'fontface' ,'touch' ,'csstransforms3d'
+ ,'generatedcontent'
+
+ ]); tests['flexbox'] = function() {
+ return testPropsAll('flexOrder');
+ };
+
+
+ tests['flexbox-legacy'] = function() {
+ return testPropsAll('boxDirection');
+ };
+
+
+ tests['canvas'] = function() {
+ var elem = document.createElement('canvas');
+ return !!(elem.getContext && elem.getContext('2d'));
+ };
+
+ tests['canvastext'] = function() {
+ return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
+ }; tests['touch'] = function() {
+ return Modernizr['touch'];
+ };
+
+ tests['geolocation'] = function() {
+ return !!navigator.geolocation;
+ };
+
+ tests['postmessage'] = function() {
+ return !!window.postMessage;
+ };
+
+
+ tests['websqldatabase'] = function() {
+ return !!window.openDatabase;
+ };
+
+ tests['indexedDB'] = function() {
+ return !!testPropsAll("indexedDB",window);
+ };
+
+ tests['hashchange'] = function() {
+ return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);
+ };
+
+ tests['history'] = function() {
+ return !!(window.history && history.pushState);
+ };
+
+ tests['draganddrop'] = function() {
+ var div = document.createElement('div');
+ return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);
+ };
+
+ tests['websockets'] = function() {
+ for ( var i = -1, len = cssomPrefixes.length; ++i < len; ){
+ if ( window[cssomPrefixes[i] + 'WebSocket'] ){
+ return true;
+ }
+ }
+ return 'WebSocket' in window;
+ };
+
+
+ tests['rgba'] = function() {
+ setCss('background-color:rgba(150,255,150,.5)');
+
+ return contains(mStyle.backgroundColor, 'rgba');
+ };
+
+ tests['hsla'] = function() {
+ setCss('background-color:hsla(120,40%,100%,.5)');
+
+ return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');
+ };
+
+ tests['multiplebgs'] = function() {
+ setCss('background:url(https://),url(https://),red url(https://)');
+
+ return /(url\s*\(.*?){3}/.test(mStyle.background);
+ };
+ tests['backgroundsize'] = function() {
+ return testPropsAll('backgroundSize');
+ };
+
+ tests['borderimage'] = function() {
+ return testPropsAll('borderImage');
+ };
+
+
+
+ tests['borderradius'] = function() {
+ return testPropsAll('borderRadius');
+ };
+
+ tests['boxshadow'] = function() {
+ return testPropsAll('boxShadow');
+ };
+
+ tests['textshadow'] = function() {
+ return document.createElement('div').style.textShadow === '';
+ };
+
+
+ tests['opacity'] = function() {
+ setCssAll('opacity:.55');
+
+ return /^0.55$/.test(mStyle.opacity);
+ };
+
+
+ tests['cssanimations'] = function() {
+ return testPropsAll('animationName');
+ };
+
+
+ tests['csscolumns'] = function() {
+ return testPropsAll('columnCount');
+ };
+
+
+ tests['cssgradients'] = function() {
+ var str1 = 'background-image:',
+ str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',
+ str3 = 'linear-gradient(left top,#9f9, white);';
+
+ setCss(
+ (str1 + '-webkit- '.split(' ').join(str2 + str1)
+ + prefixes.join(str3 + str1)).slice(0, -str1.length)
+ );
+
+ return contains(mStyle.backgroundImage, 'gradient');
+ };
+
+
+ tests['cssreflections'] = function() {
+ return testPropsAll('boxReflect');
+ };
+
+
+ tests['csstransforms'] = function() {
+ return !!testPropsAll('transform');
+ };
+
+
+ tests['csstransforms3d'] = function() {
+
+ var ret = !!testPropsAll('perspective');
+
+ if ( ret && 'webkitPerspective' in docElement.style ) {
+
+ ret = Modernizr['csstransforms3d'];
+ }
+ return ret;
+ };
+
+
+ tests['csstransitions'] = function() {
+ return testPropsAll('transition');
+ };
+
+
+
+ tests['fontface'] = function() {
+ return Modernizr['fontface'];
+ };
+
+ tests['generatedcontent'] = function() {
+ return Modernizr['generatedcontent'];
+ };
+ tests['video'] = function() {
+ var elem = document.createElement('video'),
+ bool = false;
+
+ try {
+ if ( bool = !!elem.canPlayType ) {
+ bool = new Boolean(bool);
+ bool.ogg = elem.canPlayType('video/ogg; codecs="theora"') .replace(/^no$/,'');
+
+ bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,'');
+
+ bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,'');
+ }
+
+ } catch(e) { }
+
+ return bool;
+ };
+
+ tests['audio'] = function() {
+ var elem = document.createElement('audio'),
+ bool = false;
+
+ try {
+ if ( bool = !!elem.canPlayType ) {
+ bool = new Boolean(bool);
+ bool.ogg = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,'');
+ bool.mp3 = elem.canPlayType('audio/mpeg;') .replace(/^no$/,'');
+
+ bool.wav = elem.canPlayType('audio/wav; codecs="1"') .replace(/^no$/,'');
+ bool.m4a = ( elem.canPlayType('audio/x-m4a;') ||
+ elem.canPlayType('audio/aac;')) .replace(/^no$/,'');
+ }
+ } catch(e) { }
+
+ return bool;
+ };
+
+
+ tests['localstorage'] = function() {
+ try {
+ localStorage.setItem(mod, mod);
+ localStorage.removeItem(mod);
+ return true;
+ } catch(e) {
+ return false;
+ }
+ };
+
+ tests['sessionstorage'] = function() {
+ try {
+ sessionStorage.setItem(mod, mod);
+ sessionStorage.removeItem(mod);
+ return true;
+ } catch(e) {
+ return false;
+ }
+ };
+
+
+ tests['webworkers'] = function() {
+ return !!window.Worker;
+ };
+
+
+ tests['applicationcache'] = function() {
+ return !!window.applicationCache;
+ };
+
+
+ tests['svg'] = function() {
+ return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
+ };
+
+ tests['inlinesvg'] = function() {
+ var div = document.createElement('div');
+ div.innerHTML = '<svg/>';
+ return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
+ };
+
+ tests['smil'] = function() {
+ return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate')));
+ };
+
+
+ tests['svgclippaths'] = function() {
+ return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
+ };
+
+ function webforms() {
+ Modernizr['input'] = (function( props ) {
+ for ( var i = 0, len = props.length; i < len; i++ ) {
+ attrs[ props[i] ] = !!(props[i] in inputElem);
+ }
+ if (attrs.list){
+ attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement);
+ }
+ return attrs;
+ })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));
+ Modernizr['inputtypes'] = (function(props) {
+
+ for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {
+
+ inputElem.setAttribute('type', inputElemType = props[i]);
+ bool = inputElem.type !== 'text';
+
+ if ( bool ) {
+
+ inputElem.value = smile;
+ inputElem.style.cssText = 'position:absolute;visibility:hidden;';
+
+ if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {
+
+ docElement.appendChild(inputElem);
+ defaultView = document.defaultView;
+
+ bool = defaultView.getComputedStyle &&
+ defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&
+ (inputElem.offsetHeight !== 0);
+
+ docElement.removeChild(inputElem);
+
+ } else if ( /^(search|tel)$/.test(inputElemType) ){
+ } else if ( /^(url|email)$/.test(inputElemType) ) {
+ bool = inputElem.checkValidity && inputElem.checkValidity() === false;
+
+ } else if ( /^color$/.test(inputElemType) ) {
+ docElement.appendChild(inputElem);
+ docElement.offsetWidth;
+ bool = inputElem.value != smile;
+ docElement.removeChild(inputElem);
+
+ } else {
+ bool = inputElem.value != smile;
+ }
+ }
+
+ inputs[ props[i] ] = !!bool;
+ }
+ return inputs;
+ })('search tel url email datetime date month week time datetime-local number range color'.split(' '));
+ }
+ for ( var feature in tests ) {
+ if ( hasOwnProperty(tests, feature) ) {
+ featureName = feature.toLowerCase();
+ Modernizr[featureName] = tests[feature]();
+
+ classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
+ }
+ }
+
+ Modernizr.input || webforms(); setCss('');
+ modElem = inputElem = null;
+
+
+ Modernizr._version = version;
+
+ Modernizr._prefixes = prefixes;
+ Modernizr._domPrefixes = domPrefixes;
+ Modernizr._cssomPrefixes = cssomPrefixes;
+
+ Modernizr.mq = testMediaQuery;
+
+ Modernizr.hasEvent = isEventSupported;
+
+ Modernizr.testProp = function(prop){
+ return testProps([prop]);
+ };
+
+ Modernizr.testAllProps = testPropsAll;
+
+
+ Modernizr.testStyles = injectElementWithStyles;
+ return Modernizr;
+
+})(this, this.document);
+/*! HTML5 Shiv v3.4 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
+;(function(window, document) {
+
+ /** Preset options */
+ var options = window.html5 || {};
+
+ /** Used to skip problem elements */
+ var reSkip = /^<|^(?:button|form|map|select|textarea)$/i;
+
+ /** Detect whether the browser supports default html5 styles */
+ var supportsHtml5Styles;
+
+ /** Detect whether the browser supports unknown elements */
+ var supportsUnknownElements;
+
+ (function() {
+ var a = document.createElement('a');
+
+ a.innerHTML = '<xyz></xyz>';
+
+ //if the hidden property is implemented we can assume, that the browser supports HTML5 Styles
+ supportsHtml5Styles = ('hidden' in a);
+ supportsUnknownElements = a.childNodes.length == 1 || (function() {
+ // assign a false positive if unable to shiv
+ try {
+ (document.createElement)('a');
+ } catch(e) {
+ return true;
+ }
+ var frag = document.createDocumentFragment();
+ return (
+ typeof frag.cloneNode == 'undefined' ||
+ typeof frag.createDocumentFragment == 'undefined' ||
+ typeof frag.createElement == 'undefined'
+ );
+ }());
+
+ }());
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * Creates a style sheet with the given CSS text and adds it to the document.
+ * @private
+ * @param {Document} ownerDocument The document.
+ * @param {String} cssText The CSS text.
+ * @returns {StyleSheet} The style element.
+ */
+ function addStyleSheet(ownerDocument, cssText) {
+ var p = ownerDocument.createElement('p'),
+ parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
+
+ p.innerHTML = 'x<style>' + cssText + '</style>';
+ return parent.insertBefore(p.lastChild, parent.firstChild);
+ }
+
+ /**
+ * Returns the value of `html5.elements` as an array.
+ * @private
+ * @returns {Array} An array of shived element node names.
+ */
+ function getElements() {
+ var elements = html5.elements;
+ return typeof elements == 'string' ? elements.split(' ') : elements;
+ }
+
+ /**
+ * Shivs the `createElement` and `createDocumentFragment` methods of the document.
+ * @private
+ * @param {Document|DocumentFragment} ownerDocument The document.
+ */
+ function shivMethods(ownerDocument) {
+ var cache = {},
+ docCreateElement = ownerDocument.createElement,
+ docCreateFragment = ownerDocument.createDocumentFragment,
+ frag = docCreateFragment();
+
+ ownerDocument.createElement = function(nodeName) {
+ // Avoid adding some elements to fragments in IE < 9 because
+ // * Attributes like `name` or `type` cannot be set/changed once an element
+ // is inserted into a document/fragment
+ // * Link elements with `src` attributes that are inaccessible, as with
+ // a 403 response, will cause the tab/window to crash
+ // * Script elements appended to fragments will execute when their `src`
+ // or `text` property is set
+ var node = (cache[nodeName] || (cache[nodeName] = docCreateElement(nodeName))).cloneNode();
+ return html5.shivMethods && node.canHaveChildren && !reSkip.test(nodeName) ? frag.appendChild(node) : node;
+ };
+
+ ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
+ 'var n=f.cloneNode(),c=n.createElement;' +
+ 'h.shivMethods&&(' +
+ // unroll the `createElement` calls
+ getElements().join().replace(/\w+/g, function(nodeName) {
+ cache[nodeName] = docCreateElement(nodeName);
+ frag.createElement(nodeName);
+ return 'c("' + nodeName + '")';
+ }) +
+ ');return n}'
+ )(html5, frag);
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * Shivs the given document.
+ * @memberOf html5
+ * @param {Document} ownerDocument The document to shiv.
+ * @returns {Document} The shived document.
+ */
+ function shivDocument(ownerDocument) {
+ var shived;
+ if (ownerDocument.documentShived) {
+ return ownerDocument;
+ }
+ if (html5.shivCSS && !supportsHtml5Styles) {
+ shived = !!addStyleSheet(ownerDocument,
+ // corrects block display not defined in IE6/7/8/9
+ 'article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}' +
+ // corrects audio display not defined in IE6/7/8/9
+ 'audio{display:none}' +
+ // corrects canvas and video display not defined in IE6/7/8/9
+ 'canvas,video{display:inline-block;*display:inline;*zoom:1}' +
+ // corrects 'hidden' attribute and audio[controls] display not present in IE7/8/9
+ '[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}' +
+ // adds styling not present in IE6/7/8/9
+ 'mark{background:#FF0;color:#000}'
+ );
+ }
+ if (!supportsUnknownElements) {
+ shived = !shivMethods(ownerDocument);
+ }
+ if (shived) {
+ ownerDocument.documentShived = shived;
+ }
+ return ownerDocument;
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * The `html5` object is exposed so that more elements can be shived and
+ * existing shiving can be detected on iframes.
+ * @type Object
+ * @example
+ *
+ * // options can be changed before the script is included
+ * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
+ */
+ var html5 = {
+
+ /**
+ * An array or space separated string of node names of the elements to shiv.
+ * @memberOf html5
+ * @type Array|String
+ */
+ 'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video',
+
+ /**
+ * A flag to indicate that the HTML5 style sheet should be inserted.
+ * @memberOf html5
+ * @type Boolean
+ */
+ 'shivCSS': !(options.shivCSS === false),
+
+ /**
+ * A flag to indicate that the document's `createElement` and `createDocumentFragment`
+ * methods should be overwritten.
+ * @memberOf html5
+ * @type Boolean
+ */
+ 'shivMethods': !(options.shivMethods === false),
+
+ /**
+ * A string to describe the type of `html5` object ("default" or "default print").
+ * @memberOf html5
+ * @type String
+ */
+ 'type': 'default',
+
+ // shivs the document according to the specified `html5` object options
+ 'shivDocument': shivDocument
+ };
+
+ /*--------------------------------------------------------------------------*/
+
+ // expose html5
+ window.html5 = html5;
+
+ // shiv the document
+ shivDocument(document);
+
+ /*------------------------------- Print Shiv -------------------------------*/
+
+ /** Used to filter media types */
+ var reMedia = /^$|\b(?:all|print)\b/;
+
+ /** Used to namespace printable elements */
+ var shivNamespace = 'html5shiv';
+
+ /** Detect whether the browser supports shivable style sheets */
+ var supportsShivableSheets = !supportsUnknownElements && (function() {
+ // assign a false negative if unable to shiv
+ var docEl = document.documentElement;
+ return !(
+ typeof document.namespaces == 'undefined' ||
+ typeof document.parentWindow == 'undefined' ||
+ typeof docEl.applyElement == 'undefined' ||
+ typeof docEl.removeNode == 'undefined' ||
+ typeof window.attachEvent == 'undefined'
+ );
+ }());
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * Wraps all HTML5 elements in the given document with printable elements.
+ * (eg. the "header" element is wrapped with the "html5shiv:header" element)
+ * @private
+ * @param {Document} ownerDocument The document.
+ * @returns {Array} An array wrappers added.
+ */
+ function addWrappers(ownerDocument) {
+ var node,
+ nodes = ownerDocument.getElementsByTagName('*'),
+ index = nodes.length,
+ reElements = RegExp('^(?:' + getElements().join('|') + ')$', 'i'),
+ result = [];
+
+ while (index--) {
+ node = nodes[index];
+ if (reElements.test(node.nodeName)) {
+ result.push(node.applyElement(createWrapper(node)));
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Creates a printable wrapper for the given element.
+ * @private
+ * @param {Element} element The element.
+ * @returns {Element} The wrapper.
+ */
+ function createWrapper(element) {
+ var node,
+ nodes = element.attributes,
+ index = nodes.length,
+ wrapper = element.ownerDocument.createElement(shivNamespace + ':' + element.nodeName);
+
+ // copy element attributes to the wrapper
+ while (index--) {
+ node = nodes[index];
+ node.specified && wrapper.setAttribute(node.nodeName, node.nodeValue);
+ }
+ // copy element styles to the wrapper
+ wrapper.style.cssText = element.style.cssText;
+ return wrapper;
+ }
+
+ /**
+ * Shivs the given CSS text.
+ * (eg. header{} becomes html5shiv\:header{})
+ * @private
+ * @param {String} cssText The CSS text to shiv.
+ * @returns {String} The shived CSS text.
+ */
+ function shivCssText(cssText) {
+ var pair,
+ parts = cssText.split('{'),
+ index = parts.length,
+ reElements = RegExp('(^|[\\s,>+~])(' + getElements().join('|') + ')(?=[[\\s,>+~#.:]|$)', 'gi'),
+ replacement = '$1' + shivNamespace + '\\:$2';
+
+ while (index--) {
+ pair = parts[index] = parts[index].split('}');
+ pair[pair.length - 1] = pair[pair.length - 1].replace(reElements, replacement);
+ parts[index] = pair.join('}');
+ }
+ return parts.join('{');
+ }
+
+ /**
+ * Removes the given wrappers, leaving the original elements.
+ * @private
+ * @params {Array} wrappers An array of printable wrappers.
+ */
+ function removeWrappers(wrappers) {
+ var index = wrappers.length;
+ while (index--) {
+ wrappers[index].removeNode();
+ }
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ /**
+ * Shivs the given document for print.
+ * @memberOf html5
+ * @param {Document} ownerDocument The document to shiv.
+ * @returns {Document} The shived document.
+ */
+ function shivPrint(ownerDocument) {
+ var shivedSheet,
+ wrappers,
+ namespaces = ownerDocument.namespaces,
+ ownerWindow = ownerDocument.parentWindow;
+
+ if (!supportsShivableSheets || ownerDocument.printShived) {
+ return ownerDocument;
+ }
+ if (typeof namespaces[shivNamespace] == 'undefined') {
+ namespaces.add(shivNamespace);
+ }
+
+ ownerWindow.attachEvent('onbeforeprint', function() {
+ var imports,
+ length,
+ sheet,
+ collection = ownerDocument.styleSheets,
+ cssText = [],
+ index = collection.length,
+ sheets = Array(index);
+
+ // convert styleSheets collection to an array
+ while (index--) {
+ sheets[index] = collection[index];
+ }
+ // concat all style sheet CSS text
+ while ((sheet = sheets.pop())) {
+ // IE does not enforce a same origin policy for external style sheets
+ if (!sheet.disabled && reMedia.test(sheet.media)) {
+ for (imports = sheet.imports, index = 0, length = imports.length; index < length; index++) {
+ sheets.push(imports[index]);
+ }
+ try {
+ cssText.push(sheet.cssText);
+ } catch(er){}
+ }
+ }
+ // wrap all HTML5 elements with printable elements and add the shived style sheet
+ cssText = shivCssText(cssText.reverse().join(''));
+ wrappers = addWrappers(ownerDocument);
+ shivedSheet = addStyleSheet(ownerDocument, cssText);
+ });
+
+ ownerWindow.attachEvent('onafterprint', function() {
+ // remove wrappers, leaving the original elements, and remove the shived style sheet
+ removeWrappers(wrappers);
+ shivedSheet.removeNode(true);
+ });
+
+ ownerDocument.printShived = true;
+ return ownerDocument;
+ }
+
+ /*--------------------------------------------------------------------------*/
+
+ // expose API
+ html5.type += ' print';
+ html5.shivPrint = shivPrint;
+
+ // shiv for print
+ shivPrint(document);
+
+}(this, document));/*yepnope1.5.3|WTFPL*/
+(function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}})(this,document);
+Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));};
+;
\ No newline at end of file diff --git a/view/theme/dispy/js/modernizr.custom.2.5.3.min.js b/view/theme/dispy/js/modernizr.custom.2.5.3.min.js new file mode 100644 index 000000000..1ce20bdb8 --- /dev/null +++ b/view/theme/dispy/js/modernizr.custom.2.5.3.min.js @@ -0,0 +1,4 @@ +/* Modernizr 2.5.3 (Custom Build) | MIT & BSD
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-printshiv-mq-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;window.Modernizr=function(a,b,c){function C(a){i.cssText=a}function D(a,b){return C(m.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a)if(i[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.substr(1),e=(a+" "+o.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),H(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)t[c[d]]=c[d]in j;return t.list&&(t.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,g,h,i=a.length;d<i;d++)j.setAttribute("type",g=a[d]),e=j.type!=="text",e&&(j.value=k,j.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(g)&&j.style.WebkitAppearance!==c?(f.appendChild(j),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(j,null).WebkitAppearance!=="textfield"&&j.offsetHeight!==0,f.removeChild(j)):/^(search|tel)$/.test(g)||(/^(url|email)$/.test(g)?e=j.checkValidity&&j.checkValidity()===!1:/^color$/.test(g)?(f.appendChild(j),f.offsetWidth,e=j.value!=k,f.removeChild(j)):e=j.value!=k)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.5.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j=b.createElement("input"),k=":)",l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=u.slice,w,x=function(a,c,d,e){var h,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),k.appendChild(j);return h=["­","<style>",a,"</style>"].join(""),k.id=g,(l?k:m).innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},y=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return x("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=v.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(v.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(v.call(arguments)))};return e});var J=function(c,d){var f=c.join(""),g=d.length;x(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch||(j.touch&&j.touch.offsetTop)===9,e.csstransforms3d=(j.csstransforms3d&&j.csstransforms3d.offsetLeft)===9&&j.csstransforms3d.offsetHeight===3,e.generatedcontent=(j.generatedcontent&&j.generatedcontent.offsetHeight)>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",m.join("touch-enabled),("),g,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",m.join("transform-3d),("),g,")","{#csstransforms3d{left:9px;position:absolute;height:3px;}}"].join(""),['#generatedcontent:after{content:"',k,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){return I("flexOrder")},r["flexbox-legacy"]=function(){return I("boxDirection")},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){return!!a.openDatabase},r.indexedDB=function(){return!!I("indexedDB",a)},r.hashchange=function(){return z("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},r.websockets=function(){for(var b=-1,c=o.length;++b<c;)if(a[o[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(i.backgroundColor,"rgba")},r.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(i.backgroundColor,"rgba")||F(i.backgroundColor,"hsla")},r.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(i.background)},r.backgroundsize=function(){return I("backgroundSize")},r.borderimage=function(){return I("borderImage")},r.borderradius=function(){return I("borderRadius")},r.boxshadow=function(){return I("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){return D("opacity:.55"),/^0.55$/.test(i.opacity)},r.cssanimations=function(){return I("animationName")},r.csscolumns=function(){return I("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+m.join(c+a)).slice(0,-a.length)),F(i.backgroundImage,"gradient")},r.cssreflections=function(){return I("boxReflect")},r.csstransforms=function(){return!!I("transform")},r.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in f.style&&(a=e.csstransforms3d),a},r.csstransitions=function(){return I("transition")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},r.localstorage=function(){try{return localStorage.setItem(g,g),localStorage.removeItem(g),!0}catch(a){return!1}},r.sessionstorage=function(){try{return sessionStorage.setItem(g,g),sessionStorage.removeItem(g),!0}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(l.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(l.call(b.createElementNS(q.svg,"clipPath")))};for(var L in r)B(r,L)&&(w=L.toLowerCase(),e[w]=r[L](),u.push((e[w]?"":"no-")+w));return e.input||K(),C(""),h=j=null,e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.mq=y,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=x,e}(this,this.document),function(a,b){function g(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}function o(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+h().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(p(b)));return f}function p(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(m+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function q(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+h().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+m+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function r(a){var b=a.length;while(b--)a[b].removeNode()}function s(a){var b,c,d=a.namespaces,e=a.parentWindow;return!n||a.printShived?a:(typeof d[m]=="undefined"&&d.add(m),e.attachEvent("onbeforeprint",function(){var d,e,f,h=a.styleSheets,i=[],j=h.length,k=Array(j);while(j--)k[j]=h[j];while(f=k.pop())if(!f.disabled&&l.test(f.media)){for(d=f.imports,j=0,e=d.length;j<e;j++)k.push(d[j]);try{i.push(f.cssText)}catch(m){}}i=q(i.reverse().join("")),c=o(a),b=g(a,i)}),e.attachEvent("onafterprint",function(){r(c),b.removeNode(!0)}),a.printShived=!0,a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea)$/i,e,f;(function(){var a=b.createElement("a");a.innerHTML="<xyz></xyz>",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b);var l=/^$|\b(?:all|print)\b/,m="html5shiv",n=!f&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();k.type+=" print",k.shivPrint=s,s(b)}(this,document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,i){var j=b(a),l=j.autoCallback;j.url.split(".").pop().split("?").shift(),j.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]||h),j.instead?j.instead(a,e,f,g,i):(y[j.url]?j.noexec=!0:y[j.url]=1,f.load(j.url,j.forceCSS||!j.forceJS&&"css"==j.url.split(".").pop().split("?").shift()?"c":c,j.noexec,j.attrs,j.timeout),(d(e)||d(l))&&f.load(function(){k(),e&&e(j.origUrl,i,g),l&&l(j.origUrl,i,g),y[j.url]=2})))}function i(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var j,l,m=this.yepnope.loader;if(e(a))g(a,0,m,0);else if(w(a))for(j=0;j<a.length;j++)l=a[j],e(l)?g(l,0,m,0):w(l)?B(l):Object(l)===l&&i(l,m);else Object(a)===a&&i(a,m)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less new file mode 100644 index 000000000..35a539acc --- /dev/null +++ b/view/theme/dispy/light/_base.less @@ -0,0 +1,101 @@ +//* +//* _base.less +//* +//* + +//* backgrounds */ +@dk_bg_colour: #1d1f1d; +@bg_colour: #2e2f2e; +@bg_alt_colour: #2e302e; +@med_bg_colour: #4e4f4f; +@menu_bg_colour: #555753; + + +//* font colour, aka color: */ +@lt_main_colour: #ffff99; +@main_colour: #eeeecc; +@main_alt_colour: #eeeeee; +@disabled_colour: #ddddbb; +@shiny_colour: #2e3436; + +@lt_main_colour: lighten(@bg_colour, 10%); +@dk_main_colour: darken(@bg_colour, 10%); + +//* links */ +@link_colour: #88a9d2; +@dk_link_colour: darken(@link_colour, 10%); +@lt_link_colour: lighten(@link_colour, 10%); +//@hover_colour: #729fcf; +@hover_colour: darken(@link_colour, 10%); + +//* box shadows */ +@menu_shadow: 5px 0 10px 0 #111; +@main_shadow: 3px 3px 3px 10px 0 #111; + +// default here is @main_shadow +.box_shadow(@h: 5px, @v: 5px, @blur: 5px, @spread: 0px, @colour: #111) { + -moz-box-shadow: @h @v @blur @spread @colour; + -o-box-shadow: @h @v @blur @spread @colour; + -webkit-box-shadow: @h @v @blur @spread @colour; + -ms-box-shadow: @h @v @blur @spread @colour; + box-shadow: @h @v @blur @spread @colour; +} + +//* text-shadow */ +.text_shadow (@h: 1px, @v: 1px, @c: #111) { + -moz-text-shadow: @h @v @c; + -o-text-shadow: @h @v @c; + -webkit-text-shadow: @h @v @c; + -ms-text-shadow: @h @v @c; + text-shadow: @h @v @c; +} +//* transitions */ +.transition (@type: all, @dur: 0.5s, @effect: ease-in-out) { + -webkit-transition: @arguments; + -moz-transition: @arguments; + -o-transition: @arguments; + -ms-transition: @arguments; + transition: @arguments; +} + +//* borders */ +.borders (@size: 1px, @style: solid, @colour: @main_colour) { + border: @size @style @colour; +} + +//* rounded box corners */ +.rounded_corners (@r: 5px) { + -o-border-radius: @r; + -webkit-border-radius: @r; + -moz-border-radius: @r; + -ms-border-radius: @r; + border-radius: @r; +} + +//* pre wrap */ +.wrap () { + white-space: pre-wrap; + white-space: pre; + word-wrap: break-word; +} +//* font size sizing */ +.default_font_size () { + font-size: 16px; + line-height: 1.1em; + font-family: sans-serif; +} + +//* reset ul, ol */ +.list_reset () { + margin: 0px; + padding: 0px; + list-style: none; + list-style-position: inside; +} + +//* box size: width, height */ +.box (@w: 20px, @h: 20px) { + width: @w; + height: @h; +} + diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl index f14ea7915..cf0054a67 100644 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -2,7 +2,7 @@ {{ if $profile.edit }} <div class="action"> - <span class="icon-profile-edit"></span> + <span class="icon-profile-edit" rel="#profiles-menu"></span> <a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a> <ul id="profiles-menu" class="menu-popup"> {{ for $profile.menu.entries as $e }} diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 1598220b8..eb7073268 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -22,6 +22,8 @@ function dispy_init(&$a) { $cssFile = null; $colour = false; $colour = get_pconfig(local_user(), "dispy", "colour"); + $baseurl = $a->get_baseurl($ssl_state); + if ($colour === false) { $colour = "light"; } if ($colour == "light") { $colour_path = "/light/"; @@ -39,6 +41,7 @@ function dispy_init(&$a) { } $a->page['htmlhead'] .= <<<EOT + <script type="text/javascript" src="$baseurl/view/theme/dispy/js/modernizr.custom.2.5.3.min.js"></script> <script type="text/javascript"> $(document).ready(function() { $('.group-edit-icon').hover( |
