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

really fixes #15

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-03-07 20:51:05 +01:00
parent 82da438dfb
commit 0edcf5764c
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/qvitter.php
View File

@ -652,7 +652,9 @@ class QvitterAction extends ApiAction
<div id="feed">
<div id="feed-header">
<div id="feed-header-inner">
<h2></h2>
<h2>
<span id="stream-header"></span>
</h2>
<div class="reload-stream"></div>
</div>
<div id="feed-header-description"></div>

18
css/qvitter.css
View File

@ -1656,10 +1656,7 @@ body.rtl #unseen-notifications {
color: #333333;
line-height: 18px;
background-color: #FFFFFF;
padding-top: 12px;
padding-right: 12px;
padding-bottom: 12px;
padding-left: 12px;
padding: 8px 12px;
border-bottom-width: 1px;
border-bottom-color: #E8E8E8;
border-bottom-style: solid;
@ -1679,8 +1676,17 @@ body.rtl #unseen-notifications {
color: #66757F;
font-size: 22px;
font-weight: 300;
line-height: 22px;
max-width: 520px;
line-height: 30px;
}
#stream-header {
display: inline-block;
max-width: 490px;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
height: 30px;
white-space: nowrap;
}
#feed-header-description {

7
js/dom-functions.js
View File

@ -755,6 +755,9 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
$('#new-queets-bar-container').addClass('hidden');
$('.reload-stream').hide();
// remove old menu cog
$('#stream-menu-cog').remove();
display_spinner('#feed-header-inner');
// are we just reloading?
@ -773,10 +776,10 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
// set the new streams header and description
if(streamObject.streamSubHeader) {
$('#feed-header-inner h2').html(streamObject.streamSubHeader);
$('#stream-header').html(streamObject.streamSubHeader);
}
else {
$('#feed-header-inner h2').html(streamObject.streamHeader);
$('#stream-header').html(streamObject.streamHeader);
}
if(streamObject.streamDescription !== false) {
$('#feed-header-description').html(streamObject.streamDescription);

2
js/qvitter.js
View File

@ -927,7 +927,7 @@ function proceedToSetLanguageAndLogin(data){
$('#queet-box').html(window.sL.compose);
$('#queet-box').attr('data-start-text',encodeURIComponent(window.sL.compose));
$('#user-footer .queet-button button').html(window.sL.queetVerb);
$('#feed-header-inner h2').html(window.sL.queetsNounPlural);
$('#stream-header').html(window.sL.queetsNounPlural);
$('#logout').html(window.sL.logout);
$('#settings').html(window.sL.settings);
$('#other-servers-link').html(window.sL.otherServers);