diff options
Diffstat (limited to 'view')
34 files changed, 943 insertions, 492 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 45cf76fb6..606e47838 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -110,3 +110,9 @@ nav .navbar-collapse { } /* nav overrides end */ + +.dropdown-menu img { + width: 32px; + height: 32px; + margin-right: 5px; +} diff --git a/view/css/choklet.css b/view/css/choklet.css new file mode 100644 index 000000000..e5e0240f5 --- /dev/null +++ b/view/css/choklet.css @@ -0,0 +1,53 @@ +header #banner { + position: fixed; + top: 0; + width: 250px; + margin-left: auto; + margin-right: auto; +} + +#blog-banner { + position: relative; + margin-top: 75px; + width: 100%; + margin-bottom: 20px; +} + +nav.navbar { + width: 100%; + margin-left: 0; + margin-right: 0; +} + +aside#region_1 { + display: block; + min-width: 210px; + max-width: 220px; + width: 20%; + float: left; + margin-left: 10px; +} + +aside input[type='text'] { + width: 174px; +} + + +section { + margin-left: 15px; + margin-right: 15px; + float: left; + min-width: 400px; + width: 70%; + display: block; + padding-bottom: 350px; +} + +#region_3 { + display: none; +} + +#blog-margin { + margin-right: 0; + margin-left: 0; +} diff --git a/view/css/choklet_edgesthree.css b/view/css/choklet_edgesthree.css new file mode 100644 index 000000000..ad4b4e29c --- /dev/null +++ b/view/css/choklet_edgesthree.css @@ -0,0 +1,55 @@ +header #banner { + position: fixed; + top: 0; + width: 250px; + margin-left: auto; + margin-right: auto; +} +#blog-banner { + position: relative; + margin-top: 75px; + width: 100%; + margin-bottom: 20px; +} + +nav.navbar { + width: 90%; + margin-left: 5%; + margin-right: 5%; +} + +aside#region_1 { + display: block; + min-width: 210px; + max-width: 220px; + width: 20%; + float: left; + margin-left: 10px; +} + +aside input[type='text'] { + width: 174px; +} + + +section { + margin-left: 15px; + margin-right: 15px; + float: left; + min-width: 650px; + width: 60%; + display: block; + padding-bottom: 350px; +} + +#region_3 { + float: right; + min-width: 210px; + max-width: 220px; + width: 20%; +} + +#blog-margin { + margin-right: 5%; + margin-left: 5%; +}
\ No newline at end of file diff --git a/view/css/choklet_edgestwo.css b/view/css/choklet_edgestwo.css new file mode 100644 index 000000000..57d02679e --- /dev/null +++ b/view/css/choklet_edgestwo.css @@ -0,0 +1,53 @@ +header #banner { + position: fixed; + top: 0; + width: 250px; + margin-left: auto; + margin-right: auto; +} +#blog-banner { + position: relative; + margin-top: 75px; + width: 100%; + margin-bottom: 20px; +} + +nav.navbar { + width: 90%; + margin-left: 5%; + margin-right: 5%; +} + +aside#region_1 { + display: block; + min-width: 210px; + max-width: 220px; + width: 20%; + float: left; + margin-left: 10px; +} + +aside input[type='text'] { + width: 174px; +} + + +section { + margin-left: 15px; + margin-right: 15px; + float: left; + min-width: 400px; + width: 70%; + display: block; + padding-bottom: 350px; +} + +#region_3 { + display: none; +} + + +#blog-margin { + margin-right: 5%; + margin-left: 5%; +}
\ No newline at end of file diff --git a/view/css/choklet_full.css b/view/css/choklet_full.css new file mode 100644 index 000000000..883bb1ed3 --- /dev/null +++ b/view/css/choklet_full.css @@ -0,0 +1,49 @@ +#blog-banner { + position: relative; + margin-top: 45px; + width: 100%; + height: 100px; + margin-bottom: 20px; +} + +nav.navbar { + width: 90%; + margin-left: 5%; + margin-right: 5%; +} + +aside#region_1 { + display: block; + min-width: 210px; + max-width: 220px; + width: 20%; + float: left; + margin-left: 10px; +} + +aside input[type='text'] { + width: 174px; +} + + +section { + margin-left: 15px; + margin-right: 15px; + float: left; + min-width: 650px; + width: 60%; + display: block; + padding-bottom: 350px; +} + +#region_3 { + float: right; + min-width: 210px; + max-width: 220px; + width: 20%; +} + +#blog-margin { + margin-right: 5%; + margin-left: 5%; +}
\ No newline at end of file diff --git a/view/css/choklet_three.css b/view/css/choklet_three.css new file mode 100644 index 000000000..5bbff0e3b --- /dev/null +++ b/view/css/choklet_three.css @@ -0,0 +1,51 @@ +header #banner { + position: fixed; + top: 0; + width: 250px; + margin-left: auto; + margin-right: auto; +} +#blog-banner { + position: relative; + margin-top: 75px; + width: 100%; + margin-bottom: 20px; +} + +nav.navbar { + width: 100%; + margin-left: 0; + margin-right: 0; +} + +aside#region_1 { + display: block; + min-width: 210px; + max-width: 220px; + width: 20%; + float: left; + margin-left: 10px; +} + +aside input[type='text'] { + width: 174px; +} + + +section { + margin-left: 15px; + margin-right: 15px; + float: left; + min-width: 650px; + width: 60%; + display: block; + padding-bottom: 350px; +} + +#region_3 { + float: right; + min-width: 210px; + max-width: 220px; + width: 20%; +} + diff --git a/view/css/conversation.css b/view/css/conversation.css index 3396863e7..325303559 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -306,7 +306,6 @@ .like-rotator { float: left; margin: 8px; - color: $toolicon_colour; } .wall-item-delete-wrapper { diff --git a/view/css/default.css b/view/css/default.css index 4afcbf1d5..eeeb3d7cf 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -1,3 +1,11 @@ +header #banner { + position: fixed; + top: 0; + width: 250px; + margin-left: auto; + margin-right: auto; +} + aside#region_1 { display: block; width: 210px; diff --git a/view/css/full.css b/view/css/full.css index 2e710df1d..38864925f 100644 --- a/view/css/full.css +++ b/view/css/full.css @@ -1,3 +1,10 @@ +header #banner { + position: fixed; + top: 0; + width: 250px; + margin-left: auto; + margin-right: auto; +} nav { height: 24px; diff --git a/view/css/mod_viewconnections.css b/view/css/mod_viewconnections.css new file mode 100644 index 000000000..56add4cac --- /dev/null +++ b/view/css/mod_viewconnections.css @@ -0,0 +1,33 @@ + + +.contact-entry-wrapper { + float: left; + width: 120px; + height: 120px; + padding: 10px; +} + +#contacts-search { + font-size: 1em; + width: 300px; +} + +#contacts-search-end { + margin-bottom: 10px; +} + +.contact-entry-photo-end { + clear: both; +} + +.contact-entry-name { + float: left; + margin-left: 0px; + margin-right: 10px; + width: 120px; + overflow: hidden; +} + +.contact-entry-end { + clear: both; +} diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js index 45deef05b..930d3b265 100644 --- a/view/js/icon_translate.js +++ b/view/js/icon_translate.js @@ -53,4 +53,5 @@ $(document).ready(function() { $('.icon-circle').addClass(''); $('.icon-bookmark').addClass(''); $('.icon-fullscreen').addClass(''); + $('.icon-share').addClass(''); });
\ No newline at end of file diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl index dde8830ee..6cbc0c0e4 100644 --- a/view/pdl/mod_channel.pdl +++ b/view/pdl/mod_channel.pdl @@ -4,3 +4,4 @@ [widget=categories][/widget] [widget=tagcloud_wall][var=limit]24[/var][/widget] [/region] + diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl index 6b1d2a15e..cdc66dd3d 100644 --- a/view/pdl/mod_chat.pdl +++ b/view/pdl/mod_chat.pdl @@ -1,3 +1,5 @@ [region=aside] [widget=profile][/widget] +[widget=bookmarkedchats][/widget] +[widget=suggestedchats][/widget] [/region] diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index 7624ace01..11cadb5aa 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -12,4 +12,5 @@ [region=content] [widget=affinity][/widget] $content -[/region]
\ No newline at end of file +[/region] + diff --git a/view/pdl/mod_new_channel.pdl b/view/pdl/mod_new_channel.pdl index 733bc248a..90026f7fe 100644 --- a/view/pdl/mod_new_channel.pdl +++ b/view/pdl/mod_new_channel.pdl @@ -1 +1 @@ -[layout]full[/layout] +[template]full[/template] diff --git a/view/pdl/mod_register.pdl b/view/pdl/mod_register.pdl index 733bc248a..90026f7fe 100644 --- a/view/pdl/mod_register.pdl +++ b/view/pdl/mod_register.pdl @@ -1 +1 @@ -[layout]full[/layout] +[template]full[/template] diff --git a/view/php/choklet.php b/view/php/choklet.php new file mode 100644 index 000000000..fcfaf7804 --- /dev/null +++ b/view/php/choklet.php @@ -0,0 +1,24 @@ +<!DOCTYPE html >
+<html>
+<head>
+ <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+ <div id="blog-margin">
+ <header><?php if(x($page,'header')) echo $page['header']; ?></header>
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+ <div id="blog-banner"><?php if(x($page,'banner')) echo $page['banner']; ?></div>
+ <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+ <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="page-footer"></div>
+ <div id="pause"></div>
+ </section>
+ <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
+ <div class="clear"></div>
+ <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+ </div>
+</body>
+</html>
+
diff --git a/view/php/default.php b/view/php/default.php index 3573bf829..fd29ef3db 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -6,7 +6,8 @@ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
- <?php if(x($page,'nav')) echo $page['nav']; ?>
+ <header><?php if(x($page,'header')) echo $page['header']; ?></header>
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
diff --git a/view/php/full.php b/view/php/full.php index d8643d5a1..99653c06d 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -6,7 +6,8 @@ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> </head> <body> - <nav><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <header><?php if(x($page,'header')) echo $page['header']; ?></header> + <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <section><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> diff --git a/view/php/theme_init.php b/view/php/theme_init.php index b6aa5de0f..45eb2fc1d 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -2,8 +2,6 @@ require_once('include/plugin.php'); -head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); -head_add_css('library/bootstrap/css/bootstrap.min.css'); head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); @@ -11,13 +9,10 @@ head_add_css('library/jslider/css/jslider.css'); head_add_css('library/colorbox/colorbox.css'); head_add_css('view/css/conversation.css'); -head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); -head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); + head_add_js('jquery.js'); -head_add_js('library/bootstrap/js/bootstrap.min.js'); -head_add_js('library/bootstrap/js/bootbox.min.js'); head_add_js('jquery-migrate-1.1.1.js'); //head_add_js('jquery-compat.js'); head_add_js('spin.js'); @@ -42,8 +37,6 @@ head_add_js('crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); -head_add_js('library/bootstrap-datetimepicker/js/moment.js'); -head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); /** * Those who require this feature will know what to do with it. diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po index 74288b429..1a9fc7b70 100644 --- a/view/pt-br/messages.po +++ b/view/pt-br/messages.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-21 00:03-0800\n" -"PO-Revision-Date: 2014-02-24 17:27+0000\n" +"POT-Creation-Date: 2014-02-28 00:02-0800\n" +"PO-Revision-Date: 2014-03-01 05:55+0000\n" "Last-Translator: solstag <solstag@member.fsf.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/red-matrix/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgid "Categories" msgstr "Categorias" #: ../../include/widgets.php:115 ../../include/widgets.php:155 -#: ../../include/Contact.php:107 ../../include/identity.php:632 +#: ../../include/Contact.php:107 ../../include/identity.php:643 #: ../../mod/directory.php:184 ../../mod/match.php:62 #: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51 msgid "Connect" @@ -70,7 +70,8 @@ msgid "Notes" msgstr "Notas" #: ../../include/widgets.php:173 ../../include/text.php:759 -#: ../../include/text.php:773 ../../mod/filer.php:36 +#: ../../include/text.php:773 ../../mod/filer.php:36 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 msgid "Save" msgstr "Salvar" @@ -191,6 +192,14 @@ msgstr "Nova mensagem" msgid "Chat Rooms" msgstr "Salas de bate-papo" +#: ../../include/widgets.php:603 +msgid "Bookmarked Chatrooms" +msgstr "Salas de bate-papo guardadas" + +#: ../../include/widgets.php:621 +msgid "Suggested Chatrooms" +msgstr "Salas de bate-papo sugeridas" + #: ../../include/acl_selectors.php:235 msgid "Visible to everybody" msgstr "Visível para todos" @@ -339,7 +348,7 @@ msgstr "Registrar" msgid "Create an account" msgstr "Criar uma conta" -#: ../../include/nav.php:134 ../../mod/help.php:60 ../../mod/help.php:64 +#: ../../include/nav.php:134 ../../mod/help.php:60 ../../mod/help.php:65 msgid "Help" msgstr "Ajuda" @@ -1246,7 +1255,7 @@ msgstr "Início:" msgid "Finishes:" msgstr "Fim:" -#: ../../include/event.php:40 ../../include/identity.php:683 +#: ../../include/event.php:40 ../../include/identity.php:694 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462 #: ../../mod/directory.php:157 ../../mod/dirprofile.php:111 msgid "Location:" @@ -1306,95 +1315,103 @@ msgid "show fewer" msgstr "exibir menos" #: ../../include/js_strings.php:9 +msgid "+ Show More" +msgstr "+ Exibir Mais" + +#: ../../include/js_strings.php:10 +msgid "- Show Less" +msgstr "- Exibir Menos" + +#: ../../include/js_strings.php:11 msgid "Password too short" msgstr "A senha é muito curta" -#: ../../include/js_strings.php:10 +#: ../../include/js_strings.php:12 msgid "Passwords do not match" msgstr "As senhas não correspondem" -#: ../../include/js_strings.php:11 ../../mod/photos.php:39 +#: ../../include/js_strings.php:13 ../../mod/photos.php:39 msgid "everybody" msgstr "todos" -#: ../../include/js_strings.php:12 +#: ../../include/js_strings.php:14 msgid "Secret Passphrase" msgstr "Frase secreta" -#: ../../include/js_strings.php:13 +#: ../../include/js_strings.php:15 msgid "Passphrase hint" msgstr "Dica da frase secreta" -#: ../../include/js_strings.php:15 +#: ../../include/js_strings.php:17 msgid "timeago.prefixAgo" msgstr "timeago.prefixAgo" -#: ../../include/js_strings.php:16 -msgid "timeago.suffixAgo" -msgstr "timeago.suffixAgo" +#: ../../include/js_strings.php:18 +msgid "timeago.prefixFromNow" +msgstr "timeago.prefixFromNow" -#: ../../include/js_strings.php:17 +#: ../../include/js_strings.php:19 msgid "ago" msgstr "atrás" -#: ../../include/js_strings.php:18 +#: ../../include/js_strings.php:20 msgid "from now" msgstr "de agora" -#: ../../include/js_strings.php:19 +#: ../../include/js_strings.php:21 msgid "less than a minute" msgstr "menos de um minuto" -#: ../../include/js_strings.php:20 +#: ../../include/js_strings.php:22 msgid "about a minute" msgstr "aproximadamente um minuto" -#: ../../include/js_strings.php:21 +#: ../../include/js_strings.php:23 #, php-format msgid "%d minutes" msgstr "%d minutos" -#: ../../include/js_strings.php:22 +#: ../../include/js_strings.php:24 msgid "about an hour" msgstr "aproximadamente uma hora" -#: ../../include/js_strings.php:23 +#: ../../include/js_strings.php:25 #, php-format msgid "about %d hours" msgstr "aproximadamente %d horas" -#: ../../include/js_strings.php:24 +#: ../../include/js_strings.php:26 msgid "a day" msgstr "um dia" -#: ../../include/js_strings.php:25 +#: ../../include/js_strings.php:27 #, php-format msgid "%d days" msgstr "%d dias" -#: ../../include/js_strings.php:26 +#: ../../include/js_strings.php:28 msgid "about a month" msgstr "aproximadamente um mês" -#: ../../include/js_strings.php:27 +#: ../../include/js_strings.php:29 #, php-format msgid "%d months" msgstr "%d meses" -#: ../../include/js_strings.php:28 +#: ../../include/js_strings.php:30 msgid "about a year" msgstr "aproximadamente um ano" -#: ../../include/js_strings.php:29 +#: ../../include/js_strings.php:31 #, php-format msgid "%d years" msgstr "%d anos" -#: ../../include/js_strings.php:30 +#: ../../include/js_strings.php:32 msgid " " msgstr " " -#: ../../include/js_strings.php:31 +#: ../../include/js_strings.php:33 msgid "timeago.numbers" msgstr "timeago.numbers" @@ -1429,15 +1446,15 @@ msgstr "Fotos do perfil" #: ../../include/photos.php:15 ../../include/items.php:3575 #: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247 #: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/settings.php:493 ../../mod/menu.php:44 +#: ../../mod/invite.php:104 ../../mod/settings.php:492 ../../mod/menu.php:44 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 #: ../../mod/bookmarks.php:46 ../../mod/item.php:182 ../../mod/item.php:190 -#: ../../mod/chat.php:87 ../../mod/chat.php:92 +#: ../../mod/chat.php:89 ../../mod/chat.php:94 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9 #: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13 #: ../../mod/connedit.php:182 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80 +#: ../../mod/layouts.php:39 ../../mod/page.php:30 ../../mod/page.php:80 #: ../../mod/network.php:12 ../../mod/profiles.php:152 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 @@ -1516,7 +1533,7 @@ msgstr "mkdir falhou." msgid "database storage failed." msgstr "armazenamento de banco de dados falhou." -#: ../../include/bookmarks.php:31 +#: ../../include/bookmarks.php:42 #, php-format msgid "%1$s's bookmarks" msgstr "Links guardados de %1$s" @@ -1555,7 +1572,7 @@ msgid "Select" msgstr "Selecionar" #: ../../include/conversation.php:632 ../../include/ItemObject.php:108 -#: ../../mod/thing.php:236 ../../mod/settings.php:579 ../../mod/group.php:176 +#: ../../mod/thing.php:236 ../../mod/settings.php:578 ../../mod/group.php:176 #: ../../mod/admin.php:746 ../../mod/connedit.php:359 #: ../../mod/filestorage.php:171 ../../mod/photos.php:1044 msgid "Delete" @@ -1858,8 +1875,8 @@ msgstr "Encriptar texto" msgid "OK" msgstr "Ok" -#: ../../include/conversation.php:1150 ../../mod/settings.php:517 -#: ../../mod/settings.php:543 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../include/conversation.php:1150 ../../mod/settings.php:516 +#: ../../mod/settings.php:542 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 #: ../../mod/editpost.php:152 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 msgid "Cancel" @@ -1991,10 +2008,6 @@ msgstr "Perfil padrão" msgid "Requested channel is not available." msgstr "Canal solicitado não está disponível." -#: ../../include/identity.php:493 -msgid " Sorry, you don't have the permission to view this profile. " -msgstr "Desculpe, você não tem permissão para ver este perfil." - #: ../../include/identity.php:528 ../../mod/webpages.php:8 #: ../../mod/connect.php:13 ../../mod/layouts.php:8 #: ../../mod/achievements.php:8 ../../mod/blocks.php:10 @@ -2002,190 +2015,194 @@ msgstr "Desculpe, você não tem permissão para ver este perfil." msgid "Requested profile is not available." msgstr "O perfil solicitado não está disponível." -#: ../../include/identity.php:646 ../../mod/profiles.php:603 +#: ../../include/identity.php:580 +msgid " Sorry, you don't have the permission to view this profile. " +msgstr "Desculpe, você não tem permissão para ver este perfil." + +#: ../../include/identity.php:657 ../../mod/profiles.php:603 msgid "Change profile photo" msgstr "Mudar a foto do perfil" -#: ../../include/identity.php:652 +#: ../../include/identity.php:663 msgid "Profiles" msgstr "Perfis" -#: ../../include/identity.php:652 +#: ../../include/identity.php:663 msgid "Manage/edit profiles" msgstr "Administrar/editar perfis" -#: ../../include/identity.php:653 ../../mod/profiles.php:604 +#: ../../include/identity.php:664 ../../mod/profiles.php:604 msgid "Create New Profile" msgstr "Criar um novo perfil" -#: ../../include/identity.php:656 +#: ../../include/identity.php:667 msgid "Edit Profile" msgstr "Editar perfil" -#: ../../include/identity.php:667 ../../mod/profiles.php:615 +#: ../../include/identity.php:678 ../../mod/profiles.php:615 msgid "Profile Image" msgstr "Imagem do perfil" -#: ../../include/identity.php:670 ../../mod/profiles.php:618 +#: ../../include/identity.php:681 ../../mod/profiles.php:618 msgid "visible to everybody" msgstr "visível para todos" -#: ../../include/identity.php:671 ../../mod/profiles.php:619 +#: ../../include/identity.php:682 ../../mod/profiles.php:619 msgid "Edit visibility" msgstr "Editar a visibilidade" -#: ../../include/identity.php:685 ../../include/identity.php:912 +#: ../../include/identity.php:696 ../../include/identity.php:923 #: ../../mod/directory.php:159 msgid "Gender:" msgstr "Gênero:" -#: ../../include/identity.php:686 ../../include/identity.php:932 +#: ../../include/identity.php:697 ../../include/identity.php:943 #: ../../mod/directory.php:161 msgid "Status:" msgstr "Situação:" -#: ../../include/identity.php:687 ../../include/identity.php:943 +#: ../../include/identity.php:698 ../../include/identity.php:954 #: ../../mod/directory.php:163 msgid "Homepage:" msgstr "Página web:" -#: ../../include/identity.php:688 ../../mod/dirprofile.php:157 +#: ../../include/identity.php:699 ../../mod/dirprofile.php:157 msgid "Online Now" msgstr "Online agora" -#: ../../include/identity.php:756 ../../include/identity.php:836 +#: ../../include/identity.php:767 ../../include/identity.php:847 #: ../../mod/ping.php:262 msgid "g A l F d" msgstr "G l d F" -#: ../../include/identity.php:757 ../../include/identity.php:837 +#: ../../include/identity.php:768 ../../include/identity.php:848 msgid "F d" msgstr "F d" -#: ../../include/identity.php:802 ../../include/identity.php:877 +#: ../../include/identity.php:813 ../../include/identity.php:888 #: ../../mod/ping.php:284 msgid "[today]" msgstr "[hoje]" -#: ../../include/identity.php:814 +#: ../../include/identity.php:825 msgid "Birthday Reminders" msgstr "Lembres de aniversário" -#: ../../include/identity.php:815 +#: ../../include/identity.php:826 msgid "Birthdays this week:" msgstr "Aniversários nesta semana:" -#: ../../include/identity.php:870 +#: ../../include/identity.php:881 msgid "[No description]" msgstr "[Sem descrição]" -#: ../../include/identity.php:888 +#: ../../include/identity.php:899 msgid "Event Reminders" msgstr "Lembretes de eventos" -#: ../../include/identity.php:889 +#: ../../include/identity.php:900 msgid "Events this week:" msgstr "Eventos nesta semana:" -#: ../../include/identity.php:902 ../../include/identity.php:986 +#: ../../include/identity.php:913 ../../include/identity.php:997 #: ../../mod/profperm.php:107 msgid "Profile" msgstr "Perfil" -#: ../../include/identity.php:910 ../../mod/settings.php:937 +#: ../../include/identity.php:921 ../../mod/settings.php:936 msgid "Full Name:" msgstr "Nome completo:" -#: ../../include/identity.php:917 +#: ../../include/identity.php:928 msgid "j F, Y" msgstr "j de F, Y" -#: ../../include/identity.php:918 +#: ../../include/identity.php:929 msgid "j F" msgstr "j de F" -#: ../../include/identity.php:925 +#: ../../include/identity.php:936 msgid "Birthday:" msgstr "Aniversário:" -#: ../../include/identity.php:929 +#: ../../include/identity.php:940 msgid "Age:" msgstr "Idade:" -#: ../../include/identity.php:938 +#: ../../include/identity.php:949 #, php-format msgid "for %1$d %2$s" msgstr "para %1$d %2$s" -#: ../../include/identity.php:941 ../../mod/profiles.php:526 +#: ../../include/identity.php:952 ../../mod/profiles.php:526 msgid "Sexual Preference:" msgstr "Preferência sexual:" -#: ../../include/identity.php:945 ../../mod/profiles.php:528 +#: ../../include/identity.php:956 ../../mod/profiles.php:528 msgid "Hometown:" msgstr "Cidade natal:" -#: ../../include/identity.php:947 +#: ../../include/identity.php:958 msgid "Tags:" msgstr "Etiquetas:" -#: ../../include/identity.php:949 ../../mod/profiles.php:529 +#: ../../include/identity.php:960 ../../mod/profiles.php:529 msgid "Political Views:" msgstr "Posição política:" -#: ../../include/identity.php:951 +#: ../../include/identity.php:962 msgid "Religion:" msgstr "Religião:" -#: ../../include/identity.php:953 ../../mod/directory.php:165 +#: ../../include/identity.php:964 ../../mod/directory.php:165 msgid "About:" msgstr "Sobre:" -#: ../../include/identity.php:955 +#: ../../include/identity.php:966 msgid "Hobbies/Interests:" msgstr "Hobbies/Interesses:" -#: ../../include/identity.php:957 ../../mod/profiles.php:532 +#: ../../include/identity.php:968 ../../mod/profiles.php:532 msgid "Likes:" msgstr "Gosta de:" -#: ../../include/identity.php:959 ../../mod/profiles.php:533 +#: ../../include/identity.php:970 ../../mod/profiles.php:533 msgid "Dislikes:" msgstr "Não gosta de:" -#: ../../include/identity.php:962 +#: ../../include/identity.php:973 msgid "Contact information and Social Networks:" msgstr "Informações de contato e redes sociais:" -#: ../../include/identity.php:964 +#: ../../include/identity.php:975 msgid "My other channels:" msgstr "Meus outros canais:" -#: ../../include/identity.php:966 +#: ../../include/identity.php:977 msgid "Musical interests:" msgstr "Interesses musicais:" -#: ../../include/identity.php:968 +#: ../../include/identity.php:979 msgid "Books, literature:" msgstr "Livros, literatura:" -#: ../../include/identity.php:970 +#: ../../include/identity.php:981 msgid "Television:" msgstr "Televisão:" -#: ../../include/identity.php:972 +#: ../../include/identity.php:983 msgid "Film/dance/culture/entertainment:" msgstr "Filmes/dança/cultura/entretenimento:" -#: ../../include/identity.php:974 +#: ../../include/identity.php:985 msgid "Love/Romance:" msgstr "Amor/romance:" -#: ../../include/identity.php:976 +#: ../../include/identity.php:987 msgid "Work/employment:" msgstr "Trabalho/emprego:" -#: ../../include/identity.php:978 +#: ../../include/identity.php:989 msgid "School/education:" msgstr "Escola/educação:" @@ -2194,9 +2211,9 @@ msgid "Private Message" msgstr "Mensagem privada" #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8 -#: ../../include/menu.php:41 ../../mod/thing.php:235 -#: ../../mod/settings.php:578 ../../mod/menu.php:59 ../../mod/webpages.php:118 -#: ../../mod/editpost.php:112 ../../mod/layouts.php:102 +#: ../../include/menu.php:42 ../../mod/thing.php:235 +#: ../../mod/settings.php:577 ../../mod/menu.php:59 ../../mod/webpages.php:118 +#: ../../mod/editpost.php:112 ../../mod/layouts.php:97 #: ../../mod/editlayout.php:106 ../../mod/blocks.php:93 #: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120 #: ../../mod/filestorage.php:170 @@ -2290,10 +2307,10 @@ msgstr "Este(a) é você" #: ../../include/ItemObject.php:548 ../../mod/events.php:469 #: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156 -#: ../../mod/settings.php:516 ../../mod/settings.php:628 -#: ../../mod/settings.php:656 ../../mod/settings.php:680 -#: ../../mod/settings.php:752 ../../mod/settings.php:929 -#: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92 +#: ../../mod/settings.php:515 ../../mod/settings.php:627 +#: ../../mod/settings.php:655 ../../mod/settings.php:679 +#: ../../mod/settings.php:751 ../../mod/settings.php:928 +#: ../../mod/chat.php:174 ../../mod/chat.php:206 ../../mod/connect.php:92 #: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:739 #: ../../mod/admin.php:879 ../../mod/admin.php:1078 ../../mod/admin.php:1165 #: ../../mod/connedit.php:437 ../../mod/profiles.php:506 @@ -2303,8 +2320,8 @@ msgstr "Este(a) é você" #: ../../mod/filestorage.php:131 ../../mod/photos.php:566 #: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994 #: ../../mod/photos.php:1081 ../../mod/mood.php:142 -#: ../../view/theme/redbasic/php/config.php:95 -#: ../../view/theme/apw/php/config.php:231 +#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/apw/php/config.php:247 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/blogga/php/config.php:67 msgid "Submit" @@ -2639,15 +2656,15 @@ msgstr "gosta" msgid "dislikes" msgstr "desgosta" -#: ../../include/auth.php:76 +#: ../../include/auth.php:79 msgid "Logged out." msgstr "Você saiu." -#: ../../include/auth.php:188 +#: ../../include/auth.php:197 msgid "Failed authentication" msgstr "Não foi possível autenticar" -#: ../../include/auth.php:203 ../../mod/openid.php:185 +#: ../../include/auth.php:212 ../../mod/openid.php:186 msgid "Login failed." msgstr "Não foi possível entrar." @@ -2948,7 +2965,7 @@ msgstr "Não foi possível armazenar a foto." msgid "Upload New Photos" msgstr "Enviar novas fotos" -#: ../../include/reddav.php:1061 +#: ../../include/reddav.php:1063 msgid "Edit File properties" msgstr "Editar propriedades do arquivo" @@ -3039,13 +3056,13 @@ msgstr "a conta local não foi encontrada." msgid "Cannot connect to yourself." msgstr "Não é possível conectar-se consigo mesmo." -#: ../../include/security.php:291 +#: ../../include/security.php:294 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "O token de segurança do formulário não estava correto. Isso provavelmente aconteceu porque o formulário ficou aberto por muito tempo (>3 horas) antes da sua submissão." -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:64 +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:66 #: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "Default" @@ -3148,9 +3165,9 @@ msgstr "Extremamente avançado. Não mexa nisso a não ser que saiba o que está msgid "Permission denied" msgstr "Permissão negada" -#: ../../include/items.php:756 ../../mod/connedit.php:395 -msgid "Unknown" -msgstr "Desconhecidos" +#: ../../include/items.php:756 +msgid "(Unknown)" +msgstr "(Desconhecido)" #: ../../include/items.php:3513 ../../mod/thing.php:78 ../../mod/admin.php:151 #: ../../mod/admin.php:783 ../../mod/admin.php:986 ../../mod/viewsrc.php:18 @@ -3420,7 +3437,7 @@ msgstr "O nome é obrigatório" msgid "Key and Secret are required" msgstr "A chave e o segredo são obrigatórios" -#: ../../mod/settings.php:79 ../../mod/settings.php:542 +#: ../../mod/settings.php:79 ../../mod/settings.php:541 msgid "Update" msgstr "Atualizar" @@ -3452,404 +3469,404 @@ msgstr "Endereço de e-mail protegido. Não é possível mudar para esse e-mail. msgid "System failure storing new email. Please try again." msgstr "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente." -#: ../../mod/settings.php:444 +#: ../../mod/settings.php:443 msgid "Settings updated." msgstr "As configurações foram atualizadas." -#: ../../mod/settings.php:515 ../../mod/settings.php:541 -#: ../../mod/settings.php:577 +#: ../../mod/settings.php:514 ../../mod/settings.php:540 +#: ../../mod/settings.php:576 msgid "Add application" msgstr "Adicionar aplicação" -#: ../../mod/settings.php:518 ../../mod/settings.php:544 +#: ../../mod/settings.php:517 ../../mod/settings.php:543 msgid "Name" msgstr "Nome" -#: ../../mod/settings.php:518 +#: ../../mod/settings.php:517 msgid "Name of application" msgstr "Nome da aplicação" -#: ../../mod/settings.php:519 ../../mod/settings.php:545 +#: ../../mod/settings.php:518 ../../mod/settings.php:544 msgid "Consumer Key" msgstr "Chave de consumidor" -#: ../../mod/settings.php:519 ../../mod/settings.php:520 +#: ../../mod/settings.php:518 ../../mod/settings.php:519 msgid "Automatically generated - change if desired. Max length 20" msgstr "Gerado automaticamente - troque se desejável. Comprimento máximo 20" -#: ../../mod/settings.php:520 ../../mod/settings.php:546 +#: ../../mod/settings.php:519 ../../mod/settings.php:545 msgid "Consumer Secret" msgstr "Segredo de consumidor" -#: ../../mod/settings.php:521 ../../mod/settings.php:547 +#: ../../mod/settings.php:520 ../../mod/settings.php:546 msgid "Redirect" msgstr "Redirecionamento" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:520 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:521 ../../mod/settings.php:547 msgid "Icon url" msgstr "URL do ícone" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:521 msgid "Optional" msgstr "Opcional" -#: ../../mod/settings.php:533 +#: ../../mod/settings.php:532 msgid "You can't edit this application." msgstr "Você não pode editar esta aplicação." -#: ../../mod/settings.php:576 +#: ../../mod/settings.php:575 msgid "Connected Apps" msgstr "Aplicações conectadas" -#: ../../mod/settings.php:580 +#: ../../mod/settings.php:579 msgid "Client key starts with" msgstr "Chave do cliente começa com" -#: ../../mod/settings.php:581 +#: ../../mod/settings.php:580 msgid "No name" msgstr "Sem nome" -#: ../../mod/settings.php:582 +#: ../../mod/settings.php:581 msgid "Remove authorization" msgstr "Remover autorização" -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:592 msgid "No feature settings configured" msgstr "Não foi definida nenhuma configuração do recurso" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:600 msgid "Feature Settings" msgstr "Configurações do recurso" -#: ../../mod/settings.php:624 +#: ../../mod/settings.php:623 msgid "Account Settings" msgstr "Configurações da conta" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:624 msgid "Password Settings" msgstr "Configurações da senha" -#: ../../mod/settings.php:626 +#: ../../mod/settings.php:625 msgid "New Password:" msgstr "Nova senha:" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:626 msgid "Confirm:" msgstr "Confirme:" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:626 msgid "Leave password fields blank unless changing" msgstr "Deixe os campos de senha em branco, a não ser que você queira alterá-la" -#: ../../mod/settings.php:629 ../../mod/settings.php:938 +#: ../../mod/settings.php:628 ../../mod/settings.php:937 msgid "Email Address:" msgstr "Endereço de e-mail:" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:629 msgid "Remove Account" msgstr "Remover conta" -#: ../../mod/settings.php:631 +#: ../../mod/settings.php:630 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Atenção: Esta ação é permanente e não pode ser revertida." -#: ../../mod/settings.php:647 +#: ../../mod/settings.php:646 msgid "Off" msgstr "Desligado" -#: ../../mod/settings.php:647 +#: ../../mod/settings.php:646 msgid "On" msgstr "Ligado" -#: ../../mod/settings.php:654 +#: ../../mod/settings.php:653 msgid "Additional Features" msgstr "Recursos adicionais" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:678 msgid "Connector Settings" msgstr "Configurações do conector" -#: ../../mod/settings.php:709 ../../mod/admin.php:379 +#: ../../mod/settings.php:708 ../../mod/admin.php:379 msgid "No special theme for mobile devices" msgstr "Sem tema especial para aparelhos móveis" -#: ../../mod/settings.php:750 +#: ../../mod/settings.php:749 msgid "Display Settings" msgstr "Configurações de exibição" -#: ../../mod/settings.php:756 +#: ../../mod/settings.php:755 msgid "Display Theme:" msgstr "Tema do perfil:" -#: ../../mod/settings.php:757 +#: ../../mod/settings.php:756 msgid "Mobile Theme:" msgstr "Tema móvel:" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:757 msgid "Update browser every xx seconds" msgstr "Atualizar navegador a cada xx segundos" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:757 msgid "Minimum of 10 seconds, no maximum" msgstr "Mínimo de 10 segundos, sem máximo" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:758 msgid "Maximum number of conversations to load at any time:" msgstr "Número máximo permitido de conversas carregadas:" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:758 msgid "Maximum of 100 items" msgstr "Máximo de 100 itens" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:759 msgid "Don't show emoticons" msgstr "Não exibir emoticons" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:760 msgid "Do not view remote profiles in frames" msgstr "Não exibir perfis remotos em frames" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:760 msgid "By default open in a sub-window of your own site" msgstr "Por padrão, abrir em uma sub-janela do seu próprio site" -#: ../../mod/settings.php:796 +#: ../../mod/settings.php:795 msgid "Nobody except yourself" msgstr "Ninguém exceto você mesmo" -#: ../../mod/settings.php:797 +#: ../../mod/settings.php:796 msgid "Only those you specifically allow" msgstr "Apenas quem você der permissão" -#: ../../mod/settings.php:798 +#: ../../mod/settings.php:797 msgid "Anybody in your address book" msgstr "Qualquer um nos seus contatos" -#: ../../mod/settings.php:799 +#: ../../mod/settings.php:798 msgid "Anybody on this website" msgstr "Qualquer um neste site" -#: ../../mod/settings.php:800 +#: ../../mod/settings.php:799 msgid "Anybody in this network" msgstr "Qualquer um nesta rede" -#: ../../mod/settings.php:801 +#: ../../mod/settings.php:800 msgid "Anybody authenticated" msgstr "Qualquer um autenticado" -#: ../../mod/settings.php:802 +#: ../../mod/settings.php:801 msgid "Anybody on the internet" msgstr "Qualquer um na internet" -#: ../../mod/settings.php:879 +#: ../../mod/settings.php:878 msgid "Publish your default profile in the network directory" msgstr "Publicar seu perfil padrão no diretório da rede?" -#: ../../mod/settings.php:879 ../../mod/settings.php:884 -#: ../../mod/settings.php:955 ../../mod/api.php:106 ../../mod/profiles.php:484 +#: ../../mod/settings.php:878 ../../mod/settings.php:883 +#: ../../mod/settings.php:954 ../../mod/api.php:106 ../../mod/profiles.php:484 msgid "No" msgstr "Não" -#: ../../mod/settings.php:879 ../../mod/settings.php:884 -#: ../../mod/settings.php:955 ../../mod/api.php:105 ../../mod/profiles.php:483 +#: ../../mod/settings.php:878 ../../mod/settings.php:883 +#: ../../mod/settings.php:954 ../../mod/api.php:105 ../../mod/profiles.php:483 msgid "Yes" msgstr "Sim" -#: ../../mod/settings.php:884 +#: ../../mod/settings.php:883 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Permitir sugerir você como amigo potencial para outros membros?" -#: ../../mod/settings.php:888 ../../mod/profile_photo.php:288 +#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288 msgid "or" msgstr "ou" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:892 msgid "Your channel address is" msgstr "O endereço do seu canal é" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:926 msgid "Channel Settings" msgstr "Configurações do canal" -#: ../../mod/settings.php:936 +#: ../../mod/settings.php:935 msgid "Basic Settings" msgstr "Configurações básicas" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:938 msgid "Your Timezone:" msgstr "Seu fuso horário:" -#: ../../mod/settings.php:940 +#: ../../mod/settings.php:939 msgid "Default Post Location:" msgstr "Localização padrão de suas publicações:" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:940 msgid "Use Browser Location:" msgstr "Usar localizador do navegador:" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:942 msgid "Adult Content" msgstr "Conteúdo adulto" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:942 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:944 msgid "Security and Privacy Settings" msgstr "Configurações de segurança e privacidade" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:946 msgid "Hide my online presence" msgstr "Esconda minha presença online" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:946 msgid "Prevents displaying in your profile that you are online" msgstr "Previne exibir em seu perfil que você está online" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:948 msgid "Simple Privacy Settings:" msgstr "Configurações de privacidade simples:" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:949 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "Muito público - <em>extremamente permissivo (deve ser usado com cuidado)</em>" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:950 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "Típico - <em>público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)</em>" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:951 msgid "Private - <em>default private, never open or public</em>" msgstr "Privado - <em>privado por padrão, nunca aberto ou público</em>" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:952 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "Bloqueado - <em>por padrão bloquado de/para todos</em>" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:954 msgid "Allow others to tag your posts" msgstr "Permitir que outros etiquetem suas publicações" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:954 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:956 msgid "Advanced Privacy Settings" msgstr "Configurações de privacidade avançadas" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:958 msgid "Maximum Friend Requests/Day:" msgstr "Número máximo de requisições de amizade por dia:" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:958 msgid "May reduce spam activity" msgstr "Pode reduzir a frequência de spam" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:959 msgid "Default Post Permissions" msgstr "Permissões padrão de publicação" -#: ../../mod/settings.php:961 ../../mod/mitem.php:134 ../../mod/mitem.php:177 +#: ../../mod/settings.php:960 ../../mod/mitem.php:134 ../../mod/mitem.php:177 msgid "(click to open/close)" msgstr "(clique para abrir/fechar)" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:971 msgid "Maximum private messages per day from unknown people:" msgstr "Máximo número de mensagens privadas por dia de pessoas desconhecidas:" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:971 msgid "Useful to reduce spamming" msgstr "Útil para reduzir a frequência de spam" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:974 msgid "Notification Settings" msgstr "Configurações de notificação" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:975 msgid "By default post a status message when:" msgstr "Por padrão, publicar uma mensagem de status quando:" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:976 msgid "accepting a friend request" msgstr "aceitar um pedido de amizade" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:977 msgid "joining a forum/community" msgstr "associar-se a um fórum/comunidade" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:978 msgid "making an <em>interesting</em> profile change" msgstr "modificar algo <em>interessante</em> em seu perfil" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:979 msgid "Send a notification email when:" msgstr "Enviar um e-mail de notificação quando:" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:980 msgid "You receive an introduction" msgstr "Você recebeu uma apresentação" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:981 msgid "Your introductions are confirmed" msgstr "Suas solicitações forem confirmadas" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:982 msgid "Someone writes on your profile wall" msgstr "Alguém escrever no mural do seu perfil" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:983 msgid "Someone writes a followup comment" msgstr "Alguém comentou a sua mensagem" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:984 msgid "You receive a private message" msgstr "Você recebeu uma mensagem privada" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:985 msgid "You receive a friend suggestion" msgstr "Você recebe uma sugestão de amizade" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:986 msgid "You are tagged in a post" msgstr "Você é mencionado num post" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:987 msgid "You are poked/prodded/etc. in a post" msgstr "Você foi cutucado/espetado/etc. numa publicação" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:990 msgid "Advanced Account/Page Type Settings" msgstr "Configurações avançadas de conta/tipo de página" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:991 msgid "Change the behaviour of this account for special situations" msgstr "Mudar o comportamento dessa conta em situações especiais" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:994 msgid "" "Please enable expert mode (in <a href=\"settings/features\">Settings > " "Additional features</a>) to adjust!" msgstr "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:995 msgid "Miscellaneous Settings" msgstr "Configurações miscelâneas" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:997 msgid "Personal menu to display in your channel pages" msgstr "Menu pessoal para exibir nas páginas dos seus canais" @@ -3954,7 +3971,7 @@ msgstr "Modificar" msgid "Not found." msgstr "Não encontrado." -#: ../../mod/webpages.php:121 ../../mod/layouts.php:105 +#: ../../mod/webpages.php:121 ../../mod/layouts.php:100 #: ../../mod/blocks.php:96 msgid "View" msgstr "Ver" @@ -4060,31 +4077,39 @@ msgstr "alternar o mode de tela inteira" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s etiquetou %3$s de %2$s com %4$s" -#: ../../mod/chat.php:18 ../../mod/channel.php:25 +#: ../../mod/chat.php:19 ../../mod/channel.php:25 msgid "You must be logged in to see this page." msgstr "Você precisa estar autenticado para ver esta página." -#: ../../mod/chat.php:163 +#: ../../mod/chat.php:165 +msgid "Room not found" +msgstr "Sala não encontrada" + +#: ../../mod/chat.php:175 msgid "Leave Room" msgstr "Sair da sala" -#: ../../mod/chat.php:164 +#: ../../mod/chat.php:176 msgid "I am away right now" msgstr "Eu estou ausente no momento" -#: ../../mod/chat.php:165 +#: ../../mod/chat.php:177 msgid "I am online" msgstr "Eu estou online" -#: ../../mod/chat.php:189 ../../mod/chat.php:209 +#: ../../mod/chat.php:179 +msgid "Bookmark this room" +msgstr "Guarde esta sala" + +#: ../../mod/chat.php:203 ../../mod/chat.php:223 msgid "New Chatroom" msgstr "Nova sala de bate-papo" -#: ../../mod/chat.php:190 +#: ../../mod/chat.php:204 msgid "Chatroom Name" msgstr "Nome da sala de bate-papo" -#: ../../mod/chat.php:205 +#: ../../mod/chat.php:219 #, php-format msgid "%1$s's Chatrooms" msgstr "Salas de bate-papo de %1$s" @@ -4203,14 +4228,6 @@ msgstr "Adicionar" msgid "No entries." msgstr "Sem entradas." -#: ../../mod/chatsvc.php:102 -msgid "Away" -msgstr "Ausente" - -#: ../../mod/chatsvc.php:106 -msgid "Online" -msgstr "Online" - #: ../../mod/attach.php:9 msgid "Item not available." msgstr "O item não está disponível." @@ -5123,6 +5140,10 @@ msgstr "Ocultar ou deixar de ocultar esta conexão" msgid "Delete this connection" msgstr "Deletar esta conexão" +#: ../../mod/connedit.php:395 +msgid "Unknown" +msgstr "Desconhecidos" + #: ../../mod/connedit.php:405 ../../mod/connedit.php:434 msgid "Approve this connection" msgstr "Aprovar esta conexão" @@ -5294,15 +5315,15 @@ msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "Respostas/reações às suas publicações públicas <strong>podem</strong> continuar visíveis." -#: ../../mod/layouts.php:52 +#: ../../mod/layouts.php:45 msgid "Layout Help" msgstr "Ajuda de layout" -#: ../../mod/layouts.php:55 +#: ../../mod/layouts.php:48 msgid "Help with this feature" msgstr "Ajuda com este recurso" -#: ../../mod/layouts.php:74 +#: ../../mod/layouts.php:69 msgid "Layout Name" msgstr "Nome do layout" @@ -5310,11 +5331,11 @@ msgstr "Nome do layout" msgid "Help:" msgstr "Ajuda:" -#: ../../mod/help.php:68 ../../index.php:223 +#: ../../mod/help.php:69 ../../index.php:223 msgid "Not Found" msgstr "Não encontrada" -#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100 +#: ../../mod/help.php:72 ../../mod/page.php:83 ../../mod/display.php:100 #: ../../index.php:226 msgid "Page not found." msgstr "Página não encontrada." @@ -5631,7 +5652,7 @@ msgid "" " logout and retry." msgstr "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente." -#: ../../mod/post.php:256 ../../mod/openid.php:70 ../../mod/openid.php:175 +#: ../../mod/post.php:256 ../../mod/openid.php:71 ../../mod/openid.php:176 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "Bem vindo %s. Autenticação remota realizada com sucesso." @@ -6230,6 +6251,26 @@ msgstr "Endereço de e-mail" msgid "Reset" msgstr "Restaurar" +#: ../../mod/rbmark.php:88 +msgid "Select a bookmark folder" +msgstr "Escolha uma pasta de links onde guardar" + +#: ../../mod/rbmark.php:93 +msgid "Save Bookmark" +msgstr "Guardar link" + +#: ../../mod/rbmark.php:94 +msgid "URL of bookmark" +msgstr "URL do link guardado" + +#: ../../mod/rbmark.php:95 +msgid "Description" +msgstr "Descrição" + +#: ../../mod/rbmark.php:99 +msgid "Or enter new bookmark folder name" +msgstr "Ou digite o nome para uma nova pasta de links" + #: ../../mod/import.php:36 msgid "Nothing to import." msgstr "Nada a importar." @@ -6364,6 +6405,14 @@ msgstr "Nenhuma correspondência" msgid "invalid target signature" msgstr "assinatura do destino inválida" +#: ../../mod/chatsvc.php:102 +msgid "Away" +msgstr "Ausente" + +#: ../../mod/chatsvc.php:106 +msgid "Online" +msgstr "Online" + #: ../../mod/mail.php:33 msgid "Unable to lookup recipient." msgstr "Não foi possível encontrar o destinatário." @@ -7083,109 +7132,113 @@ msgstr "adicionou seu canal" msgid "posted an event" msgstr "publicou um evento" -#: ../../view/theme/redbasic/php/config.php:76 +#: ../../view/theme/redbasic/php/config.php:78 msgid "Scheme Default" msgstr "Padrão do esquema" -#: ../../view/theme/redbasic/php/config.php:87 +#: ../../view/theme/redbasic/php/config.php:89 msgid "silver" msgstr "prata" -#: ../../view/theme/redbasic/php/config.php:98 -#: ../../view/theme/apw/php/config.php:234 +#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/apw/php/config.php:250 #: ../../view/theme/blogga/view/theme/blog/config.php:69 #: ../../view/theme/blogga/php/config.php:69 msgid "Theme settings" msgstr "Configurações de tema" -#: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/apw/php/config.php:235 +#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/apw/php/config.php:251 msgid "Set scheme" msgstr "Definir esquema" -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Narrow navbar" +msgstr "Barra de navegação estreita" + +#: ../../view/theme/redbasic/php/config.php:103 msgid "Navigation bar colour" msgstr "Cor da barra de navegação" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:104 msgid "link colour" msgstr "cor dos links" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set font-colour for banner" msgstr "Definir a cor da fonte para o cartaz" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Set the background colour" msgstr "Definir a cor do pano de fundo" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Set the background image" msgstr "Definir a imagem do pano de fundo" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Set the background colour of items" msgstr "Definir a cor de fundo dos items" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Set the opacity of items" msgstr "Definir a opacidade de items" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Set the basic colour for item icons" msgstr "Definir a cor básica para ícones de itens" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Set the hover colour for item icons" msgstr "Definir a cor para ícones de itens quando que o mouse está sobre eles" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set font-size for the entire application" msgstr "Definir o tamanho da fonte para a aplicação como um todo" -#: ../../view/theme/redbasic/php/config.php:110 -#: ../../view/theme/apw/php/config.php:236 +#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/apw/php/config.php:252 msgid "Set font-size for posts and comments" msgstr "Definir o tamanho da fonte para publicações e comentários" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set font-colour for posts and comments" msgstr "Definir a cor da fonte para publicações e comentários" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set radius of corners" msgstr "Definir o raio de curvatura dos cantos" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set shadow depth of photos" msgstr "Definir a profundidade de sombra das fotos" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set maximum width of conversation regions" msgstr "Definir a largura máxima da área de conversas" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set minimum opacity of nav bar - to hide it" msgstr "Definir opacidade mínima para a barra de navegação - para escondê-la" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set size of conversation author photo" msgstr "Definir o tamanho da foto do autor da conversa" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set size of followup author photos" msgstr "Definir o tamanho da foto dos autores de comentários" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Sloppy photo albums" msgstr "Álbuns de fotos desleixados" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Are you a clean desk or a messy desk person?" msgstr "Sua mesa é do tipo limpinha ou bagunçada?" #: ../../view/theme/apw/php/config.php:193 -#: ../../view/theme/apw/php/config.php:211 +#: ../../view/theme/apw/php/config.php:227 msgid "Schema Default" msgstr "Padrão do esquema" @@ -7197,115 +7250,115 @@ msgstr "Sans-Serif" msgid "Monospace" msgstr "Monoespaçada" -#: ../../view/theme/apw/php/config.php:237 +#: ../../view/theme/apw/php/config.php:253 msgid "Set font face" msgstr "Definir a face da fonte" -#: ../../view/theme/apw/php/config.php:238 +#: ../../view/theme/apw/php/config.php:254 msgid "Set iconset" msgstr "Definir o conjunto de ícones" -#: ../../view/theme/apw/php/config.php:239 +#: ../../view/theme/apw/php/config.php:255 msgid "Set big shadow size, default 15px 15px 15px" msgstr "Definir o tamanho da sombra grande, padrão 15px 15px 15px" -#: ../../view/theme/apw/php/config.php:240 +#: ../../view/theme/apw/php/config.php:256 msgid "Set small shadow size, default 5px 5px 5px" msgstr "Definir o tamanho da sombra pequena, padrão 5px 5px 5px" -#: ../../view/theme/apw/php/config.php:241 +#: ../../view/theme/apw/php/config.php:257 msgid "Set shadow colour, default #000" msgstr "Definir a cor da sombra, padrão #000" -#: ../../view/theme/apw/php/config.php:242 +#: ../../view/theme/apw/php/config.php:258 msgid "Set radius size, default 5px" msgstr "Definir o tamanho do raio de curvatura, padrão 5px" -#: ../../view/theme/apw/php/config.php:243 +#: ../../view/theme/apw/php/config.php:259 msgid "Set line-height for posts and comments" msgstr "Definir a altura da linha para publicações e comentários" -#: ../../view/theme/apw/php/config.php:244 +#: ../../view/theme/apw/php/config.php:260 msgid "Set background image" msgstr "Definir a imagem do pano de fundo" -#: ../../view/theme/apw/php/config.php:245 +#: ../../view/theme/apw/php/config.php:261 msgid "Set background colour" msgstr "Definir a cor do pano de fundo" -#: ../../view/theme/apw/php/config.php:246 +#: ../../view/theme/apw/php/config.php:262 msgid "Set section background image" msgstr "Definir a imagem de fundo de seção" -#: ../../view/theme/apw/php/config.php:247 +#: ../../view/theme/apw/php/config.php:263 msgid "Set section background colour" msgstr "Definir a cor de fundo de seção" -#: ../../view/theme/apw/php/config.php:248 +#: ../../view/theme/apw/php/config.php:264 msgid "Set colour of items - use hex" msgstr "Definir a cor dos itens - use hex" -#: ../../view/theme/apw/php/config.php:249 +#: ../../view/theme/apw/php/config.php:265 msgid "Set colour of links - use hex" msgstr "Definir a cor dos links - use hex" -#: ../../view/theme/apw/php/config.php:250 +#: ../../view/theme/apw/php/config.php:266 msgid "Set max-width for items. Default 400px" msgstr "Definir a largura máxima para itens. Padrão 400px" -#: ../../view/theme/apw/php/config.php:251 +#: ../../view/theme/apw/php/config.php:267 msgid "Set min-width for items. Default 240px" msgstr "Definir a largura mínima para itens. Padrão 240px" -#: ../../view/theme/apw/php/config.php:252 +#: ../../view/theme/apw/php/config.php:268 msgid "Set the generic content wrapper width. Default 48%" msgstr "Definir a largura do envólucro para conteúdo genérico. Padrão 48%" -#: ../../view/theme/apw/php/config.php:253 +#: ../../view/theme/apw/php/config.php:269 msgid "Set colour of fonts - use hex" msgstr "Definir a cor das fontes - use hex" -#: ../../view/theme/apw/php/config.php:254 +#: ../../view/theme/apw/php/config.php:270 msgid "Set background-size element" msgstr "Definir o elemento <em>background-size</em>" -#: ../../view/theme/apw/php/config.php:255 +#: ../../view/theme/apw/php/config.php:271 msgid "Item opacity" msgstr "Opacidade de itens" -#: ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/apw/php/config.php:272 msgid "Display post previews only" msgstr "Exibir apenas a pré-visualização de publicações" -#: ../../view/theme/apw/php/config.php:257 +#: ../../view/theme/apw/php/config.php:273 msgid "Display side bar on channel page" msgstr "Exibir a barra lateral na página do canal" -#: ../../view/theme/apw/php/config.php:258 +#: ../../view/theme/apw/php/config.php:274 msgid "Colour of the navigation bar" msgstr "Cor da barra de navegação" -#: ../../view/theme/apw/php/config.php:259 +#: ../../view/theme/apw/php/config.php:275 msgid "Item float" msgstr "Flutuação de item" -#: ../../view/theme/apw/php/config.php:260 +#: ../../view/theme/apw/php/config.php:276 msgid "Left offset of the section element" msgstr "Deslocamento esquerdo do elemento de seção" -#: ../../view/theme/apw/php/config.php:261 +#: ../../view/theme/apw/php/config.php:277 msgid "Right offset of the section element" msgstr "Deslocamento direito do elemento de seção" -#: ../../view/theme/apw/php/config.php:262 +#: ../../view/theme/apw/php/config.php:278 msgid "Section width" msgstr "largura de seção" -#: ../../view/theme/apw/php/config.php:263 +#: ../../view/theme/apw/php/config.php:279 msgid "Left offset of the aside" msgstr "Deslocamento esquerdo do aparte" -#: ../../view/theme/apw/php/config.php:264 +#: ../../view/theme/apw/php/config.php:280 msgid "Right offset of the aside element" msgstr "Deslocamento direito do aparte" @@ -7359,6 +7412,6 @@ msgstr "permissão negada" msgid "Got Zot?" msgstr "Já tem Zot?" -#: ../../boot.php:1906 +#: ../../boot.php:1920 msgid "toggle mobile" msgstr "alternar para interface móvel" diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php index c1c127e61..439d6db9f 100644 --- a/view/pt-br/strings.php +++ b/view/pt-br/strings.php @@ -43,6 +43,8 @@ $a->strings["Settings"] = "Configurações"; $a->strings["Check Mail"] = "Checar mensagens"; $a->strings["New Message"] = "Nova mensagem"; $a->strings["Chat Rooms"] = "Salas de bate-papo"; +$a->strings["Bookmarked Chatrooms"] = "Salas de bate-papo guardadas"; +$a->strings["Suggested Chatrooms"] = "Salas de bate-papo sugeridas"; $a->strings["Visible to everybody"] = "Visível para todos"; $a->strings["show"] = "exibir"; $a->strings["don't show"] = "não exibir"; @@ -315,13 +317,15 @@ $a->strings["Delete this item?"] = "Excluir este item?"; $a->strings["Comment"] = "Comentar"; $a->strings["show more"] = "exibir mais"; $a->strings["show fewer"] = "exibir menos"; +$a->strings["+ Show More"] = "+ Exibir Mais"; +$a->strings["- Show Less"] = "- Exibir Menos"; $a->strings["Password too short"] = "A senha é muito curta"; $a->strings["Passwords do not match"] = "As senhas não correspondem"; $a->strings["everybody"] = "todos"; $a->strings["Secret Passphrase"] = "Frase secreta"; $a->strings["Passphrase hint"] = "Dica da frase secreta"; $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo"; +$a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; $a->strings["ago"] = "atrás"; $a->strings["from now"] = "de agora"; $a->strings["less than a minute"] = "menos de um minuto"; @@ -469,8 +473,8 @@ $a->strings["Nickname has unsupported characters or is already being used on thi $a->strings["Unable to retrieve created identity"] = "Não foi possível recuperar a identidade criada"; $a->strings["Default Profile"] = "Perfil padrão"; $a->strings["Requested channel is not available."] = "Canal solicitado não está disponível."; -$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Desculpe, você não tem permissão para ver este perfil."; $a->strings["Requested profile is not available."] = "O perfil solicitado não está disponível."; +$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Desculpe, você não tem permissão para ver este perfil."; $a->strings["Change profile photo"] = "Mudar a foto do perfil"; $a->strings["Profiles"] = "Perfis"; $a->strings["Manage/edit profiles"] = "Administrar/editar perfis"; @@ -744,7 +748,7 @@ $a->strings["Can send me bookmarks"] = "Pode me enviar links guardados"; $a->strings["Can administer my channel resources"] = "Pode administrar os recursos do meu canal"; $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremamente avançado. Não mexa nisso a não ser que saiba o que está fazendo"; $a->strings["Permission denied"] = "Permissão negada"; -$a->strings["Unknown"] = "Desconhecidos"; +$a->strings["(Unknown)"] = "(Desconhecido)"; $a->strings["Item not found."] = "O item não foi encontrado."; $a->strings["Collection not found."] = "A coleção não foi encontrada."; $a->strings["Collection is empty."] = "A coleção está vazia."; @@ -965,9 +969,11 @@ $a->strings["Channel not found."] = "O canal não foi encontrado."; $a->strings["toggle full screen mode"] = "alternar o mode de tela inteira"; $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s etiquetou %3\$s de %2\$s com %4\$s"; $a->strings["You must be logged in to see this page."] = "Você precisa estar autenticado para ver esta página."; +$a->strings["Room not found"] = "Sala não encontrada"; $a->strings["Leave Room"] = "Sair da sala"; $a->strings["I am away right now"] = "Eu estou ausente no momento"; $a->strings["I am online"] = "Eu estou online"; +$a->strings["Bookmark this room"] = "Guarde esta sala"; $a->strings["New Chatroom"] = "Nova sala de bate-papo"; $a->strings["Chatroom Name"] = "Nome da sala de bate-papo"; $a->strings["%1\$s's Chatrooms"] = "Salas de bate-papo de %1\$s"; @@ -996,8 +1002,6 @@ $a->strings["Existing Page Delegates"] = "Atuais delegados da página"; $a->strings["Potential Delegates"] = "Potenciais delegados"; $a->strings["Add"] = "Adicionar"; $a->strings["No entries."] = "Sem entradas."; -$a->strings["Away"] = "Ausente"; -$a->strings["Online"] = "Online"; $a->strings["Item not available."] = "O item não está disponível."; $a->strings["Menu element updated."] = "O elemento de menu foi atualizado."; $a->strings["Unable to update menu element."] = "Não foi possível atualizar o elemento de menu."; @@ -1217,6 +1221,7 @@ $a->strings["Unhide"] = "Não ocultar"; $a->strings["Hide"] = "Ocultar"; $a->strings["Hide or Unhide this connection"] = "Ocultar ou deixar de ocultar esta conexão"; $a->strings["Delete this connection"] = "Deletar esta conexão"; +$a->strings["Unknown"] = "Desconhecidos"; $a->strings["Approve this connection"] = "Aprovar esta conexão"; $a->strings["Accept connection to allow communication"] = "Aceite a conexão para permitir comunicação"; $a->strings["Automatic Permissions Settings"] = "Configurações de permissão automáticas"; @@ -1467,6 +1472,11 @@ $a->strings["Forgot your Password?"] = "Esqueceu a sua senha?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções."; $a->strings["Email Address"] = "Endereço de e-mail"; $a->strings["Reset"] = "Restaurar"; +$a->strings["Select a bookmark folder"] = "Escolha uma pasta de links onde guardar"; +$a->strings["Save Bookmark"] = "Guardar link"; +$a->strings["URL of bookmark"] = "URL do link guardado"; +$a->strings["Description"] = "Descrição"; +$a->strings["Or enter new bookmark folder name"] = "Ou digite o nome para uma nova pasta de links"; $a->strings["Nothing to import."] = "Nada a importar."; $a->strings["Unable to download data from old server"] = "Não foi possível descarregar os dados do servidor antigo"; $a->strings["Imported file is empty."] = "O arquivo importado está vazio."; @@ -1498,6 +1508,8 @@ $a->strings["No keywords to match. Please add keywords to your default profile." $a->strings["is interested in:"] = "se interessa por:"; $a->strings["No matches"] = "Nenhuma correspondência"; $a->strings["invalid target signature"] = "assinatura do destino inválida"; +$a->strings["Away"] = "Ausente"; +$a->strings["Online"] = "Online"; $a->strings["Unable to lookup recipient."] = "Não foi possível encontrar o destinatário."; $a->strings["Unable to communicate with requested channel."] = "Não foi possível comunicar com o canal solicitado."; $a->strings["Cannot verify requested channel."] = "Não foi possível verificar o canal requisitado."; @@ -1674,6 +1686,7 @@ $a->strings["Scheme Default"] = "Padrão do esquema"; $a->strings["silver"] = "prata"; $a->strings["Theme settings"] = "Configurações de tema"; $a->strings["Set scheme"] = "Definir esquema"; +$a->strings["Narrow navbar"] = "Barra de navegação estreita"; $a->strings["Navigation bar colour"] = "Cor da barra de navegação"; $a->strings["link colour"] = "cor dos links"; $a->strings["Set font-colour for banner"] = "Definir a cor da fonte para o cartaz"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2402e514e..ab2bd1b3d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -74,6 +74,10 @@ input[type="submit"] { text-decoration: none; } +pre code { + border: none; +} + code { font-family: Courier, monospace; display: block; @@ -429,6 +433,11 @@ footer { text-decoration: none; } +.vcard .dropdown-menu { + position: absolute; + left: 200px; + top: 18px; +} #profile-extra-links { clear: both; @@ -445,9 +454,7 @@ footer { margin-top: 5px; } -.profile-edit-side-div { - float: right; -} + .profile-edit-side-link { opacity: 0.3; filter:alpha(opacity=30); @@ -488,72 +495,6 @@ footer { padding: 12px; } -#profiles-menu.menu-popup { - left: 200px; - right: auto; - top: 22px; -} - -ul.menu-popup { - position: absolute; - display: none; - width: 10em; - background: #0080FF; - color: #eec; - padding: 0px; - list-style: none; -/* border-radius: 0px 0px 20px 20px; */ - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - display: block; - color: #FFFFFF; - padding: 5px 10px; - text-decoration: none; -} - - -ul.menu-popup a:hover { - background-color: #888888; - color: #FFFFFF; -} -ul.menu-popup .menu-sep { - border-top: 1px solid #9eabb0; -} -ul.menu-popup li { - float: none; - overflow: auto; - height: auto; - display: block; -} -ul.menu-popup li img { - float: left; - width: 16px; - height: 16px; - padding-right: 5px; -} -ul.menu-popup .empty { - padding: 5px; - text-align: center; - color: #9eabb0; -} -ul.menu-popup .toolbar { - background-color: #9eabb0; - height: auto; - overflow: auto; -} -ul.menu-popup .toolbar a { - float: right; -} -ul.menu-popup .toolbar a:hover { - background-color: #ffffff; -} - - - #profile-in-dir-yes-label, #profile-in-dir-no-label, #profile-in-netdir-yes-label, @@ -793,6 +734,24 @@ ul.menu-popup .toolbar a:hover { } +.pmenu.horizontal { + padding: 0 0 0 0; + border-bottom: none; +} + +.pmenu.horizontal .pmenu-title { + display: none; +} +.pmenu.horizontal ul { + -moz-padding-start: 0; +} + +.pmenu.horizontal li { + margin-left: 0; + display: inline; + padding-right: 15px; +} + #settings-default-perms-menu { margin-top: 15px; margin-bottom: 15px; @@ -807,7 +766,7 @@ ul.menu-popup .toolbar a:hover { display: block; color: #FFFFFF; margin-top: 15px; - background-color: $nav_bg_2; + background-color: $nav_bg; -webkit-border-radius: $radiuspx ; -moz-border-radius: $radiuspx; border-radius: $radiuspx; @@ -896,7 +855,7 @@ ul.menu-popup .toolbar a:hover { #nav-search-spinner { float: left; margin: 25px 0px 0px 25px; - color: #fff; + color: $nav_active_icon_colour; } #nav-search-text:hover, @@ -910,7 +869,7 @@ ul.menu-popup .toolbar a:hover { margin: 15px; padding: 0px 5px 0px 5px; border-radius: 10px; - border: none; + border-color: $nav_bd; background-color: $search_background; transition: background-color 300ms ease 0s; } @@ -1549,7 +1508,7 @@ div.jGrowl div.info { #nav-search-text-ac .autocomplete { position: fixed; top: 51px; - border: 1px solid #222; + border: 1px solid $nav_bd; border-top: none; } @@ -2242,6 +2201,7 @@ img.mail-list-sender-photo { } /* nav bootstrap */ + nav i { font-size: 14px; } @@ -2269,7 +2229,62 @@ nav .dropdown-menu { border-bottom-left-radius: $radiuspx; } +#usermenu-caret { + color: $nav_icon_colour; +} + +#avatar:hover + #usermenu-caret { + color: $nav_active_icon_colour; +} + /* bootstrap overrides */ blockquote { font-size: $body_font_size; } + +.dropdown-menu { + font-size: $body_font_size; + border-radius: $radiuspx; +} + +.dropdown-menu img { + border-radius: $radiuspx; +} + +.navbar-inverse { + background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); + background-image: linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_gradient_top, endColorstr=$nav_gradient_bottom, GradientType=0); + background-color: $nav_bg; + border-color: $nav_bd; +} + +.navbar-inverse .navbar-nav > .active > a { + background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%); + background-image: linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_active_gradient_top, endColorstr=$nav_active_gradient_bottom, GradientType=0); +} + + +.navbar-inverse .navbar-nav > li > a { + color: $nav_icon_colour; + text-shadow: 0px 0px 0px; +} + +.navbar-inverse .navbar-nav > li > a:hover, +.navbar-inverse .navbar-nav > li > a:focus { + color: $nav_active_icon_colour; +} + +.navbar-inverse .navbar-nav > .active > a, +.navbar-inverse .navbar-nav > .active > a:hover, +.navbar-inverse .navbar-nav > .active > a:focus { + color: $nav_active_icon_colour; +} + +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus { + background-color: $nav_bd; + color: $nav_active_icon_colour; +} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 2235a9742..608a9bda7 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -7,7 +7,14 @@ function theme_content(&$a) { $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); - $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['nav_bg'] = get_pconfig(local_user(),'redbasic', 'nav_bg' ); + $arr['nav_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_top' ); + $arr['nav_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_bottom' ); + $arr['nav_active_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_active_gradient_top' ); + $arr['nav_active_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_active_gradient_bottom' ); + $arr['nav_bd'] = get_pconfig(local_user(),'redbasic', 'nav_bd' ); + $arr['nav_icon_colour'] = get_pconfig(local_user(),'redbasic', 'nav_icon_colour' ); + $arr['nav_active_icon_colour'] = get_pconfig(local_user(),'redbasic', 'nav_active_icon_colour' ); $arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' ); $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); @@ -35,7 +42,14 @@ function theme_post(&$a) { if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); set_pconfig(local_user(), 'redbasic', 'narrow_navbar', $_POST['redbasic_narrow_navbar']); - set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); + set_pconfig(local_user(), 'redbasic', 'nav_bg', $_POST['redbasic_nav_bg']); + set_pconfig(local_user(), 'redbasic', 'nav_gradient_top', $_POST['redbasic_nav_gradient_top']); + set_pconfig(local_user(), 'redbasic', 'nav_gradient_bottom', $_POST['redbasic_nav_gradient_bottom']); + set_pconfig(local_user(), 'redbasic', 'nav_active_gradient_top', $_POST['redbasic_nav_active_gradient_top']); + set_pconfig(local_user(), 'redbasic', 'nav_active_gradient_bottom', $_POST['redbasic_nav_active_gradient_bottom']); + set_pconfig(local_user(), 'redbasic', 'nav_bd', $_POST['redbasic_nav_bd']); + set_pconfig(local_user(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']); + set_pconfig(local_user(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']); set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); @@ -60,8 +74,6 @@ function theme_post(&$a) { function redbasic_form(&$a, $arr) { - - $scheme_choices = array(); $scheme_choices["---"] = t("Default"); $files = glob('view/theme/redbasic/schema/*.php'); @@ -72,22 +84,6 @@ function redbasic_form(&$a, $arr) { $scheme_choices[$f] = $scheme_name; } } - - - $nav_colours = array ( - '' => t('Scheme Default'), - 'red' => 'red', - 'pink' => 'pink', - 'green' => 'green', - 'blue' => 'blue', - 'purple' => 'purple', - 'black' => 'black', - 'orange' => 'orange', - 'brown' => 'brown', - 'grey' => 'grey', - 'gold' => 'gold', - 'silver' => t('silver'), - ); if(feature_enabled(local_user(),'expert')) $expert = 1; @@ -100,7 +96,14 @@ if(feature_enabled(local_user(),'expert')) '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']), - '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background colour'), $arr['nav_bg']), + '$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top colour'), $arr['nav_gradient_top']), + '$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom colour'), $arr['nav_gradient_bottom']), + '$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top colour'), $arr['nav_active_gradient_top']), + '$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom colour'), $arr['nav_active_gradient_bottom']), + '$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border colour '), $arr['nav_bd']), + '$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon colour '), $arr['nav_icon_colour']), + '$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon colour '), $arr['nav_active_icon_colour']), '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 901d06af7..4bb852a40 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -7,13 +7,15 @@ if(! $a->install) { if($uid) load_pconfig($uid,'redbasic'); -// Nav colours are mess. Set $nav_colour as a single word for the sake of letting folk pick one -// but it actually consists of at least two colours to form a gradient - $nav_bg_1 and $nav_bg_2 -// A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme -// wants to implement that - $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); - // Load the owners pconfig + $nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); + $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); + $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); + $nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top"); + $nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom"); + $nav_bd = get_pconfig($uid, "redbasic", "nav_bd"); + $nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour"); + $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $link_colour = get_pconfig($uid, "redbasic", "link_colour"); @@ -37,10 +39,16 @@ if(! $a->install) { } -// Now load the scheme. If a value is changed above, we'll keep the settings -// If not, we'll keep those defined by the schema -// Setting $scheme to '' wasn't working for some reason, so we'll check it's -// not --- like the mobile theme does instead. + // Now load the scheme. If a value is changed above, we'll keep the settings + // If not, we'll keep those defined by the schema + // Setting $schema to '' wasn't working for some reason, so we'll check it's + // not --- like the mobile theme does instead. + + + // Allow layouts to over-ride the schema + + if($_REQUEST['schema']) + $schema = $_REQUEST['schema']; if (($schema) && ($schema != '---')) { // Check it exists, because this setting gets distributed to clones @@ -62,17 +70,28 @@ if(! $a->install) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. - if (! $nav_colour) { - $nav_colour = "red"; - $nav_bg_1 = "#f88"; - $nav_bg_2 = "#b00"; - $nav_bg_3 = "#f00"; - $nav_bg_4 = "#b00"; - } + if (! $nav_bg) + $nav_bg = "#222"; + if (! $nav_gradient_top) + $nav_gradient_top = "#3c3c3c"; + if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#222"; + if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#222"; + if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#282828"; + if (! $nav_bd) + $nav_bd = "#080808"; + if (! $nav_icon_colour) + $nav_icon_colour = "#999"; + if (! $nav_active_icon_colour) + $nav_active_icon_colour = "#fff"; if (! $link_colour) $link_colour = "#0080FF"; if (! $banner_colour) - $banner_colour = "fff"; + $banner_colour = "#fff"; + if (! $search_background) + $search_background = "#eee"; if (! $bgcolour) $bgcolour = "#fdfdfd"; if (! $background_image) @@ -117,70 +136,20 @@ if(! $a->install) { $nav_float_min_opacity = (float) $nav_min_opacity; $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; } - -// Nav colours have nested values, so we have to define the actual variables -// used in the CSS from the higher level "red", "black", etc here - if ($nav_colour == "red") { - $nav_bg_1 = $nav_bg_3 = "#ba002f"; - $nav_bg_2 = $nav_bg_4 = "#ad002c"; - $search_background = "#EEEEEE"; - $active_colour = '#444444'; - } - - if ($nav_colour == "black") { - $nav_bg_1 = $nav_bg_3 = "#000"; - $nav_bg_2 = $nav_bg_4 = "#222"; - $search_background = '#EEEEEE'; - $active_colour = '#AAAAAA'; - } - if ($nav_colour == "silver") { - $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; - $search_background = '#EEEEEE'; - } - if($nav_colour === "pink") { - $nav_bg_1 = $nav_bg_3 = "#FFC1CA"; - $nav_bg_2 = $nav_bg_4 = "#FFC1CA"; - } - if($nav_colour === "green") { - $nav_bg_1 = $nav_bg_3 = "#5CD65C"; - $nav_bg_2 = $nav_bg_4 = "#5CD65C"; - } - if($nav_colour === "blue") { - $nav_bg_1 = $nav_bg_3 = "#1872a2"; - $nav_bg_2 = $nav_bg_4 = "#1872a2"; - } - if($nav_colour === "purple") { - $nav_bg_1 = $nav_bg_3 = "#551A8B"; - $nav_bg_2 = $nav_bg_4 = "#551A8B"; - } - if($nav_colour === "orange") { - $nav_bg_1 = $nav_bg_3 = "#FF3D0D"; - $nav_bg_2 = $nav_bg_4 = "#FF3D0D"; - } - if($nav_colour === "brown") { - $nav_bg_1 = $nav_bg_3 = "#330000"; - $nav_bg_2 = $nav_bg_4 = "#330000"; - } - if($nav_colour === "grey") { - $nav_bg_1 = $nav_bg_3 = "#2e2f2e"; - $nav_bg_2 = $nav_bg_4 = "#2e2f2e"; - } - if($nav_colour === "gold") { - $nav_bg_1 = $nav_bg_3 = "#FFAA00"; - $nav_bg_2 = $nav_bg_4 = "#FFAA00"; - } - - // Apply the settings if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); $options = array ( -'$nav_bg_1' => $nav_bg_1, -'$nav_bg_2' => $nav_bg_2, -'$nav_bg_3' => $nav_bg_3, -'$nav_bg_4' => $nav_bg_4, +'$nav_bg' => $nav_bg, +'$nav_gradient_top' => $nav_gradient_top, +'$nav_gradient_bottom' => $nav_gradient_bottom, +'$nav_active_gradient_top' => $nav_active_gradient_top, +'$nav_active_gradient_bottom' => $nav_active_gradient_bottom, +'$nav_bd' => $nav_bd, +'$nav_icon_colour' => $nav_icon_colour, +'$nav_active_icon_colour' => $nav_active_icon_colour, '$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, @@ -208,7 +177,6 @@ $options = array ( ); echo str_replace(array_keys($options), array_values($options), $x); - } if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index ccb85a070..12f49efa7 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -1,5 +1,14 @@ <?php head_add_css('library/font_awesome/css/font-awesome.min.css'); +head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); +head_add_css('library/bootstrap/css/bootstrap.min.css'); +head_add_css('view/css/bootstrap-red.css'); +head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); + require_once('view/php/theme_init.php'); +head_add_js('library/bootstrap/js/bootstrap.min.js'); +head_add_js('library/bootstrap/js/bootbox.min.js'); +head_add_js('library/bootstrap-datetimepicker/js/moment.js'); +head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php new file mode 100644 index 000000000..f93e879e3 --- /dev/null +++ b/view/theme/redbasic/schema/BS-Default.php @@ -0,0 +1,20 @@ +<?php + + if (! $nav_bg) + $nav_bg = "#f8f8f8"; + if (! $nav_bd) + $nav_bd = "#e7e7e7"; + if (! $nav_gradient_top) + $nav_gradient_top = "#fff"; + if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#f8f8f8"; + if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#ebebeb"; + if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#f3f3f3"; + if (! $nav_icon_colour) + $nav_icon_colour = "#777"; + if (! $nav_active_icon_colour) + $nav_active_icon_colour = "#555"; + if (! $radius) + $radius = "4"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index af2969397..34c04e91c 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -4,8 +4,15 @@ </div> {{if $expert}} -{{* include file="field_select.tpl" field=$nav_colour *}} {{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_input.tpl" field=$nav_bg}} +{{include file="field_input.tpl" field=$nav_gradient_top}} +{{include file="field_input.tpl" field=$nav_gradient_bottom}} +{{include file="field_input.tpl" field=$nav_active_gradient_top}} +{{include file="field_input.tpl" field=$nav_active_gradient_bottom}} +{{include file="field_input.tpl" field=$nav_bd}} +{{include file="field_input.tpl" field=$nav_icon_colour}} +{{include file="field_input.tpl" field=$nav_active_icon_colour}} {{include file="field_input.tpl" field=$banner_colour}} {{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl new file mode 100644 index 000000000..7635bb826 --- /dev/null +++ b/view/tpl/bookmarkedchats.tpl @@ -0,0 +1,10 @@ +{{if $rooms}} +<div class="widget"> +<h3>{{$header}}</h3> +<ul class="bookmarkchat"> +{{foreach $rooms as $room}} +<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li> +{{/foreach}} +</ul> +</div> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl new file mode 100644 index 000000000..b0d936742 --- /dev/null +++ b/view/tpl/hdr.tpl @@ -0,0 +1,8 @@ +<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> + +<ul id="nav-notifications-template" style="display:none;" rel="template"> + <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> +</ul> + +{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}} +<div id="panel" style="display: none;"></div> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl new file mode 100644 index 000000000..96c692c1c --- /dev/null +++ b/view/tpl/layoutlist.tpl @@ -0,0 +1,19 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <div class="page-list-item"> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} + {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} + {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{$item.title}} + </div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 20600ccd7..ec9731fef 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,9 +1,3 @@ -<header> -<!-- <div id="site-location">{{$sitelocation}}</div> --> - <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> -</header> - -<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> @@ -12,7 +6,7 @@ <span class="icon-bar"></span> </button> {{if $userinfo}} - <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span> + <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> {{if $localuser}} <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> {{foreach $nav.usermenu as $usermenu}} @@ -169,17 +163,11 @@ {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> </li> {{/if}} </ul> </div> </div> -</nav> -<ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> -</ul> -{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}} -<div id="panel" style="display: none;"></div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 10a928e1c..10a0a25a9 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,9 +1,9 @@ <div class="vcard"> {{if $profile.edit}} - <div class="action"> - <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> - <ul id="profiles-menu" class="menu-popup dropdown-menu"> + <div class="dropdown"> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> + <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index 80e160fdf..a5c6faa99 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -1,4 +1,4 @@ -<div class="pmenu"> +<div class="pmenu{{if $class}} {{$class}}{{/if}}"> {{if $menu.menu_desc}} <h3 class="pmenu-title">{{$menu.menu_desc}}</h3> {{/if}} |