Merge branch 'master' of github.com:hannesmannerheim/qvitter
This commit is contained in:
Knut Erik Hollund
commit
a5633f9cab
|
|
@ -212,7 +212,11 @@ class QvitterPlugin extends Plugin {
|
|||
|
||||
|
||||
if ($this->hijack_ui === true) {
|
||||
$m->connect('', array('action' => 'qvitter'));
|
||||
|
||||
// other plugins might want to reroute to qvitter
|
||||
Event::handle('QvitterHijackUI', array($m));
|
||||
|
||||
$m->connect('', array('action' => 'qvitter'));
|
||||
$m->connect('main/all', array('action' => 'qvitter'));
|
||||
$m->connect('main/public', array('action' => 'qvitter'));
|
||||
$m->connect('search/notice', array('action' => 'qvitter'));
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@ class QvitterAction extends ApiAction
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="menu-container"><?php
|
||||
<div id="main-menu" class="menu-container"><?php
|
||||
|
||||
if($logged_in_user) {
|
||||
?><a href="<?php print $instanceurl.$logged_in_user->nickname ?>/all" class="stream-selection friends-timeline"><i class="chev-right"></i></a>
|
||||
|
|
@ -523,7 +523,23 @@ class QvitterAction extends ApiAction
|
|||
<div id="new-queets-bar-container" class="hidden"><div id="new-queets-bar"></div></div>
|
||||
<div id="feed-body"></div>
|
||||
</div>
|
||||
<div id="hidden-html"><?php
|
||||
|
||||
// adds temporary support for microformats and linkbacks on the notice page
|
||||
if(substr($_SERVER['REQUEST_URI'],0,8) == '/notice/' && $this->arg('notice')) {
|
||||
echo '<ol class="notices xoxo">';
|
||||
$notice = Notice::getKV('id', $this->arg('notice'));
|
||||
if($notice instanceof Notice) {
|
||||
$widget = new NoticeListItem($notice, $this);
|
||||
$widget->show();
|
||||
$this->flush();
|
||||
}
|
||||
echo '</ol>';
|
||||
}
|
||||
|
||||
Event::handle('QvitterHiddenHtml', array($this));
|
||||
|
||||
?></div>
|
||||
<div id="footer"><div id="footer-spinner-container"></div></div>
|
||||
</div>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery-2.1.4.min.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/jquery-2.1.4.min.js')); ?>"></script>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,8 @@ ul, li {
|
|||
list-style: none outside none;
|
||||
}
|
||||
|
||||
#dynamic-styles {
|
||||
#dynamic-styles,
|
||||
#hidden-html {
|
||||
display:none;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
· ·
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
|
||||
// plugins can add translatons to this object
|
||||
window.pluginTranslations = [];
|
||||
|
||||
// object to keep old states of streams in, to speed up stream change
|
||||
window.oldStreams = new Object();
|
||||
|
||||
|
|
@ -723,6 +726,19 @@ $(window).load(function() {
|
|||
function proceedToSetLanguageAndLogin(data){
|
||||
window.sL = data;
|
||||
|
||||
// plugins might have added translations
|
||||
$.each(window.pluginTranslations,function(k,pluginTranslation) {
|
||||
if(typeof pluginTranslation[window.selectedLanguage] != 'undefined') {
|
||||
$.extend(window.sL,pluginTranslation[window.selectedLanguage]);
|
||||
}
|
||||
else if(typeof pluginTranslation['en'] != 'undefined') {
|
||||
$.extend(window.sL,pluginTranslation['en']);
|
||||
}
|
||||
});
|
||||
|
||||
// plugins might want to wait and do stuff until after language is set
|
||||
$(document).trigger('qvitterAfterLanguageIsSet');
|
||||
|
||||
// if this is a RTL-language, add rtl class to body
|
||||
if(window.sL.directionality == 'rtl') {
|
||||
$('body').addClass('rtl');
|
||||
|
|
|
|||
|
|
@ -37,6 +37,16 @@
|
|||
· ·
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
|
||||
/* ·
|
||||
·
|
||||
· Other plugins can add streams to Qvitter, by pushing streamObjects to
|
||||
· this array. See the structure in pathToStreamRouter()
|
||||
·
|
||||
· · · · · · · · · */
|
||||
|
||||
window.pluginStreamObjects = [];
|
||||
|
||||
|
||||
|
||||
/* ·
|
||||
·
|
||||
|
|
@ -347,6 +357,18 @@ function pathToStreamRouter(path) {
|
|||
streamObject.stream = 'statusnet/groups/list.json?count=10&screen_name=' + streamObject.nickname + '&withuserarray=1';
|
||||
return streamObject;
|
||||
}
|
||||
|
||||
// other plugins can add streams to Qvitter
|
||||
if(window.pluginStreamObjects.length > 0) {
|
||||
$.each(window.pluginStreamObjects,function(k,pluginStreamObject) {
|
||||
if(typeof pluginStreamObject.pathRegExp != 'undefined' && pluginStreamObject.pathRegExp.test(path)){
|
||||
$.extend(streamObject,pluginStreamObject);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
return streamObject;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -124,18 +124,18 @@
|
|||
"clickToDrag":"Click para arrastrar",
|
||||
"keyboardShortcuts":"Atajos de teclado",
|
||||
"classicInterface":"Classic {site-title}",
|
||||
"accessibilityToggleLink":"For better accessibility, click this link to switch to the classic interface",
|
||||
"tooltipBookmarkStream":"Add this stream to your bookmarks",
|
||||
"tooltipTopMenu":"Menu and settings",
|
||||
"tooltipAttachImage":"Attach an image",
|
||||
"tooltipShortenUrls":"Shorten all URLs in the Queet",
|
||||
"tooltipReloadStream":"Refresh this stream",
|
||||
"tooltipRemoveBookmark":"Remove this bookmark",
|
||||
"clearHistory":"Clear browsing history",
|
||||
"ERRORsomethingWentWrong":"Something went wrong.",
|
||||
"ERRORmustBeLoggedIn":"You must be logged in to view this stream.",
|
||||
"ERRORcouldNotFindUserWithNickname":"Could not find a user with nickname \"{nickname}\" on this server",
|
||||
"ERRORcouldNotFindGroupWithNickname":"Could not find a group with nickname \"{nickname}\" on this server",
|
||||
"ERRORcouldNotFindPage":"Could not find that page.",
|
||||
"ERRORnoticeRemoved": "This notice has been removed."
|
||||
"accessibilityToggleLink":"Para una mejor accesibilidad, clica este enlace para cambiar a la vista clásica",
|
||||
"tooltipBookmarkStream":"Añadir este stream a tus favoritos",
|
||||
"tooltipTopMenu":"Menú i configuración",
|
||||
"tooltipAttachImage":"Añade una imagen",
|
||||
"tooltipShortenUrls":"Acortar todas las URL del Queet",
|
||||
"tooltipReloadStream":"Actualiza el stream",
|
||||
"tooltipRemoveBookmark":"Eliminar el marcador",
|
||||
"clearHistory":"Limpiar el historial de navegación",
|
||||
"ERRORsomethingWentWrong":"Algo ha ido mal.",
|
||||
"ERRORmustBeLoggedIn":"Debes iniciar sessión para ver el stream.",
|
||||
"ERRORcouldNotFindUserWithNickname":"No se ha encontrado el usuario con el apodo \"{nickname}\" en este servidor",
|
||||
"ERRORcouldNotFindGroupWithNickname":"No se ha encontrado el grupo con el nombre \"{nickname}\" en este servidor",
|
||||
"ERRORcouldNotFindPage":"No se pudo encontrar la página.",
|
||||
"ERRORnoticeRemoved": "Este aviso se ha eliminado."
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user