Merge remote-tracking branch 'origin/master' into dbal

v1.18.x
Baris Usakli 11 years ago
commit 6313a5eeb1

@ -1,6 +1,54 @@
#!/bin/sh
clear
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1
#!/bin/bash
# $0 script path
# $1 action
# $2 subaction
case "$1" in
start)
node app
;;
dev)
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development node app
;;
watch)
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1
;;
language)
case "$2" in
check)
node app --language="check"
;;
*)
echo "Language Settings"
echo $"Usage: $0 language {check}"
echo ''
column -s ' ' -t <<< '
check Compare language files against the /en directory
'
;;
esac
;;
*)
echo "Welcome to NodeBB"
echo $"Usage: $0 {start|dev|watch|language}"
echo ''
column -s ' ' -t <<< '
start Start NodeBB in production mode
dev Start NodeBB in development mode
watch Start NodeBB in development mode and watch for changes
language Language settings
'
exit 1
esac

@ -0,0 +1,14 @@
{
"new_topic_button": "Neues Thema",
"no_topics": "<strong>Es gibt noch keine Threads in dieser Kategorie.</strong><br />Warum beginnst du nicht den ersten?",
"sidebar.recent_replies": "Neuste Antworten",
"sidebar.active_participants": "Aktive Teilnehmer",
"sidebar.moderators": "Moderatoren",
"posts": "Posts",
"views": "Aufrufe",
"posted": "Geposted",
"browsing": "Sieht zu",
"no_replies": "Niemand hat geantwortet",
"replied": "geantwortet",
"last_edited_by": "zuletzt editiert durch"
}

@ -0,0 +1,10 @@
{
"chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>",
"chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
"chat.send": "Senden",
"stats.online": "Online",
"stats.users": "Benutzer",
"stats.topics": "Themen",
"stats.posts": "Beiträge",
"success": "erfolg"
}

@ -0,0 +1,31 @@
{
"home": "Übersicht",
"search": "Suche",
"buttons.close": "Schließen",
"403.title": "Zugriff Verweigert",
"403.message": "Du bist nicht dazu berechtigt, diese Seite aufzurufen. <a href='/login'>Logge dich ein</a> und versuche es erneut.",
"404.title": " Nicht Gefunden",
"404.message": "Die abgefragte Seite wurde nicht gefunden. <a href='/''>Zurück zur Übersicht</a>.",
"500.title": "Internal error.",
"500.message": "Ooops! Looks like something went wrong!",
"register": "Registrierung",
"login": "Login",
"logout": "Logout",
"logout.title": "Du bist ausgeloggt.",
"logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
"save_changes": "Speichere Änderungen",
"close": "Schließen",
"header.admin": "Admin",
"header.recent": "Aktuell",
"header.unread": "Ungelesen",
"header.users": "Benutzer",
"header.search": "Suche",
"header.profile": "Profil",
"notifications.loading": "Benachrichtigungen laden",
"chats.loading": "Nachrichten werden geladen"
}

@ -0,0 +1,10 @@
{
"login": "Einloggen",
"username": "Benutzername",
"password": "Passwort",
"remember_me": "Eingeloggt bleiben?",
"forgot_password": "Passwort vergessen?",
"alternative_logins": "Login Alternativen",
"failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.",
"login_successful": "Du hast dich erfolgreich eingeloggt!"
}

@ -0,0 +1,9 @@
{
"title": "Benachrichtigungen",
"back_to_home": "Zurück zur Startseite",
"mark_all_as_read": "Alles als gelesen markieren",
"outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun",
"continue_to": "Gehe weiter zu",
"return_to": "Kehre zurück zu"
}

@ -0,0 +1,5 @@
{
"day": "Tag",
"week": "Woche",
"month": "Monat"
}

@ -0,0 +1,16 @@
{
"register": "Registrieren",
"help.email": "Deine E-Mail Adresse ist standardmäßig nicht öffentlich sichtbar.",
"help.username_restrictions": "Einen einmaligen Benutzernamen. 3-16 Zeichen. Andere Benutzer können dich mit @<span id='yourUsername'>Benutzername</span> anschreiben.",
"help.minimum_password_length": "Dein Passwort muss mindestens sechs Zeichen lang sein.",
"email_address": "E-Mail",
"email_address_placeholder": "E-Mail Adresse hier eingeben",
"username": "Benutzername",
"username_placeholder": "Benutzernamen eingeben",
"password": "Passwort",
"password_placeholder": "Passwort eingeben",
"confirm_password": "Passwort bestätigen",
"confirm_password_placeholder": "Passwort zur Bestätigung erneut eingeben",
"register_now_button": "Jetzt registrieren",
"alternative_registration": "Alternative Registrierung"
}

@ -0,0 +1,13 @@
{
"reset_password": "Passwort zurücksetzen",
"update_password": "Ändere Passwort",
"password_change": "Passwort wurde geändert",
"password_reset_successful": "<p>Das Passwort wurde erfolgreich zurückgesetzt. <a href=\"/login\">Log dich neu ein</a>.",
"wrong_reset_code.title": "Der Reset-Code ist falsch.",
"wrong_reset_code.message": "Der empfangene Reset-Code war falsch. Bitte versuche es erneut oder <a href=\"/reset\">fordere einen neuen Code an</a>.",
"new_password": "Neues Passwort",
"repeat_password": "Wiederhole das Passwort",
"enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
"password_reset_sent": "Passwortzrücksetzung beantragt.",
"invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
}

@ -0,0 +1,40 @@
{
"topic": "Thema",
"topics": "Themen",
"no_topics_found": "Keine passende Themen gefunden.",
"profile": "Profil",
"posted_by": "geschrieben von",
"chat": "Chat",
"notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.",
"quote": "zitieren",
"reply": "antworten",
"edit": "bearbeiten",
"delete": "löschen",
"banned": "gesperrt",
"link": "Link",
"thread_tools.title": "Thread Tools",
"thread_tools.pin": "Thread pinnen",
"thread_tools.unpin": "Thread nicht mehr pinnen",
"thread_tools.lock": "Thread sperren",
"thread_tools.move": "Thread verschieben",
"thread_tools.delete": "Thread löschen",
"load_categories": "Kategorien laden",
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "verschieben",
"favourite": "Favorit",
"favourites": "Favoriten",
"favourites.not_logged_in.title": "Nicht eingeloggt!",
"favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
"favourites.has_no_favourites":"Du hast noch keine Favoriten.",
"posted_by": "Geposted von",
"loading": "Lade",
"more_posts": "Mehr Posts",
"move_topic": "Thema verschieben",
"topic_will_be_moved_to": "Dieses Thema wird verschoben nach"
}

@ -0,0 +1,5 @@
{
"no_unread_topics": "Es gibt keine ungelesenen Themen.",
"mark_all_read": "alle als gelesen markieren",
"load_more": "mehr laden"
}

@ -0,0 +1,38 @@
{
"banned": "Gebannt",
"offline": "offline",
"email": "E-Mail",
"fullname": "Kompletter Name",
"website": "Homepage",
"location": "Wohnort",
"age": "Alter",
"joined": "Beigetreten",
"profil_views": "Profilaufrufe",
"reputation": "Reputation",
"posts": "Posts",
"followers": "Follower",
"following": "Folgt",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Geburtstag",
"change_picture": "Ändere Profilbild",
"edit": "Ändern",
"uploaded_pictures": "Hochgeladene Bilder",
"upload_new_picture": "Neues Bild hochladen",
"change_password": "Ändere Passwort",
"confirm_password": "Passwort wiederholen",
"password": "Passwort",
"upload_picture": "Bild hochladen",
"upload_a_picture": "Ein Bild hochladen",
"image_spec": "Du solltest nur Dateien die PNG, JPG, oder GIF kleiner als 256kb hochladen.",
"settings": "Einstellungen",
"show_my_email": "Zeige meine E-Mail Adresse an.",
"has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemanden."
}

@ -0,0 +1,9 @@
{
"latest_users": "neuste Benutzer",
"top_posters": "meiste Beiträge",
"most_reputation": "höhstes Ansehen",
"online": "Online",
"search": "Suchen",
"enter_username": "Benutzer durchsuchen",
"load_more": "mehr laden"
}

@ -3,5 +3,12 @@
"no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",
"sidebar.recent_replies": "Recent Replies",
"sidebar.active_participants": "Active Participants",
"sidebar.moderators": "Moderators"
}
"sidebar.moderators": "Moderators",
"posts": "posts",
"views": "views",
"posted": "posted",
"browsing": "browsing",
"no_replies": "No one has replied",
"replied": "replied",
"last_edited_by": "last edited by"
}

@ -1,9 +1,10 @@
{
"chat.chatting_with": "Chat with <span id='chat-with-name'></span>",
"chat.chatting_with": "Chat with <span id=\"chat-with-name\"></span>",
"chat.placeholder": "type chat message here, press enter to send",
"chat.send": "Send",
"stats.online": "Online",
"stats.users": "Users",
"stats.topics": "Topics",
"stats.posts": "Posts"
}
"stats.posts": "Posts",
"success": "success"
}

@ -7,15 +7,25 @@
"404.title": "Not Found",
"404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='/'>home page</a>.",
"500.title": "Internal error.",
"500.message": "Ooops! Looks like something went wrong!",
"500.message": "Oops! Looks like something went wrong!",
"register": "Register",
"login": "Login",
"logout": "Logout",
"logout.title": "You are now logged out.",
"logout.message": "You have successfully logged out of NodeBB",
"save_changes": "Save Changes",
"close": "Close",
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Unread",
"header.users": "Users",
"header.search": "Search",
"header.profile": "Profile",
"notifications.loading": "Loading Notifications",
"chats.loading": "Loading Chats"
}
}

@ -7,4 +7,4 @@
"alternative_logins": "Alternative Logins",
"failed_login_attempt": "Failed login attempt, please try again.",
"login_successful": "You have successfully logged in!"
}
}

@ -1,3 +1,9 @@
{
"title": "Notifications"
}
"title": "Notifications",
"back_to_home": "back to NodeBB",
"mark_all_as_read": "Mark All as Read",
"outgoing_link": "Outgoing Link",
"outgoing_link_message": "You are now leaving",
"continue_to": "Continue to",
"return_to": "Return to "
}

@ -0,0 +1,13 @@
{
"reset_password": "Reset Password",
"update_password": "Update Password",
"password_changed.title": "Password Changed",
"password_changed.message": "<p>Password successfully reset, please <a href=\"/login\">log in again</a>.",
"wrong_reset_code.title": "Incorrect Reset Code",
"wrong_reset_code.message": "The reset code received was incorrect. Please try again, or <a href=\"/reset\">request a new reset code</a>.",
"new_password": "New Password",
"repeat_password": "Confirm Password",
"enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
"password_reset_sent": "Password Reset Sent",
"invalid_email": "Invalid Email / Email does not exist!"
}

@ -1,23 +1,39 @@
{
"topic": "Topic",
"topics": "Topics",
"no_topics_found": "No topics found!",
"profile": "Profile",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Be notified of new replies in this topic",
"favourite": "Favourite",
"quote": "Quote",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"banned": "banned",
"link": "Link",
"thread_tools.title": "Thread Tools",
"thread_tools.pin": "Pin Thread",
"thread_tools.lock": "Lock Thread",
"thread_tools.move": "Move Thread",
"thread_tools.delete": "Delete Thread",
"load_categories": "Loading Categories",
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"favourite": "Favourite",
"favourites": "Favorites",
"favourites.not_logged_in.title": "Not Logged In",
"favourites.not_logged_in.message": "Please log in in order to favourite this post"
}
"favourites.not_logged_in.message": "Please log in in order to favourite this post",
"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
"posted_by": "posted by",
"loading": "Lade",
"more_posts": "More Posts",
"move_topic": "Move Topic",
"topic_will_be_moved_to": "This topic will be moved to the category"
}

@ -0,0 +1,36 @@
{
"banned": "Banned",
"offline": "offline",
"email": "email",
"fullname": "full name",
"website": "website",
"location": "location",
"age": "age",
"joined": "joined",
"profil_views": "profil views",
"reputation": "reputation",
"posts": "posts",
"followers": "followers",
"following": "following",
"signature": "signature",
"gravatar": "gravatar",
"birthday": "birthday",
"change_picture": "change picture",
"edit": "edit",
"uploaded_pictures": "uploaded pictures",
"upload_new_picture": "upload new picture",
"change_password": "change password",
"confirm_password": "confirm password",
"password": "password",
"upload_picture": "Upload picture",
"upload_a_picture": "Upload a picture",
"image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.",
"settings": "settings",
"show_my_email": "show my email",
"has_no_follower": "This user doesn't have any followers :(",
"follows_no_one": "This user isn't following anyone :("
}

@ -0,0 +1,14 @@
{
"new_topic_button": "Nuevo Tema",
"no_topics": "<strong>No hay temas en esta categoría.</strong><br />Por que no te animas y publicas uno?",
"sidebar.recent_replies": "Respuestas recientes",
"sidebar.active_participants": "Miembros más activos",
"sidebar.moderators": "Moderadores",
"posts": "respuestas",
"views": "visitas",
"posted": "posted",
"browsing": "viendo ahora",
"no_replies": "Nadie ha respondido aún",
"replied": "respondio",
"last_edited_by": "ultima edición por"
}

@ -0,0 +1,10 @@
{
"chat.chatting_with": "Chatear con <span id='chat-with-name'></span>",
"chat.placeholder": "ingresa tu mensaje aqui, y presiona enter para enviar",
"chat.send": "Enviar",
"stats.online": "Online",
"stats.users": "Usuarios",
"stats.topics": "Temas",
"stats.posts": "Posts",
"success": "exito!"
}

@ -0,0 +1,31 @@
{
"home": "Inicio",
"search": "Buscar",
"buttons.close": "Cerrar",
"403.title": "Acceso denegado",
"403.message": "Al parecer no tienes premisos necesarios para estar en este lugar. Tal vez puedes <a href='/login'>intentar conectarte</a>?",
"404.title": "Ups... 404, no se encontra che!",
"404.message": "Al parecer lo que estas buscando no existe. Te recomendamos que vuelvas al <a href='/''>inicio</a>.",
"500.title": "Error Interno.",
"500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán",
"register": "Registrarse",
"login": "Conectarse",
"logout": "Salir",
"logout.title": "Te has desconectado.",
"logout.message": "Haz sido desconectado correctamente",
"save_changes": "Guardar Cambios",
"close": "Cerrar",
"header.admin": "Admin",
"header.recent": "Recientes",
"header.unread": "No Leeidos",
"header.users": "Miembros",
"header.search": "Buscar",
"header.profile": "Perfil",
"notifications.loading": "Cargando Notificaciones",
"chats.loading": "Cargando Chats"
}

@ -0,0 +1,10 @@
{
"login": "Conectarse",
"username": "Usuario",
"password": "Contraseña",
"remember_me": "Recordarme?",
"forgot_password": "Olvidaste tu contraseña?",
"alternative_logins": "Conexiones Alternativas",
"failed_login_attempt": "Error al loguearte, intenta de nuevo.",
"login_successful": "Te has conectado con exito!"
}

@ -0,0 +1,9 @@
{
"title": "Notificaciones",
"back_to_home": "volver al Inicio",
"mark_all_as_read": "Marcar todo como leeido",
"outgoing_link": "Link Externo",
"outgoing_link_message": "Estas saliendo del sitio",
"continue_to": "Continuar",
"return_to": "Volver a "
}

@ -0,0 +1,5 @@
{
"day": "Día",
"week": "Semana",
"month": "Mes"
}

@ -0,0 +1,16 @@
{
"register": "Registrase",
"help.email": "Por defecto, tu email será oculto al publico.",
"help.username_restrictions": "El nombre de usuario debe tener entre %1 y %2 caracteres. Los miembros pueden responderte escribiendo @<span id='yourUsername'>usuario</span>.",
"help.minimum_password_length": "Tu contraseña debe tener al menos %1 caracteres.",
"email_address": "Email",
"email_address_placeholder": "Escribe tu email",
"username": "Usuario",
"username_placeholder": "Escribe tu usuario",
"password": "Contraseña",
"password_placeholder": "Escribe tu Contraseña",
"confirm_password": "Confirmar Contraseña",
"confirm_password_placeholder": "Confirmar Contraseña",
"register_now_button": "Registrarme ahora",
"alternative_registration": "Otros metodos interesantes para registrarse"
}

@ -0,0 +1,13 @@
{
"reset_password": "Resetear Contraseña",
"update_password": "Actualizar contraseña",
"password_changed.title": "Contraseña editada",
"password_changed.message": "<p>La contraseña fue modificada con exito, por favor <a href=\"/login\">conectate de nuevo</a>.",
"wrong_reset_code.title": "Código de Reseteo Incorrecto",
"wrong_reset_code.message": "El código de reseteo ingresado no es correcto. Por favor intentalo de nuevo o <a href=\"/reset\">pide un nuevo código</a>.",
"new_password": "Nueva Contraseña",
"repeat_password": "Confirmar Contraseña",
"enter_email": "Por favor ingresa tu <strong>email</strong> y te enviaremos un email de como resetear tu cuenta.",
"password_reset_sent": "Resteo de contraseña enviado",
"invalid_email": "Email Invalido o no existe!"
}

@ -0,0 +1,39 @@
{
"topic": "Tema",
"topics": "Temas",
"no_topics_found": "No se encontraron temas!",
"profile": "Perfil",
"posted_by": "Publicado por",
"chat": "Chat",
"notify_me": "Seras notificado cuando haya nuevas respuestas en este tema",
"quote": "Citar",
"reply": "Responder",
"edit": "Editar",
"delete": "Borrar",
"banned": "banneado",
"link": "Link",
"thread_tools.title": "Herramientas del Tema",
"thread_tools.pin": "Poner Sticky",
"thread_tools.lock": "Cerrar Tema",
"thread_tools.move": "Mover Tema",
"thread_tools.delete": "Borrar Tema",
"load_categories": "Cargando Categorias",
"disabled_categories_note": "Las categorías deshabilidas estan en gris",
"confirm_move": "Mover",
"favourite": "Favorito",
"favourites": "Favoritos",
"favourites.not_logged_in.title": "No estas conectado :(",
"favourites.not_logged_in.message": "Por favor, conectate para agregar a favorito este post.",
"favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aqui!",
"posted_by": "Publicado por",
"loading": "Cargando",
"more_posts": "Más posts",
"move_topic": "Mover Tema",
"topic_will_be_moved_to": "Este tema sera movido a la categoría"
}

@ -0,0 +1,5 @@
{
"no_unread_topics": "No hay temas nuevos para leer.",
"mark_all_read": "Marcar todo como leeido",
"load_more": "Cargar más"
}

@ -0,0 +1,36 @@
{
"banned": "Banneado",
"offline": "desconectado",
"email": "email",
"fullname": "nombre completo",
"website": "website",
"location": "ubicación",
"age": "edad",
"joined": "registro",
"profil_views": "visitas en su perfil",
"reputation": "reputación",
"posts": "posts",
"followers": "seguidores",
"following": "siguiendo",
"signature": "firma",
"gravatar": "gravatar",
"birthday": "cumpleaños",
"change_picture": "cambiar foto",
"edit": "editar",
"uploaded_pictures": "fotos cargadas",
"upload_new_picture": "cargar nueva foto",
"change_password": "cambiar contraseña",
"confirm_password": "confirmar contraseña",
"password": "contraseña",
"upload_picture": "Cargar foto",
"upload_a_picture": "Cargar una foto",
"image_spec": "Solo puedes usar PNG, JPG, o GIF hasta 256kb.",
"settings": "opciones",
"show_my_email": "mostrar mi email",
"has_no_follower": "Este miembro no tiene seguidores :(",
"follows_no_one": "Este miembro no sigue a nadie, que pena :("
}

@ -0,0 +1,9 @@
{
"latest_users": "Ultimos Miembros",
"top_posters": "Top Posteadores",
"most_reputation": "Mayor Reputación",
"online": "Conectados",
"search": "Buscar",
"enter_username": "Ingresa el nombre de usuario para buscar",
"load_more": "Cargar más"
}

@ -119,7 +119,7 @@ var ajaxify = {};
});
}
utils.refreshTitle(url);
app.refreshTitle(url);
}, url, template);

@ -396,7 +396,44 @@ var socket,
$('body,html').animate({
scrollTop: $('html').height() - 100
});
}
};
var titleObj = {
active: false,
interval: undefined,
titles: []
};
app.alternatingTitle = function (title) {
if (typeof title !== 'string') return;
if (title.length > 0) {
titleObj.titles[1] = title;
if (titleObj.interval) {
clearInterval(titleObj.interval);
}
titleObj.interval = setInterval(function() {
window.document.title = titleObj.titles[titleObj.titles.indexOf(window.document.title) ^ 1];
}, 2000);
} else {
if (titleObj.interval) {
clearInterval(titleObj.interval);
}
if (titleObj.titles[0]) window.document.title = titleObj.titles[0];
}
};
app.refreshTitle = function(url) {
if (!url) {
var a = document.createElement('a');
a.href = document.location;
url = a.pathname.slice(1);
}
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
titleObj.titles[0] = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
app.alternatingTitle('');
});
};
jQuery('document').ready(function () {
$('#search-form').on('submit', function () {
@ -410,5 +447,5 @@ var socket,
showWelcomeMessage = location.href.indexOf('loggedin') !== -1;
app.loadConfig();
app.alternatingTitle('');
}());

@ -112,7 +112,7 @@
socket.emit('api:notifications.mark_all_read', null, function() {
notifIcon.toggleClass('active', false);
utils.refreshTitle();
app.refreshTitle();
// Update favicon + local count
Tinycon.setBubble(0);
@ -167,7 +167,7 @@
type: 'warning',
timeout: 2000
});
utils.refreshTitle();
app.refreshTitle();
// Update the favicon + local storage
var savedCount = parseInt(localStorage.getItem('notifications:count'),10) || 0;
@ -209,7 +209,6 @@
});
socket.on('chatMessage', function(data) {
require(['chat'], function(chat) {
var modal = null;
if (chat.modalExists(data.fromuid)) {
@ -220,10 +219,12 @@
chat.load(modal.attr('UUID'));
} else {
chat.toggleNew(modal.attr('UUID'), true);
app.alternatingTitle(data.username + ' has messaged you');
}
} else {
modal = chat.createModal(data.username, data.fromuid);
chat.toggleNew(modal.attr('UUID'), true);
app.alternatingTitle(data.username + ' has messaged you');
}
});
});

@ -26,6 +26,7 @@ define(function() {
taskbar.minimizeAll();
module.load(uuid);
taskbar.toggleNew(uuid, false);
app.alternatingTitle('');
// Highlight the button
$(taskbar.tasklist).removeClass('active');

@ -82,7 +82,7 @@
var parsedKey = keys[key].replace('[[', '').replace(']]', '').split(':');
if (!(parsedKey[0] && parsedKey[1])) continue;
var languageFile = parsedKey[0];
parsedKey = parsedKey[1].split(',')[0];

@ -169,23 +169,6 @@
return tags;
},
refreshTitle: function(url) {
if (!url) {
var a = document.createElement('a');
a.href = document.location;
url = a.pathname.slice(1);
}
var notificationIcon;
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
notificationIcon = notificationIcon || document.querySelector('.notifications a i');
if (numNotifications > 0 && notificationIcon) {
notificationIcon.className = 'fa fa-circle active';
}
});
},
isRelativeUrl: function(url) {
var firstChar = url.slice(0, 1);
return (firstChar === '.' || firstChar === '/');

@ -13,71 +13,68 @@
<img src="{picture}" class="user-profile-picture img-thumbnail"/>
</div>
<div class="account-online-status">
<span><i class="fa fa-circle-o"></i> <span>offline</span></span>
<span><i class="fa fa-circle-o"></i> <span>[[user:offline]]</span></span>
</div>
<!-- IF banned -->
<div>
<span class="label label-danger">banned</span>
<span class="label label-danger">[[user:banned]]</span>
</div>
<!-- ENDIF banned -->
<div>
<a id="chat-btn" href="#" class="btn btn-default hide">Chat</a>
</div>
<div id="user-actions">
<a id="follow-btn" href="#" class="btn btn-default hide">Follow</a>
<a id="unfollow-btn" href="#" class="btn btn-default hide">Unfollow</a>
<a id="follow-btn" href="#" class="btn btn-default">Follow</a>
<a id="unfollow-btn" href="#" class="btn btn-default">Unfollow</a>
</div>
</div>
<div class="col-md-4">
<div class="inline-block">
<div class="account-bio-block">
<span class="account-bio-label">email</span><i class="fa fa-eye-slash {emailClass}" title="Email hidden"></i>
<span class="account-bio-label">[[user:email]]</span><i class="fa fa-eye-slash {emailClass}" title="Email hidden"></i>
<span>{email}</span>
<br/>
<span class="account-bio-label">full name</span>
<span class="account-bio-label">[[user:fullname]]</span>
<span>{fullname}</span>
<br/>
<span class="account-bio-label">website</span>
<span class="account-bio-label">[[user:website]]</span>
<span><a href="{website}">{websiteName}</a></span>
<br/>
<span class="account-bio-label">location</span>
<span class="account-bio-label">[[user:location]]</span>
<span>{location}</span>
<br/>
<span class="account-bio-label">age</span>
<span class="account-bio-label">[[user:age]]</span>
<span>{age}</span>
<br/>
<hr/>
<span class="account-bio-label">joined</span>
<span class="account-bio-label">[[user:joined]]</span>
<span class="timeago" title="{joindate}"></span>
<br/>
<span class="account-bio-label">profile views</span>
<span class="account-bio-label">[[user:profil_views]]</span>
<span class="formatted-number">{profileviews}</span>
<br/>
<span class="account-bio-label">reputation</span>
<span class="account-bio-label">[[user:reputation]]</span>
<span class="formatted-number">{reputation}</span>
<br/>
<span class="account-bio-label">posts</span>
<span class="account-bio-label">[[user:posts]]</span>
<span class="formatted-number">{postcount}</span>
<br/>
<span class="account-bio-label">followers</span>
<span class="account-bio-label">[[user:followers]]</span>
<span class="formatted-number">{followerCount}</span>
<br/>
<span class="account-bio-label">following</span>
<span class="account-bio-label">[[user:following]]</span>
<span class="formatted-number">{followingCount}</span>
<br/>
<hr/>
<span class="account-bio-label">signature</span>
<span class="account-bio-label">[[user:signature]]</span>
<div class="post-signature">
<span id='signature'>{signature}</span>
</div>
@ -102,4 +99,4 @@
<input type="hidden" template-variable="yourid" value="{yourid}" />
<input type="hidden" template-variable="theirid" value="{theirid}" />
<input type="hidden" template-type="boolean" template-variable="isFollowing" value="{isFollowing}" />
<input type="hidden" template-type="boolean" template-variable="isFollowing" value="{isFollowing}" />

@ -1,27 +1,27 @@
<div class="well">
<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Change Picture" aria-hidden="true">
<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">Change Picture</h3>
<h3 id="myModalLabel">[[user:change_picture]]</h3>
</div>
<div class="modal-body">
<div id="gravatar-box">
<img id="user-gravatar-picture" src="" class="img-thumbnail user-profile-picture">
<span class="user-picture-label">Gravatar</span>
<span class="user-picture-label">[[user: gravatar]]</span>
<i class='fa fa-check fa-2x'></i>
</div>
<br/>
<div id="uploaded-box">
<img id="user-uploaded-picture" src="" class="img-thumbnail user-profile-picture">
<span class="user-picture-label">Uploaded picture</span>
<span class="user-picture-label">[[user: uploaded_picture]]</span>
<i class='fa fa-check fa-2x'></i>
</div>
<a id="uploadPictureBtn" href="#">Upload new picture</a>
<a id="uploadPictureBtn" href="#">[[user: upload_new_picture]]</a>
</div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
@ -34,7 +34,7 @@
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/edit">edit</a>
<a href="/user/{userslug}/edit">[[user:edit]]</a>
</span>
</div>
@ -42,7 +42,7 @@
<div class="col-md-2" style="text-align: center; margin-bottom:20px;">
<div class="account-picture-block text-center">
<img id="user-current-picture" class="user-profile-picture img-thumbnail" src="{picture}" /><br /><br />
<a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
</div>
</div>
@ -50,42 +50,42 @@
<div>
<form class='form-horizontal'>
<div class="control-group">
<label class="control-label" for="inputEmail">Email</label>
<label class="control-label" for="inputEmail">[[user:email]]</label>
<div class="controls">
<input class="form-control" type="text" id="inputEmail" placeholder="Email" value="{email}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputFullname">Full Name</label>
<label class="control-label" for="inputFullname">[[user:fullname]]</label>
<div class="controls">
<input class="form-control" type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputWebsite">Website</label>
<label class="control-label" for="inputWebsite">[[user:website]]</label>
<div class="controls">
<input class="form-control" type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputLocation">Location</label>
<label class="control-label" for="inputLocation">[[user:location]]</label>
<div class="controls">
<input class="form-control" type="text" id="inputLocation" placeholder="Location" value="{location}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputBirthday">Birthday</label>
<label class="control-label" for="inputBirthday">[[user:birthday]]</label>
<div class="controls">
<input class="form-control" type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputSignature">Signature</label>
<label class="control-label" for="inputSignature">[[user:signature]]</label>
<div class="controls">
<textarea class="form-control" id="inputSignature" placeholder="max 150 chars" rows="5">{signature}</textarea>
</div>
@ -94,7 +94,7 @@
<input type="hidden" id="inputUID" value="{uid}"><br />
<div class="form-actions">
<a id="submitBtn" href="#" class="btn btn-primary">Save changes</a>
<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
</div>
</form>
@ -114,7 +114,7 @@
</div>
<div class="control-group">
<label class="control-label" for="inputNewPassword">Password</label>
<label class="control-label" for="inputNewPassword">[[user:password]]</label>
<div class="input-group">
<input class="form-control" type="password" id="inputNewPassword" placeholder="New Password" value="">
<span class="input-group-addon">
@ -124,7 +124,7 @@
</div>
<div class="control-group">
<label class="control-label" for="inputNewPasswordAgain">Confirm Password</label>
<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
<div class="input-group">
<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value="">
<span class="input-group-addon">
@ -134,7 +134,7 @@
</div>
<br/>
<div class="form-actions">
<a id="changePasswordBtn" href="#" class="btn btn-primary">Change Password</a>
<a id="changePasswordBtn" href="#" class="btn btn-primary">[[user:change_password]]</a>
</div>
</form>

@ -4,7 +4,7 @@
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/settings">settings</a>
<a href="/user/{userslug}/settings">[[user:settings]]</a>
</span>
</div>
@ -13,7 +13,7 @@
<h4>privacy</h4>
<div class="checkbox">
<label>
<input id="showemailCheckBox" type="checkbox" {showemail}> Show my email
<input id="showemailCheckBox" type="checkbox" {showemail}> [[user:show_my_email]]
</label>
</div>
</div>
@ -23,6 +23,6 @@
</div>
</div>
<div class="form-actions">
<a id="submitBtn" href="#" class="btn btn-primary">Save changes</a>
<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
</div>
</div>

@ -45,12 +45,12 @@
</a>
<small>
<span class="topic-stats">
posts
[[category:posts]]
<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
</span>
|
<span class="topic-stats">
views
[[category:views]]
<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
</span>
|
@ -58,18 +58,18 @@
<a href="/user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a>
posted <span class="timeago" title="{topics.relativeTime}"></span>
[[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span>
</span>
<span class="pull-right hidden-xs">
<!-- IF topics.unreplied -->
No one has replied
[[category:no_replies]]
<!-- ELSE -->
<a href="/user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
replied
[[category:replied]]
</a>
<span class="timeago" title="{topics.teaser_timestamp}"></span>
<!-- ENDIF topics.unreplied -->
@ -120,4 +120,4 @@
<input type="hidden" template-variable="category_id" value="{category_id}" />
<input type="hidden" template-variable="twitter-intent-url" value="{twitter-intent-url}" />
<input type="hidden" template-variable="facebook-share-url" value="{facebook-share-url}" />
<input type="hidden" template-variable="google-share-url" value="{google-share-url}" />
<input type="hidden" template-variable="google-share-url" value="{google-share-url}" />

@ -2,6 +2,6 @@
<strong>{title}</strong>
<p>{text}</p>
<p>
<a href="/">NodeBB Home</a>
<a href="/">[[notification:back_to_home]]</a>
</p>
</div>

@ -2,12 +2,12 @@
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/favourites">favourites</a>
<a href="/user/{userslug}/favourites">[[topic:favourites]]</a>
</span>
</div>
<!-- IF show_nofavourites -->
<div id="no-favourites-notice" class="alert alert-warning">You don't have any favourites, favourite some posts to see them here!</div>
<div id="no-favourites-notice" class="alert alert-warning">[[topic:has_no_favourites]]</div>
<!-- ENDIF show_nofavourites -->
<div class="row">

@ -4,7 +4,7 @@
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/followers">followers</a>
<a href="/user/{userslug}/followers">[[user:followers]]</a>
</span>
</div>
@ -30,7 +30,7 @@
</div>
<!-- END followers -->
</div>
<div id="no-followers-notice" class="alert alert-warning hide">This user doesn't have any followers :(</div>
<div id="no-followers-notice" class="alert alert-warning hide">[[user:has_no_follower]]</div>
</div>
<input type="hidden" template-variable="yourid" value="{yourid}" />

@ -4,7 +4,7 @@
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/following">following</a>
<a href="/user/{userslug}/following">[[user:following]]</a>
</span>
</div>
@ -31,7 +31,7 @@
<!-- END following -->
</div>
<div id="no-following-notice" class="alert alert-warning hide">This user isn't following anyone :(</div>
<div id="no-following-notice" class="alert alert-warning hide">[[user:follows_no_one]]</div>
</div>
<input type="hidden" template-variable="yourid" value="{yourid}" />

@ -26,21 +26,21 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel">Upload Picture</h3>
<h3 id="myModalLabel">[[user:upload_picture]]</h3>
</div>
<div class="modal-body">
<form id="uploadForm" action="" method="post" enctype="multipart/form-data">
<div class="form-group">
<label for="userPhoto">Upload a picture</label>
<label for="userPhoto">[[user:upload_a_picture]]</label>
<input type="file" id="userPhotoInput" name="userPhoto">
<p class="help-block">You may only upload PNG, JPG, or GIF files under 256kb.</p>
<p class="help-block">[[user:image_spec]]</p>
</div>
<input id="imageUploadCsrf" type="hidden" name="_csrf" value="" />
</form>
<div id="upload-progress-box" class="progress progress-striped">
<div id="upload-progress-bar" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0">
<span class="sr-only"> success</span>
<span class="sr-only"> [[footer:success]]</span>
</div>
</div>
@ -50,7 +50,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="pictureUploadSubmitBtn" class="btn btn-primary">Upload Picture</button>
<button id="pictureUploadSubmitBtn" class="btn btn-primary">[[user:upload_picture]]</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
@ -61,7 +61,9 @@
<footer id="footer" class="container footer">
{footerHTML}
<div class="copyright">Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.org">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></div>
<div class="copyright">
Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.com">NodeBB Forums</a> | <a target="_blank" href="//github.com/designcreateplay/NodeBB/graphs/contributors">Contributors</a>
</div>
</footer>
<script>
@ -69,4 +71,4 @@
</script>
</body>
</html>
</html>

@ -113,10 +113,10 @@
</a>
<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
<li>
<a id="user-profile-link" href=""><span>Profile</span></a>
<a id="user-profile-link" href=""><span>[[global:header.profile]]</span></a>
</li>
<li id="logout-link">
<a href="#">Log out</a>
<a href="#">[[global:logout]]</a>
</li>
</ul>
</li>
@ -125,19 +125,19 @@
<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
<li class="visible-lg visible-md visible-sm">
<a href="/register">Register</a>
<a href="/register">[[global:register]]</a>
</li>
<li class="visible-lg visible-md visible-sm">
<a href="/login">Login</a>
<a href="/login">[[global:login]]</a>
</li>
<li class="visible-xs">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
<li>
<a href="/register">Register</a>
<a href="/register">[[global:register]]</a>
</li>
<li>
<a href="/login">Login</a>
<a href="/login">[[global:login]]</a>
</li>
</ul>
</li>

@ -20,13 +20,13 @@
<div class="form-group">
<label for="username" class="col-lg-2 control-label">[[login:username]]</label>
<div class="col-lg-10">
<input class="form-control" type="text" placeholder="Enter Username" name="username" id="username" />
<input class="form-control" type="text" placeholder="[[login:username]]" name="username" id="username" />
</div>
</div>
<div class="form-group">
<label for="password" class="col-lg-2 control-label">[[login:password]]</label>
<div class="col-lg-10">
<input class="form-control" type="password" placeholder="Enter Password" name="password" id="password" />
<input class="form-control" type="password" placeholder="[[login:password]]" name="password" id="password" />
</div>
</div>
<div class="form-group">

@ -1,6 +1,6 @@
<h2>[[notifications:title]]</h2>
<button type="button" class="btn btn-default" id="mark-all-notifs-read">Mark All as Read</button>
<button type="button" class="btn btn-default" id="mark-all-notifs-read">[[notifications:mark_all_as_read]]</button>
<ul class="notifications-list">
<!-- BEGIN notifications -->
@ -11,4 +11,4 @@
</p>
</li>
<!-- END notifications -->
</ul>
</ul>

@ -4,17 +4,17 @@
<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
</li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">Outgoing Link</span>
<span itemprop="title">[[notifications:outgoing_link]]</span>
</li>
</ol>
<div class="well">
<h3>
You are now leaving {title}.
[[notifications:outgoing_link_message]] {title}.
</h3>
<p>
<a href="{url}" rel="nofollow" class="btn btn-primary btn-lg">Continue to {url}</a>
<a id="return-btn" href="#" class="btn btn-lg btn-warning">Return to {title}</a>
<a href="{url}" rel="nofollow" class="btn btn-primary btn-lg">[[notifications:continue_to]] {url}</a>
<a id="return-btn" href="#" class="btn btn-lg btn-warning">[[notifications:return_to]] {title}</a>
</p>
</div>
</div>
@ -24,4 +24,4 @@
history.back();
return false;
});
</script>
</script>

@ -1,28 +1,28 @@
<ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">Reset Password</span>
<span itemprop="title">[[reset_password:reset_password]]</span>
</li>
</ol>
<div class="alert alert-info">
Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.
[[reset_password:reset_password:enter_email]]
</div>
<div class="well">
<div class="alert alert-success" id="success" style="display:none">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Password Reset Sent</strong>
<strong>[[reset_password:password_reset_sent]]</strong>
</div>
<div class="alert alert-danger" id="error" style="display:none">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Invalid Email / Email does not exist!</strong>
<strong>[[reset_password:invalid_email]]</strong>
</div>
<form onsubmit="return false;">
<input type="text" class="form-control input-block input-lg" placeholder="Enter Email Address" id="email" />
<br />
<button class="btn btn-primary btn-block btn-lg" id="reset" type="submit">Reset Password</button>
<button class="btn btn-primary btn-block btn-lg" id="reset" type="submit">[[reset_password:reset_password]]</button>
</form>
</div>

@ -1,12 +1,12 @@
<ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li>
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/reset" itemprop="url"><span itemprop="title">Reset Password</span></a>
<a href="/reset" itemprop="url"><span itemprop="title">[[reset_password:reset_password]]</span></a>
</li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">Update Password</span>
<span itemprop="title">[[reset_password:update_password]]</span>
</li>
</ol>
@ -14,23 +14,23 @@
<div class="well">
<div class="alert alert-success" id="success" style="display:none">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Password Changed</strong>
<p>Password successfully reset, please <a href="/login">log in again</a>.</p>
<strong>[[reset_password:password_changed.title]]</strong>
<p>[[reset_password:password_changed.message]]</p>
</div>
<div class="alert alert-warning" id="notice" style="display:none">
<strong></strong>
<p></p>
</div>
<div class="alert alert-danger" id="error" style="display:none">
<strong>Incorrect Reset Code</strong>
<p>The reset code received was incorrect. Please try again, or <a href="/reset">request a new reset code</a></p>
<strong>[[reset_password:wrong_reset_code.title]]</strong>
<p>[[reset_password:wrong_reset_code.message]]</p>
</div>
<form onsubmit="return false;" id="reset-form">
<label for="password">New Password</label>
<label for="password">[[reset_password:new_password]]</label>
<input class="form-control input-lg" type="password" placeholder="A new password" id="password" /><br />
<label for="repeat">Confirm Password</label>
<label for="repeat">[[reset_password:repeat_password]]</label>
<input class="form-control input-lg" type="password" placeholder="The same password" id="repeat" /><br />
<button class="btn btn-primary btn-lg btn-block" id="reset" type="submit" disabled>Reset Password</button>
<button class="btn btn-primary btn-lg btn-block" id="reset" type="submit" disabled>[[reset_password:reset_password]]</button>
</form>
</div>
<input type="hidden" template-variable="reset_code" value="{reset_code}" />

@ -1,6 +1,6 @@
<ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li class="active">Search</li>
<li><a href="/">[[global:home]]</a></li>
<li class="active">[[global:header.search]]</li>
</ol>
@ -9,15 +9,15 @@
<div class="form-group">
<input type="text" class="form-control" placeholder="Search" name="query" value="">
</div>
<button type="submit" class="btn btn-default hide">Search</button>
<button type="submit" class="btn btn-default hide">[[global:header.search]]</button>
</div>
</form>
<div class="category search">
<div class="{show_results}">
<ul id="topics-container" data-search-query="{search_query}">
<h3>Topics</h3>
<div class="alert alert-info {show_no_topics}">No topics found!</div>
<h3>[[topic:topics]]</h3>
<div class="alert alert-info {show_no_topics}">[[topic:no_topics_found]]</div>
<!-- BEGIN topics -->
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
<li class="category-item">

@ -52,7 +52,7 @@
<div class="topic-buttons">
<div class="btn-group">
<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="Posted by {posts.username}">
<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
<span class="username-field" href="/user/{posts.userslug}" itemprop="author">{posts.username}&nbsp;</span>
<span class="caret"></span>
</button>
@ -111,9 +111,9 @@
{posts.additional_profile_info}
</span>
<span class="pull-right">
posted <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span>
[[category:posted]] <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span>
<!-- IF posts.editor -->
<span>| last edited by <strong><a href="/user/{posts.editorslug}">{posts.editorname}</a></strong></span>
<span>| [[category:last_edited_by]] <strong><a href="/user/{posts.editorslug}">{posts.editorname}</a></strong></span>
<span class="timeago" title="{posts.relativeEditTime}"></span>
<!-- ENDIF posts.editor -->
</span>
@ -127,11 +127,11 @@
<li class="well post-bar">
<div class="inline-block">
<small class="topic-stats">
<span>posts</span>
<span>[[category:posts]]</span>
<strong><span id="topic-post-count" class="human-readable-number" title="{postcount}">{postcount}</span></strong> |
<span>views</span>
<span>[[category:views]]</span>
<strong><span class="human-readable-number" title="{viewcount}">{viewcount}</span></strong> |
<span>browsing</span>
<span>[[category:browsing]]</span>
</small>
<div class="thread_active_users active-users inline-block"></div>
</div>
@ -158,7 +158,7 @@
<div class="well col-md-11 col-xs-12 pull-right hide">
<div class="topic-main-buttons pull-right inline-block hide">
<div class="loading-indicator" done="0" style="display:none;">
Loading <span class="hidden-xs" style="display:inline!important;">More Posts</span> <i class="fa fa-refresh fa-spin"></i>
[[topic:loading]] <span class="hidden-xs" style="display:inline!important;">[[topic:more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
</div>
<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
<div class="btn-group thread-tools hide">
@ -181,7 +181,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Move Topic</h3>
<h3>[[topic:move_topic]]</h3>
</div>
<div class="modal-body">
<p id="categories-loading"><i class="fa fa-spin fa-refresh"></i> [[topic:load_categories]]</p>
@ -191,7 +191,7 @@
</p>
<div id="move-confirm" style="display: none;">
<hr />
<div class="alert alert-info">This topic will be moved to the category <strong><span id="confirm-category-name"></span></strong></div>
<div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div>
</div>
</div>
<div class="modal-footer">
@ -203,4 +203,4 @@
</div>
</div>
</div>
</div>

@ -1156,6 +1156,4 @@ websockets.init = function(io) {
return userSockets;
}
}
})(module.exports);
})(module.exports);

Loading…
Cancel
Save