diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/es-es/hmessages.po | 186 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 128 | ||||
| -rw-r--r-- | view/php/theme_init.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.css | 4 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 23 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 4 |
6 files changed, 224 insertions, 124 deletions
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 7089c2eab..ec03b4c2c 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-18 08:37+0200\n" -"PO-Revision-Date: 2018-04-20 09:32+0000\n" +"POT-Creation-Date: 2018-04-23 11:34+0200\n" +"PO-Revision-Date: 2018-04-24 09:02+0000\n" "Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -101,8 +101,8 @@ msgid "Social Networking" msgstr "Redes sociales" #: ../../Zotlabs/Access/PermissionRoles.php:284 -msgid "Social - Party" -msgstr "Social - Extra público" +msgid "Social - Federation" +msgstr "Social - Federación" #: ../../Zotlabs/Access/PermissionRoles.php:285 msgid "Social - Mostly Public" @@ -461,15 +461,16 @@ msgstr "3. Pulse [conectar]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:823 +#: ../../addon/diaspora/diaspora.php:825 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 +#: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 +#: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1069 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -569,7 +570,7 @@ msgstr "Resumen: " #: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 #: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:878 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 #: ../../include/conversation.php:1160 msgid "Unknown" msgstr "Desconocido" @@ -731,7 +732,7 @@ msgstr "Teléfono" #: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 msgid "Email" msgstr "Correo electrónico" @@ -1093,8 +1094,8 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 #: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 #: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 -#: ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 @@ -1145,8 +1146,8 @@ msgstr "No" #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 #: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 #: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 -#: ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 +#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 @@ -1463,13 +1464,13 @@ msgstr "Servidor no encontrado" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:116 ../../include/text.php:2005 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388 +#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 #: ../../include/conversation.php:144 ../../include/text.php:2011 msgid "status" msgstr "el mensaje de estado" @@ -1577,6 +1578,7 @@ msgid "" msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s" #: ../../Zotlabs/Module/New_channel.php:149 +#: ../../Zotlabs/Module/Settings/Channel.php:539 #: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" @@ -1597,10 +1599,18 @@ msgstr "Crear un canal" #: ../../Zotlabs/Module/New_channel.php:153 msgid "" -"A channel is your identity on this network. It can represent a person, a " -"blog, or a forum to name a few. Channels can make connections with other " -"channels to share information with highly detailed permissions." -msgstr "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada." +"A channel is a unique network identity. It can represent a person (social " +"network profile), a forum (group), a business or celebrity page, a newsfeed," +" and many other things. Channels can make connections with other channels to" +" share information with each other." +msgstr "Un canal es una identidad única en la red. Puede representar a una persona (un perfil de una red social), un foro o grupo, un negocio o una página de una celebridad, un \"feed\" de noticias, y muchas otras cosas. Los canales pueden conectarse con otros canales para compartir información unos con otros." + +#: ../../Zotlabs/Module/New_channel.php:153 +msgid "" +"The type of channel you create affects the basic privacy settings, the " +"permissions that are granted to connections/friends, and also the channel's " +"visibility across the network." +msgstr "El tipo de canal que cree afecta a la configuración básica de privacidad, a los permisos que se conceden a las conexiones/amigos y también a la visibilidad del canal en la red." #: ../../Zotlabs/Module/New_channel.php:154 msgid "" @@ -3365,11 +3375,11 @@ msgctxt "acl" msgid "Profile" msgstr "Perfil" -#: ../../Zotlabs/Module/Moderate.php:62 +#: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" msgstr "El comentario ha sido aprobado" -#: ../../Zotlabs/Module/Moderate.php:66 +#: ../../Zotlabs/Module/Moderate.php:69 msgid "Comment deleted" msgstr "Se ha eliminado el comentario" @@ -3633,10 +3643,6 @@ msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicac msgid "Profile to assign new connections" msgstr "Perfil para asignar a las nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:539 -msgid "Channel permissions category:" -msgstr "Categoría de los permisos del canal:" - #: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Permissions Group" msgstr "Grupo de permisos predeterminados" @@ -4910,7 +4916,7 @@ msgstr "Ver todo" #: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 #: ../../include/conversation.php:1981 ../../include/channel.php:1539 -#: ../../include/taxonomy.php:660 +#: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4953,7 +4959,7 @@ msgid "Close" msgstr "Cerrar" #: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:663 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 msgid "Recent Photos" msgstr "Fotos recientes" @@ -5266,7 +5272,7 @@ msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. " #: ../../Zotlabs/Module/Profile_photo.php:120 #: ../../Zotlabs/Module/Profile_photo.php:248 -#: ../../include/photo/photo_driver.php:740 +#: ../../include/photo/photo_driver.php:741 msgid "Profile Photos" msgstr "Fotos del perfil" @@ -6839,12 +6845,12 @@ msgid "Previous action reversed." msgstr "Acción anterior revocada." #: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 -#: ../../addon/pubcrawl/as.php:1423 ../../include/conversation.php:160 +#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1425 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -8351,11 +8357,11 @@ msgstr "Firma de mensaje incorrecta" msgid "Add Tag" msgstr "Añadir etiqueta" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:574 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 msgid "like" msgstr "me gusta" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 msgid "dislike" msgstr "no me gusta" @@ -8657,9 +8663,9 @@ msgstr "Seleccionar una agenda para importarla" #: ../../Zotlabs/Widget/Appcategories.php:40 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 -#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:408 -#: ../../include/taxonomy.php:490 ../../include/taxonomy.php:510 -#: ../../include/taxonomy.php:531 +#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 +#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 +#: ../../include/taxonomy.php:532 msgid "Categories" msgstr "Temas" @@ -8847,8 +8853,8 @@ msgstr "Carpetas guardadas" msgid "Click to show more" msgstr "Hacer clic para ver más" -#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:319 -#: ../../include/taxonomy.php:448 ../../include/taxonomy.php:469 +#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320 +#: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470 msgid "Tags" msgstr "Etiquetas" @@ -10166,39 +10172,39 @@ msgstr "una declaración de amor eterno" msgid "declared undying love for" msgstr "ha declarado amor eterno a" -#: ../../addon/diaspora/diaspora.php:779 +#: ../../addon/diaspora/diaspora.php:781 msgid "Diaspora Protocol Settings updated." msgstr "Los ajustes del protocolo de Diaspora se han actualizado." -#: ../../addon/diaspora/diaspora.php:798 +#: ../../addon/diaspora/diaspora.php:800 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos." -#: ../../addon/diaspora/diaspora.php:801 +#: ../../addon/diaspora/diaspora.php:803 msgid "Enable the Diaspora protocol for this channel" msgstr "Activar el protocolo de Diaspora para este canal" -#: ../../addon/diaspora/diaspora.php:805 +#: ../../addon/diaspora/diaspora.php:807 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas" -#: ../../addon/diaspora/diaspora.php:809 +#: ../../addon/diaspora/diaspora.php:811 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios " -#: ../../addon/diaspora/diaspora.php:813 +#: ../../addon/diaspora/diaspora.php:815 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora" -#: ../../addon/diaspora/diaspora.php:818 +#: ../../addon/diaspora/diaspora.php:820 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)" -#: ../../addon/diaspora/diaspora.php:823 +#: ../../addon/diaspora/diaspora.php:825 msgid "Diaspora Protocol Settings" msgstr "Ajustes del protocolo de Diaspora" @@ -10441,6 +10447,32 @@ msgstr "Incluir un marcador en el mapa." msgid "text to include in all outgoing posts from this site" msgstr "texto a incluir en todos los mensajes salientes de este sitio" +#: ../../addon/fuzzloc/fuzzloc.php:148 +msgid "Fuzzloc Settings updated." +msgstr "Los ajustes de Fuzzloc se han actualizado." + +#: ../../addon/fuzzloc/fuzzloc.php:175 +msgid "" +"Fuzzloc allows you to blur your precise location if your channel uses " +"browser location mapping." +msgstr "Fuzzloc le permite desdibujar su ubicación precisa si su canal utiliza la asignación de ubicación del navegador." + +#: ../../addon/fuzzloc/fuzzloc.php:178 +msgid "Enable Fuzzloc Plugin" +msgstr "Habilitar el plugin Fuzzloc" + +#: ../../addon/fuzzloc/fuzzloc.php:182 +msgid "Minimum offset in meters" +msgstr "Offset mínimo en metros" + +#: ../../addon/fuzzloc/fuzzloc.php:186 +msgid "Maximum offset in meters" +msgstr "Offset máximo en metros" + +#: ../../addon/fuzzloc/fuzzloc.php:191 +msgid "Fuzzloc Settings" +msgstr "Ajustes de Fuzzloc" + #: ../../addon/rtof/rtof.php:45 msgid "Post to Friendica" msgstr "Publicar en Friendica" @@ -10643,35 +10675,35 @@ msgstr "Nombre de inicio de sesión en Friendica" msgid "Friendica Login Password" msgstr "Contraseña de inicio de sesión en Friendica" -#: ../../addon/pubcrawl/as.php:1129 ../../addon/pubcrawl/as.php:1256 -#: ../../addon/pubcrawl/as.php:1432 ../../include/network.php:1768 +#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 +#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/pubcrawl.php:1050 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings updated." msgstr "Se han actualizado los ajustes del protocolo ActivityPub." -#: ../../addon/pubcrawl/pubcrawl.php:1059 +#: ../../addon/pubcrawl/pubcrawl.php:1062 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos." -#: ../../addon/pubcrawl/pubcrawl.php:1062 +#: ../../addon/pubcrawl/pubcrawl.php:1065 msgid "Enable the ActivityPub protocol for this channel" msgstr "Activar el protocolo ActivityPub para este canal" -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Send multi-media HTML articles" msgstr "Enviar artículos multimedia en HTML" -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1068 msgid "Not supported by some microblog services such as Mastodon" msgstr "No soportado por algunos servicios de microblog como Mastodon" -#: ../../addon/pubcrawl/pubcrawl.php:1069 +#: ../../addon/pubcrawl/pubcrawl.php:1072 msgid "ActivityPub Protocol Settings" msgstr "Ajustes del protocolo ActivityPub" @@ -12232,7 +12264,7 @@ msgid "Profile Details" msgstr "Detalles del perfil" #: ../../include/conversation.php:1837 ../../include/nav.php:404 -#: ../../include/photos.php:662 +#: ../../include/photos.php:666 msgid "Photo Albums" msgstr "Álbumes de fotos" @@ -13414,43 +13446,43 @@ msgstr "Fax de trabajo" msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:1763 ../../include/network.php:1764 +#: ../../include/network.php:1764 ../../include/network.php:1765 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1765 +#: ../../include/network.php:1766 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1766 +#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1767 +#: ../../include/network.php:1768 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1770 +#: ../../include/network.php:1771 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1771 +#: ../../include/network.php:1772 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1772 +#: ../../include/network.php:1773 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1773 +#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1774 +#: ../../include/network.php:1775 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1775 +#: ../../include/network.php:1776 msgid "MySpace" msgstr "MySpace" @@ -13922,35 +13954,35 @@ msgstr "Nube de etiquetas" msgid "Provide a personal tag cloud on your channel page" msgstr "Proveer nube de etiquetas personal en su página de canal" -#: ../../include/taxonomy.php:319 +#: ../../include/taxonomy.php:320 msgid "Trending" msgstr "Populares" -#: ../../include/taxonomy.php:551 +#: ../../include/taxonomy.php:552 msgid "Keywords" msgstr "Palabras clave" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:573 msgid "have" msgstr "tener" -#: ../../include/taxonomy.php:572 +#: ../../include/taxonomy.php:573 msgid "has" msgstr "tiene" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:574 msgid "want" msgstr "quiero" -#: ../../include/taxonomy.php:573 +#: ../../include/taxonomy.php:574 msgid "wants" msgstr "quiere" -#: ../../include/taxonomy.php:574 +#: ../../include/taxonomy.php:575 msgid "likes" msgstr "gusta de" -#: ../../include/taxonomy.php:575 +#: ../../include/taxonomy.php:576 msgid "dislikes" msgstr "no gusta de" @@ -14188,21 +14220,21 @@ msgstr "La imagen excede el límite de %lu bytes del sitio" msgid "Image file is empty." msgstr "El fichero de imagen está vacío. " -#: ../../include/photos.php:322 +#: ../../include/photos.php:326 msgid "Photo storage failed." msgstr "La foto no ha podido ser guardada." -#: ../../include/photos.php:371 +#: ../../include/photos.php:375 msgid "a new photo" msgstr "una nueva foto" -#: ../../include/photos.php:375 +#: ../../include/photos.php:379 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s ha publicado %2$s en %3$s" -#: ../../include/photos.php:667 +#: ../../include/photos.php:671 msgid "Upload New Photos" msgstr "Subir nuevas fotos" @@ -14219,7 +14251,7 @@ msgstr "No ha sido posible de verificar la firma del canal" msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" -#: ../../include/zot.php:4217 +#: ../../include/zot.php:4219 msgid "invalid target signature" msgstr "La firma recibida no es válida" diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 76c3fb69e..60552588e 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -8,20 +8,20 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine $(spinelement).show(); } // Check if there is a cached result that contains the same information we would get with a full server-side search - var bt = backend_url+type; - if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; +// var bt = backend_url+type; +// if(!(bt in contact_search.cache)) contact_search.cache[bt] = {}; - var lterm = term.toLowerCase(); // Ignore case - for(var t in contact_search.cache[bt]) { - if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results - $(spinelement).hide(); +// var lterm = term.toLowerCase(); // Ignore case +// for(var t in contact_search.cache[bt]) { +// if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results +// $(spinelement).hide(); // Filter old results locally - var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one - matching.unshift({taggable:false, text: term, replace: term}); - setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems - return; - } - } +// var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one +// matching.unshift({taggable:false, text: term, replace: term}); +// setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems +// return; +// } +// } var postdata = { start:0, @@ -41,9 +41,9 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine success: function(data){ // Cache results if we got them all (more information would not improve results) // data.count represents the maximum number of items - if(data.items.length -1 < data.count) { - contact_search.cache[bt][lterm] = data.items; - } +// if(data.items.length -1 < data.count) { +// contact_search.cache[bt][lterm] = data.items; +// } var items = data.items.slice(0); items.unshift({taggable:false, text: term, replace: term}); callback(items); @@ -180,12 +180,17 @@ function string2bb(element) { */ (function( $ ) { $.fn.editor_autocomplete = function(backend_url, extra_channels) { + + if(! this.length) + return; + if (typeof extra_channels === 'undefined') extra_channels = false; // Autocomplete contacts contacts = { - match: /(^|\s)(@\!*)([^ \n]+)$/, + match: /(^|\s)(@\!*)([^ \n]{3,})$/, index: 3, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, replace: editor_replace, template: contact_format @@ -193,8 +198,9 @@ function string2bb(element) { // Autocomplete forums forums = { - match: /(^|\s)(\!\!*)([^ \n]+)$/, + match: /(^|\s)(\!\!*)([^ \n]{3,})$/, index: 3, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', extra_channels, spinelement=false); }, replace: editor_replace, template: contact_format @@ -203,8 +209,9 @@ function string2bb(element) { // Autocomplete hashtags tags = { - match: /(^|\s)(\#)([^ \n]{2,})$/, + match: /(^|\s)(\#)([^ \n]{3,})$/, index: 3, + cache: true, search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, replace: function(item) { return "$1$2" + item.text + ' '; }, context: function(text) { return text.toLowerCase(); }, @@ -215,13 +222,23 @@ function string2bb(element) { smilies = { match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, + cache: true, search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, //template: function(item) { return item.icon + item.text; }, replace: function(item) { return "$1" + item.text + ' '; }, template: smiley_format }; this.attr('autocomplete','off'); - this.textcomplete([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + + var Textarea = Textcomplete.editors.Textarea; + + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + }); + + }; })( jQuery ); @@ -230,10 +247,15 @@ function string2bb(element) { */ (function( $ ) { $.fn.search_autocomplete = function(backend_url) { + + if(! this.length) + return; + // Autocomplete contacts contacts = { match: /(^@)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); }, replace: basic_replace, template: contact_format, @@ -243,6 +265,7 @@ function string2bb(element) { forums = { match: /(^\!)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', [], spinelement='#nav-search-spinner'); }, replace: basic_replace, template: contact_format @@ -252,6 +275,7 @@ function string2bb(element) { tags = { match: /(^\#)([^ \n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, replace: function(item) { return "$1" + item.text + ' '; }, context: function(text) { return text.toLowerCase(); }, @@ -259,65 +283,98 @@ function string2bb(element) { }; this.attr('autocomplete', 'off'); - var a = this.textcomplete([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); - a.on('textComplete:select', function(e, value, strategy) { submit_form(this); }); + + var Textarea = Textcomplete.editors.Textarea; + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); + }); + + this.on('select', function(e, value, strategy) { submit_form(this); }); }; })( jQuery ); (function( $ ) { $.fn.contact_autocomplete = function(backend_url, typ, autosubmit, onselect) { + + if(! this.length) + return; + if(typeof typ === 'undefined') typ = ''; if(typeof autosubmit === 'undefined') autosubmit = false; // Autocomplete contacts contacts = { - match: /(^)([^\n]+)$/, + match: /(^)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, replace: basic_replace, template: contact_format, }; this.attr('autocomplete','off'); - var a = this.textcomplete([contacts], {className:'acpopup', zIndex:1020}); + + var Textarea = Textcomplete.editors.Textarea; + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); + }); if(autosubmit) - a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); + this.on('select', function(e,value,strategy) { submit_form(this); }); if(typeof onselect !== 'undefined') - a.on('textComplete:select', function(e, value, strategy) { onselect(value); }); + this.on('select', function(e, value, strategy) { onselect(value); }); }; })( jQuery ); (function( $ ) { $.fn.name_autocomplete = function(backend_url, typ, autosubmit, onselect) { + + if(! this.length) + return; + if(typeof typ === 'undefined') typ = ''; if(typeof autosubmit === 'undefined') autosubmit = false; // Autocomplete contacts names = { - match: /(^)([^\n]+)$/, + match: /(^)([^\n]{3,})$/, index: 2, + cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); }, replace: trim_replace, template: contact_format, }; this.attr('autocomplete','off'); - var a = this.textcomplete([names], {className:'acpopup', zIndex:1020}); + + var Textarea = Textcomplete.editors.Textarea; + + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([names], {className:'acpopup', zIndex:1020}); + }); if(autosubmit) - a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); + this.on('select', function(e,value,strategy) { submit_form(this); }); if(typeof onselect !== 'undefined') - a.on('textComplete:select', function(e, value, strategy) { onselect(value); }); + this.on('select', function(e, value, strategy) { onselect(value); }); }; })( jQuery ); (function( $ ) { $.fn.bbco_autocomplete = function(type) { + if(! this.length) + return; + if(type=='bbcode') { var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; @@ -375,11 +432,18 @@ function string2bb(element) { }; this.attr('autocomplete','off'); - var a = this.textcomplete([bbco], {className:'acpopup', zIndex:1020}); - a.on('textComplete:select', function(e, value, strategy) { value; }); + var Textarea = Textcomplete.editors.Textarea; + + $(this).each(function() { + var editor = new Textarea(this); + var textcomplete = new Textcomplete(editor); + textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); + }); + + this.on('select', function(e, value, strategy) { value; }); - a.keypress(function(e){ + this.keypress(function(e){ if (e.keyCode == 13) { var x = listNewLineAutocomplete(this.id); if(x) { diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f2c46da28..dd8dcb5ee 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -15,9 +15,8 @@ head_add_js('jquery.js'); head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('/library/sprintf.js/dist/sprintf.min.js'); -//head_add_js('jquery.textinputs.js'); +head_add_js('/library/textcomplete/textcomplete.min.js'); head_add_js('autocomplete.js'); -head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js'); head_add_js('/library/jquery.timeago.js'); head_add_js('/library/readmore.js/readmore.js'); diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index d0154bfb1..dbee67c84 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -1,5 +1,4 @@ .generic-content-wrapper { - border: 1px solid #111; background-color: transparent; } @@ -148,7 +147,8 @@ option { background-color:#111; } -.modal-content { +.modal-content, +#notifications_wrapper { background-color: #111; } diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 991a4c8b1..df67e9b2d 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -568,11 +568,14 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del function postSaveChanges(action, type) { if({{$auto_save_draft}}) { + var doctype = $('#jot-webpage').val(); + var postid = '-' + doctype + '-' + $('#jot-postid').val(); + if(action != 'clean') { - localStorage.setItem("post_title", $("#jot-title").val()); - localStorage.setItem("post_body", $("#profile-jot-text").val()); + localStorage.setItem("post_title" + postid, $("#jot-title").val()); + localStorage.setItem("post_body" + postid, $("#profile-jot-text").val()); if($("#jot-category").length) - localStorage.setItem("post_category", $("#jot-category").val()); + localStorage.setItem("post_category + postid", $("#jot-category").val()); } if(action == 'start') { @@ -589,9 +592,9 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del if(action == 'clean') { clearTimeout(postSaveTimer); postSaveTimer = null; - localStorage.removeItem("post_title"); - localStorage.removeItem("post_body"); - localStorage.removeItem("post_category"); + localStorage.removeItem("post_title" + postid); + localStorage.removeItem("post_body" + postid); + localStorage.removeItem("post_category" + postid); } } @@ -602,9 +605,11 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del var cleaned = false; if({{$auto_save_draft}}) { - var postTitle = localStorage.getItem("post_title"); - var postBody = localStorage.getItem("post_body"); - var postCategory = (($("#jot-category").length) ? localStorage.getItem("post_category") : ''); + var doctype = $('#jot-webpage').val(); + var postid = '-' + doctype + '-' + $('#jot-postid').val(); + var postTitle = localStorage.getItem("post_title" + postid); + var postBody = localStorage.getItem("post_body" + postid); + var postCategory = (($("#jot-category").length) ? localStorage.getItem("post_category" + postid) : ''); var openEditor = false; if(postTitle) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index bc9339d4c..9aa330c40 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -21,8 +21,8 @@ <input type="hidden" name="media_str" id="jot-media" value="" /> <input type="hidden" name="source" id="jot-source" value="{{$source}}" /> <input type="hidden" name="coord" id="jot-coord" value="" /> - <input type="hidden" name="post_id" value="{{$post_id}}" /> - <input type="hidden" name="webpage" value="{{$webpage}}" /> + <input type="hidden" id="jot-postid" name="post_id" value="{{$post_id}}" /> + <input type="hidden" id="jot-webpage" name="webpage" value="{{$webpage}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> <input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" /> |