wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.gnu.io:h2p/Qvitter

Browse Source
This commit is contained in:
abjectio 2016-02-07 18:58:21 +01:00
commit 2b8065e047
9 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actions/qvitter.php
View File

@ -398,6 +398,7 @@ class QvitterAction extends ApiAction
<li class="fullwidth"><a id="edit-profile-header-link"></a></li>
<li class="fullwidth"><a id="settings" href="<?php print $instanceurl; ?>settings/profile" donthijack></a></li>
<li class="fullwidth"><a id="faq-link"></a></li>
<li class="fullwidth"><a id="tou-link"></a></li>
<li class="fullwidth"><a id="shortcuts-link"></a></li>
<?php if (common_config('invite', 'enabled') && !common_config('site', 'closed')) { ?>
<li class="fullwidth"><a id="invite-link" href="<?php print $instanceurl; ?>main/invite"></a></li>

3
css/qvitter.css
View File

@ -5158,7 +5158,8 @@ content:"\f068";
/* FAQ
-----------*/
#popup-faq #faq-container {
#popup-faq #faq-container,
#popup-terms #terms-container {
padding:10px 20px 20px;
color:#000;
min-height:100vh;

4
doc/de/terms.html
View File

@ -29,3 +29,7 @@ unkommerziell und alle unsere Ausgaben werden durch Spenden von Einzelpersonen b
zu eröffnen, wenn du vorhast kommerzielle Angebote zu posten.</p>
<p>Der Inhalt dieser Seite ist lizensiert unter <a href="{instance-license-url}">{instance-license-title}</a>.</p>
<p>Each user is responsible for the content they submit. If you have any questions
about something posted on this instance, contact the user in question first. As a last resort you
can email the <a href="mailto:{instance-email}">admins</a>.</p>

4
doc/en/terms.html
View File

@ -25,3 +25,7 @@ non-profit and all our expenses are payed for by donations from individuals.
if your intention is commercial.</p>
<p>All content on this site is licensed with <a href="{instance-license-url}">{instance-license-title}</a>.</p>
<p>Each user is responsible for the content they submit. If you have any questions
about something posted on this instance, contact the user in question first. As a last resort you
can email the <a href="mailto:{instance-email}">admins</a>.</p>

4
doc/io/terms.html
View File

@ -9,3 +9,7 @@
<p>Anunco e komercala enti ne esas permisita ye ca exemplero. Ni esas tote neprofita e nia spensi esas tote pagita da individui. <a href="mailto:{instance-email}">Ni povas helpar vu</a> iniciar vua propra exemplero di GNU Social se vua intenco esas komercala.</p>
<p>Omna kontenajo ye ca ret-situo esas licencita per <a href="{instance-license-url}">{instance-license-title}</a>.</p>
<p>Each user is responsible for the content they submit. If you have any questions
about something posted on this instance, contact the user in question first. As a last resort you
can email the <a href="mailto:{instance-email}">admins</a>.</p>

4
doc/no/terms.html
View File

@ -27,3 +27,7 @@ alla andre brukere.</p>
instans om du har kommersielle intensjoner.</p>
<p>Alt innhold på instansen publiseres under lisensen <a href="{instance-license-url}">{instance-license-title}</a>.</p>
<p>Each user is responsible for the content they submit. If you have any questions
about something posted on this instance, contact the user in question first. As a last resort you
can email the <a href="mailto:{instance-email}">admins</a>.</p>

5
doc/sv/terms.html
View File

@ -13,7 +13,6 @@ från trakasserier och förtryck, men utan att införa en central censur.</p>
också vara vaksamma mot t ex rasism, sexism, funko-, trans- och homofobi. Sådana yttranden
skapar ett osäkert rum för andra användare, och i praktiken begränsar det deras yttrandefrihet.</p>
<p>Den offentliga tidslinjen, under rubriken "Hela sajtens flöde", anser vi vara särskilt
känslig. Dels är den vårt ansikte utåt, dels får alla se vad som skrivs där – inte bara
användarens följare. Moderatorer kan därför dölja användare från den offentliga tidslinjen,
@ -27,3 +26,7 @@ helt icke-kommersiellt och alla våra omkostnader betalas av donationer från en
instans om du har kommersiella intentioner.</p>
<p>Allt innehåll på sajten publiceras under licensen <a href="{instance-license-url}">{instance-license-title}</a>.</p>
<p>Varje användare ansvarar för innehållet som de lägger upp. Om du har några betänkligheter
om något som postats på denna instans, hör av dig till användaren i fråga först. Om det
inte hjälper kan du mejla sajtens <a href="mailto:{instance-email}">administratörer</a>.</p>

3
js/misc-functions.js
View File

@ -1882,7 +1882,8 @@ function loadHistoryFromLocalStorage() {
$('#history-container').css('display','block');
$('#history-container').html('');
$.each(cacheData, function(key,obj) {
$('#history-container').append('<a class="stream-selection" href="' + obj.dataStreamHref + '">' + obj.dataStreamHeader + '<i class="chev-right" data-tooltip="' + window.sL.tooltipBookmarkStream + '"></i></a>');
var streamHeader = replaceHtmlSpecialChars(obj.dataStreamHeader); // because we're pulling the header with jQuery.text() before saving in localstorage, which unescapes our escaped html
$('#history-container').append('<a class="stream-selection" href="' + obj.dataStreamHref + '">' + streamHeader + '<i class="chev-right" data-tooltip="' + window.sL.tooltipBookmarkStream + '"></i></a>');
});
}
updateHistoryLocalStorage();

15
js/qvitter.js
View File

@ -936,6 +936,7 @@ function proceedToSetLanguageAndLogin(data){
$('.stream-selection.public-and-external-timeline').prepend(window.sL.publicAndExtTimeline)
$('#search-query').attr('placeholder',window.sL.searchVerb);
$('#faq-link').html(window.sL.FAQ);
$('#tou-link').html(window.sL.showTerms);
$('#add-edit-language-link').html(window.sL.addEditLanguageLink);
$('#shortcuts-link').html(window.sL.keyboardShortcuts);
$('#invite-link').html(window.sL.inviteAFriend);
@ -1094,6 +1095,20 @@ $('#faq-link').click(function(){
});
/* ·
·
· Terms
·
· · · · · · · · · · · · · */
$('#tou-link').click(function(){
popUpAction('popup-terms', window.sL.showTerms,'<div id="terms-container"></div>',false);
getDoc('terms',function(termsHtml){
$('#terms-container').html(termsHtml);
});
});
/* ·
·