fixes #63

css/qvitter.css

@@ -2225,7 +2225,8 @@ body.rtl .queet.rtl .expanded-content {
 	position:relative;
 }
 .quoted-notice,
-.oembed-item {
+.oembed-item,
+.xfolkentry {
 	width:100%;
 	border: 1px solid #eee;
     border-radius: 4px;
@@ -2238,17 +2239,25 @@ body.rtl .queet.rtl .expanded-content {
 	color:#292f33 !important;
 	overflow: hidden;
 	}
-.oembed-item {
+.oembed-item,
+.xfolkentry {
 	padding:0;
 	}
 .quoted-notice:hover,
-.oembed-item:hover {
+.oembed-item:hover,
+.xfolkentry:hover {
 	text-decoration: none !important;
 	}
 .stream-item:hover:not(.expanded) .quoted-notice ,
-.stream-item:hover:not(.expanded) .oembed-item {
+.stream-item:hover:not(.expanded) .oembed-item,
+.stream-item:hover:not(.expanded) .xfolkentry {
 	border: 1px solid #ddd;
 	}
+.stream-item:hover:not(.expanded) .xfolkentry .taggedlink::before {
+	background-color:#ddd;
+	color:#bbb;
+	}
+
 
 .quoted-notice-attachments {
 	width:100%;
@@ -2263,7 +2272,8 @@ body.rtl .queet.rtl .expanded-content {
 	}
 
 .quoted-notice-img-container,
-.oembed-img-container {
+.oembed-img-container,
+.xfolkentry .taggedlink::before {
     height: 102px;
     width: 102px;
 	display: inline-block;
@@ -2273,6 +2283,20 @@ body.rtl .queet.rtl .expanded-content {
 	background-repeat:no-repeat;
 	background-position: center;
 	}
+.xfolkentry .taggedlink::before {
+    background-color: #eee;
+    color: #ccc;
+    content: '\f097';
+    float: left;
+    font-family: "fontAwesome";
+    font-size: 40px;
+    height: 70px;
+    line-height: 70px;
+    margin-top: 0;
+    text-align: center;
+    vertical-align: top;
+    width: 70px;
+	}
 .oembed-img-container {
     height: 125px;
     width: 125px;
@@ -2344,13 +2368,28 @@ body.rtl .queet.rtl .expanded-content {
 	line-height: 18.3px;
 	margin-top:4.5px;
 	}
-.oembed-item-footer {
+.oembed-item-footer,
+.xfolkentry .meta .tag {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 	color:#999;
 	padding-bottom: 9px;
 	}
+.xfolkentry .taggedlink {
+	line-height:25px;
+	font-weight: bold;
+    overflow: hidden;
+    white-space: nowrap;
+	}
+.xfolkentry .meta,
+.xfolkentry .description {
+	display:block;
+    margin:-2px 10px 3px 8px;
+	}
+.xfolkentry .meta .tag::before {
+	content:"#";
+	}
 .oembed-item-provider-url {
 	font-style:italic;
 	}

js/dom-functions.js

@@ -2278,6 +2278,11 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
 		$(this).contents().unwrap();
 		});
 
+	// bookmarks created by the bookmark plugin get's a tooltip
+	statusnetHTML.find('.xfolkentry').each(function(){
+		$(this).attr('data-tooltip',window.sL.thisIsABookmark);
+		});
+
 	// find a place in the queet-text for the quoted notices
 	statusnetHTML = placeQuotedNoticesInQueetText(attachmentBuild.quotedNotices, statusnetHTML);
 	statusnetHTML = statusnetHTML.html();

locale/ar.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/ast.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/ca.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/de.json

@@ -196,5 +196,6 @@
 	"userMuted":"Ausgeblendete Nutzer",
 	"mutedStreamDescription":"Du hast diese Nutzer in Deiner Timeline ausgeblendet. Benachrichtigungen von diesen Nutzern werden werden weiterhin angezeigt. Um sie ebenfalls zu verbergen, wähle im Zahnradmenu der Benachrichtigungsseite die Option "Benachrichtigungen von ausgeblendeten Benutzern verbergen".",
 	"profileAndSettings":"Profil und Einstellungen",
-	"profileSettings":"Profileinstellungen"
+	"profileSettings":"Profileinstellungen",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/en.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still receive notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/es.json

@@ -195,5 +195,6 @@
 	"userMuted":"Cuentas silenciadas",
 	"mutedStreamDescription":"Has ocultado estas cuentas de tu línea temporal. Seguirás recibiendo notificaciones de dichas cuentas a menos que selecciones "Ocultar notificaciones de usuarios silencioados" desde el menú con forma de rueda dentada en la página de notificaciones.",
 	"profileAndSettings":"Perfil y ajustes",
-	"profileSettings":"Ajustes del perfil"
+	"profileSettings":"Ajustes del perfil",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/es_419.json

@@ -196,5 +196,6 @@
 	"userMuted":"Cuentas mudas",
 	"mutedStreamDescription":"Haz ocultado esas cuentas de tu línea temporal. Igualmente recibirás notificaciones de esas cuentas, a menos que selecciones "Hide notifications from muted users" desde el menú de la rueda dentada en la página de notificaciones.",
 	"profileAndSettings":"Perfiles y configuraciones",
-	"profileSettings":"Perfil y configuración"
+	"profileSettings":"Perfil y configuración",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/es_ahorita.json

@@ -196,5 +196,6 @@
 	"userMuted":"Cuentas silenciadas",
 	"mutedStreamDescription":"Has ocultado estas cuentas de tu línea temporal. Seguirás recibiendo notificaciones de dichas cuentas a menos que selecciones "Ocultar notificaciones de usuarios silencioados" desde el menú con forma de rueda dentada en la página de notificaciones.",
 	"profileAndSettings":"Perfil y ajustes",
-	"profileSettings":"Ajustes del perfil"
+	"profileSettings":"Ajustes del perfil",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/eu.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/fa.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/fi.json

@@ -197,5 +197,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/fr.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/gl.json

@@ -196,5 +196,6 @@
 	"userMuted":"Contas acaladas",
 	"mutedStreamDescription":"Ocultaches estas contas da túa liña de tempo. Continuarás a recibir notificacións destas contas, a non ser que selecciones "Agochar notificacións de usuarias acaladas" na roda dentada do menú da páxina de notificacións.",
 	"profileAndSettings":"Perfil e axustes",
-	"profileSettings":"Axustes do perfil"
+	"profileSettings":"Axustes do perfil",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/he.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/hy.json

@@ -193,5 +193,6 @@
 	"userMuted":"Արհամարհվող օգտատերերը։",
 	"mutedStreamDescription":"Դուք թացրել եք այս օգտատերերին Ձեր հոսքից։ Դուք կշարունակեք ստանալ այս օգտատերերից ծանուցումներ, եթե չընտրեք "Թաքցնել արհամարհվող օգտատերերի ծանուցումները " Ծանուցումների էջի մենյուի կարգավորումներում",
 	"profileAndSettings":"Էջ և կարգավորումներ",
-	"profileSettings":"Էջի կարգավորումներ"
+	"profileSettings":"Էջի կարգավորումներ",
-}
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
+}

locale/io.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/it.json

@@ -196,5 +196,6 @@
 	"userMuted":"Account a cui hai tolto la voce",
 	"mutedStreamDescription":"Hai nascosto questi account dalla tua bacheca. Riceverai comunque le loro notifiche, per disabilitarle seleziona "Nascondi notifiche dagli account senza voce" dal menu delle impostazioni sulla pagina relativa alle notifiche.",
 	"profileAndSettings":"Profilo e impostazioni",
-	"profileSettings":"Impostazioni del profilo"
+	"profileSettings":"Impostazioni del profilo",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/ja.json

@@ -196,5 +196,6 @@
 	"userMuted":"ミュートされているユーザー",
 	"mutedStreamDescription":"あなたのタイムラインから、選択されたユーザーを隠しました。あなたがお知らせページの歯車のメニューにある"ミュートしたユーザーからのお知らせを隠す"を選択しなかったユーザー以外からは、まだお知らせを受け取ります。",
 	"profileAndSettings":"プロフィールと設定",
-	"profileSettings":"プロフィール設定"
+	"profileSettings":"プロフィール設定",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/nb.json

@@ -196,5 +196,6 @@
 	"userMuted":"Forstummede kontoer",
 	"mutedStreamDescription":"Du har skjul disse kontoene fra din tidslinje. Du vil alikevel motta notifikasjoner fra disse kontoene, hvis da du ikke velger "Skjul notifikasjoner fra forstummede brukere" fra tannhjul menyen på notifikasjons siden.",
 	"profileAndSettings":"Profiler og innstillinger",
-	"profileSettings":"Profil innstillinger"
+	"profileSettings":"Profil innstillinger",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/nl.json

@@ -196,5 +196,6 @@
 	"userMuted":"Gedempte gebruikers",
 	"mutedStreamDescription":"Je negeert deze gebruikers in je tijdlijn. Je krijgt wel nog mededelingen van deze gebruikers, tenzij je "Geen mededelingen van genegeerde gebruikers." kiest van het instellingen icoon op de mededelingen pagina.",
 	"profileAndSettings":"Profiel en instellingen",
-	"profileSettings":"Profiel instellingen"
+	"profileSettings":"Profiel instellingen",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/pt.json

@@ -196,5 +196,6 @@
 	"userMuted":"Contas Caladas",
 	"mutedStreamDescription":"Você escondeu estas contas da sua linha do tempo. Irá continuar a receber notificações delas, a não ser que selecione a opção \"Esconder notificações de utilizadores calados\" a partir do menu da roldana na página de notificações.",
 	"profileAndSettings":"Perfil e Definições",
-	"profileSettings":"Definições do Perfil"
+	"profileSettings":"Definições do Perfil",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/pt_br.json

@@ -196,5 +196,6 @@
 	"userMuted":"Contas caladas",
 	"mutedStreamDescription":"Você escondeu estas contas de sua linha do tempo. Você ainda receberá notificações destas contas, a menos que você selecione "Esconder notificações de usuários calados" no menu de engrenagem na página de notificações.",
 	"profileAndSettings":"Perfil e ajustes",
-	"profileSettings":"Ajustes de perfil"
+	"profileSettings":"Ajustes de perfil",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/ru.json

@@ -194,5 +194,6 @@
 	"userMuted":"Игнорируемые учётные записи",
 	"mutedStreamDescription":"Вы скрыли этих пользователей из вашей ленты. Вы будете продолжать получать уведомления от этих пользователей, если не выберете "Скрыть уведомления от игнорируемых пользователей" в меню с шестерёнкой на странице уведомлений",
 	"profileAndSettings":"Профиль и настройки",
-	"profileSettings":"Настройки профиля"
+	"profileSettings":"Настройки профиля",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/sq.json

@@ -196,6 +196,6 @@
 	"userMuted":"Llogari pa zë",
 	"mutedStreamDescription":"Këto llogari i keni fshehur prej rrjedhës suaj kohore. Do të merrni, prapëseprapë, njoftime nga këto llogari, veç në përzgjedhshi "Fshihi njoftimet prej përdorues me zë të hequr", te menuja me ikonën e ingranazhit te faqja e njoftimeve.",
 	"profileAndSettings":"Profil dhe rregullime",
-	"profileSettings":"Rregullime profili"
+	"profileSettings":"Rregullime profili",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }
-

locale/sv.json

@@ -196,5 +196,6 @@
 	"userMuted":"Ignorerade konton",
 	"mutedStreamDescription":"Du har dolt dessa användare från dina flöden. Du kommer fortfarande få notiser från dem, om du inte väljer "Dölj notiser från användare som du ignorerar" från kugghjulsmenyn på notissidan.",
 	"profileAndSettings":"Profil och inställningar",
-	"profileSettings":"Profilinställningar"
+	"profileSettings":"Profilinställningar",
+	"thisIsABookmark":"Detta är ett bokmärke som skapats i GNU socials standardgränssnitt"
 }

locale/tr.json

@@ -196,5 +196,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/uk.json

@@ -196,5 +196,6 @@
 	"userMuted":"Облікови записи котри Ви ігноруюти зараз",
 	"mutedStreamDescription":"Ви сховали ці облікови записи з вашей стрічкі. Ви будете одержувати оголошення від цих облікових записів, доки Ви не виберіте "Сховати оголошення від корістувачей котрих я ігнорую" в меню з шестернею на сторінкі оголошень.",
 	"profileAndSettings":"Профіль та налаштування",
-	"profileSettings":"Налаштування профіля"
+	"profileSettings":"Налаштування профіля",
-}
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
+}

locale/zh_cn.json

@@ -195,5 +195,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }

locale/zh_tw.json

@@ -195,5 +195,6 @@
 	"userMuted":"Muted accounts",
 	"mutedStreamDescription":"You've hidden these accounts from your timeline. You will still recieve notifications from these accounts, unless you select "Hide notifications from muted users" from the cog wheel menu on the notifications page.",
 	"profileAndSettings":"Profile and settings",
-	"profileSettings":"Profile settings"
+	"profileSettings":"Profile settings",
+	"thisIsABookmark":"This is a bookmark created in the Classic interface"
 }